Skip to content

L
lcc-reese84
Commit d5c65148 authored by wang's avatar wang
Browse files
Options

test

parent fad3810f
Hide whitespace changes
Inline Side-by-side
Showing with 16240 additions and 9037 deletions
ast/encode.js 0 → 100644
View file @ d5c65148
This source diff could not be displayed because it is too large. You can view the blob instead.
src/jsdom/lib/jsdom/browser/Window.js
View file @ d5c65148
......@@ -929,14 +929,14 @@ Object.defineProperty(window, "chrome", {
writable: true
});
Object.defineProperty(window, "openDatabase", {
value: v_saf(function openDatabase(){
}),
configurable: true,
enumerable: false,
writable: true
});
// Object.defineProperty(window, "openDatabase", {
// value: v_saf(function openDatabase(){
//
// }),
// configurable: true,
// enumerable: false,
// writable: true
// });
this.postMessage = postMessage(window);
this.atob = function (str) {
......
src/jsdom/lib/jsdom/living/generated/HTMLIFrameElement.js
View file @ d5c65148
......@@ -359,7 +359,9 @@ exports.install = (globalObject, globalNames) => {
);
}
return utils.tryWrapperForImpl(esValue[implSymbol]["contentWindow"]);
let res = utils.tryWrapperForImpl(esValue[implSymbol]["contentWindow"]);
res.WebGL2RenderingContext = window.WebGL2RenderingContext
return res;
}
get align() {
......
src/jsdom/lib/jsdom/living/generated/Navigator.js
View file @ d5c65148
......@@ -411,7 +411,7 @@ exports.install = (globalObject, globalNames) => {
get language() {
return window.ENV.navigatorparams.language ||
"en-US"
"en"
const esValue = this !== null && this !== undefined ? this : globalObject;
......
src/jsdom/lib/jsdom/living/navigator/NavigatorLanguage-impl.js
View file @ d5c65148
......@@ -2,7 +2,7 @@
exports.implementation = class NavigatorLanguageImpl {
get language() {
return "en-US";
return 'en';
}
// See Navigator constructor for languages
......
src/package-lock.json
View file @ d5c65148
......@@ -13,7 +13,6 @@
"abab": "^2.0.5",
"acorn": "^8.4.1",
"acorn-globals": "^6.0.0",
"canvas": "^2.11.2",
"cssom": "^0.5.0",
"cssstyle": "^2.3.0",
"data-urls": "^3.0.0",
......@@ -436,25 +435,6 @@
"@jridgewell/sourcemap-codec": "^1.4.14"
}
},
"node_modules/@mapbox/node-pre-gyp": {
"version": "1.0.11",
"resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz",
"integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==",
"dependencies": {
"detect-libc": "^2.0.0",
"https-proxy-agent": "^5.0.0",
"make-dir": "^3.1.0",
"node-fetch": "^2.6.7",
"nopt": "^5.0.0",
"npmlog": "^5.0.1",
"rimraf": "^3.0.2",
"semver": "^7.3.5",
"tar": "^6.1.11"
},
"bin": {
"node-pre-gyp": "bin/node-pre-gyp"
}
},
"node_modules/@sindresorhus/is": {
"version": "4.6.0",
"resolved": "https://registry.npmmirror.com/@sindresorhus/is/-/is-4.6.0.tgz",
......@@ -481,11 +461,6 @@
"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
"integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="
},
"node_modules/abbrev": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
},
"node_modules/accepts": {
"version": "1.3.8",
"resolved": "https://registry.npmmirror.com/accepts/-/accepts-1.3.8.tgz",
......@@ -577,14 +552,6 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
},
"node_modules/ansi-regex": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
"engines": {
"node": ">=8"
}
},
"node_modules/ansi-styles": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
......@@ -596,23 +563,6 @@
"node": ">=4"
}
},
"node_modules/aproba": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
"integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="
},
"node_modules/are-we-there-yet": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
"integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
"dependencies": {
"delegates": "^1.0.0",
"readable-stream": "^3.6.0"
},
"engines": {
"node": ">=10"
}
},
"node_modules/array-flatten": {
"version": "1.1.1",
"resolved": "https://registry.npmmirror.com/array-flatten/-/array-flatten-1.1.1.tgz",
......@@ -623,11 +573,6 @@
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
},
"node_modules/balanced-match": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
},
"node_modules/bezier-js": {
"version": "6.1.4",
"resolved": "https://registry.npmjs.org/bezier-js/-/bezier-js-6.1.4.tgz",
......@@ -660,15 +605,6 @@
"npm": "1.2.8000 || >= 1.4.16"
}
},
"node_modules/brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"dependencies": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
}
},
"node_modules/browser-process-hrtime": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
......@@ -721,20 +657,6 @@
"resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001517.tgz",
"integrity": "sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA=="
},
"node_modules/canvas": {
"version": "2.11.2",
"resolved": "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz",
"integrity": "sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==",
"hasInstallScript": true,
"dependencies": {
"@mapbox/node-pre-gyp": "^1.0.0",
"nan": "^2.17.0",
"simple-get": "^3.0.3"
},
"engines": {
"node": ">=6"
}
},
"node_modules/chalk": {
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
......@@ -748,14 +670,6 @@
"node": ">=4"
}
},
"node_modules/chownr": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
"integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
"engines": {
"node": ">=10"
}
},
"node_modules/color-convert": {
"version": "1.9.3",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
......@@ -769,14 +683,6 @@
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
},
"node_modules/color-support": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
"integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
"bin": {
"color-support": "bin.js"
}
},
"node_modules/combined-stream": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
......@@ -788,16 +694,6 @@
"node": ">= 0.8"
}
},
"node_modules/concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
},
"node_modules/console-control-strings": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
"integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="
},
"node_modules/content-disposition": {
"version": "0.5.4",
"resolved": "https://registry.npmmirror.com/content-disposition/-/content-disposition-0.5.4.tgz",
......@@ -921,17 +817,6 @@
"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
"integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
},
"node_modules/decompress-response": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
"integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
"dependencies": {
"mimic-response": "^2.0.0"
},
"engines": {
"node": ">=8"
}
},
"node_modules/delayed-stream": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
......@@ -940,11 +825,6 @@
"node": ">=0.4.0"
}
},
"node_modules/delegates": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
"integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="
},
"node_modules/depd": {
"version": "2.0.0",
"resolved": "https://registry.npmmirror.com/depd/-/depd-2.0.0.tgz",
......@@ -962,14 +842,6 @@
"npm": "1.2.8000 || >= 1.4.16"
}
},
"node_modules/detect-libc": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.2.tgz",
"integrity": "sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==",
"engines": {
"node": ">=8"
}
},
"node_modules/domexception": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
......@@ -1010,11 +882,6 @@
"resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.475.tgz",
"integrity": "sha512-mTye5u5P98kSJO2n7zYALhpJDmoSQejIGya0iR01GpoRady8eK3bw7YHHnjA1Rfi4ZSLdpuzlAC7Zw+1Zu7Z6A=="
},
"node_modules/emoji-regex": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
},
"node_modules/encodeurl": {
"version": "1.0.2",
"resolved": "https://registry.npmmirror.com/encodeurl/-/encodeurl-1.0.2.tgz",
......@@ -1200,57 +1067,11 @@
"node": ">= 0.6"
}
},
"node_modules/fs-minipass": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
"integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
"dependencies": {
"minipass": "^3.0.0"
},
"engines": {
"node": ">= 8"
}
},
"node_modules/fs-minipass/node_modules/minipass": {
"version": "3.3.6",
"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
"integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
"dependencies": {
"yallist": "^4.0.0"
},
"engines": {
"node": ">=8"
}
},
"node_modules/fs.realpath": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
},
"node_modules/function-bind": {
"version": "1.1.1",
"resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz",
"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
},
"node_modules/gauge": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
"integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
"dependencies": {
"aproba": "^1.0.3 || ^2.0.0",
"color-support": "^1.1.2",
"console-control-strings": "^1.0.0",
"has-unicode": "^2.0.1",
"object-assign": "^4.1.1",
"signal-exit": "^3.0.0",
"string-width": "^4.2.3",
"strip-ansi": "^6.0.1",
"wide-align": "^1.1.2"
},
"engines": {
"node": ">=10"
}
},
"node_modules/generative-bayesian-network": {
"version": "2.1.37",
"resolved": "https://registry.npmmirror.com/generative-bayesian-network/-/generative-bayesian-network-2.1.37.tgz",
......@@ -1288,25 +1109,6 @@
"bezier-js": "^6.1.3"
}
},
"node_modules/glob": {
"version": "7.2.3",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
"dependencies": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
"inherits": "2",
"minimatch": "^3.1.1",
"once": "^1.3.0",
"path-is-absolute": "^1.0.0"
},
"engines": {
"node": "*"
},
"funding": {
"url": "https://github.com/sponsors/isaacs"
}
},
"node_modules/globals": {
"version": "11.12.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
......@@ -1350,11 +1152,6 @@
"node": ">= 0.4"
}
},
"node_modules/has-unicode": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
"integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="
},
"node_modules/header-generator": {
"version": "2.1.37",
"resolved": "https://registry.npmmirror.com/header-generator/-/header-generator-2.1.37.tgz",
......@@ -1473,15 +1270,6 @@
"node": ">=0.10.0"
}
},
"node_modules/inflight": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
"dependencies": {
"once": "^1.3.0",
"wrappy": "1"
}
},
"node_modules/inherits": {
"version": "2.0.4",
"resolved": "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz",
......@@ -1495,14 +1283,6 @@
"node": ">= 0.10"
}
},
"node_modules/is-fullwidth-code-point": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
"engines": {
"node": ">=8"
}
},
"node_modules/is-obj": {
"version": "2.0.0",
"resolved": "https://registry.npmmirror.com/is-obj/-/is-obj-2.0.0.tgz",
......@@ -1548,39 +1328,6 @@
"resolved": "https://registry.npmmirror.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
"integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
},
"node_modules/lru-cache": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
"dependencies": {
"yallist": "^4.0.0"
},
"engines": {
"node": ">=10"
}
},
"node_modules/make-dir": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
"dependencies": {
"semver": "^6.0.0"
},
"engines": {
"node": ">=8"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/make-dir/node_modules/semver": {
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"bin": {
"semver": "bin/semver.js"
}
},
"node_modules/media-typer": {
"version": "0.3.0",
"resolved": "https://registry.npmmirror.com/media-typer/-/media-typer-0.3.0.tgz",
......@@ -1632,80 +1379,11 @@
"node": ">= 0.6"
}
},
"node_modules/mimic-response": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
"integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
"engines": {
"node": ">=8"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/minimatch": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
"dependencies": {
"brace-expansion": "^1.1.7"
},
"engines": {
"node": "*"
}
},
"node_modules/minipass": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
"integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
"engines": {
"node": ">=8"
}
},
"node_modules/minizlib": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
"integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
"dependencies": {
"minipass": "^3.0.0",
"yallist": "^4.0.0"
},
"engines": {
"node": ">= 8"
}
},
"node_modules/minizlib/node_modules/minipass": {
"version": "3.3.6",
"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
"integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
"dependencies": {
"yallist": "^4.0.0"
},
"engines": {
"node": ">=8"
}
},
"node_modules/mkdirp": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
"bin": {
"mkdirp": "bin/cmd.js"
},
"engines": {
"node": ">=10"
}
},
"node_modules/ms": {
"version": "2.0.0",
"resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
},
"node_modules/nan": {
"version": "2.17.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
"integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ=="
},
"node_modules/negotiator": {
"version": "0.6.3",
"resolved": "https://registry.npmmirror.com/negotiator/-/negotiator-0.6.3.tgz",
......@@ -1714,87 +1392,16 @@
"node": ">= 0.6"
}
},
"node_modules/node-fetch": {
"version": "2.6.12",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
"integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
"dependencies": {
"whatwg-url": "^5.0.0"
},
"engines": {
"node": "4.x || >=6.0.0"
},
"peerDependencies": {
"encoding": "^0.1.0"
},
"peerDependenciesMeta": {
"encoding": {
"optional": true
}
}
},
"node_modules/node-fetch/node_modules/tr46": {
"version": "0.0.3",
"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
},
"node_modules/node-fetch/node_modules/webidl-conversions": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
},
"node_modules/node-fetch/node_modules/whatwg-url": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
"dependencies": {
"tr46": "~0.0.3",
"webidl-conversions": "^3.0.0"
}
},
"node_modules/node-releases": {
"version": "2.0.13",
"resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.13.tgz",
"integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ=="
},
"node_modules/nopt": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
"integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
"dependencies": {
"abbrev": "1"
},
"bin": {
"nopt": "bin/nopt.js"
},
"engines": {
"node": ">=6"
}
},
"node_modules/npmlog": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
"integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
"dependencies": {
"are-we-there-yet": "^2.0.0",
"console-control-strings": "^1.1.0",
"gauge": "^3.0.0",
"set-blocking": "^2.0.0"
}
},
"node_modules/nwsapi": {
"version": "2.2.7",
"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz",
"integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ=="
},
"node_modules/object-assign": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
"integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/object-inspect": {
"version": "1.12.3",
"resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.12.3.tgz",
......@@ -1811,14 +1418,6 @@
"node": ">= 0.8"
}
},
"node_modules/once": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
"integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
"dependencies": {
"wrappy": "1"
}
},
"node_modules/ow": {
"version": "0.28.2",
"resolved": "https://registry.npmmirror.com/ow/-/ow-0.28.2.tgz",
......@@ -1847,14 +1446,6 @@
"node": ">= 0.8"
}
},
"node_modules/path-is-absolute": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
"integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/path-to-regexp": {
"version": "0.1.7",
"resolved": "https://registry.npmmirror.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
......@@ -1928,38 +1519,11 @@
"node": ">= 0.8"
}
},
"node_modules/readable-stream": {
"version": "3.6.2",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
"dependencies": {
"inherits": "^2.0.3",
"string_decoder": "^1.1.1",
"util-deprecate": "^1.0.1"
},
"engines": {
"node": ">= 6"
}
},
"node_modules/requires-port": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
},
"node_modules/rimraf": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
"dependencies": {
"glob": "^7.1.3"
},
"bin": {
"rimraf": "bin.js"
},
"funding": {
"url": "https://github.com/sponsors/isaacs"
}
},
"node_modules/safe-buffer": {
"version": "5.2.1",
"resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz",
......@@ -1981,20 +1545,6 @@
"node": ">=10"
}
},
"node_modules/semver": {
"version": "7.5.4",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
"integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dependencies": {
"lru-cache": "^6.0.0"
},
"bin": {
"semver": "bin/semver.js"
},
"engines": {
"node": ">=10"
}
},
"node_modules/send": {
"version": "0.18.0",
"resolved": "https://registry.npmmirror.com/send/-/send-0.18.0.tgz",
......@@ -2037,11 +1587,6 @@
"node": ">= 0.8.0"
}
},
"node_modules/set-blocking": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
"integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
},
"node_modules/setprototypeof": {
"version": "1.2.0",
"resolved": "https://registry.npmmirror.com/setprototypeof/-/setprototypeof-1.2.0.tgz",
......@@ -2057,40 +1602,6 @@
"object-inspect": "^1.9.0"
}
},
"node_modules/signal-exit": {
"version": "3.0.7",
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
"integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
},
"node_modules/simple-concat": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
"integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/feross"
},
{
"type": "patreon",
"url": "https://www.patreon.com/feross"
},
{
"type": "consulting",
"url": "https://feross.org/support"
}
]
},
"node_modules/simple-get": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz",
"integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==",
"dependencies": {
"decompress-response": "^4.2.0",
"once": "^1.3.1",
"simple-concat": "^1.0.0"
}
},
"node_modules/source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
......@@ -2108,38 +1619,6 @@
"node": ">= 0.8"
}
},
"node_modules/string_decoder": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
"dependencies": {
"safe-buffer": "~5.2.0"
}
},
"node_modules/string-width": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
"dependencies": {
"emoji-regex": "^8.0.0",
"is-fullwidth-code-point": "^3.0.0",
"strip-ansi": "^6.0.1"
},
"engines": {
"node": ">=8"
}
},
"node_modules/strip-ansi": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
"dependencies": {
"ansi-regex": "^5.0.1"
},
"engines": {
"node": ">=8"
}
},
"node_modules/supports-color": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
......@@ -2156,22 +1635,6 @@
"resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
},
"node_modules/tar": {
"version": "6.1.15",
"resolved": "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz",
"integrity": "sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==",
"dependencies": {
"chownr": "^2.0.0",
"fs-minipass": "^2.0.0",
"minipass": "^5.0.0",
"minizlib": "^2.1.1",
"mkdirp": "^1.0.3",
"yallist": "^4.0.0"
},
"engines": {
"node": ">=10"
}
},
"node_modules/to-fast-properties": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
......@@ -2270,11 +1733,6 @@
"requires-port": "^1.0.0"
}
},
"node_modules/util-deprecate": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
},
"node_modules/utils-merge": {
"version": "1.0.1",
"resolved": "https://registry.npmmirror.com/utils-merge/-/utils-merge-1.0.1.tgz",
......@@ -2352,19 +1810,6 @@
"node": ">=12"
}
},
"node_modules/wide-align": {
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
"integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
"dependencies": {
"string-width": "^1.0.2 || 2 || 3 || 4"
}
},
"node_modules/wrappy": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
},
"node_modules/ws": {
"version": "8.13.0",
"resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
......@@ -2394,11 +1839,6 @@
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
"integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
},
"node_modules/yallist": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
}
}
}
src/package.json
View file @ d5c65148
......@@ -13,7 +13,6 @@
"abab": "^2.0.5",
"acorn": "^8.4.1",
"acorn-globals": "^6.0.0",
"canvas": "^2.11.2",
"cssom": "^0.5.0",
"cssstyle": "^2.3.0",
"data-urls": "^3.0.0",
......
src/reese84_bypass.py
View file @ d5c65148
import hashlib
import json
import platform
import random
import subprocess
import tempfile
import time
from pathlib import Path
from curl_cffi import requests
import urllib3
urllib3.disable_warnings()
......@@ -33,10 +34,10 @@ def md5(text):
class Reese84ByPass(object):
def __init__(self, target, proxy, thread_name='test'):
self._session = tls_client.Session('chrome_117')
# self._session = tls_client.Session('chrome_117')
# self._session = requests.Session()
# self._session.verify = False
self._session = requests.Session()
self._session.verify = False
self.__target = target
if proxy != '':
self._session.proxies = {
......@@ -69,7 +70,7 @@ class Reese84ByPass(object):
"sec-ch-ua-mobile": "?0",
"sec-ch-ua-platform": "\"macOS\"",
"upgrade-insecure-requests": "1",
"user-agent": 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36',
"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',
"accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
"sec-fetch-site": "none",
"sec-fetch-mode": "navigate",
......@@ -83,7 +84,7 @@ class Reese84ByPass(object):
self._session.cookies.clear()
t1 = time.time()
r1 = self._session.get(
'https://makeabooking.flyscoot.com/rtaliuery-Doct-The-Then-throngling-Was-Son-Hes-I')
'https://www.flyscoot.com/g-Then-And-meeting-beding-O-Scena-Quarre-allowt-')
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')
cache_md5 = md5(r1.text)
......@@ -109,7 +110,7 @@ class Reese84ByPass(object):
# print(len(data['solution']['interrogation']['p']))
t3 = time.time()
url = "https://makeabooking.flyscoot.com/rtaliuery-Doct-The-Then-throngling-Was-Son-Hes-I?d=makeabooking.flyscoot.com"
url = "https://www.flyscoot.com/g-Then-And-meeting-beding-O-Scena-Quarre-allowt-?d=www.flyscoot.com"
response = self._session.post(url, headers={
"Host": "www.flyscoot.com",
"sec-ch-ua": "\"Google Chrome\";v=\"117\", \"Not;A=Brand\";v=\"8\", \"Chromium\";v=\"117\"",
......@@ -117,8 +118,7 @@ class Reese84ByPass(object):
"sec-ch-ua-platform": "\"macOS\"",
"Content-Type": "text/plain; charset=utf-8",
"sec-ch-ua-mobile": "?0",
"User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36",
"x-dtpc": "4$133940727_796h2vMTLUKMIEALWOHLUOBCVHUABCMAQCLRKI-0e0",
"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",
"Origin": "https://www.flyscoot.com",
"Sec-Fetch-Site": "same-origin",
"Sec-Fetch-Mode": "cors",
......@@ -150,7 +150,7 @@ class Reese84ByPass(object):
"x-scoot-client-environment": "PROD",
"content-type": "application/json",
"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/117.0.0.0 Safari/537.36",
"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",
"sec-ch-ua-platform": "\"macOS\"",
"origin": "https://beta.makeabooking.flyscoot.com",
......@@ -176,7 +176,7 @@ class Reese84ByPass(object):
"cookies": f"Bearer {self._token}",
"Content-Type": "application/json",
"sec-ch-ua-mobile": "?0",
"User-Agent": 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36',
"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',
"sec-ch-ua-platform": "\"macOS\"",
"Origin": "https://www.flyscoot.com",
"Sec-Fetch-Site": "same-site",
......@@ -206,7 +206,7 @@ class Reese84ByPass(object):
# "sec-fetch-dest": "empty",
# "sec-fetch-mode": "cors",
# "sec-fetch-site": "same-site",
# "user-agent": 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36',
# "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-client-environment": "PROD",
# "x-scoot-client-session": "4ddf4d27-d6a1-4b50-b533-04558f7ab4b8",
......@@ -226,9 +226,9 @@ class Reese84ByPass(object):
"sec-fetch-site": "none",
"sec-fetch-user": "?1",
"upgrade-insecure-requests": "1",
"user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36"
"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"
}
return headers, self._session.cookies.get_dict()
return headers, self._session.cookies.items()
def _test(self):
......@@ -246,10 +246,11 @@ class Reese84ByPass(object):
"sec-fetch-site": "none",
"sec-fetch-user": "?1",
"upgrade-insecure-requests": "1",
"user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36"
"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/Book/Flight?culture=en-SG&type=oneway&dst1=SIN&ast1=ADL&dst2=ADL&ast2=SIN&dd=2023-12-15&rd=null&adt=1&chd=0&inf=0#"
response = self._session.get(url, headers=headers)
print(response.text)
self.log.debug(f"resp {'Flight Search Results' in response.text}")
print(self._get_cookie())
......@@ -263,7 +264,8 @@ if __name__ == '__main__':
r = Reese84ByPass('https://www.flyscoot.com/', 'http://unfflcc:76cc14-47b8dd-1f8ace-827836-0c740e@usa.rotating.proxyrack.net:9000')
# r = Reese84ByPass('https://www.flyscoot.com/', 'http://user-uni007-region-us:q39CEBTs5A5YQXor@pr.roxlabs.cn:4600')
r = Reese84ByPass('https://www.flyscoot.com/', 'http://127.0.0.1:8890')
# r = Reese84ByPass('https://www.flyscoot.com/', f'http://uni00001_custom_zone_US_sid_{random.randint(67336718, 67336728)}_time_5:q39CEBTs5A@us.foxyip.com:7778')
# while True:
print(r.start())
r.start()
for i in range(10):
r._test()
src/rrr.js
View file @ d5c65148
This source diff could not be displayed because it is too large. You can view the blob instead.
src/run.js
View file @ d5c65148
This source diff could not be displayed because it is too large. You can view the blob instead.
test.py
View file @ d5c65148
#
import requests
import tls_client
session = tls_client.Session(client_identifier='chrome_117',
......@@ -8,15 +8,15 @@ session = tls_client.Session(client_identifier='chrome_117',
'sec-ch-ua-platform', 'sec-fetch-dest', 'sec-fetch-mode', 'sec-fetch-site',
'sec-fetch-user', 'upgrade-insecure-requests', 'user-agent']
)
px = 'http://127.0.0.1:7890'
session.proxies = {
'http': px,
'https': px,
}
session.proxies = {
'http': "http://user-uni007-region-us:q39CEBTs5A5YQXor@pr.roxlabs.cn:4600",
'https': "http://user-uni007-region-us:q39CEBTs5A5YQXor@pr.roxlabs.cn:4600",
}
# px = 'http://127.0.0.1:7890'
# session.proxies = {
# 'http': px,
# 'https': px,
# }
# session.proxies = {
# 'http': "http://user-uni007-region-us:q39CEBTs5A5YQXor@pr.roxlabs.cn:4600",
# 'https': "http://user-uni007-region-us:q39CEBTs5A5YQXor@pr.roxlabs.cn:4600",
# }
session.proxies = {
'http': 'http://127.0.0.1:8890',
'https': 'http://127.0.0.1:8890',
......@@ -25,38 +25,69 @@ session.proxies = {
# 'http': 'http://unfflcc:76cc14-47b8dd-1f8ace-827836-0c740e@usa.rotating.proxyrack.net:9000',
# 'https': 'http://unfflcc:76cc14-47b8dd-1f8ace-827836-0c740e@usa.rotating.proxyrack.net:9000',
# }
# headers, cookies = \
# ({'Host': 'makeabooking.flyscoot.com', 'accept-language': 'en-US,en;q=0.9', 'authority': 'makeabooking.flyscoot.com', 'cache-control': 'no-cache', 'pragma': '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-platform': '"macOS"', 'sec-fetch-dest': 'document', 'sec-fetch-mode': 'navigate', 'sec-fetch-site': 'none', 'sec-fetch-user': '?1', 'upgrade-insecure-requests': '1', 'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36'}, {'visid_incap_2444946': 'BSqf8bocQXiPwEIFZdVWGaqkaWUAAAAAQUIPAAAAAAB2vvhNfmyPKy49qEYMa0Ri', 'nlbi_2444946_2147483392': 'TZwkZ1OdhmMnYHXMbmwDOgAAAABr9MCw98DVUmufxdAUnqcj', 'incap_ses_1046_2444946': 'FW2yIPtA3Dej7MBxfCSEDqqkaWUAAAAAtqo1AK7pCn9HhYbF8GtyMw==', 'nlbi_2444946': 'ai4VMZcijlfrD8+WbmwDOgAAAACyedacSTPF7RVxxMsvJ6AF', 'reese84': '3:Kkaf2dq6kZYrDGbhRotjrw==:cBlSSPrKIhbD0QxS/F6Hn8LdDLfbkQ2bEoSGpbroXBbpaImFKoVvWyEVi3wkDcVe/hp+MXBsr3SY9lACpcrg0a5YoYVgOVG55Bc2eKpnAlub4i6mMgrv0zkh5KWG9VFbEKPB42/erjaOmYIwuYb7J6WUBf0A96MQ6I3qsvvYcii/+1Ex2Pim9PA9g6Oj8O9CYUzAQnSCud5HmaGo2zXkZK/gBc2a+2XkRpMYO1zL1DJ5wm5nqjQL0YGbXpcKrXUbwvRGZ/6Wm+l9k5G2UUlU4cuhoeUpIoUZzccA9Q+0MDYcaiR0HuL0R1s4TvEby0AhkkazkzQLFiCz5cRLhhG0YCiO1knXyiGloIQm3C+sb/GCZeXfWXVSX8FDFS5XTwBic/2sqNwaIWiTA3+IRnIguFiS0UhqmiegyOJy0lY9971Kbt2ob4fq4cEbnkp2s1fKOXW1J+5qacpjYv//RNux3w==:7bsmhFEO5taZ/G0/vV7QyGD4Nw7o1adzpVrwxbh0vWI=', 'ASP.NET_SessionId': '4yosbuu2dhvagimx024cwfcw', '__RequestVerificationToken': 'oPWeafRQpbIAuat_6yaOYBrXTTtLmsLHmH7YE44Rf4A8Aah-ZPrPiPYDOjz7rE5dtI58-kN-Ug58MtIv7CakYEqLWnwUC0T2l2oDM2l0l0RyNwPhI1VHOjfbI7M_D5zow55yz-LJpylaAnj4qqjsrA2', 'SyKF4Lu6WkahTEFlA7FDKERTXLh48jE9bvb9aHeCggEiSi4kNMQ6AVTRguR3wzk': '638370190627342223', 'dotrez': '!99bP1pXleYxtvy6cSTMDvJJyoMoTwcfWxfyQcU6gBiRrWAKnOC6eIVgCDv0q6eRN/fyG4cnNxowET3Y='})
headers = {"sec-ch-ua-mobile": "?0", "sec-fetch-site": "none", "upgrade-insecure-requests": "1",
"Host": "makeabooking.flyscoot.com", "accept-language": "en-US,en;q=0.9", "sec-fetch-user": "?1",
"sec-ch-ua": "\"Google Chrome\";v=\"117\", \"Not;A=Brand\";v=\"8\", \"Chromium\";v=\"117\"",
"sec-ch-ua-platform": "\"macOS\"", "sec-fetch-dest": "document", "authority": "makeabooking.flyscoot.com",
"cache-control": "no-cache",
"user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36",
"cookie": "visid_incap_2444946=kM7jmWvDQXq4a6S7pvX+re2kaWUAAAAAQUIPAAAAAADNUdkeK6R1HSHVL3VC2aXN; nlbi_2444946_2147483392=3yX2O9PD1xDIChsnbmwDOgAAAADHvboadoOon4z6QR9tXquh; incap_ses_7225_2444946=LNpzS83xmVW4ZiiQKlxEZO6kaWUAAAAAvNFrM6Cn0dssoA2EdP1sgQ==; reese84=3:vJo/m6yUrbv0GXE9jiWGAw==:RzFAp65bfU/G/UX9FTYGIQPg+zgLXryBtQU6k4S/O3zUZhqdDAbI0Lj7vl6xiIKGIMPPyNaFNiIEJo18hFV4OKxnAu3enD3YXSKwyvZRQNx39y6Fl5ILxQHP1Gd9rE8CyVc9s831tvHEJyNrOt4+Vz1aXNeU86CyWp3xMQKs8t3RA48Ol9Wu+/pHW1pv5JEnwdR/6K9yLwRTbYW33U/ZOuV3blPdv+RgDIsJv0X580VMsMrQfbVCxYKkA7G1FgCbGXIHeaWWqPY1l+53wkqyX9DLOgNFC32DQQQZCRnda97KEClQgCKxdDVATxB/x3syeW8AvyByIEqp4Xt499DHkLnMy5vXq3z9PfG8IxKvPC9GQylodMovwXu4y6Gv4vvmpEPE28kcqkqhXFu0dq51Li3dtDZEt5i7jn8KdRzAw/qsUfnuo29MiqItoWMtAsCM8D1/2s4//6jOjE4aWgOknw==:bBea5wc+1uVzyab1t/VbY1qnXXN9i/2nUzxDXE2wqFw=",
"pragma": "no-cache", "sec-fetch-mode": "navigate"}
#
# session.proxies = {
# 'http': 'http://uni00001_custom_zone_US_sid_67336724_time_5:q39CEBTs5A@us.foxyip.com:7778',
# 'https': 'http://uni00001_custom_zone_US_sid_67336724_time_5:q39CEBTs5A@us.foxyip.com:7778',
# }
# headers = {"Host": "makeabooking.flyscoot.com", "upgrade-insecure-requests": "1", "cache-control": "no-cache", "pragma": "no-cache", "sec-ch-ua": "\"Google Chrome\";v=\"117\", \"Not;A=Brand\";v=\"8\", \"Chromium\";v=\"117\"", "sec-fetch-site": "none", "sec-fetch-user": "?1", "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36", "cookie": "reese84=3:VJ820WHhjme3/crOQaj78A==:eFJPEYy8XcYEaP/atv9fsT5D7ToFdNFTxaa4bwmR90dilu33beyKbfCyJnkdhT9e+5l8jAJb01h63pqt05MhGg9r/5RZejtnfIJAECMnRb6Zz7BEkeLZHIV2vSo0tb0/li9KV0/pG2fQ2hPC4Bf70WMmyNgXLCNy6+xR/VTTLuisf27xMI4qQqlwJOL4ceXIKRg9TJESeDrKT3lq+uTN/nHd5m7bMSe1jU2P7blcGFw3lCBoz9edfjoSXd2/7TxU4XcRvSz0heQxlH5afjWXEN9O/ZdR5HvbXvj8R534nWEpIlsMSF4LFm+ZtDChW+DaIXYCrON88ZAjtRRoGJD+m10v7dwIhz8GE7jqSX6w+COBRVuUw+TolSElhniGECx9ecxrDXK4lenXEBbti9c6qsUW0aDucOXJ7RuH846Cv/wHzWgxDdXfq8d48wUkWiG/CUQcWwjYUB5yQxjS+PZBHw==:199JVZOOdh33meA+GDcpO7MgGYmM8lFo8rd89zsD8XI=; incap_ses_1162_2444946=tHIUBxd4eUOf2aNY70EgEHjtb2UAAAAAV4E0WPMRva8MqaB4iKuE1g==; nlbi_2444946_2147483392=bCBsA6JgUAtev9ZQbmwDOgAAAACEAf4Pzyd7zDA/Owdy7p7I; visid_incap_2444946=yoawIYrdRCqTlkmmJjaoKHjtb2UAAAAAQUIPAAAAAADcMmrcTzpY1NPbHZffXyVR", "authority": "makeabooking.flyscoot.com", "sec-ch-ua-platform": "\"macOS\"", "sec-fetch-dest": "document", "sec-fetch-mode": "navigate", "accept-language": "en-US,en;q=0.9", "sec-ch-ua-mobile": "?0"}
headers ,cookies = ({'Host': 'makeabooking.flyscoot.com', 'accept-language': 'en-US,en;q=0.9', 'authority': 'makeabooking.flyscoot.com', 'cache-control': 'no-cache', 'pragma': '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-platform': '"macOS"', 'sec-fetch-dest': 'document', 'sec-fetch-mode': 'navigate', 'sec-fetch-site': 'none', 'sec-fetch-user': '?1', 'upgrade-insecure-requests': '1', 'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36'}, {'reese84': '3:4VO5HlaJQFzMu7zyUn+KwQ==:YQxCfIeU7Vb68mzxfd+YJRi4cPOoQ4cARU2EWlnzuQOh1g0wAve6QAKMDwdtfnK3j1OXBAUwJDAAB0GQH6RzxpZVeL+ODQNGgi3zaGxCjV4S2FjuyPdSNlhZnOEVWMcFW37CQRcgUgpMMxSCJmuq8ElkH5g+AeFhqagijk4P2zn1Uk4BQNa987XOb2Mz2F1rVokoK8x5oxevp+Y+an+QghYy2SsVCZ/WHdUQ2dr2OlRBmGldgTEGsHcdVoDJGkwrZW+GDCR6v8NZfpD/j3shpugsgHqG7dASBmblPvQj95hZ+h0+QLVNeAEEPf2kvRqXSl1rNInlIiyymCyIObXe5A1whFKpwt9udBHZzkQ5C0waaNTY1PDUjnRpR84Vve6SqUYNB75V+t1EPyhQ51ipP78303sbK6QJ55WE9NWQ62xjA7+s5MOtrdEPaiMwXFoSIdoUX/G6gQMuroq5Afx0jw==:4Tn2MNEt6I88csuHAey/NFSSbdXfvoovVjknDzxQBak=', 'incap_ses_1001_2444946': 'K3aQBv/582ntO3ynXkTkDcQqcGUAAAAAhgOults9gpnE6iK89JIRLw==', 'nlbi_2444946_2147483392': '/P2hBumSKEVFwqcUbmwDOgAAAAAAP/iwKH8x5Kb1rlNo3LB2', 'visid_incap_2444946': '13N6ErCmQOKo0CCXKgASbsQqcGUAAAAAQUIPAAAAAADMb/Rh65/VO/0hnEZBfNL+'})
cookies = {
"reese84": "3:vlm6UV4yRD7wQOa9XW9KUQ==:5aBr/YEAT1jMrqxjobmmEA0o1ng4jAlUG1hXzuM/mHxUe6x1hHGqi2xzG242g1sZ+9otzlHsNgBBehpKSo2MxHR+bTlOP0AgNaVJEYcMr/aQlte3yUtumkkvbIbMGn/7gY4SiQ57K3qbFkXSOhCvGmDeXEM8iy007jAwvi5Ln1s8o8PGnylDafgKqlprDeVCKFMgPLNUgfX7HEzIgovZNSl3AHceD6Fnp/5G0gjFevFQB8jsZZSOS9ePiUnj30MGyChvljws0BHV8eSL7/ZiTg6bB3izYBqK/CtpWUM0G42YtN8UfQxcKauk6JnlbeTiQwi9qrTGrpJux8YF2EXWA9BGhXRp4aEwVtA2qU34naAcBftMVVJruIPDjIHHqUStDmccVXyFPACJcq2eibHEkRCHO8wWPTLlOuhFvEP1MHZF09GNwqDhbvliQk07A8AC8z6MUbtaGT2MvktlJLi+b67nR6uuW2QApNEhQOPcnas=:/Vev0mNXqTgpgTJUyfdO111R0mASwjU89Zx56aoTWSY="
url = "https://makeabooking.flyscoot.com/Book/Flight?culture=en-SG&type=oneway&dst1=SIN&ast1=ADL&dst2=ADL&ast2=SIN&dd=2023-12-15&rd=null&adt=1&chd=0&inf=0#"
url = "https://makeabooking.flyscoot.com/Book/Flight"
params = {
"culture": "en-SG",
"type": "oneway",
"dst1": "SIN",
"ast1": "ADL",
"dst2": "ADL",
"ast2": "SIN",
"dd": "2023-12-15",
"rd": "null",
"adt": "1",
"chd": "0",
"inf": "0"
}
response = session.get(url, headers=headers, params=params)
print(response.url)
print(response.text)
cks = []
for k, v in cookies.items():
cks.append(f'{k}={v}')
headers['cookie'] = '; '.join(cks)
# headers['cookie'] = 'cookie: viewedOuibounceModal=true; loc=RU; hpu=/en; curr=SGD; nlbi_2444926=BQWkQzWxbCxWZUSTgG/1SgAAAADvneO8HD9YrOo1oNJVuImg; visid_incap_2444926=oJ/WridKTLa7YPrulyWXS2xclmUAAAAAQUIPAAAAAACCLIDlOz0pgeJVmV6JeY70; incap_ses_1045_2444926=C5VvLFJn5kUWZTPEGZeADm1clmUAAAAA6CxppBqZeCzHHnjiCLK+Ig==; dtCookie=v_4_srv_-2D37_sn_6V7NGQRV8VSKA62N914MSG3JHNER95LH; rxVisitor=1704352880380B4AUHHBKBA3II224RCL5E2M4ISLU4D9P; dtSa=-; _gcl_au=1.1.1950747451.1704352881; country=RU; visid_incap_3032444=sw8DCT0URdK4TEunjpR3z3BclmUAAAAAQUIPAAAAAACOiqDER1mqI5r9DeEvP3yz; nlbi_3032444=s9E9aPNzKTa4bwgL/g7ELQAAAADTWpFn8pjLhzxo15SN3oGu; incap_ses_1045_3032444=zLxGDOkwmCSZaTPEGZeADnBclmUAAAAADp4s5beS/7/dlVr0WW2gqg==; _fbp=fb.1.1704352881612.117415451; _cls_v=fcec4b38-0fef-4a64-ae2f-e7b99d7bdafd; _cls_s=bb100b55-5bc8-4163-a36b-dc4ddb9bb419:0; __clickidc=170435288295804468; _yjsu_yjad=1704352882.5a8359b1-8306-41e9-8659-21ccd5e9cc51; tfpsi=8514b406-5a16-4d57-a062-8ed6d3448376; nlbi_2444926_2147483392=rHmPdyJDdzi3Z70MgG/1SgAAAAB+QVJwR8LNw2mAp/+EQEgi; __qca=P0-1932161473-1704352882016; _gid=GA1.2.1139298275.1704352891; _ga_C8VV4V6CZR=GS1.2.1704352892.1.0.1704352892.60.0.0; rxvt=1704354693948|1704352880381; dtPC=-37$352880378_811h-vMLBDQOIICMGISGLIKHQFNHMCLPKLKKTS-0e0; ASP.NET_SessionId=pmycaztge0ad1cp2eol02nob; __RequestVerificationToken=O88IieOyYzqgySVFy9GeVXPgV-qFKDib2PXaKH3-pftDOgKPjFGfy3UKlea43Cxi_u-_3R4VG7nGStzt9O5woG5fc44gjHj8a2SXGrIzaxtrINIkigOVgBB9Q9NiZ8N2ZPjwFejyfknB6rXIELTARg2; bfSL8wt6dBrqOezhvfkdarWvtSAaQRRZDvPWtxzeQpCpSLxRnFQ9Fzd5JAsEEjp=638399496971304664; dotrez=\u0021DBwPl7vzzcSKjkj4YfoIV0iGlt0zFrBPzPGbZQw1DJzUMDET3YjABvsEIVvII8N/huRKXUDSLpvcATo=; visid_incap_2444946=1VMmQtu+R6eFhIdhNW9+HH5clmUAAAAAQUIPAAAAAAD/o+fwkbq4oWSSekAPzaRz; nlbi_2444946=sV8MarMqkFreB5ijbmwDOgAAAADZW7IjF6G6cAFibvLftHlX; incap_ses_1045_2444946=HUmKXq9LLxKgdzPEGZeADoFclmUAAAAAVlPho6ykI+keaFO/jLfjDQ==; _ga=GA1.3.2007665498.1704352881; _gid=GA1.3.1139298275.1704352891; _ga=GA1.1.2007665498.1704352881; _ga_GFV545L5B3=GS1.1.1704352880.1.1.1704352898.42.0.0; _ga_C8VV4V6CZR=GS1.3.1704352892.1.1.1704352898.54.0.0; _yoid=aa73af9f-02e3-4242-b756-8c90d4ff7723; _yosid=de340c4c-4976-46f3-9c10-8ffc3e494dc8; startTime=MjAyNC0wMS0wNCAxNToyMTozOQ==; jumpseat_uid=sMZFh4j70N0H7DOnl-nn8i; nlbi_2444946_2147483392=ZILUcBzRwnmEWqsJbmwDOgAAAAAOY9N525ciPScpDjvLyji2; reese84=3:HhrFf7gm5Fr1LQD4RgJWkg==:P5V+FQyHvjEgb9UVFqE5893ekwo34n2HRtOhI7rsuxeQgBxIzteRnRJkL2miDndwoN/9PBZZpxS5qsSzSkfa1pHNSqfmYBgk/FGpGjEIIQpTr+JJ/bjimlF3Js7AcW/TcoYUxe+KTak3zgXVDKi5ia4VET1dW6mcNtAdUqMBTBDnWdGR/sXt9RJrPT2OOu7upNOhoYSeBOZRdrWbBKcQezUn2z0DAucALlJlsk9W/SIbW63r1HgFEmbWuBtmLYO9rAkwjEYCHlZ8tvjxsgux3HsROdGhnK6jNfQD5zitrIZWq7YN+xGd8P1uawBIWe38OrM0I+ah3mNDWd7fJ7hNlOZVpndJ9ohYraa1/wyK8IbvlAUrZK+p+NBSSHD8Faq/Ky3lCceJrOp8r7t0o//nJJTZALRQmAMHBGEjm4XmcDXhf0+qvMNR9CXjQlGm5d9kodmo6+7FRsRoYkL2Uq60NA==:OXMtX3GEVY6fDr7RIS1ss/MNQ7ZuP5eUnbVJ6rV1qQ0=; QSI_HistorySession=https%3A%2F%2Fwww.flyscoot.com%2Fen~1704352895546%7Chttps%3A%2F%2Fmakeabooking.flyscoot.com%2FBook%2FFlight%3Fculture%3Den-SG%26type%3Doneway%26dst1%3DSIN%26ast1%3DADL%26dst2%3DADL%26ast2%3DSIN%26dd%3D2023-12-15%26rd%3Dnull%26adt%3D1%26chd%3D0%26inf%3D0%23~1704352910290'
print(headers)
url = "https://makeabooking.flyscoot.com/Book/Flight?culture=en-SG&type=oneway&dst1=SIN&ast1=ADL&dst2=ADL&ast2=SIN&dd=2023-12-15&rd=null&adt=1&chd=0&inf=0#"
# url = "https://makeabooking.flyscoot.com/Book/Flight"
# params = {
# "culture": "en-SG",
# "type": "oneway",
# "dst1": "SIN",
# "ast1": "ADL",
# "dst2": "ADL",
# "ast2": "SIN",
# "dd": "2023-12-15",
# "rd": "null",
# "adt": "1",
# "chd": "0",
# "inf": "0"
# }
# response = session.get(url, headers=headers, params=params, cookies=cookies)
# print(response.url)
# print(response.text)
# print(response)
url = "https://makeabooking.flyscoot.com/manage"
prox = 'http://uni00001_custom_zone_US_sid_67336726_time_5:q39CEBTs5A@us.foxyip.com:7778'
prox = 'http://127.0.0.1:8890'
# response = requests.post('http://52.52.23.116/tls/forward',
response = requests.post('http://127.0.0.1:58000/tls/forward',
json=dict(url=url, headers=headers, method="GET", proxy=prox, debug=True
, allow_redirects=True
))
response = response.json()
print(response)
print(response['status_code'])
print(response['text'])
# import requests
#
# request_data = {
# "service_name": "lcc-tls-forward",
......@@ -71,3 +102,23 @@ print(response)
#
# res = requests.post(url=request_url, json=request_data)
# print(res.text)
headers = {
"authority": "makeabooking.flyscoot.com",
"accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
"accept-language": "en",
"cache-control": "no-cache",
"pragma": "no-cache",
"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": "document",
"sec-fetch-mode": "navigate",
"sec-fetch-site": "none",
"sec-fetch-user": "?1",
"upgrade-insecure-requests": "1",
"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/manage"
print()
\ No newline at end of file
test_tmx.py
View file @ d5c65148
......@@ -4,21 +4,23 @@ from pyquery import PyQuery
def get_header():
r = requests.post('http://ymx-lcc.unififi.com/header/borrow',json={
"brush_type": "cookieTR",
r = requests.post('http://ymx-lcc.unififi.com/header/borrow', json={
"brush_type": "cookieAS",
"brush_fromto": "aaa-bbb",
"method": "shopping"
})
return r.json()
def return_header(header):
r = requests.post('http://ymx-lcc.unififi.com/header/return',json={
r = requests.post('http://ymx-lcc.unififi.com/header/return', json={
"brush_type": "cookieTR",
"_id": header['brush_id'],
"status": 0,
})
print(r.text)
def test():
header = get_header()
headers = header['data']['brush_header']
......@@ -26,43 +28,47 @@ def test():
# "content-type": "application/json",
# "accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
# })
headers.update({
"authority": "makeabooking.flyscoot.com",
"accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
"accept-language": "en-US,en;q=0.9",
"user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36"
})
# headers.update({
# "authority": "makeabooking.flyscoot.com",
# "accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
# "accept-language": "en-US,en;q=0.9",
# "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36"
# })
brush_proxy = header['data']['brush_proxy']
session = tls_client.Session(client_identifier='chrome_117')
session.proxies = {
'http': 'http://127.0.0.1:7890',
'https': 'http://127.0.0.1:7890',
}
# session.proxies = {
# 'http': brush_proxy,
# 'https': brush_proxy,
# 'http': 'http://127.0.0.1:7890',
# 'https': 'http://127.0.0.1:7890',
# }
session.proxies = {
'http': brush_proxy,
'https': brush_proxy,
}
print(headers)
print(brush_proxy)
url = "https://makeabooking.flyscoot.com/Book/Flight?culture=en-SG&type=oneway&dst1=SIN&ast1=ADL&dst2=ADL&ast2=SIN&dd=2023-12-15&rd=null&adt=1&chd=0&inf=0#"
# url = "https://makeabooking.flyscoot.com/Book/Flight?culture=en-SG&type=oneway&dst1=SIN&ast1=ADL&dst2=ADL&ast2=SIN&dd=2023-12-18&rd=null&adt=1&chd=0&inf=0"
response = session.get(url, headers=headers)
# response = requests.post('http://52.52.23.116/tls/forward',
# # response = requests.post('http://127.0.0.1:58000/tls/forward',
# json=dict(url=url, headers=headers, method="GET", proxy=session.proxies['http'],debug=True, ),
#
# # ,allow_redirects=True
# )
# print(response.json()['text'])
# print(response.json()['status_code'])
# h = PyQuery(response.json()['text'])
print(response.status_code)
h = PyQuery(response.text)
# response = session.get(url, headers=headers)
response = requests.post('http://52.52.23.116/tls/forward',
# response = requests.post('http://127.0.0.1:58000/tls/forward',
json=dict(url=url, headers=headers, method="GET", proxy=session.proxies['http'],
debug=True, )
, allow_redirects=True
)
print(response.json()['text'])
print(response.json()['status_code'])
h = PyQuery(response.json()['text'])
# print(response.status_code)
# h = PyQuery(response.text)
print(h.find('iframe[id="main-iframe"]').attr('src'))
r1 = session.get('https://makeabooking.flyscoot.com' + h.find('iframe[id="main-iframe"]').attr('src'), headers=headers)
r1 = session.get('https://makeabooking.flyscoot.com' + h.find('iframe[id="main-iframe"]').attr('src'),
headers=headers)
print(r1.text)
r2 = session.get(url, headers=headers)
print(r2.text)
return_header(header['data'])
if __name__ == '__main__':
test()
\ No newline at end of file
test()
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