mirror of
https://github.com/FlareSolverr/FlareSolverr.git
synced 2025-12-05 17:18:19 +01:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
436831edb8 | ||
|
|
b17a3a369b |
2
package-lock.json
generated
2
package-lock.json
generated
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "flaresolverr",
|
"name": "flaresolverr",
|
||||||
"version": "2.2.7",
|
"version": "2.2.8",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "flaresolverr",
|
"name": "flaresolverr",
|
||||||
"version": "2.2.7",
|
"version": "2.2.8",
|
||||||
"description": "Proxy server to bypass Cloudflare protection.",
|
"description": "Proxy server to bypass Cloudflare protection.",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"install": "node install.js",
|
"install": "node install.js",
|
||||||
|
|||||||
@@ -18,8 +18,6 @@ const CAPTCHA_SELECTORS: string[] = [
|
|||||||
'#cf-challenge-hcaptcha-wrapper', '#cf-norobot-container', 'input[name="cf_captcha_kind"]'
|
'#cf-challenge-hcaptcha-wrapper', '#cf-norobot-container', 'input[name="cf_captcha_kind"]'
|
||||||
];
|
];
|
||||||
|
|
||||||
const delay = (ms: number) => new Promise(resolve => setTimeout(resolve, ms))
|
|
||||||
|
|
||||||
export default async function resolveChallenge(url: string, page: Page, response: HTTPResponse): Promise<HTTPResponse> {
|
export default async function resolveChallenge(url: string, page: Page, response: HTTPResponse): Promise<HTTPResponse> {
|
||||||
|
|
||||||
// look for challenge and return fast if not detected
|
// look for challenge and return fast if not detected
|
||||||
@@ -72,34 +70,6 @@ export default async function resolveChallenge(url: string, page: Page, response
|
|||||||
// captcha detected
|
// captcha detected
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
// new Cloudflare Challenge #cf-please-wait
|
|
||||||
const displayStyle = await page.evaluate((selector) => {
|
|
||||||
return getComputedStyle(document.querySelector(selector)).getPropertyValue("display");
|
|
||||||
}, selector);
|
|
||||||
if (displayStyle == "none") {
|
|
||||||
// spinner is hidden, could be a captcha or not
|
|
||||||
log.debug('Challenge element is hidden')
|
|
||||||
log.debug("Waiting for 30 secs");
|
|
||||||
await delay(30 * 1000);
|
|
||||||
// wait until redirecting disappears
|
|
||||||
while (true) {
|
|
||||||
try {
|
|
||||||
await page.waitForTimeout(1000)
|
|
||||||
const displayStyle2 = await page.evaluate(() => {
|
|
||||||
return getComputedStyle(document.querySelector('#cf-spinner-redirecting')).getPropertyValue("display");
|
|
||||||
});
|
|
||||||
if (displayStyle2 == "none") {
|
|
||||||
break // hCaptcha detected
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
break // redirection completed
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break
|
|
||||||
} else {
|
|
||||||
log.debug('Challenge element is visible')
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
log.debug('Found challenge element again')
|
log.debug('Found challenge element again')
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user