Merge remote-tracking branch 'origin/tr' into tr

# Conflicts:
#	src/reese84_bypass.py
#	src/run.js

Dockerfile

@@ -6,10 +6,11 @@ COPY src/ /home/opt/lcc-reese84/src
 #ADD package-lock.json package.json /home/opt/lcc-5s/
 WORKDIR /home/opt/lcc-reese84/
 RUN cd /home/opt/lcc-reese84/src && npm i
-#RUN sed -i "s/'all'/'asll'/g" /home/opt/lcc-reese84/src/node_modules/nwsapi/src/nwsapi.js
+RUN sed -i "s/'all'/'asll'/g" /home/opt/lcc-reese84/src/node_modules/nwsapi/src/nwsapi.js
 WORKDIR /home/opt/lcc-reese84/src
 RUN pip3 install requests loguru curl_cffi tls_client pyquery nacos-sdk-python pyyaml
 RUN sed -i "s/\"Accep/#\"Accep/g" /usr/local/lib/python3.10/site-packages/tls_client/sessions.py
+RUN sed -i 's/typing_extensions/typing/g' /usr/local/lib/python3.10/site-packages/tls_client/settings.py
 RUN npm i -g pm2 canvas
 
 

docker-compose.yml

@@ -26,19 +26,19 @@ services:
       - /data/log/lcc-5s/:/data/log/lcc-5s/
     environment:
       -  work_dir=2
-#  reese843: # 单个服务标识(名字)
-#    container_name: lcc-py-reese84-3        # 启动后的容器名称 相当于 --name 指定的名称
-#    image: lcctr:latest             # 镜像
-#    restart: "always"
-#    deploy:
-#      resources:
-#        limits:
-#          cpus: '2'
-#          memory: 1G
-#    volumes:
-#      - /data/log/lcc-5s/:/data/log/lcc-5s/
-#    environment:
-#      - work_dir=3
+  reese843: # 单个服务标识(名字)
+    container_name: lcc-py-tr-3       # 启动后的容器名称 相当于 --name 指定的名称
+    image: lcctr:latest             # 镜像
+    restart: "always"
+    deploy:
+      resources:
+        limits:
+          cpus: '2'
+          memory: 1G
+    volumes:
+      - /data/log/lcc-5s/:/data/log/lcc-5s/
+    environment:
+      - work_dir=3
 #  reese844: # 单个服务标识(名字)
 #    container_name: lcc-py-reese84-4      # 启动后的容器名称 相当于 --name 指定的名称
 #    image: lcctr:latest             # 镜像

geetestast/gee_init.py

@@ -11,35 +11,35 @@ class Gee():
         self.session = requests.Session(impersonate='chrome110')
         self.session.verify = False
         self.session.proxies = {
-            'http': 'http://127.0.0.1:9000',
-            'https': 'http://127.0.0.1:9000'
+            'http': 'http://127.0.0.1:8890',
+            'https': 'http://127.0.0.1:8890'
         }
         self.ctx = execjs.compile(open('./src.js').read())
 
-        self.cts = '%2f9XNtvh%2b8sFajJwQz8jmN%2f%2faHuZXcLYTqMdydRu5uHE07VQmDkmT%2batCVVo%2fb%2fNi'
+        self.cts = 'aylqflYEw3UReF+NHwmVm5NHv9ghECWvoYmzhZeBvKClUmUmfr744onaktuzC9XS'
+        r = requests.post('http://aws-lcc.unififi.com/header/borrow', json={
+            'brush_type':'cookiePR',
+            'method': "shopping"
+        })
+        cks = r.json()['data']['brush_header']['cookie']
+        for i in cks.split('; '):
+            t = i.index('=')
+
+            self.session.cookies.update({
+                i[:t]: i[t+1:]
+            })
+
+        self.headers = r.json()['data']['brush_header']
+        self.headers.pop('cookie')
         pass
 
     def init(self):
