Bump version 2.2.2 (#339)

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "flaresolverr",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "flaresolverr",
-      "version": "2.1.0",
+      "version": "2.2.2",
       "license": "MIT",
       "dependencies": {
         "await-timeout": "^1.1.1",
@@ -25,7 +25,6 @@
         "@types/express": "^4.17.13",
         "@types/jest": "^27.0.2",
         "@types/node": "^16.11.7",
-        "@types/puppeteer": "^5.4.4",
         "@types/supertest": "^2.0.11",
         "@types/uuid": "^8.3.1",
         "archiver": "^5.3.0",
@@ -1261,15 +1260,6 @@
       "dev": true,
       "peer": true
     },
-    "node_modules/@types/puppeteer": {
-      "version": "5.4.4",
-      "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-5.4.4.tgz",
-      "integrity": "sha512-3Nau+qi69CN55VwZb0ATtdUAlYlqOOQ3OfQfq0Hqgc4JMFXiQT/XInlwQ9g6LbicDslE6loIFsXFklGh5XmI6Q==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/qs": {
       "version": "6.9.7",
       "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
@@ -8677,15 +8667,6 @@
       "dev": true,
       "peer": true
     },
-    "@types/puppeteer": {
-      "version": "5.4.4",
-      "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-5.4.4.tgz",
-      "integrity": "sha512-3Nau+qi69CN55VwZb0ATtdUAlYlqOOQ3OfQfq0Hqgc4JMFXiQT/XInlwQ9g6LbicDslE6loIFsXFklGh5XmI6Q==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
     "@types/qs": {
       "version": "6.9.7",
       "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "flaresolverr",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "Proxy server to bypass Cloudflare protection.",
   "scripts": {
     "start": "tsc && node ./dist/server.js",
@@ -32,7 +32,6 @@
     "@types/express": "^4.17.13",
     "@types/jest": "^27.0.2",
     "@types/node": "^16.11.7",
-    "@types/puppeteer": "^5.4.4",
     "@types/supertest": "^2.0.11",
     "@types/uuid": "^8.3.1",
     "archiver": "^5.3.0",

src/providers/cloudflare.ts

@@ -37,7 +37,13 @@ export default async function resolveChallenge(url: string, page: Page, response
   }
 
   if (await findAnySelector(page, BAN_SELECTORS)) {
-    throw new Error('Cloudflare has blocked this request. Probably your IP is banned for this site, check in your web browser.')
+    const errorCodeElem = await page.$(BAN_SELECTORS[0]);
+    if (errorCodeElem) {
+      let displayCSSProperty = await errorCodeElem.evaluate(el => (<HTMLElement>el).style.display);
+      if (displayCSSProperty !== 'none') {
+        throw new Error('Cloudflare has blocked this request. Probably your IP is banned for this site, check in your web browser.');
+      }
+    }
   }
 
   // find Cloudflare selectors

src/server.ts

@@ -39,6 +39,11 @@ process.on('SIGTERM', () => {
   process.exit(0)
 })
 
+process.on('uncaughtException', function(err) {
+  // Avoid crashing in NodeJS 17 due to UnhandledPromiseRejectionWarning: Unhandled promise rejection.
+  log.error(err)
+})
+
 validateEnvironmentVariables();
 
 testWebBrowserInstallation().then(() => {

src/services/sessions.ts

@@ -57,8 +57,12 @@ function buildExtraPrefsFirefox(proxy: Proxy): object {
 
   // proxy.url format => http://<host>:<port>
   if (proxy && proxy.url) {
+    log.debug(`Using proxy: ${proxy.url}`)
     const [host, portStr] = proxy.url.replace(/.+:\/\//g, '').split(':');
     const port = parseInt(portStr);
+    if (!host || !portStr || !port) {
+      throw new Error("Proxy configuration is invalid! Use the format: protocol://ip:port")
+    }
 
     const proxyPrefs = {
       "network.proxy.type": 1,
@@ -118,7 +122,8 @@ export async function testWebBrowserInstallation(): Promise<void> {
     oneTimeSession: true
   })
   const page = await session.browser.newPage()
-  await page.goto(testUrl)
+  const pageTimeout = Number(process.env.BROWSER_TIMEOUT) || 40000
+  await page.goto(testUrl, {waitUntil: 'domcontentloaded', timeout: pageTimeout})
   webBrowserUserAgent = await page.evaluate(() => navigator.userAgent)
 
   // replace Linux ARM user-agent because it's detected
@@ -134,6 +139,8 @@ export async function testWebBrowserInstallation(): Promise<void> {
 }
 
 export async function create(session: string, options: SessionCreateOptions): Promise<SessionsCacheItem> {
+  log.debug('Creating new session...')
+
   const sessionId = session || UUIDv1()
 
   // NOTE: cookies can't be set in the session, you need to open the page first
@@ -141,7 +148,7 @@ export async function create(session: string, options: SessionCreateOptions): Pr
   const puppeteerOptions: any = {
     product: 'firefox',
     headless: process.env.HEADLESS !== 'false',
-    timeout: process.env.BROWSER_TIMEOUT || 40000
+    timeout: Number(process.env.BROWSER_TIMEOUT) || 40000
   }
 
   puppeteerOptions.extraPrefsFirefox = buildExtraPrefsFirefox(options.proxy)

src/services/solver.ts

@@ -89,7 +89,11 @@ async function resolveChallenge(params: V1Request, session: SessionsCacheItem):
             // is response is ok
             // reload the page to be sure we get the real page
             log.debug("Reloading the page")
-            response = await gotoPage(params, page);
+            try {
+                response = await gotoPage(params, page);
+            } catch (e) {
+                log.warn("Page not reloaded (do not report!): Cause: " + e.toString())
+            }
 
         } catch (e) {
             status = "error";
@@ -129,14 +133,17 @@ async function resolveChallenge(params: V1Request, session: SessionsCacheItem):
 }
 
 async function gotoPage(params: V1Request, page: Page): Promise<HTTPResponse> {
-    let response: HTTPResponse;
-    if (params.method != 'POST') {
-        response = await page.goto(params.url, {waitUntil: 'domcontentloaded'});
+    let pageTimeout = params.maxTimeout / 3;
+    let response: HTTPResponse
+    try {
+        response = await page.goto(params.url, {waitUntil: 'domcontentloaded', timeout: pageTimeout});
+    } catch (e) {
+        // retry
+        response = await page.goto(params.url, {waitUntil: 'domcontentloaded', timeout: 2000});
+    }
 
-    } else {
+    if (params.method == 'POST') {
         // post hack
-        // first request a page without cloudflare
-        response = await page.goto(params.url, {waitUntil: 'domcontentloaded'});
         await page.setContent(
             `
 <!DOCTYPE html>