Bump version 2.2.4

Clarify that `request.get` will not use the provided proxy when a session is set.

README.md

@@ -8,11 +8,11 @@
 [![Donate Bitcoin](https://en.cryptobadges.io/badge/micro/13Hcv77AdnFWEUZ9qUpoPBttQsUT7q9TTh)](https://en.cryptobadges.io/donate/13Hcv77AdnFWEUZ9qUpoPBttQsUT7q9TTh)
 [![Donate Ethereum](https://en.cryptobadges.io/badge/micro/0x0D1549BbB00926BF3D92c1A8A58695e982f1BE2E)](https://en.cryptobadges.io/donate/0x0D1549BbB00926BF3D92c1A8A58695e982f1BE2E)
 
-FlareSolverr is a proxy server to bypass Cloudflare protection.
+FlareSolverr is a proxy server to bypass Cloudflare and DDoS-GUARD protection.
 
 ## How it works
 
-FlareSolverr starts a proxy server and it waits for user requests in an idle state using few resources.
+FlareSolverr starts a proxy server, and it waits for user requests in an idle state using few resources.
 When some request arrives, it uses [puppeteer](https://github.com/puppeteer/puppeteer) with the
 [stealth plugin](https://github.com/berstend/puppeteer-extra/tree/master/packages/puppeteer-extra-plugin-stealth)
 to create a headless browser (Firefox). It opens the URL with user parameters and waits until the Cloudflare challenge
@@ -56,6 +56,10 @@ docker run -d \
   ghcr.io/flaresolverr/flaresolverr:latest
 ```
 
+If your host OS is Debian, make sure `libseccomp2` version is 2.5.x. You can check the version with `sudo apt-cache policy libseccomp2` 
+and update the package with `sudo apt install libseccomp2=2.5.1-1~bpo10+1` or `sudo apt install libseccomp2=2.5.1-1+deb11u1`.
+Remember to restart the Docker daemon and the container after the update.
+
 ### Precompiled binaries
 
 This is the recommended way for Windows users.
@@ -104,6 +108,7 @@ This also speeds up the requests since it won't have to launch a new browser ins
 Parameter | Notes
 |--|--|
 session | Optional. The session ID that you want to be assigned to the instance. If isn't set a random UUID will be assigned.
+proxy | Optional, default disabled. Eg: `"proxy": {"url": "http://127.0.0.1:8888"}`. You must include the proxy schema in the URL: `http://`, `socks4://` or `socks5://`. Authorization (username/password) is not supported.
 
 #### + `sessions.list`
 
@@ -141,7 +146,7 @@ session | Optional. Will send the request from and existing browser instance. If
 maxTimeout | Optional, default value 60000. Max timeout to solve the challenge in milliseconds.
 cookies | Optional. Will be used by the headless browser. Follow [this](https://github.com/puppeteer/puppeteer/blob/v3.3.0/docs/api.md#pagesetcookiecookies) format.
 returnOnlyCookies | Optional, default false. Only returns the cookies. Response data, headers and other parts of the response are removed.
-proxy | Optional, default disabled. Eg: `"proxy": {"url": "http://127.0.0.1:8888"}`. You must include the proxy schema in the URL: `http://`, `socks4://` or `socks5://`. Authorization (username/password) is not supported.
+proxy | Optional, default disabled. Eg: `"proxy": {"url": "http://127.0.0.1:8888"}`. You must include the proxy schema in the URL: `http://`, `socks4://` or `socks5://`. Authorization (username/password) is not supported. (When the `session` parameter is set, the proxy is ignored; a session specific proxy can be set in `sessions.create`.)
 
 :warning: If you want to use Cloudflare clearance cookie in your scripts, make sure you use the FlareSolverr User-Agent too. If they don't match you will see the challenge.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "flaresolverr",
-  "version": "2.2.0",
+  "version": "2.2.4",
   "description": "Proxy server to bypass Cloudflare protection.",
   "scripts": {
     "start": "tsc && node ./dist/server.js",
@@ -20,27 +20,26 @@
   },
   "dependencies": {
     "await-timeout": "^1.1.1",
-    "body-parser": "^1.19.0",
+    "body-parser": "^1.20.0",
     "console-log-level": "^1.4.1",
-    "express": "^4.17.1",
+    "express": "^4.17.3",
-    "puppeteer": "^13.1.2",
+    "puppeteer": "^13.5.2",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@types/await-timeout": "^0.3.1",
     "@types/body-parser": "^1.19.1",
     "@types/express": "^4.17.13",
-    "@types/jest": "^27.0.2",
+    "@types/jest": "^27.4.1",
-    "@types/node": "^16.11.7",
+    "@types/node": "^16.11.27",
-    "@types/puppeteer": "^5.4.4",
+    "@types/supertest": "^2.0.12",
-    "@types/supertest": "^2.0.11",
     "@types/uuid": "^8.3.1",
-    "archiver": "^5.3.0",
+    "archiver": "^5.3.1",
     "nodemon": "^2.0.13",
-    "pkg": "^5.5.2",
+    "pkg": "^5.6.0",
     "supertest": "^6.1.6",
-    "ts-jest": "^27.0.7",
+    "ts-jest": "^27.1.4",
-    "ts-node": "^10.3.0",
+    "ts-node": "^10.7.0",
-    "typescript": "^4.4.4"
+    "typescript": "^4.6.3"
   }
 }

src/providers/cloudflare.ts

@@ -6,18 +6,23 @@ import log from "../services/log";
  *  This class contains the logic to solve protections provided by CloudFlare
  **/
 
-const BAN_SELECTORS = ['.text-gray-600'];
+// the selector '.text-gray-600' is not working well because it can be hidden
-const CHALLENGE_SELECTORS = [
+// <span style="display: none;" class="text-gray-600" data-translate="error">error code: 1020</span>
+const BAN_SELECTORS: string[] = [];
+const CHALLENGE_SELECTORS: string[] = [
     '#trk_jschal_js', '.ray_id', '.attack-box', '#cf-please-wait', // CloudFlare
     '#link-ddg', // DDoS-GUARD
     'td.info #js_info' // Custom CloudFlare for EbookParadijs, Film-Paleis, MuziekFabriek and Puur-Hollands
 ];
-const CAPTCHA_SELECTORS = ['input[name="cf_captcha_kind"]'];
+const CAPTCHA_SELECTORS: string[] = [
+    'input[name="cf_captcha_kind"]'
+];
 
 export default async function resolveChallenge(url: string, page: Page, response: HTTPResponse): Promise<HTTPResponse> {
 
   // look for challenge and return fast if not detected
-  let cfDetected = response.headers().server && response.headers().server.startsWith('cloudflare');
+  let cfDetected = response.headers().server &&
+      (response.headers().server.startsWith('cloudflare') || response.headers().server.startsWith('ddos-guard'));
   if (cfDetected) {
     if (response.status() == 403 || response.status() == 503) {
       cfDetected = true; // Defected CloudFlare and DDoS-GUARD
@@ -37,7 +42,7 @@ 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.')
+    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")
+            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;
+    let pageTimeout = params.maxTimeout / 3;
-    if (params.method != 'POST') {
+    let response: HTTPResponse
-        response = await page.goto(params.url, {waitUntil: 'domcontentloaded'});
+    try {
+        response = await page.goto(params.url, {waitUntil: 'domcontentloaded', timeout: pageTimeout});
+    } catch (e) {
+        // retry
+        response = await page.goto(params.url, {waitUntil: 'domcontentloaded', timeout: pageTimeout});
+    }
 
-    } 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>

src/tests/app.test.ts

@@ -15,7 +15,7 @@ const postUrl = "https://ptsv2.com/t/qv4j3-1634496523";
 const cfUrl = "https://pirateiro.com/torrents/?search=harry";
 const cfCaptchaUrl = "https://idope.se"
 const cfBlockedUrl = "https://www.torrentmafya.org/table.php"
-const ddgUrl = "https://www.erai-raws.info/feed/?type=magnet";
+const ddgUrl = "https://anidex.info/";
 const ccfUrl = "https://www.muziekfabriek.org";
 
 beforeAll(async () => {
@@ -189,12 +189,12 @@ describe("Test '/v1' path", () => {
         expect(solution.url).toContain(ddgUrl)
         expect(solution.status).toBe(200);
         expect(Object.keys(solution.headers).length).toBeGreaterThan(0)
-        expect(solution.response).toContain("<rss version")
+        expect(solution.response).toContain("<!DOCTYPE html>")
         expect(Object.keys(solution.cookies).length).toBeGreaterThan(0)
         expect(solution.userAgent).toContain("Firefox/")
 
         const cfCookie: string = (solution.cookies as any[]).filter(function(cookie) {
-            return cookie.name == "__ddg1";
+            return cookie.name == "__ddg1_";
         })[0].value
         expect(cfCookie.length).toBeGreaterThan(10)
     });