Wavyzz/FlareSolverr
2
0
Fork 0
mirror of https://github.com/FlareSolverr/FlareSolverr.git synced 2026-04-18 05:55:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve Firefox start time and code clean up

Browse Source
This commit is contained in:
ngosang
2021-10-18 21:45:21 +02:00
parent 356b893c18
commit 075b53ee24
5 changed files with 63 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/providers/cloudflare.ts
View File

@@ -39,7 +39,7 @@ export default async function resolveChallenge(url: string, page: Page, response
selector = await findAnySelector(page, CHALLENGE_SELECTORS)
if (!selector) {
// solved!
log.debug('Challenge element not found.')
log.debug('Challenge element not found')
break
} else {
log.debug(`Javascript challenge element '${selector}' detected.`)
@@ -50,7 +50,7 @@ export default async function resolveChallenge(url: string, page: Page, response
}, selector);
if (displayStyle == "none") {
// spinner is hidden, could be a captcha or not
log.debug('Challenge element is hidden.')
log.debug('Challenge element is hidden')
// wait until redirecting disappears
while (true) {
try {
@@ -67,10 +67,10 @@ export default async function resolveChallenge(url: string, page: Page, response
}
break
} else {
log.debug('Challenge element is visible.')
log.debug('Challenge element is visible')
}
}
log.debug('Found challenge element again.')
log.debug('Found challenge element again')
} catch (error)
{
@@ -97,7 +97,7 @@ export default async function resolveChallenge(url: string, page: Page, response
// check for CAPTCHA challenge
if (await findAnySelector(page, CAPTCHA_SELECTORS)) {
log.info('CAPTCHA challenge detected.');
log.info('CAPTCHA challenge detected');
throw new Error('FlareSolverr can not resolve CAPTCHA challenges. Since the captcha doesn\'t always appear, you may have better luck with the next request.');
// const captchaSolver = getCaptchaSolver()
@@ -120,7 +120,7 @@ export default async function resolveChallenge(url: string, page: Page, response
{
throw new Error('No challenge selectors found, unable to proceed.')
} else {
log.info('Challenge solved.');
log.info('Challenge solved');
}
}

76
src/services/sessions.ts
View File

@@ -32,7 +32,7 @@ let webBrowserUserAgent: string;
function userDataDirFromId(id: string): string {
return path.join(os.tmpdir(), `/puppeteer_profile_${id}`)
return path.join(os.tmpdir(), `/puppeteer_cprofile_${id}`)
}
function prepareBrowserProfile(id: string, proxy: Proxy): string {
@@ -42,31 +42,49 @@ function prepareBrowserProfile(id: string, proxy: Proxy): string {
fs.mkdirSync(userDataDir, { recursive: true })
}
// Some parameters to configure Firefox
// https://github.com/puppeteer/puppeteer/blob/943477cc1eb4b129870142873b3554737d5ef252/experimental/puppeteer-firefox/misc/puppeteer.cfg
let prefs = `// Any comment. You must start the file with a comment!
// Disable newtabpage
user_pref("browser.newtabpage.enabled", false);
user_pref("browser.startup.homepage", "about:blank");
// Do not warn when closing all open tabs
user_pref("browser.tabs.warnOnClose", false);
// Disable telemetry
user_pref("toolkit.telemetry.reportingpolicy.firstRun", false);
// Disable first-run welcome page
user_pref("startup.homepage_welcome_url", "about:blank");
user_pref("startup.homepage_welcome_url.additional", "");
// Disable images to speed up load
user_pref("permissions.default.image", 2);
`
// proxy.url format => http://<host>:<port>
if (proxy && proxy.url) {
let [host, port] = proxy.url.replace(/https?:\/\//g, '').split(':');
prefs += `
let prefs = `
user_pref("browser.newtabpage.enabled", false);
user_pref("browser.startup.homepage", "about:blank");
user_pref("browser.tabs.warnOnClose", false);
user_pref("toolkit.telemetry.reportingpolicy.firstRun", false);
user_pref("trailhead.firstrun.branches", "nofirstrun-empty");
user_pref("browser.aboutwelcome.enabled", false);
user_pref("network.proxy.ftp", "${host}");
user_pref("network.proxy.ftp_port", ${port});
user_pref("network.proxy.http", "${host}");
user_pref("network.proxy.http_port", ${port});
user_pref("network.proxy.share_proxy_settings", true);
user_pref("network.proxy.socks", "${host}");
user_pref("network.proxy.socks_port", ${port});
user_pref("network.proxy.ssl", "${host}");
user_pref("network.proxy.ssl_port", ${port});
user_pref("network.proxy.type", 1);
`
// Proxy configuration
user_pref("network.proxy.ftp", "${host}");
user_pref("network.proxy.ftp_port", ${port});
user_pref("network.proxy.http", "${host}");
user_pref("network.proxy.http_port", ${port});
user_pref("network.proxy.share_proxy_settings", true);
user_pref("network.proxy.socks", "${host}");
user_pref("network.proxy.socks_port", ${port});
user_pref("network.proxy.ssl", "${host}");
user_pref("network.proxy.ssl_port", ${port});
user_pref("network.proxy.type", 1);
fs.writeFileSync(path.join(userDataDir, './prefs.js'), prefs);
`
}
fs.writeFileSync(path.join(userDataDir, './prefs.js'), prefs);
return userDataDir
}
@@ -118,23 +136,9 @@ export async function create(session: string, options: SessionCreateOptions): Pr
}
log.debug('Launching web browser...')
// todo: the retries are required?
let launchTries = 3
let browser: Browser;
while (0 <= launchTries--) {
try {
browser = await puppeteer.launch(puppeteerOptions)
break
} catch (e) {
if (e.message !== 'Failed to launch the browser process!')
throw e
log.warn('Failed to open browser, trying again...')
}
}
let browser: Browser = await puppeteer.launch(puppeteerOptions)
if (!browser) {
throw Error(`Failed to launch browser 3 times in a row.`)
throw Error(`Failed to launch web browser.`)
}
sessionCache[sessionId] = {

1
src/services/solver.ts
View File

@@ -88,6 +88,7 @@ async function resolveChallenge(params: V1Request, session: SessionsCacheItem):
}
// reload the page to be sure we get the real page
log.debug("Reloading the page")
response = await gotoPage(params, page);
const payload: ChallengeResolutionT = {