github/FlareSolverr
1
1
Fork 0
mirror of https://github.com/FlareSolverr/FlareSolverr.git synced 2025-06-08 12:35:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moving log.html right after loading the page and add one on reload, fix #30

Browse Source
This commit is contained in:
Alexandre Beloin 2020-12-14 15:18:18 -05:00
parent 7ca880da7c
commit 54d589464a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/routes.ts
View File

@ -134,6 +134,8 @@ async function resolveChallenge(ctx: RequestContext, { url, maxTimeout, proxy, d
log.debug(`Navigating to... ${url}`) log.debug(`Navigating to... ${url}`)
let response = await page.goto(url, { waitUntil: 'domcontentloaded' }) let response = await page.goto(url, { waitUntil: 'domcontentloaded' })
log.html(await page.content())
// look for challenge // look for challenge
if (response.headers().server.startsWith('cloudflare')) { if (response.headers().server.startsWith('cloudflare')) {
log.info('Cloudflare detected') log.info('Cloudflare detected')
@ -148,7 +150,6 @@ async function resolveChallenge(ctx: RequestContext, { url, maxTimeout, proxy, d
for (const selector of CHALLENGE_SELECTORS) { for (const selector of CHALLENGE_SELECTORS) {
const cfChallengeElem = await page.$(selector) const cfChallengeElem = await page.$(selector)
if (cfChallengeElem) { if (cfChallengeElem) {
log.html(await page.content())
log.debug('Waiting for Cloudflare challenge...') log.debug('Waiting for Cloudflare challenge...')
let interceptingResult: ChallengeResolutionT; let interceptingResult: ChallengeResolutionT;
@ -181,6 +182,7 @@ async function resolveChallenge(ctx: RequestContext, { url, maxTimeout, proxy, d
response = await page.reload({ waitUntil: 'domcontentloaded' }) response = await page.reload({ waitUntil: 'domcontentloaded' })
log.debug('Reloaded page...') log.debug('Reloaded page...')
log.html(await page.content())
} }
if (Date.now() - ctx.startTimestamp >= maxTimeout) { if (Date.now() - ctx.startTimestamp >= maxTimeout) {
@ -203,7 +205,6 @@ async function resolveChallenge(ctx: RequestContext, { url, maxTimeout, proxy, d
const captchaStartTimestamp = Date.now() const captchaStartTimestamp = Date.now()
const challengeForm = await page.$('#challenge-form') const challengeForm = await page.$('#challenge-form')
if (challengeForm) { if (challengeForm) {
log.html(await page.content())
const captchaTypeElm = await page.$('input[name="cf_captcha_kind"]') const captchaTypeElm = await page.$('input[name="cf_captcha_kind"]')
const cfCaptchaType: string = await captchaTypeElm.evaluate((e: any) => e.value) const cfCaptchaType: string = await captchaTypeElm.evaluate((e: any) => e.value)
const captchaType: CaptchaType = (CaptchaType as any)[cfCaptchaType] const captchaType: CaptchaType = (CaptchaType as any)[cfCaptchaType]