-        headers = {
-            "authority": "makeabooking.flyscoot.com",
-            "accept": "*/*",
-            "accept-language": "en",
-            "cache-control": "no-cache",
-            "pragma": "no-cache",
-            "referer": "https://makeabooking.flyscoot.com/_Incapsula_Resource?SWUDNSAI=31&xinfo=5-105210083-0%20NNNY%20RT%281704432742576%20659%29%20q%280%20-1%20-1%203%29%20r%280%20-1%29%20B12%2814%2c0%2c0%29%20U18&incident_id=1160001190813994914-755464947643194821&edet=12&cinfo=0e0000000628&rpinfo=0&cts=G%2f%2b%2fkZktndgiZArS%2fSFP%2b2saKar%2bLqbKCyUlpPSoyd%2fP1gM8zgmubGYfRB%2fLJIzM&mth=GET",
-            "sec-ch-ua": "\"Not_A Brand\";v=\"8\", \"Chromium\";v=\"120\", \"Google Chrome\";v=\"120\"",
-            "sec-ch-ua-mobile": "?0",
-            "sec-ch-ua-platform": "\"macOS\"",
-            "sec-fetch-dest": "empty",
-            "sec-fetch-mode": "cors",
-            "sec-fetch-site": "same-origin",
-            "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
-        }
-        url = "https://makeabooking.flyscoot.com/_Incapsula_Resource?SWCNGEEC=" + self.cts
+        url = 'https://book.philippineairlines.com/_Incapsula_Resource?SWCNGEEC=aylqflYEw3UReF%2bNHwmVm5NHv9ghECWvoYmzhZeBvKClUmUmfr744onaktuzC9XS'
+
+
 
-        response = self.session.get(url, headers=headers)
 
-        response = self.session.get(url, headers=headers)
+        response = self.session.get(url, headers=self.headers)
         print(response.text)
         self.challenge = response.json()["challenge"]
         self.gt = response.json()["gt"]

src/main.py

@@ -19,13 +19,13 @@ if not pathlib.Path('nacos-data/snapshot/').exists():
 
 
 def check_pull():
-    get_url = 'http://ymx-lcc.unififi.com/header/task/pull/cookieTR?brush_name=test'
+    get_url = 'http://aws-lcc.unififi.com/header/task/pull/cookieTR?brush_name=test'
     r = requests.get(get_url)
     return r.json()
 
 
 def get_proxy():
-    get_proxy_url = 'http://ymx-lcc.unififi.com/proxy/get-proxy'
+    get_proxy_url = 'http://aws-lcc.unififi.com/proxy/get-proxy'
     r = requests.post(get_proxy_url, json={
         'name': 'TR',
         'type': 'shopping'
@@ -46,7 +46,7 @@ def add_header(headers: dict, cookies: dict, px: str, thread_id=0):
         "brush_proxy": px,
         "brush_type": "cookieTR"
     }
-    r = requests.post("http://ymx-lcc.unififi.com/header/add", json=data)
+    r = requests.post("http://aws-lcc.unififi.com/header/add", json=data)
     print(r.json())
 
 
@@ -65,7 +65,7 @@ def exec(thread_id):
 
         try:
             px = get_proxy()['url']
-            px = random.choice(['http://user-uni007-region-us:q39CEBTs5A5YQXor@pr.roxlabs.cn:4600', px])
+            # px = random.choice([px])
             cf = Reese84ByPass(target="https://www.flyscoot.com/", proxy=px, thread_name=f'{thread_id}')
             headers, cookies = cf.start()
             # cf.test()

test_tmx.py

@@ -4,7 +4,7 @@ from pyquery import PyQuery
 
 
 def get_header():
-    r = requests.post('http://ymx-lcc.unififi.com/header/borrow', json={
+    r = requests.post('http://aws-lcc.unififi.com/header/borrow', json={
         "brush_type": "cookieAS",
         "brush_fromto": "aaa-bbb",
         "method": "shopping"
@@ -13,7 +13,7 @@ def get_header():
 
 
 def return_header(header):
-    r = requests.post('http://ymx-lcc.unififi.com/header/return', json={
+    r = requests.post('http://aws-lcc.unififi.com/header/return', json={
         "brush_type": "cookieTR",
         "_id": header['brush_id'],
         "status": 0,