Commit 0d0c8b94 authored by wang's avatar wang

111

parent 087652ea
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "src",
"dependencies": { "dependencies": {
"@babel/core": "^7.23.7", "@babel/core": "^7.23.7",
"abab": "^2.0.5", "abab": "^2.0.5",
...@@ -576,7 +577,7 @@ ...@@ -576,7 +577,7 @@
}, },
"node_modules/canvas": { "node_modules/canvas": {
"version": "2.11.2", "version": "2.11.2",
"resolved": "https://registry.npmmirror.com/canvas/-/canvas-2.11.2.tgz", "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz",
"integrity": "sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==", "integrity": "sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==",
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
...@@ -1495,9 +1496,10 @@ ...@@ -1495,9 +1496,10 @@
"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
}, },
"node_modules/tar": { "node_modules/tar": {
"version": "6.2.0", "version": "6.2.1",
"resolved": "https://registry.npmmirror.com/tar/-/tar-6.2.0.tgz", "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
"integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==", "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
"license": "ISC",
"dependencies": { "dependencies": {
"chownr": "^2.0.0", "chownr": "^2.0.0",
"fs-minipass": "^2.0.0", "fs-minipass": "^2.0.0",
...@@ -1647,9 +1649,10 @@ ...@@ -1647,9 +1649,10 @@
"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
}, },
"node_modules/ws": { "node_modules/ws": {
"version": "8.16.0", "version": "8.18.0",
"resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
"integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
"license": "MIT",
"engines": { "engines": {
"node": ">=10.0.0" "node": ">=10.0.0"
}, },
......
{ {
"dependencies": { "dependencies": {
"@babel/core": "^7.23.7", "@babel/core": "^7.23.7",
"canvas": "^2.11.2",
"crypto-js": "^4.2.0",
"ghost-cursor": "^1.1.19",
"node-rsa": "^1.1.1",
"abab": "^2.0.5", "abab": "^2.0.5",
"acorn": "^8.4.1", "acorn": "^8.4.1",
"acorn-globals": "^6.0.0", "acorn-globals": "^6.0.0",
"canvas": "^2.11.2",
"crypto-js": "^4.2.0",
"cssom": "^0.5.0", "cssom": "^0.5.0",
"cssstyle": "^2.3.0", "cssstyle": "^2.3.0",
"data-urls": "^3.0.0", "data-urls": "^3.0.0",
...@@ -15,10 +13,12 @@ ...@@ -15,10 +13,12 @@
"domexception": "^2.0.1", "domexception": "^2.0.1",
"escodegen": "^2.0.0", "escodegen": "^2.0.0",
"form-data": "^4.0.0", "form-data": "^4.0.0",
"ghost-cursor": "^1.1.19",
"html-encoding-sniffer": "^2.0.1", "html-encoding-sniffer": "^2.0.1",
"http-proxy-agent": "^4.0.1", "http-proxy-agent": "^4.0.1",
"https-proxy-agent": "^5.0.0", "https-proxy-agent": "^5.0.0",
"is-potential-custom-element-name": "^1.0.1", "is-potential-custom-element-name": "^1.0.1",
"node-rsa": "^1.1.1",
"nwsapi": "^2.2.0", "nwsapi": "^2.2.0",
"parse5": "6.0.1", "parse5": "6.0.1",
"saxes": "^5.0.1", "saxes": "^5.0.1",
......
...@@ -6,10 +6,11 @@ import subprocess ...@@ -6,10 +6,11 @@ import subprocess
import tempfile import tempfile
import time import time
from pathlib import Path from pathlib import Path
# import requests
from curl_cffi import requests from curl_cffi import requests
# import urllib3 import urllib3
# urllib3.disable_warnings() urllib3.disable_warnings()
from loguru import logger from loguru import logger
req_level = logger.level('REQU', no=100, color='<fg 34>') req_level = logger.level('REQU', no=100, color='<fg 34>')
...@@ -83,7 +84,7 @@ class Reese84ByPass(object): ...@@ -83,7 +84,7 @@ class Reese84ByPass(object):
self._session.cookies.clear() self._session.cookies.clear()
t1 = time.time() t1 = time.time()
r1 = self._session.get( r1 = self._session.get(
'https://www.flyscoot.com/g-Then-And-meeting-beding-O-Scena-Quarre-allowt-') 'https://www.flyscoot.com/Volute-of-and-The-Exit-which-newell-Exeunt-Son-R/11451574250290671991?s=mz4CWHGF')
self.log.log('REQU', f'jsURL: {"https://makeabooking.flyscoot.com/rtaliuery-Doct-The-Then-throngling-Was-Son-Hes-I"}') self.log.log('REQU', f'jsURL: {"https://makeabooking.flyscoot.com/rtaliuery-Doct-The-Then-throngling-Was-Son-Hes-I"}')
self.log.log('REQU', f'JSURL: code:{r1.status_code} cost:{(time.time() - t1):.3f}s') self.log.log('REQU', f'JSURL: code:{r1.status_code} cost:{(time.time() - t1):.3f}s')
cache_md5 = md5(r1.text) cache_md5 = md5(r1.text)
...@@ -109,7 +110,7 @@ class Reese84ByPass(object): ...@@ -109,7 +110,7 @@ class Reese84ByPass(object):
# print(len(data['solution']['interrogation']['p'])) # print(len(data['solution']['interrogation']['p']))
t3 = time.time() t3 = time.time()
url = "https://www.flyscoot.com/g-Then-And-meeting-beding-O-Scena-Quarre-allowt-?d=www.flyscoot.com" url = "https://www.flyscoot.com/Volute-of-and-The-Exit-which-newell-Exeunt-Son-R/11451574250290671991?d=www.flyscoot.com"
response = self._session.post(url, headers={ response = self._session.post(url, headers={
"Host": "www.flyscoot.com", "Host": "www.flyscoot.com",
"sec-ch-ua": "\"Google Chrome\";v=\"117\", \"Not;A=Brand\";v=\"8\", \"Chromium\";v=\"117\"", "sec-ch-ua": "\"Google Chrome\";v=\"117\", \"Not;A=Brand\";v=\"8\", \"Chromium\";v=\"117\"",
...@@ -122,7 +123,7 @@ class Reese84ByPass(object): ...@@ -122,7 +123,7 @@ class Reese84ByPass(object):
"Sec-Fetch-Site": "same-origin", "Sec-Fetch-Site": "same-origin",
"Sec-Fetch-Mode": "cors", "Sec-Fetch-Mode": "cors",
"Sec-Fetch-Dest": "empty", "Sec-Fetch-Dest": "empty",
"Referer": "https://www.flyscoot.com/en/", "Referer": "https://booking.flyscoot.com/en/",
"Accept-Language": "en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7,ru;q=0.6" "Accept-Language": "en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7,ru;q=0.6"
}, json=data) }, json=data)
self.log.log('REQU', f'JSURL: code:{response.status_code} cost:{(time.time() - t3):.3f}s') self.log.log('REQU', f'JSURL: code:{response.status_code} cost:{(time.time() - t3):.3f}s')
...@@ -138,27 +139,25 @@ class Reese84ByPass(object): ...@@ -138,27 +139,25 @@ class Reese84ByPass(object):
t1 = time.time() t1 = time.time()
headers = { headers = {
"Host": "ibe.api.flyscoot.com", "Host": "booking.api.flyscoot.com",
"pragma": "no-cache", "sec-ch-ua": "\"Chromium\";v=\"128\", \"Not;A=Brand\";v=\"24\", \"Google Chrome\";v=\"128\"",
"cache-control": "no-cache",
"sec-ch-ua": "\"Google Chrome\";v=\"117\", \"Not;A=Brand\";v=\"8\", \"Chromium\";v=\"117\"",
"sec-ch-ua-mobile": "?0", "sec-ch-ua-mobile": "?0",
"x-scoot-client-session": "6a8f7c3d-9735-4254-a37c-dc79a87feead", "x-scoot-client-session": "fdbdf124-c8ca-40c7-a51a-05bd24d3b317",
"authorization": "", "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36",
"x-scoot-client-version": "0.0.0",
"x-scoot-client-environment": "PROD", "x-scoot-client-environment": "PROD",
"x-scoot-client-version": "0.0.0",
"content-type": "application/json", "content-type": "application/json",
"accept": "application/json, text/plain, */*", "accept": "application/json, text/plain, */*",
"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",
"x-scoot-appsource": "IBE-WEB", "x-scoot-appsource": "IBE-WEB",
"sec-ch-ua-platform": "\"macOS\"", "sec-ch-ua-platform": "\"macOS\"",
"origin": "https://beta.makeabooking.flyscoot.com", "origin": "https://booking.flyscoot.com",
"sec-fetch-site": "same-site", "sec-fetch-site": "same-site",
"sec-fetch-mode": "cors", "sec-fetch-mode": "cors",
"sec-fetch-dest": "empty", "sec-fetch-dest": "empty",
"accept-language": "en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7,ru;q=0.6" "accept-language": "en",
"priority": "u=1, i"
} }
url = "https://ibe.api.flyscoot.com/v1/account/anonymous" url = "https://booking.api.flyscoot.com/v1/account/anonymous"
response = self._session.get(url, headers=headers) response = self._session.get(url, headers=headers)
print(response.text) print(response.text)
self._token = response.json()['data']['accessToken'] self._token = response.json()['data']['accessToken']
......
...@@ -1307,7 +1307,7 @@ const { ...@@ -1307,7 +1307,7 @@ const {
} = jsdom; // 引出 JSDOM 类, 等同于 JSDOM = jsdom.JSDOM } = jsdom; // 引出 JSDOM 类, 等同于 JSDOM = jsdom.JSDOM
const dom = new JSDOM( const dom = new JSDOM(
` <!DOCTYPE html> <html lang="en" en-sg RU> <head><script src="/g-Then-And-meeting-beding-O-Scena-Quarre-allowt-" async></script> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> <meta charset="utf-8" /><script type="text/javascript" src="/ruxitagentjs_ICA27NVfghjqrux_10279231130031246.js" data-dtconfig="rid=RID_1501609|rpid=-1859062762|domain=fscootdyn.flyscootca.com|reportUrl=https://fscootdyn.flyscootca.com/rb_bf52368gpr|app=d8c5241ff29ef576|cors=1|featureHash=ICA27NVfghjqrux|vcv=2|rdnt=1|uxrgce=1|bp=3|cuc=oas0oo1m|mel=100000|dpvc=1|md=mdcc1=fx-liveagent-session-key|ssv=4|lastModification=1701885191507|tp=500,50,0,1|agentUri=/ruxitagentjs_ICA27NVfghjqrux_10279231130031246.js"></script><script type="text/html" id="sf-tracking-consent-manager"> ` <!DOCTYPE html> <html lang="en" en-sg RU> <head><script src="/Volute-of-and-The-Exit-which-newell-Exeunt-Son-R/11451574250290671991" async></script> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> <meta charset="utf-8" /><script type="text/javascript" src="/ruxitagentjs_ICA27NVfghjqrux_10279231130031246.js" data-dtconfig="rid=RID_1501609|rpid=-1859062762|domain=fscootdyn.flyscootca.com|reportUrl=https://fscootdyn.flyscootca.com/rb_bf52368gpr|app=d8c5241ff29ef576|cors=1|featureHash=ICA27NVfghjqrux|vcv=2|rdnt=1|uxrgce=1|bp=3|cuc=oas0oo1m|mel=100000|dpvc=1|md=mdcc1=fx-liveagent-session-key|ssv=4|lastModification=1701885191507|tp=500,50,0,1|agentUri=/ruxitagentjs_ICA27NVfghjqrux_10279231130031246.js"></script><script type="text/html" id="sf-tracking-consent-manager">
\t<div id="tracking-consent-dialog" style="display:none;" class="hidden"> \t<div id="tracking-consent-dialog" style="display:none;" class="hidden">
</div> </div>
</script><script type="text/javascript" src="/WebResource.axd?d=DzHrpQl5URXarFHAtrmzFiVGCp9k3PJKAh3Au6tULwI3z2EKZIWdZjHIKorXmVWtqfboHFuCdj6oa1XUJAP5fA3f4Iqu4x90S3aDJ9UC6y8T1XJIHmjzt0iedHwMeb8hvKIBNUtZpwwmosLi2qggI96FCNOD3Bf3q9GkuZENu9ZjYmUuSvaKCV9uZxDDJ8q_0&amp;t=637885997880000000"> </script><script type="text/javascript" src="/WebResource.axd?d=DzHrpQl5URXarFHAtrmzFiVGCp9k3PJKAh3Au6tULwI3z2EKZIWdZjHIKorXmVWtqfboHFuCdj6oa1XUJAP5fA3f4Iqu4x90S3aDJ9UC6y8T1XJIHmjzt0iedHwMeb8hvKIBNUtZpwwmosLi2qggI96FCNOD3Bf3q9GkuZENu9ZjYmUuSvaKCV9uZxDDJ8q_0&amp;t=637885997880000000">
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment