Fix Dockerfile for linux/386 architecture

credit: @realivanjx
https://github.com/FlareSolverr/FlareSolverr/issues/481#issuecomment-1242951929

.dockerignore

@@ -1,7 +1,5 @@
 .git/
 .github/
 .idea/
-bin/
-dist/
-node_modules/
+html_samples/
 resources/

.eslintrc.js

@@ -1,15 +0,0 @@
-module.exports = {
-  env: {
-    browser: true,
-    commonjs: true,
-    es2020: true
-  },
-  extends: [
-    'standard'
-  ],
-  parserOptions: {
-    ecmaVersion: 11
-  },
-  rules: {
-  }
-}

.github/workflows/autotag.yml

@@ -1,20 +1,21 @@
-name: autotag
-
-on:
-  push:
-    branches:
-      - "master"
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Auto Tag
-        uses: Klemensas/action-autotag@stable
-        with:
-          GITHUB_TOKEN: "${{ secrets.GH_PAT }}"
-          tag_prefix: "v"
+# todo: enable in the first release
+#name: autotag
+#
+#on:
+#  push:
+#    branches:
+#      - "master"
+#
+#jobs:
+#  build:
+#    runs-on: ubuntu-latest
+#    steps:
+#      -
+#        name: Checkout
+#        uses: actions/checkout@v2
+#      -
+#        name: Auto Tag
+#        uses: Klemensas/action-autotag@stable
+#        with:
+#          GITHUB_TOKEN: "${{ secrets.GH_PAT }}"
+#          tag_prefix: "v"

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v2
         with:
-          node-version: '14'
+          node-version: '16'
 
       - name: Build artifacts
         run: |

.gitignore

@@ -1,126 +1,125 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-
-# Diagnostic reports (https://nodejs.org/api/report.html)
-report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-*.lcov
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# Snowpack dependency directory (https://snowpack.dev/)
-web_modules/
-
-# TypeScript cache
-*.tsbuildinfo
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Microbundle cache
-.rpt2_cache/
-.rts2_cache_cjs/
-.rts2_cache_es/
-.rts2_cache_umd/
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
-.env.test
-
-# parcel-bundler cache (https://parceljs.org/)
-.cache
-.parcel-cache
-
-# Next.js build output
-.next
-out
-
-# Nuxt.js build / generate output
-.nuxt
-dist
-
-# Gatsby files
-.cache/
-# Comment in the public line in if your project uses Gatsby and not Next.js
-# https://nextjs.org/blog/next-9-1#public-directory-support
-# public
-
-# vuepress build output
-.vuepress/dist
-
-# Serverless directories
-.serverless/
-
-# FuseBox cache
-.fusebox/
-
-# DynamoDB Local files
-.dynamodb/
-
-# TernJS port file
-.tern-port
-
-# Stores VSCode versions used for testing VSCode extensions
-.vscode-test
-
-# yarn v2
-.yarn/cache
-.yarn/unplugged
-.yarn/build-state.yml
-.yarn/install-state.gz
-.pnp.*
-
-# IntelliJ IDEA
+# Editors
+.vscode/
 .idea/
-*.iml
 
-# Project Development
-testing/
+# Vagrant
+.vagrant/
 
-# Binaries
-bin/
+# Mac/OSX
+.DS_Store
+
+# Windows
+Thumbs.db
+
+# Source for the following rules: https://raw.githubusercontent.com/github/gitignore/master/Python.gitignore
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json

Dockerfile

@@ -1,34 +1,69 @@
-FROM --platform=${TARGETPLATFORM:-linux/amd64} node:16-alpine3.15
+FROM python:3.10-slim-bullseye as builder
 
-# Print build information
-ARG TARGETPLATFORM
-ARG BUILDPLATFORM
-RUN printf "I am running on ${BUILDPLATFORM:-linux/amd64}, building for ${TARGETPLATFORM:-linux/amd64}\n$(uname -a)\n"
+# Build dummy packages to skip installing them and their dependencies
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends equivs \
+    && equivs-control libgl1-mesa-dri \
+    && printf 'Section: misc\nPriority: optional\nStandards-Version: 3.9.2\nPackage: libgl1-mesa-dri\nVersion: 99.0.0\nDescription: Dummy package for libgl1-mesa-dri\n' >> libgl1-mesa-dri \
+    && equivs-build libgl1-mesa-dri \
+    && mv libgl1-mesa-dri_*.deb /libgl1-mesa-dri.deb \
+    && equivs-control adwaita-icon-theme \
+    && printf 'Section: misc\nPriority: optional\nStandards-Version: 3.9.2\nPackage: adwaita-icon-theme\nVersion: 99.0.0\nDescription: Dummy package for adwaita-icon-theme\n' >> adwaita-icon-theme \
+    && equivs-build adwaita-icon-theme \
+    && mv adwaita-icon-theme_*.deb /adwaita-icon-theme.deb
 
-# Install the web browser (package firefox-esr is available too)
-RUN apk update && \
-    apk add --no-cache firefox dumb-init && \
-    rm -Rf /var/cache
+FROM python:3.10-slim-bullseye
 
-# Copy FlareSolverr code
-USER node
-RUN mkdir -p /home/node/flaresolverr
-WORKDIR /home/node/flaresolverr
-COPY --chown=node:node package.json package-lock.json tsconfig.json ./
-COPY --chown=node:node src ./src/
+# Copy dummy packages
+COPY --from=builder /*.deb /
 
-# Install package. Skip installing the browser, we will use the installed package.
-ENV PUPPETEER_PRODUCT=firefox \
-    PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \
-    PUPPETEER_EXECUTABLE_PATH=/usr/bin/firefox
-RUN npm install && \
-    npm run build && \
-    npm prune --production && \
-    rm -rf /home/node/.npm
+# Install dependencies and create flaresolverr user
+# We have to install and old version of Chromium because its not working in Raspberry Pi / ARM
+# You can test Chromium running this command inside the container:
+#    xvfb-run -s "-screen 0 1600x1200x24" chromium --no-sandbox
+# The error traces is like this: "*** stack smashing detected ***: terminated"
+# To check the package versions available you can use this command:
+#    apt-cache madison chromium
+WORKDIR /app
+RUN echo "\ndeb http://snapshot.debian.org/archive/debian/20210519T212015Z/ bullseye main" >> /etc/apt/sources.list \
+    && echo 'Acquire::Check-Valid-Until "false";' | tee /etc/apt/apt.conf.d/00snapshot \
+    # Install dummy packages
+    && dpkg -i /libgl1-mesa-dri.deb \
+    && dpkg -i /adwaita-icon-theme.deb \
+    # Install dependencies
+    && apt-get update \
+    && apt-get install -y --no-install-recommends chromium=89.0.4389.114-1 chromium-common=89.0.4389.114-1 \
+        chromium-driver=89.0.4389.114-1 xvfb \
+    # Remove temporary files and hardware decoding libraries
+    && rm -rf /var/lib/apt/lists/* \
+    && rm -f /usr/lib/x86_64-linux-gnu/libmfxhw* \
+    && rm -f /usr/lib/x86_64-linux-gnu/mfx/* \
+    # Create flaresolverr user
+    && useradd --home-dir /app --shell /bin/sh flaresolverr \
+    && mv /usr/bin/chromedriver chromedriver \
+    && chown -R flaresolverr:flaresolverr .
+
+# Install Python dependencies
+COPY requirements.txt .
+RUN pip install -r requirements.txt \
+    # Remove temporary files
+    && rm -rf /root/.cache \
+    && find / -name '*.pyc' -delete
+
+USER flaresolverr
+
+COPY src .
+COPY package.json ../
 
 EXPOSE 8191
-ENTRYPOINT ["/usr/bin/dumb-init", "--"]
-CMD ["node", "./dist/server.js"]
 
-# docker build -t flaresolverr:custom .
-# docker run -p 8191:8191 -e LOG_LEVEL=debug flaresolverr:custom
+CMD ["/usr/local/bin/python", "-u", "/app/flaresolverr.py"]
+
+# Local build
+# docker build -t ngosang/flaresolverr:3.0.0.beta2 .
+# docker run -p 8191:8191 ngosang/flaresolverr:3.0.0.beta2
+
+# Multi-arch build
+# docker buildx create --use
+# docker buildx build -t ngosang/flaresolverr:3.0.0.beta2 --platform linux/386,linux/amd64,linux/arm/v7,linux/arm64/v8 .
+#   add --push to publish in DockerHub

LICENSE

@@ -1,7 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Diego Heras (ngosang)
-Copyright (c) 2020 Noah Cardoza (NoahCardoza)
+Copyright (c) 2022 Diego Heras (ngosang / ngosang@hotmail.es)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -4,18 +4,18 @@
 [![Docker Pulls](https://img.shields.io/docker/pulls/flaresolverr/flaresolverr)](https://hub.docker.com/r/flaresolverr/flaresolverr/)
 [![GitHub issues](https://img.shields.io/github/issues/FlareSolverr/FlareSolverr)](https://github.com/FlareSolverr/FlareSolverr/issues)
 [![GitHub pull requests](https://img.shields.io/github/issues-pr/FlareSolverr/FlareSolverr)](https://github.com/FlareSolverr/FlareSolverr/pulls)
-[![Donate PayPal](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=X5NJLLX5GLTV6&source=url)
-[![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)
+[![Donate PayPal](https://img.shields.io/badge/Donate-PayPal-yellow.svg)](https://www.paypal.com/paypalme/diegoheras0xff)
+[![Donate Bitcoin](https://img.shields.io/badge/Donate-Bitcoin-f7931a.svg)](https://www.blockchain.com/btc/address/13Hcv77AdnFWEUZ9qUpoPBttQsUT7q9TTh)
+[![Donate Ethereum](https://img.shields.io/badge/Donate-Ethereum-8c8c8c.svg)](https://www.blockchain.com/eth/address/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.
-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
+FlareSolverr starts a proxy server, and it waits for user requests in an idle state using few resources.
+When some request arrives, it uses [Selenium](https://www.selenium.dev) with the
+[undetected-chromedriver](https://github.com/ultrafunkamsterdam/undetected-chromedriver)
+to create a web browser (Chrome). It opens the URL with user parameters and waits until the Cloudflare challenge
 is solved (or timeout). The HTML code and the cookies are sent back to the user, and those cookies can be used to
 bypass Cloudflare using other HTTP clients.
 
@@ -37,11 +37,13 @@ Docker images are available in:
 * DockerHub => https://hub.docker.com/r/flaresolverr/flaresolverr
 
 Supported architectures are:
-| Architecture | Tag |
-| :----: | --- |
-| x86-64 | linux/amd64 |
-| ARM64 | linux/arm64 |
-| ARM32 | linux/arm/v7 |
+
+| Architecture | Tag          |
+|--------------|--------------|
+| x86          | linux/386    |
+| x86-64       | linux/amd64  |
+| ARM32        | linux/arm/v7 |
+| ARM64        | linux/arm64  |
 
 We provide a `docker-compose.yml` configuration file. Clone this repository and execute `docker-compose up -d` to start
 the container.
@@ -56,6 +58,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.
@@ -66,13 +72,12 @@ This is the recommended way for Windows users.
 ### From source code
 
 This is the recommended way for macOS users and for developers.
-* Install [NodeJS](https://nodejs.org/) 16.
+* Install [Python 3.10](https://www.python.org/downloads/).
+* Install [Chrome](https://www.google.com/intl/en_us/chrome/) or [Chromium](https://www.chromium.org/getting-involved/download-chromium/) web browser.
+* (Only in Linux / macOS) Install [Xvfb](https://en.wikipedia.org/wiki/Xvfb) package.
 * Clone this repository and open a shell in that path.
-* Run `export PUPPETEER_PRODUCT=firefox` (Linux/macOS) or `set PUPPETEER_PRODUCT=firefox` (Windows).
-* Run `npm install` command to install FlareSolverr dependencies.
-* Run `npm start` command to compile TypeScript code and start FlareSolverr.
-
-If you get errors related to firefox not installed try running `node node_modules/puppeteer/install.js` to install Firefox.
+* Run `pip install -r requirements.txt` command to install FlareSolverr dependencies.
+* Run `python src/flaresolverr.py` command to start FlareSolverr.
 
 ### Systemd service
 
@@ -101,9 +106,10 @@ cookies for the browser to use.
 
 This also speeds up the requests since it won't have to launch a new browser instance for every request.
 
-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.
+| 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`
 
@@ -128,20 +134,20 @@ Example response:
 This will properly shutdown a browser instance and remove all files associated with it to free up resources for a new
 session. When you no longer need to use a session you should make sure to close it.
 
-Parameter | Notes
-|--|--|
-session | The session ID that you want to be destroyed.
+| Parameter | Notes                                         |
+|-----------|-----------------------------------------------|
+| session   | The session ID that you want to be destroyed. |
 
 #### + `request.get`
 
-Parameter | Notes
-|--|--|
-url | Mandatory
-session | Optional. Will send the request from and existing browser instance. If one is not sent it will create a temporary instance that will be destroyed immediately after the request is completed.
-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.
+| Parameter         | Notes                                                                                                                                                                                                                                                                                                                                        |
+|-------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| url               | Mandatory                                                                                                                                                                                                                                                                                                                                    |
+| session           | Optional. Will send the request from and existing browser instance. If one is not sent it will create a temporary instance that will be destroyed immediately after the request is completed.                                                                                                                                                |
+| 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. (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.
 
@@ -208,23 +214,23 @@ Example response from running the `curl` above:
 
 This is the same as `request.get` but it takes one more param:
 
-Parameter | Notes
-|--|--|
-postData | Must be a string with `application/x-www-form-urlencoded`. Eg: `a=b&c=d`
+| Parameter | Notes                                                                    |
+|-----------|--------------------------------------------------------------------------|
+| postData  | Must be a string with `application/x-www-form-urlencoded`. Eg: `a=b&c=d` |
 
 ## Environment variables
 
-Name | Default | Notes
-|--|--|--|
-LOG_LEVEL | info | Verbosity of the logging. Use `LOG_LEVEL=debug` for more information.
-LOG_HTML | false | Only for debugging. If `true` all HTML that passes through the proxy will be logged to the console in `debug` level.
-CAPTCHA_SOLVER | none | Captcha solving method. It is used when a captcha is encountered. See the Captcha Solvers section.
-TZ | UTC | Timezone used in the logs and the web browser. Example: `TZ=Europe/London`.
-HEADLESS | true | Only for debugging. To run the web browser in headless mode or visible.
-BROWSER_TIMEOUT | 40000 | If you are experiencing errors/timeouts because your system is slow, you can try to increase this value. Remember to increase the `maxTimeout` parameter too.
-TEST_URL | https://www.google.com | FlareSolverr makes a request on start to make sure the web browser is working. You can change that URL if it is blocked in your country.
-PORT | 8191 | Listening port. You don't need to change this if you are running on Docker.
-HOST | 0.0.0.0 | Listening interface. You don't need to change this if you are running on Docker.
+| Name            | Default                | Notes                                                                                                                                                         |
+|-----------------|------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| LOG_LEVEL       | info                   | Verbosity of the logging. Use `LOG_LEVEL=debug` for more information.                                                                                         |
+| LOG_HTML        | false                  | Only for debugging. If `true` all HTML that passes through the proxy will be logged to the console in `debug` level.                                          |
+| CAPTCHA_SOLVER  | none                   | Captcha solving method. It is used when a captcha is encountered. See the Captcha Solvers section.                                                            |
+| TZ              | UTC                    | Timezone used in the logs and the web browser. Example: `TZ=Europe/London`.                                                                                   |
+| HEADLESS        | true                   | Only for debugging. To run the web browser in headless mode or visible.                                                                                       |
+| BROWSER_TIMEOUT | 40000                  | If you are experiencing errors/timeouts because your system is slow, you can try to increase this value. Remember to increase the `maxTimeout` parameter too. |
+| TEST_URL        | https://www.google.com | FlareSolverr makes a request on start to make sure the web browser is working. You can change that URL if it is blocked in your country.                      |
+| PORT            | 8191                   | Listening port. You don't need to change this if you are running on Docker.                                                                                   |
+| HOST            | 0.0.0.0                | Listening interface. You don't need to change this if you are running on Docker.                                                                              |
 
 Environment variables are set differently depending on the operating system. Some examples:
 * Docker: Take a look at the Docker section in this document. Environment variables can be set in the `docker-compose.yml` file or in the Docker CLI command.

build-binaries.js

@@ -1,111 +0,0 @@
-const fs = require('fs')
-const path = require('path')
-const { execSync } = require('child_process')
-const archiver = require('archiver')
-const https = require('https')
-const puppeteer = require('puppeteer')
-const version = 'v' + require('./package.json').version;
-
-function getFirefoxNightlyVersion() {
-  const firefoxVersions = 'https://product-details.mozilla.org/1.0/firefox_versions.json';
-  return new Promise((resolve, reject) => {
-    let data = '';
-    https
-      .get(firefoxVersions, (r) => {
-        if (r.statusCode >= 400)
-          return reject(new Error(`Got status code ${r.statusCode}`));
-        r.on('data', (chunk) => {
-          data += chunk;
-        });
-        r.on('end', () => {
-          try {
-            const versions = JSON.parse(data);
-            return resolve(versions.FIREFOX_NIGHTLY);
-          } catch {
-            return reject(new Error('Firefox version not found'));
-          }
-        });
-      })
-      .on('error', reject);
-  });
-}
-
-(async () => {
-  const builds = [
-    {
-      platform: 'linux',
-      firefoxFolder: 'firefox',
-      fsExec: 'flaresolverr-linux',
-      fsZipExec: 'flaresolverr',
-      fsZipName: 'linux-x64',
-      fsLicenseName: 'LICENSE'
-    },
-    {
-      platform: 'win64',
-      firefoxFolder: 'firefox',
-      fsExec: 'flaresolverr-win.exe',
-      fsZipExec: 'flaresolverr.exe',
-      fsZipName: 'windows-x64',
-      fsLicenseName: 'LICENSE.txt'
-    }
-    // todo: this has to be build in macOS (hdiutil is required). changes required in sessions.ts too
-    // {
-    //   platform: 'mac',
-    //   firefoxFolder: 'firefox',
-    //   fsExec: 'flaresolverr-macos',
-    //   fsZipExec: 'flaresolverr',
-    //   fsZipName: 'macos',
-    //   fsLicenseName: 'LICENSE'
-    // }
-  ]
-
-  // generate executables
-  console.log('Generating executables...')
-  if (fs.existsSync('bin')) {
-    fs.rmSync('bin', { recursive: true })
-  }
-  execSync('./node_modules/.bin/pkg -t node16-win-x64,node16-linux-x64 --out-path bin .')
-  // execSync('./node_modules/.bin/pkg -t node16-win-x64,node16-mac-x64,node16-linux-x64 --out-path bin .')
-
-  // get firefox revision
-  const revision = await getFirefoxNightlyVersion();
-
-  // download firefox and zip together
-  for (const os of builds) {
-    console.log('Building ' + os.fsZipName + ' artifact')
-
-    // download firefox
-    console.log(`Downloading firefox ${revision} for ${os.platform} ...`)
-    const f = puppeteer.createBrowserFetcher({
-      product: 'firefox',
-      platform: os.platform,
-      path: path.join(__dirname, 'bin', 'puppeteer')
-    })
-    await f.download(revision)
-
-    // compress in zip
-    console.log('Compressing zip file...')
-    const zipName = 'bin/flaresolverr-' + version + '-' + os.fsZipName + '.zip'
-    const output = fs.createWriteStream(zipName)
-    const archive = archiver('zip')
-
-    output.on('close', function () {
-      console.log('File ' + zipName + ' created. Size: ' + archive.pointer() + ' bytes')
-    })
-
-    archive.on('error', function (err) {
-      throw err
-    })
-
-    archive.pipe(output)
-
-    archive.file('LICENSE', { name: 'flaresolverr/' + os.fsLicenseName })
-    archive.file('bin/' + os.fsExec, { name: 'flaresolverr/' + os.fsZipExec })
-    archive.directory('bin/puppeteer/' + os.platform + '-' + revision + '/' + os.firefoxFolder, 'flaresolverr/firefox')
-    if (os.platform === 'linux') {
-      archive.file('flaresolverr.service', { name: 'flaresolverr/flaresolverr.service' })
-    }
-
-    await archive.finalize()
-  }
-})()

flaresolverr.service

@@ -1,19 +0,0 @@
-[Unit]
-Description=FlareSolverr
-After=network.target
-
-[Service]
-SyslogIdentifier=flaresolverr
-Restart=always
-RestartSec=5
-Type=simple
-User=flaresolverr
-Group=flaresolverr
-Environment="LOG_LEVEL=info"
-Environment="CAPTCHA_SOLVER=none"
-WorkingDirectory=/opt/flaresolverr
-ExecStart=/opt/flaresolverr/flaresolverr
-TimeoutStopSec=30
-
-[Install]
-WantedBy=multi-user.target

html_samples/cloudflare_captcha_hcaptcha_v1.html

@@ -0,0 +1,219 @@
+<!DOCTYPE html>
+<html lang="en-US">
+
+<head>
+    <title>Just a moment...</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge">
+    <meta name="robots" content="noindex,nofollow">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <link href="Just%20a%20moment_files/cf-errors.css" rel="stylesheet">
+
+    <script>
+        (function () {
+            window._cf_chl_opt = {
+                cvId: '2',
+                cType: 'managed',
+                cNounce: '67839',
+                cRay: '732fbc436ab471ed',
+                cHash: 'dce5bd920f3aa51',
+                cUPMDTk: "\/search?q=2022&__cf_chl_tk=lkycIb1jDXlmFqiB7AXTwy38_EzYPvu79CCQyU9lhUE-1659201316-0-gaNycGzNCf0",
+                cFPWv: 'g',
+                cTTimeMs: '1000',
+                cTplV: 2,
+                cRq: {
+                    ru: 'aHR0cHM6Ly8wbWFnbmV0LmNvbS9zZWFyY2g/cT0yMDIy',
+                    ra: 'TW96aWxsYS81LjAgKFgxMTsgTGludXggeDg2XzY0OyBydjoxMDUuMCkgR2Vja28vMjAxMDAxMDEgRmlyZWZveC8xMDUuMA==',
+                    rm: 'R0VU',
+                    d: 'MqxNbbGfWazPaVMZ7GQRz02TV/pSUL9POWx0y4e7HFRwP1RTAxLc1RZRuHg+N/bGMuPj08kSx0UpcjEjMkSOqiU6I/64IDYbCJvey5rY07fkkljpZaYGTDZIoWdOWlgP3ky15ybZ42xMK4tfI1yJ+iFZCVgR6VBjJzi5I56j9Ijog2AvsoQW2TrguGpgKaT1LkhxWNElzBbvXWt1uyRgE19UQ9J/5vtxEwoh5wodHh7WE297n8uI1hpDgge2bDYQvwe+RDq3QAyhQOmymg+IIlt1y115v9R8k5ehT9TFY3vYvYnoJu9cOyHYprf9Z0jTNGxSTvLHYJbfq30Samu5fKfE0oZREZizvPUgUsJm2rRKkCY9VCdBkpO8vaUgIwIYkeWavtqdudjb3zEDBCD4cAH/xv3Bl1VRy2Qf7XlcbpElCOq06TDTQ1uGjyCqbVbvjesrOy0Dp2nXTjdfbkWvnN7mWpFlPUD7/41MUo9lc6V1Aj1Kjg6AKfVV4DUHpq6ZVnMHzrcPQLy4qD7CptcMpQKArZtJCRsUpgq8GWKJcU4dU8ZmyROAA+l+JEVnGbh2bsRdif4azh57OdjZfEKSa5c+AL3i66vyWAZCw9Wl6CAQdFTA+ixkbl8zKbCm8ulv',
+                    t: 'MTY1OTIwMTMxNi4zOTIwMDA=',
+                    m: '3l81qRkXiMTbjTzBtc0v1XwSheF46UfagbXVhYgbAVw=',
+                    i1: 'Iu5a1gH3p9igzqBwncow9g==',
+                    i2: 'PmNXozjc73unhnp/X0+kUQ==',
+                    zh: 'qP4bnGc6j96JlnjNSE7HmQci3S9L50bHFtm4bQRjjKU=',
+                    uh: 'SK3PXNkeRzZtkRARhJpbmZpCIiWQw6+5gpOE7vojWx4=',
+                    hh: 'azXzJl8Ou22g0nN/9idVUoB9EqZ7fLmkSdDRHM3Lkmw=',
+                }
+            }
+            window._cf_chl_enter = function () { window._cf_chl_opt.p = 1 };
+        })();
+    </script>
+
+    <script src="Just%20a%20moment_files/v1.js"></script>
+    <script type="text/javascript" src="Just%20a%20moment_files/api.js"></script>
+</head>
+
+<body class="no-js">
+
+    <div class="privacy-pass">
+        <a rel="noopener noreferrer" href="https://addons.mozilla.org/en-US/firefox/addon/privacy-pass/"
+            target="_blank">
+            Privacy Pass
+            <span class="privacy-pass-icon-wrapper">
+                <div class="privacy-pass-icon"></div>
+            </span>
+        </a>
+    </div>
+
+    <div class="main-wrapper" role="main">
+        <div class="main-content">
+            <h1 class="zone-name-title h1">
+                <img class="heading-favicon" src="Just%20a%20moment_files/favicon.ico"
+                    onerror="this.onerror=null;this.parentNode.removeChild(this)">
+                0MAGNET.COM
+            </h1>
+            <h2 class="h2" id="cf-challenge-running">
+                Checking if the site connection is secure
+            </h2>
+            <div id="cf-challenge-stage" style="display: block;">
+                <div id="cf-challenge-hcaptcha-wrapper" class="captcha-prompt spacer">
+                    <div style="display: none;" class="hcaptcha-box"><iframe src="Just%20a%20moment_files/hcaptcha.html"
+                            title="widget containing checkbox for hCaptcha security challenge" tabindex="0"
+                            scrolling="no" data-hcaptcha-widget-id="0tiueg8lyuj" data-hcaptcha-response=""
+                            style="width: 303px; height: 78px; overflow: hidden;" frameborder="0"></iframe><textarea
+                            id="h-captcha-response-0tiueg8lyuj" name="h-captcha-response"
+                            style="display: none;"></textarea></div>
+                    <div class="hcaptcha-box"><iframe src="Just%20a%20moment_files/hcaptcha_002.html"
+                            title="widget containing checkbox for hCaptcha security challenge" tabindex="0"
+                            scrolling="no" data-hcaptcha-widget-id="10tlmhzz0qyq" data-hcaptcha-response=""
+                            style="width: 303px; height: 78px; overflow: hidden;" frameborder="0"></iframe><textarea
+                            id="h-captcha-response-10tlmhzz0qyq" name="h-captcha-response"
+                            style="display: none;"></textarea></div>
+                </div>
+            </div>
+            <div id="cf-challenge-spinner" class="spacer loading-spinner" style="display: none; visibility: hidden;">
+                <div class="lds-ring">
+                    <div></div>
+                    <div></div>
+                    <div></div>
+                    <div></div>
+                </div>
+            </div>
+            <noscript>
+                <div id="cf-challenge-error-title">
+                    <div class="h2">
+                        <span class="icon-wrapper">
+                            <div class="heading-icon warning-icon"></div>
+                        </span>
+                        <span id="cf-challenge-error-text">
+                            Enable JavaScript and cookies to continue
+                        </span>
+                    </div>
+                </div>
+            </noscript>
+            <div
+                style="display:none;background-image:url('/cdn-cgi/images/trace/captcha/nojs/transparent.gif?ray=732fbc436ab471ed')">
+            </div>
+            <div id="cf-challenge-body-text" class="core-msg spacer">
+                0magnet.com needs to review the security of your connection before
+                proceeding.
+            </div>
+            <div id="cf-challenge-fact-wrapper" style="display: block; visibility: visible;" class="fact spacer hidden">
+                <span class="fact-title">Did you know</span> <span id="cf-challenge-fact" class="body-text">the first
+                    botnet in 2003 took over 500-1000 devices? Today, botnets take over millions of devices at
+                    once.</span>
+            </div>
+            <div id="cf-challenge-explainer-expandable" class="hidden expandable body-text spacer"
+                style="display: block; visibility: visible;">
+                <div class="expandable-title" id="cf-challenge-explainer-summary"><button class="expandable-summary-btn"
+                        id="cf-challenge-explainer-btn" type="button"> Why am I seeing this page? <span
+                            class="caret-icon-wrapper">
+                            <div class="caret-icon"></div>
+                        </span> </button> </div>
+                <div class="expandable-details" id="cf-challenge-explainer-details">
+                    Requests from malicious bots can pose as legitimate traffic.
+                    Occasionally, you may see this page while the site ensures that the
+                    connection is secure.</div>
+            </div>
+            <div id="cf-challenge-success" style="display: none;">
+                <div class="h2"><span class="icon-wrapper"><img class="heading-icon" alt="Success icon"
+                            src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADQAAAA0CAMAAADypuvZAAAANlBMVEUAAAAxMTEwMDAxMTExMTEwMDAwMDAwMDAxMTExMTExMTEwMDAwMDAxMTExMTEwMDAwMDAxMTHB9N+uAAAAEXRSTlMA3zDvfyBAEJC/n3BQz69gX7VMkcMAAAGySURBVEjHnZZbFoMgDEQJiDzVuv/NtgbtFGuQ4/zUKpeMIQbUhXSKE5l1XSn4pFWHRm/WShT1HRLWC01LGxFEVkCc30eYkLJ1Sjk9pvkw690VY6k8DWP9OM9yMG0Koi+mi8XA36NXmW0UXra4eJ3iwHfrfXVlgL0NqqGBHdqfeQhMmyJ48WDuKP81h3+SMPeRKkJcSXiLUK4XTHCjESOnz1VUXQoc6lgi2x4cI5aTQ201Mt8wHysI5fc05M5c81uZEtHcMKhxZ7iYEty1GfhLvGKpm+EYkdGxm1F5axmcB93DoORIbXfdN7f+hlFuyxtDP+sxtBnF43cIYwaZAWRgzxIoiXEMESoPlMhwLRDXeK772CAzXEdBRV7cmnoVBp0OSlyGidEzJTFq5hhcsA5388oSGM6b5p+qjpZrBlMS9xj4AwXmz108ukU1IomM3ceiW0CDwHCqp1NjAqXlFrbga+xuloQJ+tuyfbIBPNpqnmxqT7dPaOnZqBfhSBCteJAxWj58zLk2xgg+SPGYM6dRO6WczSnIxxwEExRaO+UyCUhbOp7CGQ+kxSUfNtLQFC+Po29vvy7jj4y0yAAAAABJRU5ErkJggg=="></span>Connection
+                    is secure</div>
+                <div class="core-msg spacer">Proceeding...</div>
+            </div>
+            <form id="challenge-form"
+                action="/search?q=2022&amp;__cf_chl_f_tk=lkycIb1jDXlmFqiB7AXTwy38_EzYPvu79CCQyU9lhUE-1659201316-0-gaNycGzNCf0"
+                method="POST" enctype="application/x-www-form-urlencoded">
+                <input type="hidden" name="md"
+                    value="P4fDbSohR3e3VZmGdBSN0Gd8t8ueht.ZVgSdQYwa45Y-1659201316-0-AesEKnKN8eJLiLESJle3R0T3fwKbVMlX09CR0sIU1LruDXen0nSlT2a5OpMUFYR7HQMGcF9Ja227n2p2D2ffUlWHPVeFX-YSNiewLZA3XuAQmOn-1DyWKA-SaMH_MW2vOSC7PCHAdJDhoRWjM_o3MyKziopj3WmDcaCI_ikk68bJTIValZ_e9tO7hmHC8zjsxDC8kXmI0tbrhyW5nyS2hRlx_ZVRcRHbHsVRN0-FGtEbCoaHmnp-q0N4AYhCJXofYRunPcSG_Y1iWMk-7ofOXON_gO7oGG_8-WWD5EG1jaz2ldpNO1RTkS7dQvTiC1Io1qAsVnQtokEaDR2zoWK_MF-hz6tOmuJIDgnAoH6vPFAa9EyJOUiG2RV-3q1CKTUgr82XRJw5CaXpN0QeBq0xHxFl5mzkFO8xqQsRnPkGUKtxBQ58syPIhR4AvNp8HA028gUNmaztJZ9i2UcWydut4VghHsoJjS5DEKTamjJhNrrkargjXUekXTfKXMVKCXxo0NFObTmKwzsNB5hrk3M43KzZCOOgTnqsrVUk54bAeDsr4qmTVW2wVk-0u78QpV2JFFOIJxRLikPmqo9CUokgUJ_IPsEjA5Q3kjrf9yq2OHU0MkwzLFNOAyc5N3A4WSYp91kESwxM98qFetpAZ0R3LID2c2-MraHnpOI2Xn4bxbDIdUPmjy6VB8Huuuf6M-o3Tw">
+                <input type="hidden" name="r"
+                    value="bdZ7.nm8dGOZxq3EDOv_Kx7nKVv68q7b0RARXAlR9kQ-1659201316-0-AawyK3x4GgWasA2OtBBEp9Ea52qs8zEWwnQJxLWUnC+1jqlxaKHTIHeVQjvrTl/ccu6QA41yrSTKvazKiv6zQEiDj/6ziYkhldx+oJ7SqgMzPozzza1jofsGpCCPAzIlDicF+7sh4WKOxUJOeHgHCgfEZF/MPNsaahvbQ10U8Ei9tmvj8c2tkoybya75Bj5XHPPu0S9hnOH7S24ltm9vmyHlttI7uuI962FzPCTGjuAl4R/5+06WVAzBCJrS4biDNIuyYe22PtLl4b3Yf55eW7AFgyzKgddsohZJuNNliKyD6cusHDhm7MYpnXc5zwTdCbt6KGK/tBaylNyYwH/WBAUhyRYN5EVt9/iIKHrb+P6Z0RL4nO3BtQE/Zwx1VC3g1Wy4PPQJjqLixQptzl5eIzu43JIO/LBvT/mWuheH4eoPlghvyMYwfHcs7B4d7FCv1Tj9Skp9Fcj6HBAZlq/ss/eIwk7oOcTviQs+EUF9/yYatgtpXX9RCyvhMU6/ghOLfXRmOpAzsmoGnVqEpc2IMlZegYtieLveXU35cGJMI6wCR2ciCJIX995vLuL/4BdCAMEhyMAUWxtaCD2ZfRHyOWKNuf80w9k6/Ofhu7RevCr2mjQJAVTyE2OWWgOUuYJ4pZim93J7slMXieL3S5/JM08Q8g179Of7dzpN/oG7s80ljxAiCprpUAwpEmNiqNJN//v0e9KxknhCHeAWSAe8IeXbp5PSEQHXTmsqOFRkpud1pTsETcNbdonk8XMyv8mZRcFPVWRRWUb8hupn/d+x9r6mOdKdJkH8ZZ0R30LG0SLPYEvsVr2yU9o+uCZrRWkuE3SP3Lq3BIx+0vtm0DOvj6cODxy5/4Zm4x7LIpSa9wr69Rs2x+t+U5ydUupZ7oiAbWfYZSXHpmB0zJYOLMPJZcut50J/IgWuTMda8QBcTG3jRr4BTwpcmBZRmddfOJYgD7EMpOi1HgwLnS7l5QELafaMn0Hl6G774GVy4lEK2jURG9IEE3PV1m5Y903pqldFkJQsMxdisJWOzVjbtf41fxxnt4cQgiDQhktqCwg8xP6ijzPeWgvQHL5fMq61cQ5/4HB+yt9wKWMlBfUJR+ocI2MYx2nUWz+0BwCnTU29D9bx1xkir9bsnUnfOlfRDO2OEvI0iTe82666rVQO9XqTEz3POxrJYzLcSC9fTHpHfmCVwT2zWGGLi6pW5kqZh/uzSQ12MSvF5+dwvhe7yRks5gwMhnDHMQFyxKw3Xxm+dq2Ix/1uUucOhCu2L72j/NIwkF3Z7O7afY9nIu+NqMe8PbPJjq5ovEluosQfAMzWJH5Va8iur8o6K1y6hm7XFdNYAR+uCtxMw6WzF58QWVXXrDvfPeBMaNz+VVCnGP9elAwv62tc4Uh2SCbKbWdZchtLHgrJgYgQtCMhBDh0AXzE6ubbtfm9jE2vWcPj5jbo8U72i1pL2j8Xfr562Xc2WrQ7tKvSFQepGxfu2XgF7q55XKVqrnrBeXxZViUkB/gyXxI26CfrVfPLW+sYUo3JS+eCjyn2K7phv+630ixdpKrRJCTmkP3G8tcoLTJCB67/pbz+dXiNSB4JlHf4i3FVRkr8TAWS2zuMjJhB+ZyxnrGq/m7KSwpEEqgSCpOrQ5nkeoKIOyITfe9EPBSy9QtYDK+SAhUiLnICVURK7kGgrhZuKyK5/nyK9l7ffg16aaChJBisPBeiYsTDHlAeq0GbW7VR/jQDAVtVldeyD/dM5rJ4X+wl3A+faYD1OUxYT3n8dMs+E/1jLnYixXJpo7iXCqlTV3phOatg4XDQ5Bj6EYQIljVI4x2e8XHspcETIa0WepLsZF7WUtY7KbN8ZyDBFXgTMb4lzPmWyY8hZ05uX8EBKqUJhWh91AUob/OpJdf+u3axDDeRgsjl8K6CFM/5uQKo93co3KPqGZiqx0JoVj1t6KGxkrzYsgwlrTyeL44cEgr0zRQz5oFExuwHGYyogbHZ8EvU1eoiJ3IuQFxUH/1ULidfGtB371RYfz9gqONi1KiVzJ+zLjw+4HgMKXOV+ra09Dyg+eyUNfHillLXkhKWVoDpUhc+r46W6vXFp3oMKUWTRM0dE7iHofo+0tHb73d3ID2blRXgUeoMCQwOptoAYlFBIUYjggrIhd1AMC8TiZmiNULyP5imDePwcfq+ZjGH3o8VKRI2FcoFmChQegGco6pEbB5DxCguDuJbFRwGH4t9T0y74ZhlZiTNKA4xXsQnfIBEC5qz3mkcDAWoe73zqFAjp35JRVBjo3UDvehJppxzuoCXt9UbeuNEGll5/YJR4lfbUsEai0U6TFVleTTY53ofYCWEM6EnNDIToTFbm514YFTUSc4h8Qlq2fPeqC3IcCmirNT4Kf0FCO7MQrtGNFPJme2cpb/pZguS3pxxkKb4lOS+eGiUBGcSs1v3zHroJ+hum4wTJFRG0Yb99aCVQU44wgV3nKW7FZkXzwO3QY7nnkFI2kaAXerCPF4+Ho463g==">
+
+                <span style="display: none;"><span class="text-gray-600" data-translate="error">error code:
+                        1020</span></span>
+            </form>
+        </div>
+    </div>
+    <script>
+        (function () {
+            var trkjs = document.createElement('img');
+            trkjs.setAttribute('src', '/cdn-cgi/images/trace/captcha/js/transparent.gif?ray=732fbc436ab471ed');
+            trkjs.setAttribute('style', 'display: none');
+            document.body.appendChild(trkjs);
+            var cpo = document.createElement('script');
+            cpo.src = '/cdn-cgi/challenge-platform/h/g/orchestrate/managed/v1?ray=732fbc436ab471ed';
+            window._cf_chl_opt.cOgUHash = location.hash === '' && location.href.indexOf('#') !== -1 ? '#' : location.hash;
+            window._cf_chl_opt.cOgUQuery = location.search === '' && location.href.slice(0, -window._cf_chl_opt.cOgUHash.length).indexOf('?') !== -1 ? '?' : location.search;
+            if (window.history && window.history.replaceState) {
+                var ogU = location.pathname + window._cf_chl_opt.cOgUQuery + window._cf_chl_opt.cOgUHash;
+                history.replaceState(null, null, "\/search?q=2022&__cf_chl_rt_tk=lkycIb1jDXlmFqiB7AXTwy38_EzYPvu79CCQyU9lhUE-1659201316-0-gaNycGzNCf0" + window._cf_chl_opt.cOgUHash);
+                cpo.onload = function () {
+                    history.replaceState(null, null, ogU);
+                };
+            }
+            document.getElementsByTagName('head')[0].appendChild(cpo);
+        }());
+    </script><img src="Just%20a%20moment_files/transparent.gif" style="display: none">
+
+    <div class="footer" role="contentinfo">
+        <div class="footer-inner">
+            <div class="clearfix diagnostic-wrapper">
+                <div class="ray-id">Ray ID: <code>732fbc436ab471ed</code></div>
+            </div>
+            <div class="text-center">
+                Performance &amp; security by
+                <a rel="noopener noreferrer" href="https://www.cloudflare.com/" target="_blank">Cloudflare</a>
+            </div>
+        </div>
+    </div>
+
+
+    <div style="background-color: rgb(255, 255, 255); border: 1px solid rgb(215, 215, 215); box-shadow: rgba(0, 0, 0, 0.1) 0px 0px 4px; border-radius: 4px; left: -10000px; top: -10000px; z-index: -2147483648; position: absolute; transition: opacity 0.15s ease-out 0s; opacity: 0; visibility: hidden;"
+        aria-hidden="true">
+        <div style="position: relative; z-index: 1;"><iframe src="Just%20a%20moment_files/hcaptcha_003.html"
+                title="Main content of the hCaptcha challenge" scrolling="no"
+                style="border: 0px none; z-index: 2000000000; position: relative;" frameborder="0"></iframe></div>
+        <div
+            style="width: 100%; height: 100%; position: fixed; pointer-events: none; top: 0px; left: 0px; z-index: 0; background-color: rgb(255, 255, 255); opacity: 0.05;">
+        </div>
+        <div
+            style="border-width: 11px; position: absolute; pointer-events: none; margin-top: -11px; z-index: 1; right: 100%;">
+            <div
+                style="border-width: 10px; border-style: solid; border-color: transparent rgb(255, 255, 255) transparent transparent; position: relative; top: 10px; z-index: 1;">
+            </div>
+            <div
+                style="border-width: 11px; border-style: solid; border-color: transparent rgb(215, 215, 215) transparent transparent; position: relative; top: -11px; z-index: 0;">
+            </div>
+        </div>
+    </div>
+    <div style="background-color: rgb(255, 255, 255); border: 1px solid rgb(215, 215, 215); box-shadow: rgba(0, 0, 0, 0.1) 0px 0px 4px; border-radius: 4px; left: -10000px; top: -10000px; z-index: -2147483648; position: absolute; transition: opacity 0.15s ease-out 0s; opacity: 0; visibility: hidden;"
+        aria-hidden="true">
+        <div style="position: relative; z-index: 1;"><iframe src="Just%20a%20moment_files/hcaptcha_004.html"
+                title="Main content of the hCaptcha challenge" scrolling="no"
+                style="border: 0px none; z-index: 2000000000; position: relative;" frameborder="0"></iframe></div>
+        <div
+            style="width: 100%; height: 100%; position: fixed; pointer-events: none; top: 0px; left: 0px; z-index: 0; background-color: rgb(255, 255, 255); opacity: 0.05;">
+        </div>
+        <div
+            style="border-width: 11px; position: absolute; pointer-events: none; margin-top: -11px; z-index: 1; right: 100%;">
+            <div
+                style="border-width: 10px; border-style: solid; border-color: transparent rgb(255, 255, 255) transparent transparent; position: relative; top: 10px; z-index: 1;">
+            </div>
+            <div
+                style="border-width: 11px; border-style: solid; border-color: transparent rgb(215, 215, 215) transparent transparent; position: relative; top: -11px; z-index: 0;">
+            </div>
+        </div>
+    </div>
+</body>
+
+</html>

html_samples/cloudflare_captcha_norobot_v1.html

@@ -0,0 +1,170 @@
+<!DOCTYPE html>
+<html lang="en-US">
+
+<head>
+    <title>Just a moment...</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge">
+    <meta name="robots" content="noindex,nofollow">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <link href="Just%20a%20moment2_files/cf-errors.css" rel="stylesheet">
+
+    <script>
+        (function () {
+            window._cf_chl_opt = {
+                cvId: '2',
+                cType: 'managed',
+                cNounce: '94250',
+                cRay: '732fc1c74f757330',
+                cHash: '8c4978fa93c1751',
+                cUPMDTk: "\/search?q=2022&__cf_chl_tk=6E3KpS5eCzuCMJG64ch2shvOMHdwQ8ioliqACpoQqM8-1659201542-0-gaNycGzNCeU",
+                cFPWv: 'g',
+                cTTimeMs: '1000',
+                cTplV: 2,
+                cRq: {
+                    ru: 'aHR0cHM6Ly8wbWFnbmV0LmNvbS9zZWFyY2g/cT0yMDIy',
+                    ra: 'TW96aWxsYS81LjAgKFgxMTsgTGludXggeDg2XzY0OyBydjoxMDUuMCkgR2Vja28vMjAxMDAxMDEgRmlyZWZveC8xMDUuMA==',
+                    rm: 'R0VU',
+                    d: 'C4CtJo9JDMtUWZ0r+/s2CwjYdSTdqGYK3qFo1OXpvSc9v7/3d5QuMwmvG3e5oV1BpjlQb8eJJ23gVRxavjw/gpPp1brmKoHuvcJEmAP3Sof38vqcpF91/9NHe3JbmCM2xshiGvJdbpJXb5wXdYKYPMqy7NUHL1VU4hupa3Da3tBq9zyuMa1NcZaiyeE6piSl7n96m+VziRdwyG+SBUldIG/Fsv9J1yl+Gj19wbX1XEneMXChcClGgRrSe1MTd9thLkq2NGFqROnsUmpA8b+2Eqi+IPYQfkPcydWkHmJqQixN9ZFTIBChIC60hGHOQ7O354ju65tVGAhB/nBRREpdqvwoYzgufgg83+dbPHVdQasiuLRHvftOtHhS5/iaBOVoEBH+rElTSk/OYjU2Yh6gkQj0FjkbebEBptFeVAxgqoYZljOrhamWYYZ14tOKeonzc1rz/FXNTM5qVtrWCwAlt9SsXDjM/GYXZMTbOdNLnLZGlLNQCx+l6hMC0OQC45sWFzZECljbjXwiYfodKobeqe11lUXnskj8AN5Qc7O8OqtALsxoNCLZ7ou+ORY0lauremeuu3U3WqadgSGFGA+TZZw2VcCA3BIUKCGlsNLBlJ8wQS2UAGJfGLOVuhErmtsM',
+                    t: 'MTY1OTIwMTU0Mi4yOTUwMDA=',
+                    m: 'eWHHJ28v6yOyvSePVqcdyHxAYkkc3xq3VJ8YiDCk5nk=',
+                    i1: 'M3dMvem+HcwSbNQrJbaYdQ==',
+                    i2: 'ebY327qYCu6NZKHSQXkbaQ==',
+                    zh: 'qP4bnGc6j96JlnjNSE7HmQci3S9L50bHFtm4bQRjjKU=',
+                    uh: 'SK3PXNkeRzZtkRARhJpbmZpCIiWQw6+5gpOE7vojWx4=',
+                    hh: 'azXzJl8Ou22g0nN/9idVUoB9EqZ7fLmkSdDRHM3Lkmw=',
+                }
+            }
+            window._cf_chl_enter = function () { window._cf_chl_opt.p = 1 };
+        })();
+    </script>
+
+    <script src="Just%20a%20moment2_files/v1.js"></script>
+    <script type="text/javascript" src="Just%20a%20moment2_files/api.js"></script>
+</head>
+
+<body class="no-js">
+
+    <div class="privacy-pass">
+        <a rel="noopener noreferrer" href="https://addons.mozilla.org/en-US/firefox/addon/privacy-pass/"
+            target="_blank">
+            Privacy Pass
+            <span class="privacy-pass-icon-wrapper">
+                <div class="privacy-pass-icon"></div>
+            </span>
+        </a>
+    </div>
+
+    <div class="main-wrapper" role="main">
+        <div class="main-content">
+            <h1 class="zone-name-title h1">
+                <img class="heading-favicon" src="Just%20a%20moment2_files/favicon.ico"
+                    onerror="this.onerror=null;this.parentNode.removeChild(this)">
+                0MAGNET.COM
+            </h1>
+            <h2 class="h2" id="cf-challenge-running">
+                Checking if the site connection is secure
+            </h2>
+            <div id="cf-challenge-stage" style="display: block;">
+                <div id="cf-norobot-container" style="display: flex;"><input type="button" value="Verify you are human"
+                        class="big-button pow-button" style="cursor: pointer;"></div>
+            </div>
+            <div id="cf-challenge-spinner" class="spacer loading-spinner" style="display: none; visibility: hidden;">
+                <div class="lds-ring">
+                    <div></div>
+                    <div></div>
+                    <div></div>
+                    <div></div>
+                </div>
+            </div>
+            <noscript>
+                <div id="cf-challenge-error-title">
+                    <div class="h2">
+                        <span class="icon-wrapper">
+                            <div class="heading-icon warning-icon"></div>
+                        </span>
+                        <span id="cf-challenge-error-text">
+                            Enable JavaScript and cookies to continue
+                        </span>
+                    </div>
+                </div>
+            </noscript>
+            <div
+                style="display:none;background-image:url('/cdn-cgi/images/trace/captcha/nojs/transparent.gif?ray=732fc1c74f757330')">
+            </div>
+            <div id="cf-challenge-body-text" class="core-msg spacer">
+                0magnet.com needs to review the security of your connection before
+                proceeding.
+            </div>
+            <div id="cf-challenge-fact-wrapper" style="display: block; visibility: visible;" class="fact spacer hidden">
+                <span class="fact-title">Did you know</span> <span id="cf-challenge-fact" class="body-text">botnets can
+                    be used to shutdown popular websites?</span>
+            </div>
+            <div id="cf-challenge-explainer-expandable" class="hidden expandable body-text spacer"
+                style="display: block; visibility: visible;">
+                <div class="expandable-title" id="cf-challenge-explainer-summary"><button class="expandable-summary-btn"
+                        id="cf-challenge-explainer-btn" type="button"> Why am I seeing this page? <span
+                            class="caret-icon-wrapper">
+                            <div class="caret-icon"></div>
+                        </span> </button> </div>
+                <div class="expandable-details" id="cf-challenge-explainer-details">
+                    Requests from malicious bots can pose as legitimate traffic.
+                    Occasionally, you may see this page while the site ensures that the
+                    connection is secure.</div>
+            </div>
+            <div id="cf-challenge-success" style="display: none;">
+                <div class="h2"><span class="icon-wrapper"><img class="heading-icon" alt="Success icon"
+                            src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADQAAAA0CAMAAADypuvZAAAANlBMVEUAAAAxMTEwMDAxMTExMTEwMDAwMDAwMDAxMTExMTExMTEwMDAwMDAxMTExMTEwMDAwMDAxMTHB9N+uAAAAEXRSTlMA3zDvfyBAEJC/n3BQz69gX7VMkcMAAAGySURBVEjHnZZbFoMgDEQJiDzVuv/NtgbtFGuQ4/zUKpeMIQbUhXSKE5l1XSn4pFWHRm/WShT1HRLWC01LGxFEVkCc30eYkLJ1Sjk9pvkw690VY6k8DWP9OM9yMG0Koi+mi8XA36NXmW0UXra4eJ3iwHfrfXVlgL0NqqGBHdqfeQhMmyJ48WDuKP81h3+SMPeRKkJcSXiLUK4XTHCjESOnz1VUXQoc6lgi2x4cI5aTQ201Mt8wHysI5fc05M5c81uZEtHcMKhxZ7iYEty1GfhLvGKpm+EYkdGxm1F5axmcB93DoORIbXfdN7f+hlFuyxtDP+sxtBnF43cIYwaZAWRgzxIoiXEMESoPlMhwLRDXeK772CAzXEdBRV7cmnoVBp0OSlyGidEzJTFq5hhcsA5388oSGM6b5p+qjpZrBlMS9xj4AwXmz108ukU1IomM3ceiW0CDwHCqp1NjAqXlFrbga+xuloQJ+tuyfbIBPNpqnmxqT7dPaOnZqBfhSBCteJAxWj58zLk2xgg+SPGYM6dRO6WczSnIxxwEExRaO+UyCUhbOp7CGQ+kxSUfNtLQFC+Po29vvy7jj4y0yAAAAABJRU5ErkJggg=="></span>Connection
+                    is secure</div>
+                <div class="core-msg spacer">Proceeding...</div>
+            </div>
+            <form id="challenge-form"
+                action="/search?q=2022&amp;__cf_chl_f_tk=6E3KpS5eCzuCMJG64ch2shvOMHdwQ8ioliqACpoQqM8-1659201542-0-gaNycGzNCeU"
+                method="POST" enctype="application/x-www-form-urlencoded">
+                <input type="hidden" name="md"
+                    value="UPeuijc1TS5ZQ21GIY6wjg6HHN_jWKH9sqolcSJABwg-1659201542-0-AR_ZxgiwVB4GwEgAjllIrmnGAumHNwuvfpFBddySYLh6CWexrUnxVYlX_wlB19Yndm45fs-KngMxbYB4dEOuf4MOJ_yL_BsNG3_cIPybV0bNn9WQXecJg3FfFrIBuMFIappZOX4hdDjLtRo9f4JsVsU6FzD9sUoKJRd4BTkjTAm25yFbqmPgV15XZhnJ5HRux044u0IIOVZCwTTzgRLCqToVb-OfiuUcHBzt4W7_wNlF1ObUi2oEr00DA1zZvzzY2KnXdZVN8m2OaNY_f2zkk9uDlLQRob_Ti6MHPNDr4eRkyMqZMZ1XDCxe-9lBkcEfpqtg6_4yac9ZiIEoNdJnJVE6cuNzb59DcBooXAq3IWp6fK4y4UIBStjqOXk4bxQb5yt1COfdPuQ9iLE_7yYOPG_t7n5I-4mjwvG7_U337A17oeEemXHfJkGC88Vm3SQdEHiW96VJuOA_X-rb7p3iOMlLYB5DKJ5DaBoPnP86uAWhoHWE6nrVzeAxeQ1y0uBHYPioJba5Kn9d-e2HsTMuAi7ZgSKuk90ApclIiW3owI4bLc4wxO5cu3ZIz7sZfbdvIKDhf9ESZhpQrITU_4Hgqjz0s3lt-MVeNP_0bz31XSeA--pdiulzUpQWLx1jhC4s7Av6STUb9bmbHpE41283KbbpuzBbmHN1UczNiaaquYZiEXRHKYyEMhKD782nWTJwQA">
+                <input type="hidden" name="r"
+                    value="i1ShtnCs9Zs8QexeFnp6EFtrWs3WbGEVQGXbVfYwpRI-1659201542-0-AbDM6G9qkbgoH+BqDdr1tzCDHr/DU9Sdxelapvp2/FZN6VqYfpDkJGv+HxhBQng6aVktcEobxp2ouOxJZxPQrR6tVFIhOW6uPOAdy5kh2BBJWUHfER13aq8LQ86fvDyRh3AThEHj6bgs2udacfvOrDrHT2j/KHBPePlGKbh8rzDTJBKw0ejUleHk8eKX/BQ1bVULgxT+ZZY721lyn2wrjsde1j1OAsiiCDkVvQ4Rs+Bas7UApD5HeWzyrCu2VFk/Qf+Rk+6spM+StYenQUAKXXrekJoIeNxPf/W9ZRsJfwUoY0JUK2thOWiwQOtw21nVDpiCFB9nhhOsmBzBoRQGjckZyu/O5U7jMIFdS9ThCFC0Kffg0MEr5xTkmgw+CNSwN7AlI9v3GS2XdTFOPXe29b68fZXzYfbm2CjqYhmxomZjCGTAmkzXWaVnMOs9Vl/8VurCUEu8SAt5k9Za/vFrEurX1edXNCviVuTOBSLHjqBiLui9FbufzGLq6BaHYi3WIFA1nMkoxduxbErP+Eqyi8UNvzvmEqUbj2COalXcQzkbHkyyLo33MNHZEi1zhhHjwCm1lp6mm4BRe60kRgTHb8X7oxBpY4vEcMz4jQQdsW15xBPAjsH8m9cj1H2ujpd7kfo8JGTyZ7FcoxOzGOuZr8XRpGkH72HaWYz7M+GIb3BBZ1v2Za7sSrzinNLFjHCCVXq68MqOmZ6RhgeexGoKJzcMHsHvgGXB8CisyyNTtA3OQOujybNUnNzlW7vJ/wDreTHkko6jQ/Lm/X2GnLg85BIg6IeROzt3eInAYsCaNKpST/h5bvSGCyzRoOW46oO8ZzZrV2FI2rEr0xLTIVWzQ//K2iGOCz58RisCfxWiF2n+fzj/5nE/0cjTPzYP68TM5BxB058EO7ZEFbgqhUji8IR9V2ahy7kI9dUhwd2S4IyjL+O6hCNPwjpRohkt93wXUCZDMgNoxi1BIylqqtAxYBfodyjFz8mB8GgcqBaCHN3tI0BINENVfvSJwKniYxL73frTX5KEqniT9GdT15o4F7QLf4S1atwYzF6ezJTYgLf6fOWUZKpaFMSRzEsxmZDmOFZeiss8lj7bKS6drOpkaOYzZiSgp5t5VwLKT0yQ+PDWQmqkpZ5WOa9/ayXLyOCunzk1IUO6VkvgFe0P2LZC9XEZUfwAFakYemej8/SZx0EknoPob1il3MMsbfHNAvcvUJK9xDbdAQ7rz34r4D5zO2aPnmYw1yv9K36z78I2dZpjVT9kpiKFwaOTkuSDUDtcmnhKM1XE+goG/C66G6PsChpGKLCeaDw4Rp7BxlumiSGB4Mp/bs8pTz3gez7pSu1oNodr7Tr1wJvCK8T5nVJ5GRO/tQ+Ff2K2s67udoV0CFtKufJyRsGCEv/0u5sArg3uwtwIz1W0JtAVjhe+J2nUihLa0Gqm7AwcCwfhsLHOhMG28V2NAw19iVq8RuMN7A2kGg5PH6bUeilWUxxZvWyDfyRSJZYMQytwAJdt4gQ++Qnl3mcaSk1N3pSiltVUDpfLcYb5gd35m+mKQWtPnIDlJMAtGoBeqROQPLNDg+LYdI/dnJzIOHjI3J+pTWhbAlF7B7NtccZOHmI9Cl3vS6Fpqs5aSPEDoDENTap6JN1kgm5NszMay9tAm66AcKF95W6QhwgQsyRrwScgRaPUtCx9ZJcbav6T/CAulcBB85MjwAd8+HF1g+UZT9VvChZoxh7NzfMoR53pVbxvW6acO8oVN5ITTP8mNAIisRvWi2KVdi4KqaLjYtLFNN8AMzjAC0vBIaFyGZlIbFsB44MRiMufD64b/66dqeC0l0WrUlUG/DgrnSQr6lgK2gONJKPQZGXoaK0Ga8O8xMOkaFLNaqH5UH5KpHvIQ8nwhuXk/MS/7Gdp1W02OEB4l0hhKFytgWdo9QmCquSatvOjuFyRPa6tV8ceGmuDnQw22bJM9BwzdKlHn/2/mHjCz7gcEA3Hb/CbeP8V8mF1mc5R8HEEdz/rx+BTESmGiRivv+WQYpRKNh77iqbYvCvkduK4b3UErNbvcS10aTt8zDFF/oIwjDpsniJsrIUcC0FdQRs2dqPIfkoSHvs7YGmOjx9QThCAiTkPKUE9C5C4YPY4CWRV3nYAFJrTq0F047PkzDYm0AJMCahWK7Vq/Ra3l3nRHu9yI+P0HiruUbkzLgiEJYnAuUtxvpC/Vj0uhr+A0R9Obs1MHkwtDuMs/ETh3ZymeFtWLj70StkslJxTzKGimZSsqQXRFYGHY6CHqHwIXGrArYNjTty48VIfbfaEu58KQp6roOdFmx90AcK2lV0V5UdyuzDJeH/V5ERAmxWLrXQKWgiDrY4ZqecnRk5XEAVMq/ChPts9gR7xsQK5WsHtQNKLfltkL8YvAoS+jZvxzfUUBg99YSC4J/HzQS+FQAnkDxCgeroahXysNN1bgDASXOrn3NsC3LYpUiZ2AVTLPkj1roR9r65O">
+
+                <span style="display: none;"><span style="display: none;" class="text-gray-600"
+                        data-translate="error">error code: 1020</span></span>
+            </form>
+        </div>
+    </div>
+    <script>
+        (function () {
+            var trkjs = document.createElement('img');
+            trkjs.setAttribute('src', '/cdn-cgi/images/trace/captcha/js/transparent.gif?ray=732fc1c74f757330');
+            trkjs.setAttribute('style', 'display: none');
+            document.body.appendChild(trkjs);
+            var cpo = document.createElement('script');
+            cpo.src = '/cdn-cgi/challenge-platform/h/g/orchestrate/managed/v1?ray=732fc1c74f757330';
+            window._cf_chl_opt.cOgUHash = location.hash === '' && location.href.indexOf('#') !== -1 ? '#' : location.hash;
+            window._cf_chl_opt.cOgUQuery = location.search === '' && location.href.slice(0, -window._cf_chl_opt.cOgUHash.length).indexOf('?') !== -1 ? '?' : location.search;
+            if (window.history && window.history.replaceState) {
+                var ogU = location.pathname + window._cf_chl_opt.cOgUQuery + window._cf_chl_opt.cOgUHash;
+                history.replaceState(null, null, "\/search?q=2022&__cf_chl_rt_tk=6E3KpS5eCzuCMJG64ch2shvOMHdwQ8ioliqACpoQqM8-1659201542-0-gaNycGzNCeU" + window._cf_chl_opt.cOgUHash);
+                cpo.onload = function () {
+                    history.replaceState(null, null, ogU);
+                };
+            }
+            document.getElementsByTagName('head')[0].appendChild(cpo);
+        }());
+    </script><img src="Just%20a%20moment2_files/transparent.gif" style="display: none">
+
+    <div class="footer" role="contentinfo">
+        <div class="footer-inner">
+            <div class="clearfix diagnostic-wrapper">
+                <div class="ray-id">Ray ID: <code>732fc1c74f757330</code></div>
+            </div>
+            <div class="text-center">
+                Performance &amp; security by
+                <a rel="noopener noreferrer" href="https://www.cloudflare.com/" target="_blank">Cloudflare</a>
+            </div>
+        </div>
+    </div>
+
+
+</body>
+
+</html>

html_samples/cloudflare_init_v1.html

@@ -0,0 +1,120 @@
+<!DOCTYPE html>
+<html lang="en-US">
+
+<head>
+    <title>Just a moment...</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
+    <meta name="robots" content="noindex,nofollow" />
+    <meta name="viewport" content="width=device-width,initial-scale=1" />
+    <link href="/cdn-cgi/styles/cf-errors.css" rel="stylesheet" />
+
+    <script>
+        (function () {
+            window._cf_chl_opt = {
+                cvId: '2',
+                cType: 'managed',
+                cNounce: '46449',
+                cRay: '732fd3bc9c1d72de',
+                cHash: '8838fcad2a7f56c',
+                cUPMDTk: "\/search?q=2022&__cf_chl_tk=y4XnN88eYeUiXmFkQeqEipve1VuK0jJA.G4Hz6xztsM-1659202277-0-gaNycGzNBz0",
+                cFPWv: 'g',
+                cTTimeMs: '1000',
+                cTplV: 2,
+                cRq: {
+                    ru: 'aHR0cHM6Ly8wbWFnbmV0LmNvbS9zZWFyY2g/cT0yMDIy',
+                    ra: 'Y3VybC83Ljg0LjA=',
+                    rm: 'R0VU',
+                    d: '+SdFLvm4kJf8Z9BVci1ZbUOY6ab/Dm5Zzyb0IvscIzmY9PnAAcvPfJ/3TD9YJViBxB/ArnbCQrOUfbSkq4odyaZmW19gm+exRuL8Z3POm1ABs7y6jwMshM19q4Gr3eFY/MUO/IYWuyA2F9q94hRCI6ZNb7dLEh9yh6hORbKRd62pdn59h1xCx8tNdKDtP7VXPXo85nYmJJPLOdXTnII+YxZ03a4isAmBHbi+lGoQN/bCV0K006VmpfPElAfAO9jm45o7pc1NgPQhZSKWpTyI/nHMueH6wacPREzN5RtREoQfKuwYpV++Gq56qr5bAe/SKeF+rI0x7OSqC4HQvrNwbA+kHZzaxgOKeiMFjDxmro/GyC/+sxeZmrxnSIAh4BScjPxEl1FLLkg/6D0JH6HmxoT8N/Jgpi9447Am4WeX+WQxJ9+uDs5WrFIahx7pWrgcZUTRPh+UCu3allJ2Q3cAfwK6BclhES/HhBBbJv0pnR1R2RfKDM/gr1MpLuhaK4mFEO/kSyNUjOnCjOfd+5d7Qb0DZn7sHpF2SVc+zNv5OWSvCRDUcNHjIOV6fq0datVyVWmxD6unPS0MMUFO+ZZNiB4ionrhVCiLrb2FjPQ8tzyCqXg+tnV7WtZ0h4+JuK3rxcaQ8PQy60/As8dKHqVTnw==',
+                    t: 'MTY1OTIwMjI3Ny44NjMwMDA=',
+                    m: 'zvAOPvfoONkW1BzH+jMnKOPtDpPpZijRP52DVDWH+i8=',
+                    i1: 'dDlQDNhOEuHzFEPo/etoAA==',
+                    i2: '+LTK9hchBRjTTQk1WQU1Vw==',
+                    zh: 'qP4bnGc6j96JlnjNSE7HmQci3S9L50bHFtm4bQRjjKU=',
+                    uh: 'IdIU2i4FhVxxcYhzSFWdjoBuQm7qnyVK65JGofJuWV4=',
+                    hh: 'azXzJl8Ou22g0nN/9idVUoB9EqZ7fLmkSdDRHM3Lkmw=',
+                }
+            }
+            window._cf_chl_enter = function () { window._cf_chl_opt.p = 1 };
+        })();
+    </script>
+
+</head>
+
+<body class="no-js">
+
+    <div class="main-wrapper" role="main">
+        <div class="main-content">
+            <h1 class="zone-name-title h1">
+                <img class="heading-favicon" src="/favicon.ico"
+                    onerror="this.onerror=null;this.parentNode.removeChild(this)" />
+                0MAGNET.COM
+            </h1>
+            <h2 class="h2" id="cf-challenge-running">
+                Checking if the site connection is secure
+            </h2>
+            <noscript>
+                <div id="cf-challenge-error-title">
+                    <div class="h2">
+                        <span class="icon-wrapper">
+                            <div class="heading-icon warning-icon"></div>
+                        </span>
+                        <span id="cf-challenge-error-text">
+                            Enable JavaScript and cookies to continue
+                        </span>
+                    </div>
+                </div>
+            </noscript>
+            <div
+                style="display:none;background-image:url('/cdn-cgi/images/trace/captcha/nojs/transparent.gif?ray=732fd3bc9c1d72de')">
+            </div>
+            <div id="cf-challenge-body-text" class="core-msg spacer">
+                0magnet.com needs to review the security of your connection before
+                proceeding.
+            </div>
+            <form id="challenge-form"
+                action="/search?q=2022&amp;__cf_chl_f_tk=y4XnN88eYeUiXmFkQeqEipve1VuK0jJA.G4Hz6xztsM-1659202277-0-gaNycGzNBz0"
+                method="POST" enctype="application/x-www-form-urlencoded">
+                <input type="hidden" name="md"
+                    value="DpGhFnuVRfDhqsQNASrgdT4WiiJ8m6lqTIs03.l6RLc-1659202277-0-AfUEAk9DsJ4rmpVI_Al7-eogy2CmM3YgWe4-31iw0oG2CcDIbYvauEW2IvK9m27_gq1FvdH-UPaGHR0q6Q2haXlX4pgmQK5rlQUSEd5HquGdtWMasHWqL_Q_TZGdOKz30bE2FEk8wLHRErHJRJloDRj0tiG8MreT2La_GLvovNK1XbMXDxFZT2Cc-DThBvxbgbDffw3okYfdl1ECXhLw9G6L4o8xgLsz3QZQG3dNZNhm5n4mf55-BBsFDzDTEN1_1BgORVw3mtbsodedktcACsVBCRupyBpTev9MML1jHzk06ZT9dhcCP4zXvsMS4-gG212LFu79Cpl0MHifKvPk0DTJQja1ulaT4gVuIvmLPihPh1IYMGbEcdX4MFH0Wu_RL6UPINE6esf-oAx8-imKhKITB_R4974rpq9XJk65Kf9R6AJhu072CyOqW1YcmYMkUCqFjdZnRyNgHRT2Q5bMEJ8fv0DwfFV6ynG7n6JGMd_pEnZp0nEvjWXpK6Ft8ZZGOXtFMfmW4vNgFhs6xJ1wnaJWuLXae3V6gTZYxMkeIsyMzlvRSzYBz_rgRBNkvvAwbNvOZ369tKbaElS39hOI1WTaoOsnY2d0Z4mDe4AVbSs3fVJGikzZSa3Ctr1RnqqOztVIRYL1Q7IYRJ02P6egL7sn7RniJ6znNAoPhaWJLYzynWXeQF5YO5U0Zf779qkm3A" />
+                <input type="hidden" name="r"
+                    value="QJznOl.RWpNvkdG1Pf6TAzaNhRIFpH8DJ0w1yAuwRLw-1659202277-0-AcOBapBisncM3qf1RYdkTNlIXCth/TmoAMnk3vJozFlG8/vYeLPpjG389mhQu01aSlpJqFWn0VQf9c/7w3yh85jHmrpaxJtpxTiSL9k+AWm61kE6DkHgJBl5jUc7gu4W3oHdmP4FyOUzhbBpIkOAntSkVJJmgu6SaIE3I9fRAFu7bPxBveT8zZGyVUJSPKpwx/w4rNPzs2VnCeEVL1eOdbLInHYR1kqC8M4JyBynwdVXxIX+j5o/rTrNK8E/W4UZMhuWqIaOnX7FzmceglyBSjDqJFLCt0TOhc66m82Y25Obi8Gvsqn34bjwPA2G8qOvgrHA2RFH6lEQFSdGMzLrF4qU5P9j9FzU1CPSTfGtkKbsMnGcMrtzmyQ7LdMIfghYvnCBXTi82iIzaSwzY3sEnW9KZs24Akxu/AV1E03sqW1CAA1UCRURpX4GKXvD6UYpSgc6++q8naLdRozkLP81T/CvHyIRdQx8vylmVN9u/rPvMbW1jWtniDmuAjBQDUd058YH+IRmm4lREG5JN2yeX083h/BG6tssEQVdTcIgwZRNDB+kK8vtOmywmo5qTAX1VE/sgfPCw5+3Xxu+hhZON3C7VGfrCQI5ZSb6+YvBLXmO26Nlp3fSOyeBwZy3pVuGwv/TrEo+e8USIlIs1T6MQJYQeX/4vOdy89npo6KBqY23giTFDh8EMZo//93hfBsRUbHrY/It6kp42qzsnWTjbkyiqd1zBSpQhuMyuMPeKpQ63oVI2tlGyioLg3HcfhbHQcdpUAWDn8lZ4+GTFVMix+20fGbErkVeBs7WvFSLlZ1YtYpCXrgVaomj7WCr8Icb7ASXKfvEuqC1ZnZgn6Lb6x3dUBGiDtnSFnixHFElIF6nPedVIV0+TxccjlV/LJeyNM58GHtRo4NcmIo1a6kN3vzPAjTUhgDJe4aYP6oVKCRNDcrHlGlLubu6XuIvBFM5Sq401xxahOe3VP2u7JovkzXwfl+yUxQOYaoq1LR+wnDhXgVbBNbM2QfIhez578zu2TN5bu5H14UXZ1E78KA6Op9b/PUgA1AsgTJVRk4M6OQSpa5wRIKkXzxpGIRz6+YBxSjIaX2I220GH4s6Te4CBpq77g6V4CVIkEvqZwbN9hIoAoljWVbEEdb3WmYZqoPxN/8ZIjU7uwQUyDgnCOlc7Z52TgG6nVvj7RVyxv5ugskW+fcOI12o35iYNNpXTh1boHyn7nlPG7wtSsl9UlTss27nd04AIzbH0qyX3kn77yPsobMDYUJ3IGhOujV8Cg08XHFIlYSYGPbqqpog+CuuWtzvwyk5mmHXkJNPyFEZL/irApJbatpGNqgGNnQL+5KYp+/U8/kROLTOWa8tG5609MF+wdrScsfPT9eE+HYh7tEFURnwm8kJtdAadcxYjzO60PFcUI1R5SMGHRflAnpY2gvAzbsSssk1WIF+6eHSe6FLHMXCHMp0w1XkNKpny5Ce3YTKhJ4TRg7HfN1pvet2Duj4G04A328uYUppPlU7Spz0fj5N/FHJf3sPaqJC8jn74L0mT92ecGaxS3ZGvytw51ulA00wgzfZDWL4pirzgYVjUQTqVl9FzWYua4Vk4l3BX0opWKA4FloLTP3ekrvmO/zkztMBV4fvK+F8JIOzLOs4AuoCv8uXl7Ny9wLQI3a0hJAdbXJpI3WV/iuV7da4fQao2Z2HiatQh3ZtdLqWmGtqQlcVtsBrac82eo7mKAfwltTfLlX9Drtp4ohwoFe0Upm+YsfY6DK7zHrk3k9GN7gm6cMi1neNFaqWZR9s8ABDBg==" />
+
+            </form>
+        </div>
+    </div>
+    <script>
+        (function () {
+            var trkjs = document.createElement('img');
+            trkjs.setAttribute('src', '/cdn-cgi/images/trace/captcha/js/transparent.gif?ray=732fd3bc9c1d72de');
+            trkjs.setAttribute('style', 'display: none');
+            document.body.appendChild(trkjs);
+            var cpo = document.createElement('script');
+            cpo.src = '/cdn-cgi/challenge-platform/h/g/orchestrate/managed/v1?ray=732fd3bc9c1d72de';
+            window._cf_chl_opt.cOgUHash = location.hash === '' && location.href.indexOf('#') !== -1 ? '#' : location.hash;
+            window._cf_chl_opt.cOgUQuery = location.search === '' && location.href.slice(0, -window._cf_chl_opt.cOgUHash.length).indexOf('?') !== -1 ? '?' : location.search;
+            if (window.history && window.history.replaceState) {
+                var ogU = location.pathname + window._cf_chl_opt.cOgUQuery + window._cf_chl_opt.cOgUHash;
+                history.replaceState(null, null, "\/search?q=2022&__cf_chl_rt_tk=y4XnN88eYeUiXmFkQeqEipve1VuK0jJA.G4Hz6xztsM-1659202277-0-gaNycGzNBz0" + window._cf_chl_opt.cOgUHash);
+                cpo.onload = function () {
+                    history.replaceState(null, null, ogU);
+                };
+            }
+            document.getElementsByTagName('head')[0].appendChild(cpo);
+        }());
+    </script>
+
+    <div class="footer" role="contentinfo">
+        <div class="footer-inner">
+            <div class="clearfix diagnostic-wrapper">
+                <div class="ray-id">Ray ID: <code>732fd3bc9c1d72de</code></div>
+            </div>
+            <div class="text-center">
+                Performance &amp; security by
+                <a rel="noopener noreferrer" href="https://www.cloudflare.com" target="_blank">Cloudflare</a>
+            </div>
+        </div>
+    </div>
+</body>
+
+</html>

html_samples/cloudflare_spinner_v1.html

@@ -0,0 +1,167 @@
+<html lang="en-US">
+
+<head>
+    <title>Just a moment...</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge">
+    <meta name="robots" content="noindex,nofollow">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <link href="/cdn-cgi/styles/cf-errors.css" rel="stylesheet">
+
+    <script>
+        (function () {
+            window._cf_chl_opt = {
+                cvId: '2',
+                cType: 'managed',
+                cNounce: '52875',
+                cRay: '732fa2449b567521',
+                cHash: '79cce74ebb92671',
+                cUPMDTk: "\/search?q=2022&__cf_chl_tk=1qWQAgl8.irfEoDb73Rb0pUm1SXbis3ZamDAIoTcPks-1659200251-0-gaNycGzNCFE",
+                cFPWv: 'g',
+                cTTimeMs: '1000',
+                cTplV: 2,
+                cRq: {
+                    ru: 'aHR0cHM6Ly8wbWFnbmV0LmNvbS9zZWFyY2g/cT0yMDIy',
+                    ra: 'TW96aWxsYS81LjAgKFgxMTsgTGludXggeDg2XzY0KSBBcHBsZVdlYktpdC81MzcuMzYgKEtIVE1MLCBsaWtlIEdlY2tvKSBDaHJvbWUvMTAzLjAuNTA2MC4xMzQgU2FmYXJpLzUzNy4zNg==',
+                    rm: 'R0VU',
+                    d: 'UfK0k9mFeKGEdqoWAUIbk3OXbXe9DOHoYXdKLPyxbICSIQBS4GSNYar0DtbPI7+UQ7UeBZ2XCdQinvgH0pgzJCF1qB0nkXtu0qlLk6EwkrGAKD/pMGFFQF2EaCw3m00/xoRCDgLZRl/wUkRGz3HUOkTuPeKgZjsFyPoPv7MbYSMUtH7QU6ruIh+O3hvDOT2oA/BOKbRMSTnFedTIXADXL6GE8ZyNZ33wJlef5KzT0MHlN+3eZTAt6urCvJaY3MdTXKVye6fwyjqGEksaJ6B85vwrifLTYEU4/bORwXx8mTQTqjo3kh1rATlmthQwBpcQtWXmgDUcJ5gPrOk1fzhqrhO4b++HiIx3P5YZ9Ko2D0NNWeg1AYIwDjh9rZg5m0MmCXh1VqXDbnpseQW1vPkkZAADxyvLf/eEc1o2EpYGpK+qSpMZ4RcngnU0o8A2nS+j/CNsid0315OrYVyOIZcw6L3ovu6yfAAAALyOmg5ctXCqjzRthoibUb58u+myxOtfX1ew9IzNq8Z6t6RlomjR7Iy/7BJiJQNCF98dllNbODHz//TymlI1m8D9w+CYlZFIpiWJVH1M4h+tabH5YrqDVbkJgY6yVAfnr/NI6d6NHrhN+eSW30jkvAmZ6JRMhVWW',
+                    t: 'MTY1OTIwMDI1MS42MjAwMDA=',
+                    m: '/e8nTBb03IHZzN/DSkoHPRu0Ndm3ynYs8g6ZC+VxHcc=',
+                    i1: 'tx+ntPfeE2Gv81s52vIOlA==',
+                    i2: 'fpw8a/EO+Fo2t/ZiNKxEcg==',
+                    zh: 'qP4bnGc6j96JlnjNSE7HmQci3S9L50bHFtm4bQRjjKU=',
+                    uh: 'Eex9UQDjphKtV6LyVQ95F/MC5kBA3Rj4lC6CudiU3Vs=',
+                    hh: 'azXzJl8Ou22g0nN/9idVUoB9EqZ7fLmkSdDRHM3Lkmw=',
+                }
+            }
+            window._cf_chl_enter = function () { window._cf_chl_opt.p = 1 };
+        })();
+    </script>
+
+    <script src="/cdn-cgi/challenge-platform/h/g/orchestrate/managed/v1?ray=732fa2449b567521"></script>
+    <script type="text/javascript"
+        src="https://cloudflare.hcaptcha.com/1/api.js?endpoint=https%3A%2F%2Fcloudflare.hcaptcha.com&amp;assethost=https%3A%2F%2Fcf-assets.hcaptcha.com&amp;imghost=https%3A%2F%2Fcf-imgs.hcaptcha.com&amp;render=explicit&amp;recaptchacompat=off&amp;onload=_cf_chl_hload"></script>
+</head>
+
+<body class="no-js">
+
+    <div class="privacy-pass">
+        <a rel="noopener noreferrer"
+            href="https://chrome.google.com/webstore/detail/privacy-pass/ajhmfdgkijocedmfjonnpjfojldioehi"
+            target="_blank">
+            Privacy Pass
+            <span class="privacy-pass-icon-wrapper">
+                <div class="privacy-pass-icon"></div>
+            </span>
+        </a>
+    </div>
+
+    <div class="main-wrapper" role="main">
+        <div class="main-content">
+            <h1 class="zone-name-title h1">
+                <img class="heading-favicon" src="/favicon.ico"
+                    onerror="this.onerror=null;this.parentNode.removeChild(this)">
+                0MAGNET.COM
+            </h1>
+            <h2 class="h2" id="cf-challenge-running">
+                Checking if the site connection is secure
+            </h2>
+            <div id="cf-challenge-stage" style="display: none;"></div>
+            <div id="cf-challenge-spinner" class="spacer loading-spinner" style="display: block; visibility: visible;">
+                <div class="lds-ring">
+                    <div></div>
+                    <div></div>
+                    <div></div>
+                    <div></div>
+                </div>
+            </div>
+            <noscript>
+                <div id="cf-challenge-error-title">
+                    <div class="h2">
+                        <span class="icon-wrapper">
+                            <div class="heading-icon warning-icon"></div>
+                        </span>
+                        <span id="cf-challenge-error-text">
+                            Enable JavaScript and cookies to continue
+                        </span>
+                    </div>
+                </div>
+            </noscript>
+            <div
+                style="display:none;background-image:url('/cdn-cgi/images/trace/captcha/nojs/transparent.gif?ray=732fa2449b567521')">
+            </div>
+            <div id="cf-challenge-body-text" class="core-msg spacer">
+                0magnet.com needs to review the security of your connection before
+                proceeding.
+            </div>
+            <div id="cf-challenge-fact-wrapper" class="fact spacer hidden" style="display: block; visibility: visible;">
+                <span class="fact-title">Did you know</span> <span id="cf-challenge-fact" class="body-text">bots
+                    historically made up nearly 40% of all internet traffic?</span>
+            </div>
+            <div id="cf-challenge-explainer-expandable" class="hidden expandable body-text spacer"
+                style="display: none;">
+                <div class="expandable-title" id="cf-challenge-explainer-summary"><button class="expandable-summary-btn"
+                        id="cf-challenge-explainer-btn" type="button"> Why am I seeing this page? <span
+                            class="caret-icon-wrapper">
+                            <div class="caret-icon"></div>
+                        </span> </button> </div>
+                <div class="expandable-details" id="cf-challenge-explainer-details"> Requests from malicious bots can
+                    pose as legitimate traffic. Occasionally, you may see this page while the site ensures that the
+                    connection is secure.</div>
+            </div>
+            <div id="cf-challenge-success" style="display: none;">
+                <div class="h2"><span class="icon-wrapper"><img class="heading-icon" alt="Success icon"
+                            src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADQAAAA0CAMAAADypuvZAAAANlBMVEUAAAAxMTEwMDAxMTExMTEwMDAwMDAwMDAxMTExMTExMTEwMDAwMDAxMTExMTEwMDAwMDAxMTHB9N+uAAAAEXRSTlMA3zDvfyBAEJC/n3BQz69gX7VMkcMAAAGySURBVEjHnZZbFoMgDEQJiDzVuv/NtgbtFGuQ4/zUKpeMIQbUhXSKE5l1XSn4pFWHRm/WShT1HRLWC01LGxFEVkCc30eYkLJ1Sjk9pvkw690VY6k8DWP9OM9yMG0Koi+mi8XA36NXmW0UXra4eJ3iwHfrfXVlgL0NqqGBHdqfeQhMmyJ48WDuKP81h3+SMPeRKkJcSXiLUK4XTHCjESOnz1VUXQoc6lgi2x4cI5aTQ201Mt8wHysI5fc05M5c81uZEtHcMKhxZ7iYEty1GfhLvGKpm+EYkdGxm1F5axmcB93DoORIbXfdN7f+hlFuyxtDP+sxtBnF43cIYwaZAWRgzxIoiXEMESoPlMhwLRDXeK772CAzXEdBRV7cmnoVBp0OSlyGidEzJTFq5hhcsA5388oSGM6b5p+qjpZrBlMS9xj4AwXmz108ukU1IomM3ceiW0CDwHCqp1NjAqXlFrbga+xuloQJ+tuyfbIBPNpqnmxqT7dPaOnZqBfhSBCteJAxWj58zLk2xgg+SPGYM6dRO6WczSnIxxwEExRaO+UyCUhbOp7CGQ+kxSUfNtLQFC+Po29vvy7jj4y0yAAAAABJRU5ErkJggg=="></span>Connection
+                    is secure</div>
+                <div class="core-msg spacer">Proceeding...</div>
+            </div>
+            <form id="challenge-form"
+                action="/search?q=2022&amp;__cf_chl_f_tk=1qWQAgl8.irfEoDb73Rb0pUm1SXbis3ZamDAIoTcPks-1659200251-0-gaNycGzNCFE"
+                method="POST" enctype="application/x-www-form-urlencoded">
+                <input type="hidden" name="md"
+                    value="OghUU_ltYW6I0fpWl7rE4yHBGBPHfpZQIKZRSEpJKjE-1659200251-0-AWB-KR-MabhObmvYa3mR5-xDk3qZVV73547wjnl-QtfPoTxe017AXt4WUskEcVzEIUKC7dsJoiy8ec1NA0fxdnI8X9OfPhtynl00ReWBVZc_3Gba_wigWMmM_9e8PX9vpVDcXpCRbz1BJ5_YLsba9TJM1sp14U9RtIce-tRBB53qoxLxJRz9QFmckEVBvsba4RfoycOvYPMMsfAqSkq13qtsA3Kd6RDB5Rb5-qF8674DsB4AMvd9xu_fBplQqKjOpEtrThCUtw8M2DHY8FUr_owUo1NIS1s6fSBEyHh6ehz9CidJ7zpRwYZFwgz_Pq9i8LmQG_AajozOJJhLp-tox0dptbUZnRNGt3hGQgrNu3jlCfwPC2XVp7xgLvmZoPYrzzrZoi_wErnIvVgyGCw9-sDPblPdvLBUz6uXNreWwThEW6PeRtMXnePO9UwcZmj_2awhwcVSHSLz1t1z22LtVsQ8xNpMbiE7xDvI2D5LNHAPIUC7Wp4AcehWD-fEm0w5jnVTWOmFlVRxtcnYZSMfDSaRUxsZ3hg5B1-ghVMEX6M-r_hAd6pLKNmjIfdl_Nvdm6veQvV-gTFaULbfuhmQQjYEb9G2IptDiNTZs5S7FtmjqVBAA7PmvwBTQwxw86J0cV3v_4pT1Oj8tigwiPny35HMTrKRmRZWaAZudCmWxDZkJIW8Eir7KQ57ba-u9cHh0A">
+                <input type="hidden" name="r"
+                    value="q.UUtPBFcFi4IkcVw3l4U_xJJKDIbHJj7xmuB43IIAI-1659200251-0-Aa4lU5RipD+d4of3hcdQ0rVmZ4ulb3siZYKwhm1jGNiA+/9b8IW1HL8k1GrsYEVexDW7ycP5UINQZ1sYJvZBTCQe3lhyGLHdLZ7KdI9RXKEbPx1NUOR/HthCD0Wbo7H41jbAf7l+HhH0zTLjm77/6NpJZHcgfsbBwwubl4R3oLarzPSByV2PVBnkuMyKCYgibriuMUt2iJHoMLx7Cr+Bmjx1KEFCrPYP0t7vgQs2APTylhL7ebP77XB9ndxU6Of3r4eHnTwLIcomFJ3+jqL6pzFaNoXdUBHrv9oZs/33KZjf2NB8cu5KUpAdM2lp3t5oTSQE19fJVroxmf91hcTdele3F2DAeawFGDwncm/Jo725SlyNk4TqsmR+il7DLkS/FTcCNzQe4cQM6DRWdmF9I1OohAl1/uGXYqUJSK1F45n3gec/pyPTQyZI0OLc7sCGYXfn3VPFsGATkg5mxE9rgZIB2b6ID9JggzIlDdYxlQRWecpruu07KOgk3m7g95lyHNZTohqemo4T8Z2MOZECjmXGMAuwvvk4d5sakVHr39kmAY6aSfXrRB+iONCOKkahbumrVmjLsnMvrpTb0DFE5pRAxwANPZKzb6Ikmlvxh7oJIPOB0mG9hDeoc/AJVlvZJV4CrpDLulNjHetAWXMwMptZuYJGEhcDXxmYj0ybntTCU4Y3JJQc5K+7ehSdnluTvMueWfs628854r4PcOONZzsO337j+3lUxrP5vDUCzYD25FNxvs8jGfqRivqHMOq2z9iOs0sHQTlHroLLSt2G7M50yRJBGTfxrIsvLq+ML3e/mRIkYIQxOcp8ugoPoT4c9gex3OyY0cnnA2/9OibQs9kevwf9DSnutMRRcbIXZI0XO6FY07+MykWqUcXygwMHs1vQxhaQ26NFYwolEWfOL7EQpp4GKyN30nL4nPNil/7GsXIr5SC+o55KI0l3AOEYE1jirVx2G0U7Br7SW80Ih4Fn5U/+4qFfW57GAJrpuk9qjFfJehe7wFBu5bHghEGRhKAu0wvpY7UTc9AiacMfP7ujVWi4DIbTCfOzOgVT8E0T6KaUurBppPJflLQE41c8n29ULyKmki9t8lIKvxYmv/3/AauhXFAExh+JrdnaeSDxhJYjWEUDJiaNvnkDCHMxPs/bePhSg4DYRMh4ngcOHCRkkRlDjipUUgeCrwNBY0qu2DIqLZXI1ZMwU+R0nuWnwc5xJuMHtrLkWbziP0FQcGaF0B6SaFIcOLnWG7YjJZFzxjFpvLb8GnZxk7i2YHCDTn0Stq3JDZHCkjJQjaPMmuK+5KYzfaSHcKOcaQbkbyDjn3t/XQX3a7lknngVchIJVsVn8osqgKvOx3aAdCicYKR6QaukrXHhR9uIEbPdoBYqZPKFz0uvVOShsUx2f65CaI8wWMjOBRWxTK1xUPNsetOiyYSvNwjeULaCXPKLi2qv/cZRRbsr3g5ghdHvNTpD/O0/xUgiziev3/9CpNopyr6VzLar9dJ/s++imXY1w1TCRJ2uCI2H70XGBGWxSZdbnfxU+j3zNCL0dBuabwhDd4ZnOZmlFZjGBiOUpsWdRrHd3c+QpwXdxB3QurRwX6J+LhmkqcWsPhP7LlMnN7dr2HUFZ5FS4LASl5AOf8hjCnO06FT8fWLl1eKVVjCugx9w54qjGqOV8A0v/PdWr7Ic0WfriyYbmwn/XnH8t0ri3bqDZsDkfhQMMF9JSWHEdoGD60a7McGDxr4g9s3LZhq5KozgSvyG+RUBPla8g2zB253hR7amWE5WO4IChl7AXmRB89F9u2+AoDIbefseb3pwG7GfkYpSBwmgJ4Ju4LAWoSfBhZSPMQadHZOCg36R11KesUy+NAy9bvD1bE3UMx9e2NbFohu6sXlilpnxINHp0sFEeulreEjWSQreri1eZeKxV2QfKIzWUiMoNdyT0JzM+/brYzddBpO2DrlnK5bEPWgtu0D7d4Kfm+0T7S//Fq+hxf40lSMPP8cBlan6sEd2iWmZ6gW3z43wNbJaPQIUDgb58ELxaEKQN4tOOy75/XXfISNnhG0K8M79a175WUb8v0A=">
+
+                <span style="display: none;"><span class="text-gray-600" data-translate="error">error code:
+                        1020</span></span>
+            </form>
+        </div>
+    </div>
+    <script>
+        (function () {
+            var trkjs = document.createElement('img');
+            trkjs.setAttribute('src', '/cdn-cgi/images/trace/captcha/js/transparent.gif?ray=732fa2449b567521');
+            trkjs.setAttribute('style', 'display: none');
+            document.body.appendChild(trkjs);
+            var cpo = document.createElement('script');
+            cpo.src = '/cdn-cgi/challenge-platform/h/g/orchestrate/managed/v1?ray=732fa2449b567521';
+            window._cf_chl_opt.cOgUHash = location.hash === '' && location.href.indexOf('#') !== -1 ? '#' : location.hash;
+            window._cf_chl_opt.cOgUQuery = location.search === '' && location.href.slice(0, -window._cf_chl_opt.cOgUHash.length).indexOf('?') !== -1 ? '?' : location.search;
+            if (window.history && window.history.replaceState) {
+                var ogU = location.pathname + window._cf_chl_opt.cOgUQuery + window._cf_chl_opt.cOgUHash;
+                history.replaceState(null, null, "\/search?q=2022&__cf_chl_rt_tk=1qWQAgl8.irfEoDb73Rb0pUm1SXbis3ZamDAIoTcPks-1659200251-0-gaNycGzNCFE" + window._cf_chl_opt.cOgUHash);
+                cpo.onload = function () {
+                    history.replaceState(null, null, ogU);
+                };
+            }
+            document.getElementsByTagName('head')[0].appendChild(cpo);
+        }());
+    </script><img src="/cdn-cgi/images/trace/captcha/js/transparent.gif?ray=732fa2449b567521" style="display: none">
+
+    <div class="footer" role="contentinfo">
+        <div class="footer-inner">
+            <div class="clearfix diagnostic-wrapper">
+                <div class="ray-id">Ray ID: <code>732fa2449b567521</code></div>
+            </div>
+            <div class="text-center">
+                Performance &amp; security by
+                <a rel="noopener noreferrer" href="https://www.cloudflare.com" target="_blank">Cloudflare</a>
+            </div>
+        </div>
+    </div>
+
+
+</body>
+
+</html>

jest.config.js

@@ -1,12 +0,0 @@
-module.exports = {
-  // A list of paths to directories that Jest should use to search for files in
-  roots: [
-    "./src/"
-  ],
-  // Compile Typescript
-  transform: {
-    '^.+\\.(ts|tsx)$': 'ts-jest'
-  },
-  // Default value for FlareSolverr maxTimeout is 60000
-  testTimeout: 70000
-}

package.json

@@ -1,45 +1,7 @@
 {
   "name": "flaresolverr",
-  "version": "2.2.1",
-  "description": "Proxy server to bypass Cloudflare protection.",
-  "scripts": {
-    "start": "tsc && node ./dist/server.js",
-    "build": "tsc",
-    "dev": "nodemon -e ts --exec ts-node src/server.ts",
-    "package": "tsc && node build-binaries.js",
-    "test": "jest --runInBand"
-  },
-  "author": "Diego Heras (ngosang)",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ngosang/FlareSolverr"
-  },
-  "bin": {
-    "flaresolverr": "dist/server.js"
-  },
-  "dependencies": {
-    "await-timeout": "^1.1.1",
-    "body-parser": "^1.19.0",
-    "console-log-level": "^1.4.1",
-    "express": "^4.17.1",
-    "puppeteer": "^13.1.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/node": "^16.11.7",
-    "@types/supertest": "^2.0.11",
-    "@types/uuid": "^8.3.1",
-    "archiver": "^5.3.0",
-    "nodemon": "^2.0.13",
-    "pkg": "^5.5.2",
-    "supertest": "^6.1.6",
-    "ts-jest": "^27.0.7",
-    "ts-node": "^10.3.0",
-    "typescript": "^4.4.4"
-  }
+  "version": "3.0.0.beta2",
+  "description": "Proxy server to bypass Cloudflare protection",
+  "author": "Diego Heras (ngosang / ngosang@hotmail.es)",
+  "license": "MIT"
 }

requirements.txt

@@ -0,0 +1,9 @@
+bottle==0.12.23
+waitress==2.1.2
+selenium==4.4.3
+func-timeout==4.3.5
+# required by undetected_chromedriver
+requests==2.28.1
+websockets==10.3
+# only required for linux
+xvfbwrapper==0.2.9

src/app.ts

@@ -1,83 +0,0 @@
-import log from './services/log'
-import {NextFunction, Request, Response} from 'express';
-import {getUserAgent} from "./services/sessions";
-import {controllerV1} from "./controllers/v1";
-
-const express = require('express');
-const app = express();
-const bodyParser = require('body-parser');
-const version: string = 'v' + require('../package.json').version
-
-// Convert request objects to JSON
-app.use(bodyParser.json({
-    limit: '50mb',
-    verify(req: Request, res: Response, buf: any) {
-        req.body = buf;
-    }
-}));
-
-// Access log
-app.use(function(req: Request, res: Response, next: NextFunction) {
-    if (req.url != '/health') {
-        // count the request for the log prefix
-        log.incRequests()
-        // build access message
-        let body = "";
-        if (req.method == 'POST' && req.body) {
-            body += " body: "
-            try {
-                body += JSON.stringify(req.body)
-            } catch(e) {
-                body += req.body
-            }
-        }
-        log.info(`Incoming request => ${req.method} ${req.url}${body}`);
-    }
-    next();
-});
-
-// *********************************************************************************************************************
-// Routes
-
-// Show welcome message
-app.get("/", ( req: Request, res: Response ) => {
-    res.send({
-        "msg": "FlareSolverr is ready!",
-        "version": version,
-        "userAgent": getUserAgent()
-    });
-});
-
-// Health endpoint. this endpoint is special because it doesn't print traces
-app.get("/health", ( req: Request, res: Response ) => {
-    res.send({
-        "status": "ok"
-    });
-});
-
-// Controller v1
-app.post("/v1", async( req: Request, res: Response ) => {
-    await controllerV1(req, res);
-});
-
-// *********************************************************************************************************************
-
-// Unknown paths or verbs
-app.use(function (req : Request, res : Response) {
-    res.status(404)
-        .send({"error": "Unknown resource or HTTP verb"})
-})
-
-// Errors
-app.use(function (err: any, req: Request, res: Response, next: NextFunction) {
-    if (err) {
-        let msg = 'Invalid request: ' + err;
-        msg = msg.replace("\n", "").replace("\r", "")
-        log.error(msg)
-        res.send({"error": msg})
-    } else {
-        next()
-    }
-})
-
-module.exports = app;

src/bottle_plugins/error_plugin.py

@@ -0,0 +1,22 @@
+from bottle import response
+import logging
+
+
+def error_plugin(callback):
+    """
+    Bottle plugin to handle exceptions
+    https://stackoverflow.com/a/32764250
+    """
+
+    def wrapper(*args, **kwargs):
+        try:
+            actual_response = callback(*args, **kwargs)
+        except Exception as e:
+            logging.error(str(e))
+            actual_response = {
+                "error": str(e)
+            }
+            response.status = 500
+        return actual_response
+
+    return wrapper

src/bottle_plugins/logger_plugin.py

@@ -0,0 +1,23 @@
+from bottle import request, response
+import logging
+
+
+def logger_plugin(callback):
+    """
+    Bottle plugin to use logging module
+    http://bottlepy.org/docs/dev/plugindev.html
+
+    Wrap a Bottle request so that a log line is emitted after it's handled.
+    (This decorator can be extended to take the desired logger as a param.)
+    """
+
+    def wrapper(*args, **kwargs):
+        actual_response = callback(*args, **kwargs)
+        if not request.url.endswith("/health"):
+            logging.info('%s %s %s %s' % (request.remote_addr,
+                                          request.method,
+                                          request.url,
+                                          response.status))
+        return actual_response
+
+    return wrapper

src/captcha/index.ts

@@ -1,41 +0,0 @@
-import log from "../services/log";
-
-export enum CaptchaType {
-  re = 'reCaptcha',
-  h = 'hCaptcha'
-}
-
-export interface SolverOptions {
-  url: string
-  sitekey: string
-  type: CaptchaType
-}
-
-export type Solver = (options: SolverOptions) => Promise<string>
-
-const captchaSolvers: { [key: string]: Solver } = {}
-
-export default (): Solver => {
-  const method = process.env.CAPTCHA_SOLVER
-
-  if (!method || method.toLowerCase() == 'none') {
-    return null;
-  }
-
-  if (!(method in captchaSolvers)) {
-    try {
-      captchaSolvers[method] = require('./' + method).default as Solver
-    } catch (e) {
-      if (e.code === 'MODULE_NOT_FOUND') {
-        throw Error(`The solver '${method}' is not a valid captcha solving method.`)
-      } else {
-        console.error(e)
-        throw Error(`An error occurred loading the solver '${method}'.`)
-      }
-    }
-  }
-
-  log.info(`Using '${method}' to solve the captcha.`);
-
-  return captchaSolvers[method]
-}

src/controllers/v1.ts

@@ -1,178 +0,0 @@
-import {Request, Response} from 'express';
-import {Protocol} from "devtools-protocol";
-
-import log from '../services/log'
-import {browserRequest, ChallengeResolutionResultT, ChallengeResolutionT} from "../services/solver";
-import {SessionCreateOptions} from "../services/sessions";
-const sessions = require('../services/sessions')
-const version: string = 'v' + require('../../package.json').version
-
-interface V1Routes {
-  [key: string]: (params: V1RequestBase, response: V1ResponseBase) => Promise<void>
-}
-
-export interface Proxy {
-  url?: string
-  username?: string
-  password?: string
-}
-
-export interface V1RequestBase {
-  cmd: string
-  cookies?: Protocol.Network.CookieParam[],
-  maxTimeout?: number
-  proxy?: Proxy
-  session: string
-  headers?: Record<string, string> // deprecated v2, not used
-  userAgent?: string // deprecated v2, not used
-}
-
-interface V1RequestSession extends V1RequestBase {
-}
-
-export interface V1Request extends V1RequestBase {
-  url: string
-  method?: string
-  postData?: string
-  returnOnlyCookies?: boolean
-  download?: boolean // deprecated v2, not used
-  returnRawHtml?: boolean // deprecated v2, not used
-}
-
-export interface V1ResponseBase {
-  status: string
-  message: string
-  startTimestamp: number
-  endTimestamp: number
-  version: string
-}
-
-export interface V1ResponseSolution extends V1ResponseBase {
-  solution: ChallengeResolutionResultT
-}
-
-export interface V1ResponseSession extends V1ResponseBase {
-  session: string
-}
-
-export interface V1ResponseSessions extends V1ResponseBase {
-  sessions: string[]
-}
-
-export const routes: V1Routes = {
-  'sessions.create': async (params: V1RequestSession, response: V1ResponseSession): Promise<void> => {
-    const options: SessionCreateOptions = {
-      oneTimeSession: false,
-      cookies: params.cookies,
-      maxTimeout: params.maxTimeout,
-      proxy: params.proxy
-    }
-    const { sessionId, browser } = await sessions.create(params.session, options)
-    if (browser) {
-      response.status = "ok";
-      response.message = "Session created successfully.";
-      response.session = sessionId
-    } else {
-      throw Error('Error creating session.')
-    }
-  },
-  'sessions.list': async (params: V1RequestSession, response: V1ResponseSessions): Promise<void> => {
-    response.status = "ok";
-    response.message = "";
-    response.sessions = sessions.list();
-  },
-  'sessions.destroy': async (params: V1RequestSession, response: V1ResponseBase): Promise<void> => {
-    if (await sessions.destroy(params.session)) {
-      response.status = "ok";
-      response.message = "The session has been removed.";
-    } else {
-      throw Error('This session does not exist.')
-    }
-  },
-  'request.get': async (params: V1Request, response: V1ResponseSolution): Promise<void> => {
-    params.method = 'GET'
-    if (params.postData) {
-      throw Error('Cannot use "postBody" when sending a GET request.')
-    }
-    if (params.returnRawHtml) {
-      log.warn("Request parameter 'returnRawHtml' was removed in FlareSolverr v2.")
-    }
-    if (params.download) {
-      log.warn("Request parameter 'download' was removed in FlareSolverr v2.")
-    }
-    const result: ChallengeResolutionT = await browserRequest(params)
-
-    response.status = result.status;
-    response.message = result.message;
-    response.solution = result.result;
-    if (response.message) {
-      log.info(response.message)
-    }
-  },
-  'request.post': async (params: V1Request, response: V1ResponseSolution): Promise<void> => {
-    params.method = 'POST'
-    if (!params.postData) {
-      throw Error('Must send param "postBody" when sending a POST request.')
-    }
-    if (params.returnRawHtml) {
-      log.warn("Request parameter 'returnRawHtml' was removed in FlareSolverr v2.")
-    }
-    if (params.download) {
-      log.warn("Request parameter 'download' was removed in FlareSolverr v2.")
-    }
-    const result: ChallengeResolutionT = await browserRequest(params)
-
-    response.status = result.status;
-    response.message = result.message;
-    response.solution = result.result;
-    if (response.message) {
-      log.info(response.message)
-    }
-  },
-}
-
-export async function controllerV1(req: Request, res: Response): Promise<void> {
-  const response: V1ResponseBase = {
-    status: null,
-    message: null,
-    startTimestamp: Date.now(),
-    endTimestamp: 0,
-    version: version
-  }
-
-  try {
-    const params: V1RequestBase = req.body
-    // do some validations
-    if (!params.cmd) {
-      throw Error("Request parameter 'cmd' is mandatory.")
-    }
-    if (params.headers) {
-      log.warn("Request parameter 'headers' was removed in FlareSolverr v2.")
-    }
-    if (params.userAgent) {
-      log.warn("Request parameter 'userAgent' was removed in FlareSolverr v2.")
-    }
-
-    // set default values
-    if (!params.maxTimeout || params.maxTimeout < 1) {
-      params.maxTimeout = 60000;
-    }
-
-    // execute the command
-    const route = routes[params.cmd]
-    if (route) {
-      await route(params, response)
-    } else {
-      throw Error(`The command '${params.cmd}' is invalid.`)
-    }
-  } catch (e) {
-    res.status(500)
-    response.status = "error";
-    response.message = e.toString();
-    log.error(response.message)
-  }
-
-  response.endTimestamp = Date.now()
-  log.info(`Response in ${(response.endTimestamp - response.startTimestamp) / 1000} s`)
-  res.send(response)
-}

src/dtos.py

@@ -0,0 +1,83 @@
+
+STATUS_OK = "ok"
+STATUS_ERROR = "error"
+
+
+class ChallengeResolutionResultT:
+    url: str = None
+    status: int = None
+    headers: list = None
+    response: str = None
+    cookies: list = None
+    userAgent: str = None
+
+    def __init__(self, _dict):
+        self.__dict__.update(_dict)
+
+
+class ChallengeResolutionT:
+    status: str = None
+    message: str = None
+    result: ChallengeResolutionResultT = None
+
+    def __init__(self, _dict):
+        self.__dict__.update(_dict)
+        if self.result is not None:
+            self.result = ChallengeResolutionResultT(self.result)
+
+
+class V1RequestBase(object):
+    # V1RequestBase
+    cmd: str = None
+    cookies: list = None
+    maxTimeout: int = None
+    proxy: dict = None
+    session: str = None
+    headers: list = None  # deprecated v2.0.0, not used
+    userAgent: str = None  # deprecated v2.0.0, not used
+
+    # V1Request
+    url: str = None
+    postData: str = None
+    returnOnlyCookies: bool = None
+    download: bool = None   # deprecated v2.0.0, not used
+    returnRawHtml: bool = None  # deprecated v2.0.0, not used
+
+    def __init__(self, _dict):
+        self.__dict__.update(_dict)
+
+
+class V1ResponseBase(object):
+    # V1ResponseBase
+    status: str = None
+    message: str = None
+    startTimestamp: int = None
+    endTimestamp: int = None
+    version: str = None
+
+    # V1ResponseSolution
+    solution: ChallengeResolutionResultT = None
+
+    # hidden vars
+    __error_500__: bool = False
+
+    def __init__(self, _dict):
+        self.__dict__.update(_dict)
+        if self.solution is not None:
+            self.solution = ChallengeResolutionResultT(self.solution)
+
+
+class IndexResponse(object):
+    msg: str = None
+    version: str = None
+    userAgent: str = None
+
+    def __init__(self, _dict):
+        self.__dict__.update(_dict)
+
+
+class HealthResponse(object):
+    status: str = None
+
+    def __init__(self, _dict):
+        self.__dict__.update(_dict)

src/flaresolverr.py

@@ -0,0 +1,95 @@
+import json
+import logging
+import os
+import sys
+
+from bottle import run, response, Bottle, request
+
+from bottle_plugins.error_plugin import error_plugin
+from bottle_plugins.logger_plugin import logger_plugin
+from dtos import IndexResponse, V1RequestBase
+import flaresolverr_service
+import utils
+
+
+class JSONErrorBottle(Bottle):
+    """
+    Handle 404 errors
+    """
+    def default_error_handler(self, res):
+        response.content_type = 'application/json'
+        return json.dumps(dict(error=res.body, status_code=res.status_code))
+
+
+app = JSONErrorBottle()
+
+# plugin order is important
+app.install(logger_plugin)
+app.install(error_plugin)
+
+
+@app.route('/')
+def index():
+    """
+    Show welcome message
+    """
+    res = flaresolverr_service.index_endpoint()
+    return utils.object_to_dict(res)
+
+
+@app.route('/health')
+def health():
+    """
+    Healthcheck endpoint.
+    This endpoint is special because it doesn't print traces
+    """
+    res = flaresolverr_service.health_endpoint()
+    return utils.object_to_dict(res)
+
+
+@app.post('/v1')
+def controller_v1():
+    """
+    Controller v1
+    """
+    req = V1RequestBase(request.json)
+    res = flaresolverr_service.controller_v1_endpoint(req)
+    if res.__error_500__:
+        response.status = 500
+    return utils.object_to_dict(res)
+
+
+if __name__ == "__main__":
+    # validate configuration
+    log_level = os.environ.get('LOG_LEVEL', 'info').upper()
+    log_html = utils.get_config_log_html()
+    headless = utils.get_config_headless()
+    server_host = os.environ.get('HOST', '0.0.0.0')
+    server_port = int(os.environ.get('PORT', 8191))
+
+    # configure logger
+    logger_format = '%(asctime)s %(levelname)-8s %(message)s'
+    if log_level == 'DEBUG':
+        logger_format = '%(asctime)s %(levelname)-8s ReqId %(thread)s %(message)s'
+    logging.basicConfig(
+        format=logger_format,
+        level=log_level,
+        datefmt='%Y-%m-%d %H:%M:%S',
+        handlers=[
+            logging.StreamHandler(sys.stdout)
+        ]
+    )
+    # disable warning traces from urllib3
+    logging.getLogger('urllib3').setLevel(logging.ERROR)
+    logging.getLogger('selenium.webdriver.remote.remote_connection').setLevel(logging.WARNING)
+    logging.getLogger('undetected_chromedriver').setLevel(logging.WARNING)
+
+    logging.info(f'FlareSolverr {utils.get_flaresolverr_version()}')
+    logging.debug('Debug log enabled')
+
+    # test browser installation
+    flaresolverr_service.test_browser_installation()
+
+    # start webserver
+    # default server 'wsgiref' does not support concurrent requests
+    run(app, host=server_host, port=server_port, quiet=True, server='waitress')

src/flaresolverr_service.py

@@ -0,0 +1,261 @@
+import logging
+import time
+from urllib.parse import unquote
+
+from func_timeout import func_timeout, FunctionTimedOut
+from selenium.common import TimeoutException
+from selenium.webdriver.chrome.webdriver import WebDriver
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support.wait import WebDriverWait
+from selenium.webdriver.support.expected_conditions import presence_of_element_located, staleness_of
+
+from dtos import V1RequestBase, V1ResponseBase, ChallengeResolutionT, ChallengeResolutionResultT, IndexResponse, \
+    HealthResponse, STATUS_OK, STATUS_ERROR
+import utils
+
+ACCESS_DENIED_SELECTORS = [
+    # Cloudflare
+    'div.main-wrapper div.header.section h1 span.code-label span'
+]
+CHALLENGE_SELECTORS = [
+    # Cloudflare
+    '#cf-challenge-running', '.ray_id', '.attack-box', '#cf-please-wait', '#trk_jschal_js',
+    # DDoS-GUARD
+    '#link-ddg',
+    # Custom CloudFlare for EbookParadijs, Film-Paleis, MuziekFabriek and Puur-Hollands
+    'td.info #js_info'
+]
+SHORT_TIMEOUT = 5
+
+
+def test_browser_installation():
+    logging.info("Testing web browser installation...")
+    user_agent = utils.get_user_agent()
+    logging.info("FlareSolverr User-Agent: " + user_agent)
+    logging.info("Test successful")
+
+
+def index_endpoint() -> IndexResponse:
+    res = IndexResponse({})
+    res.msg = "FlareSolverr is ready!"
+    res.version = utils.get_flaresolverr_version()
+    res.userAgent = utils.get_user_agent()
+    return res
+
+
+def health_endpoint() -> HealthResponse:
+    res = HealthResponse({})
+    res.status = STATUS_OK
+    return res
+
+
+def controller_v1_endpoint(req: V1RequestBase) -> V1ResponseBase:
+    start_ts = int(time.time() * 1000)
+    logging.info(f"Incoming request => POST /v1 body: {utils.object_to_dict(req)}")
+    res: V1ResponseBase
+    try:
+        res = _controller_v1_handler(req)
+    except Exception as e:
+        res = V1ResponseBase({})
+        res.__error_500__ = True
+        res.status = STATUS_ERROR
+        res.message = "Error: " + str(e)
+        logging.error(res.message)
+
+    res.startTimestamp = start_ts
+    res.endTimestamp = int(time.time() * 1000)
+    res.version = utils.get_flaresolverr_version()
+    logging.debug(f"Response => POST /v1 body: {utils.object_to_dict(res)}")
+    logging.info(f"Response in {(res.endTimestamp - res.startTimestamp) / 1000} s")
+    return res
+
+
+def _controller_v1_handler(req: V1RequestBase) -> V1ResponseBase:
+    # do some validations
+    if req.cmd is None:
+        raise Exception("Request parameter 'cmd' is mandatory.")
+    if req.headers is not None:
+        logging.warning("Request parameter 'headers' was removed in FlareSolverr v2.")
+    if req.userAgent is not None:
+        logging.warning("Request parameter 'userAgent' was removed in FlareSolverr v2.")
+
+    # set default values
+    if req.maxTimeout is None or req.maxTimeout < 1:
+        req.maxTimeout = 60000
+
+    # execute the command
+    res: V1ResponseBase
+    if req.cmd == 'sessions.create':
+        raise Exception("Not implemented yet.")
+    elif req.cmd == 'sessions.list':
+        raise Exception("Not implemented yet.")
+    elif req.cmd == 'sessions.destroy':
+        raise Exception("Not implemented yet.")
+    elif req.cmd == 'request.get':
+        res = _cmd_request_get(req)
+    elif req.cmd == 'request.post':
+        res = _cmd_request_post(req)
+    else:
+        raise Exception(f"Request parameter 'cmd' = '{req.cmd}' is invalid.")
+
+    return res
+
+
+def _cmd_request_get(req: V1RequestBase) -> V1ResponseBase:
+    # do some validations
+    if req.url is None:
+        raise Exception("Request parameter 'url' is mandatory in 'request.get' command.")
+    if req.postData is not None:
+        raise Exception("Cannot use 'postBody' when sending a GET request.")
+    if req.returnRawHtml is not None:
+        logging.warning("Request parameter 'returnRawHtml' was removed in FlareSolverr v2.")
+    if req.download is not None:
+        logging.warning("Request parameter 'download' was removed in FlareSolverr v2.")
+
+    challenge_res = _resolve_challenge(req, 'GET')
+    res = V1ResponseBase({})
+    res.status = challenge_res.status
+    res.message = challenge_res.message
+    res.solution = challenge_res.result
+    return res
+
+
+def _cmd_request_post(req: V1RequestBase) -> V1ResponseBase:
+    # do some validations
+    if req.postData is None:
+        raise Exception("Request parameter 'postData' is mandatory in 'request.post' command.")
+    if req.returnRawHtml is not None:
+        logging.warning("Request parameter 'returnRawHtml' was removed in FlareSolverr v2.")
+    if req.download is not None:
+        logging.warning("Request parameter 'download' was removed in FlareSolverr v2.")
+
+    challenge_res = _resolve_challenge(req, 'POST')
+    res = V1ResponseBase({})
+    res.status = challenge_res.status
+    res.message = challenge_res.message
+    res.solution = challenge_res.result
+    return res
+
+
+def _resolve_challenge(req: V1RequestBase, method: str) -> ChallengeResolutionT:
+    timeout = req.maxTimeout / 1000
+    driver = None
+    try:
+        driver = utils.get_webdriver()
+        return func_timeout(timeout, _evil_logic, (req, driver, method))
+    except FunctionTimedOut:
+        raise Exception(f'Error solving the challenge. Timeout after {timeout} seconds.')
+    except Exception as e:
+        raise Exception('Error solving the challenge. ' + str(e))
+    finally:
+        if driver is not None:
+            driver.quit()
+
+
+def _evil_logic(req: V1RequestBase, driver: WebDriver, method: str) -> ChallengeResolutionT:
+    res = ChallengeResolutionT({})
+    res.status = STATUS_OK
+    res.message = ""
+
+    # navigate to the page
+    logging.debug(f'Navigating to... {req.url}')
+    if method == 'POST':
+        _post_request(req, driver)
+    else:
+        driver.get(req.url)
+    if utils.get_config_log_html():
+        logging.debug(f"Response HTML:\n{driver.page_source}")
+
+    # wait for the page
+    html_element = driver.find_element(By.TAG_NAME, "html")
+
+    # find access denied selectors
+    for selector in ACCESS_DENIED_SELECTORS:
+        found_elements = driver.find_elements(By.CSS_SELECTOR, selector)
+        if len(found_elements) > 0:
+            raise Exception('Cloudflare has blocked this request. '
+                            'Probably your IP is banned for this site, check in your web browser.')
+
+    # find challenge selectors
+    challenge_found = False
+    for selector in CHALLENGE_SELECTORS:
+        found_elements = driver.find_elements(By.CSS_SELECTOR, selector)
+        if len(found_elements) > 0:
+            challenge_found = True
+            logging.info("Challenge detected. Selector found: " + selector)
+            break
+
+    if challenge_found:
+        while True:
+            try:
+                # then wait until all the selectors disappear
+                for selector in CHALLENGE_SELECTORS:
+                    logging.debug("Waiting for selector: " + selector)
+                    WebDriverWait(driver, SHORT_TIMEOUT).until_not(
+                        presence_of_element_located((By.CSS_SELECTOR, selector)))
+
+                # all elements not found
+                break
+
+            except TimeoutException:
+                logging.debug("Timeout waiting for selector")
+                # update the html (cloudflare reloads the page every 5 s)
+                html_element = driver.find_element(By.TAG_NAME, "html")
+
+        # waits until cloudflare redirection ends
+        logging.debug("Waiting for redirect")
+        # noinspection PyBroadException
+        try:
+            WebDriverWait(driver, SHORT_TIMEOUT).until(staleness_of(html_element))
+        except Exception:
+            logging.debug("Timeout waiting for redirect")
+
+        logging.info("Challenge solved!")
+        res.message = "Challenge solved!"
+    else:
+        logging.info("Challenge not detected!")
+        res.message = "Challenge not detected!"
+
+    challenge_res = ChallengeResolutionResultT({})
+    challenge_res.url = driver.current_url
+    challenge_res.status = 200  # todo: fix, selenium not provides this info
+    challenge_res.cookies = driver.get_cookies()
+
+    if not req.returnOnlyCookies:
+        challenge_res.headers = {}  # todo: fix, selenium not provides this info
+        challenge_res.response = driver.page_source
+        challenge_res.userAgent = utils.get_user_agent(driver)
+
+    res.result = challenge_res
+    return res
+
+
+def _post_request(req: V1RequestBase, driver: WebDriver):
+    post_form = f'<form id="hackForm" action="{req.url}" method="POST">'
+    query_string = req.postData if req.postData[0] != '?' else req.postData[1:]
+    pairs = query_string.split('&')
+    for pair in pairs:
+        parts = pair.split('=')
+        # noinspection PyBroadException
+        try:
+            name = unquote(parts[0])
+        except Exception:
+            name = parts[0]
+        if name == 'submit':
+            continue
+        # noinspection PyBroadException
+        try:
+            value = unquote(parts[1])
+        except Exception:
+            value = parts[1]
+        post_form += f'<input type="text" name="{name}" value="{value}"><br>'
+    post_form += '</form>'
+    html_content = f"""
+        <!DOCTYPE html>
+        <html>
+        <body>
+            {post_form}
+            <script>document.getElementById('hackForm').submit();</script>
+        </body>
+        </html>"""
+    driver.get("data:text/html;charset=utf-8," + html_content)

src/providers/cloudflare.ts

@@ -1,147 +0,0 @@
-import {Page, HTTPResponse} from 'puppeteer'
-
-import log from "../services/log";
-
-/**
- *  This class contains the logic to solve protections provided by CloudFlare
- **/
-
-const BAN_SELECTORS = ['.text-gray-600'];
-const CHALLENGE_SELECTORS = [
-    '#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"]'];
-
-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');
-  if (cfDetected) {
-    if (response.status() == 403 || response.status() == 503) {
-      cfDetected = true; // Defected CloudFlare and DDoS-GUARD
-    } else if (response.headers().vary && response.headers().vary.trim() == 'Accept-Encoding,User-Agent' &&
-        response.headers()['content-encoding'] && response.headers()['content-encoding'].trim() == 'br') {
-      cfDetected = true; // Detected Custom CloudFlare for EbookParadijs, Film-Paleis, MuziekFabriek and Puur-Hollands
-    } else {
-      cfDetected = false;
-    }
-  }
-
-  if (cfDetected) {
-    log.info('Cloudflare detected');
-  } else {
-    log.info('Cloudflare not detected');
-    return 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.')
-  }
-
-  // find Cloudflare selectors
-  let selectorFound = false;
-  let selector: string = await findAnySelector(page, CHALLENGE_SELECTORS)
-  if (selector) {
-    selectorFound = true;
-    log.debug(`Javascript challenge element '${selector}' detected.`)
-    log.debug('Waiting for Cloudflare challenge...')
-
-    while (true) {
-      try {
-
-        selector = await findAnySelector(page, CHALLENGE_SELECTORS)
-        if (!selector) {
-          // solved!
-          log.debug('Challenge element not found')
-          break
-        } else {
-          log.debug(`Javascript challenge element '${selector}' detected.`)
-
-          // 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')
-            // 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')
-
-      } catch (error)
-      {
-        log.debug("Unexpected error: " + error);
-        if (!error.toString().includes("Execution context was destroyed")) {
-          break
-        }
-      }
-
-      log.debug('Waiting for Cloudflare challenge...')
-      await page.waitForTimeout(1000)
-    }
-
-    log.debug('Validating HTML code...')
-  } else {
-    log.debug(`No challenge element detected.`)
-  }
-
-  // check for CAPTCHA challenge
-  if (await findAnySelector(page, CAPTCHA_SELECTORS)) {
-    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()
-    // if (captchaSolver) {
-    //     // to-do: get the params
-    //     log.info('Waiting to receive captcha token to bypass challenge...')
-    //     const token = await captchaSolver({
-    //       url,
-    //       sitekey,
-    //       type: captchaType
-    //     })
-    //     log.debug(`Token received: ${token}`);
-    //     // to-do: send the token
-    //   }
-    // } else {
-    //   throw new Error('Captcha detected but no automatic solver is configured.');
-    // }
-  } else {
-    if (!selectorFound)
-    {
-      throw new Error('No challenge selectors found, unable to proceed.')
-    } else {
-      log.info('Challenge solved');
-    }
-  }
-
-  return response;
-}
-
-async function findAnySelector(page: Page, selectors: string[]) {
-  for (const selector of selectors) {
-    const cfChallengeElem = await page.$(selector)
-    if (cfChallengeElem) {
-      return selector;
-    }
-  }
-  return null;
-}

src/server.ts

@@ -1,63 +0,0 @@
-import log from './services/log'
-import {testWebBrowserInstallation} from "./services/sessions";
-
-const app = require("./app");
-const version: string = 'v' + require('../package.json').version
-const serverPort: number = Number(process.env.PORT) || 8191
-const serverHost: string = process.env.HOST || '0.0.0.0'
-
-function validateEnvironmentVariables() {
-  // ip and port variables are validated by nodejs
-  if (process.env.LOG_LEVEL && ['error', 'warn', 'info', 'verbose', 'debug'].indexOf(process.env.LOG_LEVEL) == -1) {
-    log.error(`The environment variable 'LOG_LEVEL' is wrong. Check the documentation.`);
-    process.exit(1);
-  }
-  if (process.env.LOG_HTML && ['true', 'false'].indexOf(process.env.LOG_HTML) == -1) {
-    log.error(`The environment variable 'LOG_HTML' is wrong. Check the documentation.`);
-    process.exit(1);
-  }
-  if (process.env.HEADLESS && ['true', 'false'].indexOf(process.env.HEADLESS) == -1) {
-    log.error(`The environment variable 'HEADLESS' is wrong. Check the documentation.`);
-    process.exit(1);
-  }
-  // todo: fix resolvers
-  // try {
-  //   getCaptchaSolver();
-  // } catch (e) {
-  //   log.error(`The environment variable 'CAPTCHA_SOLVER' is wrong. ${e.message}`);
-  //   process.exit(1);
-  // }
-}
-
-// Init
-log.info(`FlareSolverr ${version}`);
-log.debug('Debug log enabled');
-
-process.on('SIGTERM', () => {
-  // Capture signal on Docker Stop #158
-  log.info("Process interrupted")
-  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(() => {
-  // Start server
-  app.listen(serverPort, serverHost, () => {
-    log.info(`Listening on http://${serverHost}:${serverPort}`);
-  })
-}).catch(function(e) {
-  log.error(e);
-  const msg: string = "" + e;
-  if (msg.includes('while trying to connect to the browser!')) {
-    log.error(`It seems that the system is too slow to run FlareSolverr. 
-    If you are running with Docker, try to remove CPU limits in the container. 
-    If not, try setting the 'BROWSER_TIMEOUT' environment variable and the 'maxTimeout' parameter to higher values.`);
-  }
-  process.exit(1);
-})

src/services/log.ts

@@ -1,41 +0,0 @@
-let requests = 0
-
-const LOG_HTML: boolean = process.env.LOG_HTML == 'true';
-
-function toIsoString(date: Date) {
-  // this function fixes Date.toISOString() adding timezone
-  let tzo = -date.getTimezoneOffset(),
-      dif = tzo >= 0 ? '+' : '-',
-      pad = function(num: number) {
-        let norm = Math.floor(Math.abs(num));
-        return (norm < 10 ? '0' : '') + norm;
-      };
-
-  return date.getFullYear() +
-      '-' + pad(date.getMonth() + 1) +
-      '-' + pad(date.getDate()) +
-      'T' + pad(date.getHours()) +
-      ':' + pad(date.getMinutes()) +
-      ':' + pad(date.getSeconds()) +
-      dif + pad(tzo / 60) +
-      ':' + pad(tzo % 60);
-}
-
-export default {
-  incRequests: () => {
-      requests++
-  },
-  html(html: string) {
-    if (LOG_HTML) {
-        this.debug(html)
-    }
-  },
-  ...require('console-log-level')(
-    {level: process.env.LOG_LEVEL || 'info',
-      prefix(level: string) {
-        const req = (requests > 0) ? ` REQ-${requests}` : '';
-        return `${toIsoString(new Date())} ${level.toUpperCase()}${req}`
-      }
-    }
-  )
-}

src/services/sessions.ts

@@ -1,194 +0,0 @@
-import {v1 as UUIDv1} from 'uuid'
-import * as path from 'path'
-import {Browser} from 'puppeteer'
-import {Protocol} from "devtools-protocol";
-
-import log from './log'
-import {Proxy} from "../controllers/v1";
-
-const os = require('os');
-const fs = require('fs');
-const puppeteer = require('puppeteer');
-
-export interface SessionsCacheItem {
-  sessionId: string
-  browser: Browser
-}
-
-interface SessionsCache {
-  [key: string]: SessionsCacheItem
-}
-
-export interface SessionCreateOptions {
-  oneTimeSession: boolean
-  cookies?: Protocol.Network.CookieParam[],
-  maxTimeout?: number
-  proxy?: Proxy
-}
-
-const sessionCache: SessionsCache = {}
-let webBrowserUserAgent: string;
-
-function buildExtraPrefsFirefox(proxy: Proxy): object {
-  // Default configurations are defined here
-  // https://github.com/puppeteer/puppeteer/blob/v3.3.0/src/Launcher.ts#L481
-  const extraPrefsFirefox = {
-    // Disable newtabpage
-    "browser.newtabpage.enabled": false,
-    "browser.startup.homepage": "about:blank",
-
-    // Do not warn when closing all open tabs
-    "browser.tabs.warnOnClose": false,
-
-    // Disable telemetry
-    "toolkit.telemetry.reportingpolicy.firstRun": false,
-
-    // Disable first-run welcome page
-    "startup.homepage_welcome_url": "about:blank",
-    "startup.homepage_welcome_url.additional": "",
-
-    // Detected !
-    // // Disable images to speed up load
-    // "permissions.default.image": 2,
-
-    // Limit content processes to 1
-    "dom.ipc.processCount": 1
-  }
-
-  // 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,
-      "network.proxy.share_proxy_settings": true
-    }
-    if (proxy.url.indexOf("socks") != -1) {
-      // SOCKSv4 & SOCKSv5
-      Object.assign(proxyPrefs, {
-        "network.proxy.socks": host,
-        "network.proxy.socks_port": port,
-        "network.proxy.socks_remote_dns": true
-      });
-      if (proxy.url.indexOf("socks4") != -1) {
-        Object.assign(proxyPrefs, {
-          "network.proxy.socks_version": 4
-        });
-      } else {
-        Object.assign(proxyPrefs, {
-          "network.proxy.socks_version": 5
-        });
-      }
-    } else {
-      // HTTP
-      Object.assign(proxyPrefs, {
-        "network.proxy.ftp": host,
-        "network.proxy.ftp_port": port,
-        "network.proxy.http": host,
-        "network.proxy.http_port": port,
-        "network.proxy.ssl": host,
-        "network.proxy.ssl_port": port
-      });
-    }
-
-    // merge objects
-    Object.assign(extraPrefsFirefox, proxyPrefs);
-  }
-
-  return extraPrefsFirefox;
-}
-
-export function getUserAgent() {
-  return webBrowserUserAgent
-}
-
-export async function testWebBrowserInstallation(): Promise<void> {
-  log.info("Testing web browser installation...")
-
-  // check user home dir. this dir will be used by Firefox
-  const homeDir = os.homedir();
-  fs.accessSync(homeDir, fs.constants.F_OK | fs.constants.R_OK | fs.constants.W_OK | fs.constants.X_OK);
-  log.debug("FlareSolverr user home directory is OK: " + homeDir)
-
-  // test web browser
-  const testUrl = process.env.TEST_URL || "https://www.google.com";
-  log.debug("Test URL: " + testUrl)
-  const session = await create(null, {
-    oneTimeSession: true
-  })
-  const page = await session.browser.newPage()
-  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
-  if (["arm", "aarch64"].some(arch => webBrowserUserAgent.toLocaleLowerCase().includes('linux ' + arch))) {
-    webBrowserUserAgent = webBrowserUserAgent.replace(/linux \w+;/i, 'Linux x86_64;')
-  }
-
-  log.info("FlareSolverr User-Agent: " + webBrowserUserAgent)
-  await page.close()
-  await destroy(session.sessionId)
-
-  log.info("Test successful")
-}
-
-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
-
-  const puppeteerOptions: any = {
-    product: 'firefox',
-    headless: process.env.HEADLESS !== 'false',
-    timeout: Number(process.env.BROWSER_TIMEOUT) || 40000
-  }
-
-  puppeteerOptions.extraPrefsFirefox = buildExtraPrefsFirefox(options.proxy)
-
-  // if we are running inside executable binary, change browser path
-  if (typeof (process as any).pkg !== 'undefined') {
-    const exe = process.platform === "win32" ? 'firefox.exe' : 'firefox';
-    puppeteerOptions.executablePath = path.join(path.dirname(process.execPath), 'firefox', exe)
-  }
-
-  log.debug('Launching web browser...')
-  let browser: Browser = await puppeteer.launch(puppeteerOptions)
-  if (!browser) {
-    throw Error(`Failed to launch web browser.`)
-  }
-
-  sessionCache[sessionId] = {
-    sessionId: sessionId,
-    browser: browser
-  }
-
-  return sessionCache[sessionId]
-}
-
-export function list(): string[] {
-  return Object.keys(sessionCache)
-}
-
-export async function destroy(id: string): Promise<boolean>{
-  if (id && sessionCache.hasOwnProperty(id)) {
-    const { browser } = sessionCache[id]
-    if (browser) {
-      await browser.close()
-      delete sessionCache[id]
-      return true
-    }
-  }
-  return false
-}
-
-export function get(id: string): SessionsCacheItem {
-  return sessionCache[id]
-}

src/services/solver.ts

@@ -1,223 +0,0 @@
-import {Page, HTTPResponse} from 'puppeteer'
-const Timeout = require('await-timeout');
-
-import log from './log'
-import {SessionCreateOptions, SessionsCacheItem} from "./sessions";
-import {V1Request} from "../controllers/v1";
-import cloudflareProvider from '../providers/cloudflare';
-
-const sessions = require('./sessions')
-
-export interface ChallengeResolutionResultT {
-    url: string
-    status: number,
-    headers?: Record<string, string>,
-    response: string,
-    cookies: object[]
-    userAgent: string
-}
-
-export interface ChallengeResolutionT {
-    status?: string
-    message: string
-    result: ChallengeResolutionResultT
-}
-
-async function resolveChallengeWithTimeout(params: V1Request, session: SessionsCacheItem) {
-    const timer = new Timeout();
-    try {
-        const promise = resolveChallenge(params, session);
-        return await Promise.race([
-            promise,
-            timer.set(params.maxTimeout, `Maximum timeout reached. maxTimeout=${params.maxTimeout} (ms)`)
-        ]);
-    } finally {
-        timer.clear();
-    }
-}
-
-async function resolveChallenge(params: V1Request, session: SessionsCacheItem): Promise<ChallengeResolutionT | void> {
-    try {
-        let status = 'ok'
-        let message = ''
-
-        const page: Page = await session.browser.newPage()
-
-        // the Puppeter timeout should be half the maxTimeout because we reload the page and wait for challenge
-        // the user can set a really high maxTimeout if he wants to
-        await page.setDefaultNavigationTimeout(params.maxTimeout / 2)
-
-        // the user-agent is changed just for linux arm build
-        await page.setUserAgent(sessions.getUserAgent())
-
-        // set the proxy
-        if (params.proxy) {
-            log.debug(`Using proxy: ${params.proxy.url}`);
-            // todo: credentials are not working
-            // if (params.proxy.username) {
-            //     await page.authenticate({
-            //         username: params.proxy.username,
-            //         password: params.proxy.password
-            //     });
-            // }
-        }
-
-        // go to the page
-        log.debug(`Navigating to... ${params.url}`)
-        let response: HTTPResponse = await gotoPage(params, page);
-
-        // set cookies
-        if (params.cookies) {
-            for (const cookie of params.cookies) {
-                // the other fields in the cookie can cause issues
-                await page.setCookie({
-                    "name": cookie.name,
-                    "value": cookie.value
-                })
-            }
-            // reload the page
-            response = await gotoPage(params, page);
-        }
-
-        // log html in debug mode
-        log.html(await page.content())
-
-        // detect protection services and solve challenges
-        try {
-            response = await cloudflareProvider(params.url, page, response);
-
-            // 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";
-            message = "Cloudflare " + e.toString();
-        }
-
-        const payload: ChallengeResolutionT = {
-            status,
-            message,
-            result: {
-                url: page.url(),
-                status: response.status(),
-                headers: response.headers(),
-                response: null,
-                cookies: await page.cookies(),
-                userAgent: sessions.getUserAgent()
-            }
-        }
-
-        if (params.returnOnlyCookies) {
-            payload.result.headers = null;
-            payload.result.userAgent = null;
-        } else {
-            payload.result.response = await page.content()
-        }
-
-        // make sure the page is closed because if it isn't and error will be thrown
-        // when a user uses a temporary session, the browser make be quit before
-        // the page is properly closed.
-        await page.close()
-
-        return payload
-    } catch (e) {
-        log.error("Unexpected error: " + e);
-        throw e;
-    }
-}
-
-async function gotoPage(params: V1Request, page: Page): Promise<HTTPResponse> {
-    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});
-    }
-
-    if (params.method == 'POST') {
-        // post hack
-        await page.setContent(
-            `
-<!DOCTYPE html>
-<html>
-<body>
-<script>
-
-  function parseQuery(queryString) {
-    var query = {};
-    var pairs = (queryString[0] === '?' ? queryString.substr(1) : queryString).split('&');
-    for (var i = 0; i < pairs.length; i++) {
-        var pair = pairs[i].split('=');
-        query[decodeURIComponent(pair[0])] = decodeURIComponent(pair[1] || '');
-    }
-    return query;
-  }
-
-  const form = document.createElement('form');
-  form.method = 'POST';
-  form.action = '${params.url}';
-
-  const params = parseQuery('${params.postData}');
-  for (const key in params) {
-    if (params.hasOwnProperty(key)) {
-      const hiddenField = document.createElement('input');
-      hiddenField.type = 'hidden';
-      hiddenField.name = key;
-      hiddenField.value = params[key];
-      form.appendChild(hiddenField);
-    }
-  }
-
-  document.body.appendChild(form);
-  form.submit();
-    
-</script>
-</body>
-</html> 
-            `
-        );
-        await page.waitForTimeout(2000)
-        try {
-            await page.waitForNavigation({waitUntil: 'domcontentloaded', timeout: 2000})
-        } catch (e) {}
-
-    }
-    return response
-}
-
-export async function browserRequest(params: V1Request): Promise<ChallengeResolutionT> {
-    const oneTimeSession = params.session === undefined;
-
-    const options: SessionCreateOptions = {
-        oneTimeSession: oneTimeSession,
-        cookies: params.cookies,
-        maxTimeout: params.maxTimeout,
-        proxy: params.proxy
-    }
-
-    const session: SessionsCacheItem = oneTimeSession
-        ? await sessions.create(null, options)
-        : sessions.get(params.session)
-
-    if (!session) {
-        throw Error('This session does not exist. Use \'list_sessions\' to see all the existing sessions.')
-    }
-
-    try {
-        return  await resolveChallengeWithTimeout(params, session)
-    } catch (error) {
-        throw Error("Unable to process browser request. " + error)
-    } finally {
-        if (oneTimeSession) {
-            await sessions.destroy(session.sessionId)
-        }
-    }
-}

src/tests.py

@@ -0,0 +1,376 @@
+import unittest
+from datetime import datetime, timezone
+
+from webtest import TestApp
+
+from dtos import IndexResponse, HealthResponse, V1ResponseBase, STATUS_OK, STATUS_ERROR
+import flaresolverr
+import utils
+
+
+def _find_obj_by_key(key: str, value: str, _list: list) -> dict | None:
+    for obj in _list:
+        if obj[key] == value:
+            return obj
+    return None
+
+
+class TestFlareSolverr(unittest.TestCase):
+
+    proxy_url = "http://127.0.0.1:8888"
+    proxy_socks_url = "socks5://127.0.0.1:1080"
+    google_url = "https://www.google.com"
+    post_url = "https://ptsv2.com/t/qv4j3-1634496523"
+    cloudflare_url = "https://nowsecure.nl"
+    cloudflare_url_2 = "https://idope.se/torrent-list/harry/"
+    ddos_guard_url = "https://anidex.info/"
+    custom_cloudflare_url = "https://www.muziekfabriek.org"
+    cloudflare_blocked_url = "https://avistaz.to/api/v1/jackett/torrents?in=1&type=0&search="
+
+    app = TestApp(flaresolverr.app)
+
+    def test_wrong_endpoint(self):
+        res = self.app.get('/wrong', status=404)
+        self.assertEqual(res.status_code, 404)
+
+        body = res.json
+        self.assertEqual("Not found: '/wrong'", body['error'])
+        self.assertEqual(404, body['status_code'])
+
+    def test_index_endpoint(self):
+        res = self.app.get('/')
+        self.assertEqual(res.status_code, 200)
+
+        body = IndexResponse(res.json)
+        self.assertEqual("FlareSolverr is ready!", body.msg)
+        self.assertEqual(utils.get_flaresolverr_version(), body.version)
+        self.assertIn("Chrome/", body.userAgent)
+
+    def test_health_endpoint(self):
+        res = self.app.get('/health')
+        self.assertEqual(res.status_code, 200)
+
+        body = HealthResponse(res.json)
+        self.assertEqual(STATUS_OK, body.status)
+
+    def test_v1_endpoint_wrong_cmd(self):
+        res = self.app.post_json('/v1', {
+            "cmd": "request.bad",
+            "url": self.google_url
+        }, status=500)
+        self.assertEqual(res.status_code, 500)
+
+        body = V1ResponseBase(res.json)
+        self.assertEqual(STATUS_ERROR, body.status)
+        self.assertEqual("Error: Request parameter 'cmd' = 'request.bad' is invalid.", body.message)
+        self.assertGreater(body.startTimestamp, 10000)
+        self.assertGreaterEqual(body.endTimestamp, body.startTimestamp)
+        self.assertEqual(utils.get_flaresolverr_version(), body.version) 
+
+    def test_v1_endpoint_request_get_no_cloudflare(self):
+        res = self.app.post_json('/v1', {
+            "cmd": "request.get",
+            "url": self.google_url
+        })
+        self.assertEqual(res.status_code, 200)
+
+        body = V1ResponseBase(res.json)
+        self.assertEqual(STATUS_OK, body.status)
+        self.assertEqual("Challenge not detected!", body.message)
+        self.assertGreater(body.startTimestamp, 10000)
+        self.assertGreaterEqual(body.endTimestamp, body.startTimestamp)
+        self.assertEqual(utils.get_flaresolverr_version(), body.version) 
+
+        solution = body.solution
+        self.assertIn(self.google_url, solution.url)
+        self.assertEqual(solution.status, 200)
+        self.assertIs(len(solution.headers), 0)
+        self.assertIn("<title>Google</title>", solution.response)
+        self.assertGreater(len(solution.cookies), 0)
+        self.assertIn("Chrome/", solution.userAgent)
+
+    def test_v1_endpoint_request_get_cloudflare_js_1(self):
+        res = self.app.post_json('/v1', {
+            "cmd": "request.get",
+            "url": self.cloudflare_url
+        })
+        self.assertEqual(res.status_code, 200)
+
+        body = V1ResponseBase(res.json)
+        self.assertEqual(STATUS_OK, body.status)
+        self.assertEqual("Challenge solved!", body.message)
+        self.assertGreater(body.startTimestamp, 10000)
+        self.assertGreaterEqual(body.endTimestamp, body.startTimestamp)
+        self.assertEqual(utils.get_flaresolverr_version(), body.version) 
+
+        solution = body.solution
+        self.assertIn(self.cloudflare_url, solution.url)
+        self.assertEqual(solution.status, 200)
+        self.assertIs(len(solution.headers), 0)
+        self.assertIn("<title>nowSecure</title>", solution.response)
+        self.assertGreater(len(solution.cookies), 0)
+        self.assertIn("Chrome/", solution.userAgent)
+
+        cf_cookie = _find_obj_by_key("name", "cf_clearance", solution.cookies)
+        self.assertIsNotNone(cf_cookie, "Cloudflare cookie not found")
+        self.assertGreater(len(cf_cookie["value"]), 30)
+
+    def test_v1_endpoint_request_get_cloudflare_js_2(self):
+        res = self.app.post_json('/v1', {
+            "cmd": "request.get",
+            "url": self.cloudflare_url_2
+        })
+        self.assertEqual(res.status_code, 200)
+
+        body = V1ResponseBase(res.json)
+        self.assertEqual(STATUS_OK, body.status)
+        self.assertEqual("Challenge solved!", body.message)
+        self.assertGreater(body.startTimestamp, 10000)
+        self.assertGreaterEqual(body.endTimestamp, body.startTimestamp)
+        self.assertEqual(utils.get_flaresolverr_version(), body.version) 
+
+        solution = body.solution
+        self.assertIn(self.cloudflare_url_2, solution.url)
+        self.assertEqual(solution.status, 200)
+        self.assertIs(len(solution.headers), 0)
+        self.assertIn("<title>harry - idope torrent search</title>", solution.response)
+        self.assertGreater(len(solution.cookies), 0)
+        self.assertIn("Chrome/", solution.userAgent)
+
+        cf_cookie = _find_obj_by_key("name", "cf_clearance", solution.cookies)
+        self.assertIsNotNone(cf_cookie, "Cloudflare cookie not found")
+        self.assertGreater(len(cf_cookie["value"]), 30)
+
+    def test_v1_endpoint_request_get_ddos_guard_js(self):
+        res = self.app.post_json('/v1', {
+            "cmd": "request.get",
+            "url": self.ddos_guard_url
+        })
+        self.assertEqual(res.status_code, 200)
+
+        body = V1ResponseBase(res.json)
+        self.assertEqual(STATUS_OK, body.status)
+        self.assertEqual("Challenge solved!", body.message)
+        self.assertGreater(body.startTimestamp, 10000)
+        self.assertGreaterEqual(body.endTimestamp, body.startTimestamp)
+        self.assertEqual(utils.get_flaresolverr_version(), body.version) 
+
+        solution = body.solution
+        self.assertIn(self.ddos_guard_url, solution.url)
+        self.assertEqual(solution.status, 200)
+        self.assertIs(len(solution.headers), 0)
+        self.assertIn("<title>AniDex</title>", solution.response)
+        self.assertGreater(len(solution.cookies), 0)
+        self.assertIn("Chrome/", solution.userAgent)
+
+        cf_cookie = _find_obj_by_key("name", "__ddg1_", solution.cookies)
+        self.assertIsNotNone(cf_cookie, "DDOS-Guard cookie not found")
+        self.assertGreater(len(cf_cookie["value"]), 10)
+
+    def test_v1_endpoint_request_get_custom_cloudflare_js(self):
+        res = self.app.post_json('/v1', {
+            "cmd": "request.get",
+            "url": self.custom_cloudflare_url
+        })
+        self.assertEqual(res.status_code, 200)
+
+        body = V1ResponseBase(res.json)
+        self.assertEqual(STATUS_OK, body.status)
+        self.assertEqual("Challenge solved!", body.message)
+        self.assertGreater(body.startTimestamp, 10000)
+        self.assertGreaterEqual(body.endTimestamp, body.startTimestamp)
+        self.assertEqual(utils.get_flaresolverr_version(), body.version) 
+
+        solution = body.solution
+        self.assertIn(self.custom_cloudflare_url, solution.url)
+        self.assertEqual(solution.status, 200)
+        self.assertIs(len(solution.headers), 0)
+        self.assertIn("<title>MuziekFabriek : Aanmelden</title>", solution.response)
+        self.assertGreater(len(solution.cookies), 0)
+        self.assertIn("Chrome/", solution.userAgent)
+
+        cf_cookie = _find_obj_by_key("name", "ct_anti_ddos_key", solution.cookies)
+        self.assertIsNotNone(cf_cookie, "Custom Cloudflare cookie not found")
+        self.assertGreater(len(cf_cookie["value"]), 10)
+
+    # todo: test Cmd 'request.get' should return fail with Cloudflare CAPTCHA
+
+    def test_v1_endpoint_request_get_cloudflare_blocked(self):
+        res = self.app.post_json('/v1', {
+            "cmd": "request.get",
+            "url": self.cloudflare_blocked_url
+        }, status=500)
+        self.assertEqual(res.status_code, 500)
+
+        body = V1ResponseBase(res.json)
+        self.assertEqual(STATUS_ERROR, body.status)
+        self.assertEqual("Error: Error solving the challenge. Cloudflare has blocked this request. "
+                         "Probably your IP is banned for this site, check in your web browser.", body.message)
+        self.assertGreater(body.startTimestamp, 10000)
+        self.assertGreaterEqual(body.endTimestamp, body.startTimestamp)
+        self.assertEqual(utils.get_flaresolverr_version(), body.version)
+
+    # todo: test Cmd 'request.get' should return OK with 'cookies' param
+
+    def test_v1_endpoint_request_get_returnOnlyCookies_param(self):
+        res = self.app.post_json('/v1', {
+            "cmd": "request.get",
+            "url": self.google_url,
+            "returnOnlyCookies": True
+        })
+        self.assertEqual(res.status_code, 200)
+
+        body = V1ResponseBase(res.json)
+        self.assertEqual(STATUS_OK, body.status)
+        self.assertEqual("Challenge not detected!", body.message)
+        self.assertGreater(body.startTimestamp, 10000)
+        self.assertGreaterEqual(body.endTimestamp, body.startTimestamp)
+        self.assertEqual(utils.get_flaresolverr_version(), body.version)
+
+        solution = body.solution
+        self.assertIn(self.google_url, solution.url)
+        self.assertEqual(solution.status, 200)
+        self.assertIsNone(solution.headers)
+        self.assertIsNone(solution.response)
+        self.assertGreater(len(solution.cookies), 0)
+        self.assertIsNone(solution.userAgent)
+
+    # todo: test Cmd 'request.get' should return OK with HTTP 'proxy' param
+    # todo: test Cmd 'request.get' should return OK with HTTP 'proxy' param with credentials
+    # todo: test Cmd 'request.get' should return OK with SOCKSv5 'proxy' param
+    # todo: test Cmd 'request.get' should fail with wrong 'proxy' param
+
+    def test_v1_endpoint_request_get_fail_timeout(self):
+        res = self.app.post_json('/v1', {
+            "cmd": "request.get",
+            "url": self.google_url,
+            "maxTimeout": 10
+        }, status=500)
+        self.assertEqual(res.status_code, 500)
+
+        body = V1ResponseBase(res.json)
+        self.assertEqual(STATUS_ERROR, body.status)
+        self.assertEqual("Error: Error solving the challenge. Timeout after 0.01 seconds.", body.message)
+        self.assertGreater(body.startTimestamp, 10000)
+        self.assertGreaterEqual(body.endTimestamp, body.startTimestamp)
+        self.assertEqual(utils.get_flaresolverr_version(), body.version)
+
+    def test_v1_endpoint_request_get_fail_bad_domain(self):
+        res = self.app.post_json('/v1', {
+            "cmd": "request.get",
+            "url": "https://www.google.combad"
+        }, status=500)
+        self.assertEqual(res.status_code, 500)
+
+        body = V1ResponseBase(res.json)
+        self.assertEqual(STATUS_ERROR, body.status)
+        self.assertIn("Message: unknown error: net::ERR_NAME_NOT_RESOLVED", body.message)
+
+    def test_v1_endpoint_request_get_deprecated_param(self):
+        res = self.app.post_json('/v1', {
+            "cmd": "request.get",
+            "url": self.google_url,
+            "userAgent": "Test User-Agent"  # was removed in v2, not used
+        })
+        self.assertEqual(res.status_code, 200)
+
+        body = V1ResponseBase(res.json)
+        self.assertEqual(STATUS_OK, body.status)
+        self.assertEqual("Challenge not detected!", body.message)
+
+    def test_v1_endpoint_request_post_no_cloudflare(self):
+        res = self.app.post_json('/v1', {
+            "cmd": "request.post",
+            "url": self.post_url + '/post',
+            "postData": "param1=value1&param2=value2"
+        })
+        self.assertEqual(res.status_code, 200)
+
+        body = V1ResponseBase(res.json)
+        self.assertEqual(STATUS_OK, body.status)
+        self.assertEqual("Challenge not detected!", body.message)
+        self.assertGreater(body.startTimestamp, 10000)
+        self.assertGreaterEqual(body.endTimestamp, body.startTimestamp)
+        self.assertEqual(utils.get_flaresolverr_version(), body.version)
+
+        solution = body.solution
+        self.assertIn(self.post_url, solution.url)
+        self.assertEqual(solution.status, 200)
+        self.assertIs(len(solution.headers), 0)
+        self.assertIn("I hope you have a lovely day!", solution.response)
+        self.assertEqual(len(solution.cookies), 0)
+        self.assertIn("Chrome/", solution.userAgent)
+
+        # check that we sent the post data
+        res2 = self.app.post_json('/v1', {
+            "cmd": "request.get",
+            "url": self.post_url
+        })
+        self.assertEqual(res2.status_code, 200)
+
+        body2 = V1ResponseBase(res2.json)
+        self.assertEqual(STATUS_OK, body2.status)
+        date_hour = datetime.now(timezone.utc).isoformat().split(':')[0].replace('T', ' ')
+        self.assertIn(date_hour, body2.solution.response)
+
+    def test_v1_endpoint_request_post_cloudflare(self):
+        res = self.app.post_json('/v1', {
+            "cmd": "request.post",
+            "url": self.cloudflare_url,
+            "postData": "param1=value1&param2=value2"
+        })
+        self.assertEqual(res.status_code, 200)
+
+        body = V1ResponseBase(res.json)
+        self.assertEqual(STATUS_OK, body.status)
+        self.assertEqual("Challenge solved!", body.message)
+        self.assertGreater(body.startTimestamp, 10000)
+        self.assertGreaterEqual(body.endTimestamp, body.startTimestamp)
+        self.assertEqual(utils.get_flaresolverr_version(), body.version)
+
+        solution = body.solution
+        self.assertIn(self.cloudflare_url, solution.url)
+        self.assertEqual(solution.status, 200)
+        self.assertIs(len(solution.headers), 0)
+        self.assertIn("<title>405 Not Allowed</title>", solution.response)
+        self.assertGreater(len(solution.cookies), 0)
+        self.assertIn("Chrome/", solution.userAgent)
+
+        cf_cookie = _find_obj_by_key("name", "cf_clearance", solution.cookies)
+        self.assertIsNotNone(cf_cookie, "Cloudflare cookie not found")
+        self.assertGreater(len(cf_cookie["value"]), 30)
+
+    def test_v1_endpoint_request_post_fail_no_post_data(self):
+        res = self.app.post_json('/v1', {
+            "cmd": "request.post",
+            "url": self.google_url
+        }, status=500)
+        self.assertEqual(res.status_code, 500)
+
+        body = V1ResponseBase(res.json)
+        self.assertEqual(STATUS_ERROR, body.status)
+        self.assertIn("Request parameter 'postData' is mandatory in 'request.post' command", body.message)
+
+    def test_v1_endpoint_request_post_deprecated_param(self):
+        res = self.app.post_json('/v1', {
+            "cmd": "request.post",
+            "url": self.google_url,
+            "postData": "param1=value1&param2=value2",
+            "userAgent": "Test User-Agent"  # was removed in v2, not used
+        })
+        self.assertEqual(res.status_code, 200)
+
+        body = V1ResponseBase(res.json)
+        self.assertEqual(STATUS_OK, body.status)
+        self.assertEqual("Challenge not detected!", body.message)
+
+    # todo: test Cmd 'sessions.create' should return OK
+    # todo: test Cmd 'sessions.create' should return OK with session
+    # todo: test Cmd 'sessions.list' should return OK
+    # todo: test Cmd 'sessions.destroy' should return OK
+    # todo: test Cmd 'sessions.destroy' should fail
+    # todo: test Cmd 'request.get' should use session
+
+
+if __name__ == '__main__':
+    unittest.main()

src/tests/app.test.ts

@@ -1,625 +0,0 @@
-// noinspection DuplicatedCode
-
-import {Response} from "superagent";
-import {V1ResponseBase, V1ResponseSession, V1ResponseSessions, V1ResponseSolution} from "../controllers/v1"
-
-const request = require("supertest");
-const app = require("../app");
-const sessions = require('../services/sessions');
-const version: string = 'v' + require('../../package.json').version
-
-const proxyUrl = "http://127.0.0.1:8888"
-const proxySocksUrl = "socks5://127.0.0.1:1080"
-const googleUrl = "https://www.google.com";
-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 ccfUrl = "https://www.muziekfabriek.org";
-
-beforeAll(async () => {
-    // Init session
-    await sessions.testWebBrowserInstallation();
-});
-
-afterEach(async () => {
-    // Clean sessions
-    const sessionList = sessions.list();
-    for (const session of sessionList) {
-        await sessions.destroy(session);
-    }
-});
-
-describe("Test '/' path", () => {
-    test("GET method should return OK ", async () => {
-        const response: Response = await request(app).get("/");
-        expect(response.statusCode).toBe(200);
-        expect(response.body.msg).toBe("FlareSolverr is ready!");
-        expect(response.body.version).toBe(version);
-        expect(response.body.userAgent).toContain("Firefox/")
-    });
-
-    test("POST method should fail", async () => {
-        const response: Response = await request(app).post("/");
-        expect(response.statusCode).toBe(404);
-        expect(response.body.error).toBe("Unknown resource or HTTP verb");
-    });
-});
-
-describe("Test '/health' path", () => {
-    test("GET method should return OK", async () => {
-        const response: Response = await request(app).get("/health");
-        expect(response.statusCode).toBe(200);
-        expect(response.body.status).toBe("ok");
-    });
-});
-
-describe("Test '/wrong' path", () => {
-    test("GET method should fail", async () => {
-        const response: Response = await request(app).get("/wrong");
-        expect(response.statusCode).toBe(404);
-        expect(response.body.error).toBe("Unknown resource or HTTP verb");
-    });
-});
-
-describe("Test '/v1' path", () => {
-    test("Cmd 'request.bad' should fail", async () => {
-        const payload = {
-            "cmd": "request.bad",
-            "url": googleUrl
-        }
-        const response: Response = await request(app).post("/v1").send(payload);
-        expect(response.statusCode).toBe(500);
-
-        const apiResponse: V1ResponseBase = response.body;
-        expect(apiResponse.status).toBe("error");
-        expect(apiResponse.message).toBe("Error: The command 'request.bad' is invalid.");
-        expect(apiResponse.startTimestamp).toBeGreaterThan(1000);
-        expect(apiResponse.endTimestamp).toBeGreaterThanOrEqual(apiResponse.startTimestamp);
-        expect(apiResponse.version).toBe(version);
-    });
-
-    test("Cmd 'request.get' should return OK with no Cloudflare", async () => {
-        const payload = {
-            "cmd": "request.get",
-            "url": googleUrl
-        }
-        const response: Response = await request(app).post("/v1").send(payload);
-        expect(response.statusCode).toBe(200);
-
-        const apiResponse: V1ResponseSolution = response.body;
-        expect(apiResponse.status).toBe("ok");
-        expect(apiResponse.message).toBe("");
-        expect(apiResponse.startTimestamp).toBeGreaterThan(1000);
-        expect(apiResponse.endTimestamp).toBeGreaterThan(apiResponse.startTimestamp);
-        expect(apiResponse.version).toBe(version);
-
-        const solution = apiResponse.solution;
-        expect(solution.url).toContain(googleUrl)
-        expect(solution.status).toBe(200);
-        expect(Object.keys(solution.headers).length).toBeGreaterThan(0)
-        expect(solution.response).toContain("<!DOCTYPE html>")
-        expect(Object.keys(solution.cookies).length).toBeGreaterThan(0)
-        expect(solution.userAgent).toContain("Firefox/")
-    });
-
-    test("Cmd 'request.get' should return OK with Cloudflare JS", async () => {
-        const payload = {
-            "cmd": "request.get",
-            "url": cfUrl
-        }
-        const response: Response = await request(app).post("/v1").send(payload);
-        expect(response.statusCode).toBe(200);
-
-        const apiResponse: V1ResponseSolution = response.body;
-        expect(apiResponse.status).toBe("ok");
-        expect(apiResponse.message).toBe("");
-        expect(apiResponse.startTimestamp).toBeGreaterThan(1000);
-        expect(apiResponse.endTimestamp).toBeGreaterThan(apiResponse.startTimestamp);
-        expect(apiResponse.version).toBe(version);
-
-        const solution = apiResponse.solution;
-        expect(solution.url).toContain(cfUrl)
-        expect(solution.status).toBe(200);
-        expect(Object.keys(solution.headers).length).toBeGreaterThan(0)
-        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 == "cf_clearance";
-        })[0].value
-        expect(cfCookie.length).toBeGreaterThan(30)
-    });
-
-    test("Cmd 'request.get' should return fail with Cloudflare CAPTCHA", async () => {
-        const payload = {
-            "cmd": "request.get",
-            "url": cfCaptchaUrl
-        }
-        const response: Response = await request(app).post("/v1").send(payload);
-        expect(response.statusCode).toBe(200);
-
-        const apiResponse: V1ResponseSolution = response.body;
-        expect(apiResponse.status).toBe("error");
-        expect(apiResponse.message).toBe("Cloudflare Error: FlareSolverr can not resolve CAPTCHA challenges. Since the captcha doesn't always appear, you may have better luck with the next request.");
-        expect(apiResponse.startTimestamp).toBeGreaterThan(1000);
-        expect(apiResponse.endTimestamp).toBeGreaterThan(apiResponse.startTimestamp);
-        expect(apiResponse.version).toBe(version);
-        // solution is filled but not useful
-        expect(apiResponse.solution.url).toContain(cfCaptchaUrl)
-    });
-
-    test("Cmd 'request.post' should return fail with Cloudflare Blocked", async () => {
-        const payload = {
-            "cmd": "request.post",
-            "url": cfBlockedUrl,
-            "postData": "test1=test2"
-        }
-        const response: Response = await request(app).post("/v1").send(payload);
-        expect(response.statusCode).toBe(200);
-
-        const apiResponse: V1ResponseSolution = response.body;
-        expect(apiResponse.status).toBe("error");
-        expect(apiResponse.message).toBe("Cloudflare Error: Cloudflare has blocked this request. Probably your IP is banned for this site, check in your web browser.");
-        expect(apiResponse.startTimestamp).toBeGreaterThan(1000);
-        expect(apiResponse.endTimestamp).toBeGreaterThan(apiResponse.startTimestamp);
-        expect(apiResponse.version).toBe(version);
-        // solution is filled but not useful
-        expect(apiResponse.solution.url).toContain(cfBlockedUrl)
-    });
-
-    test("Cmd 'request.get' should return OK with DDoS-GUARD JS", async () => {
-        const payload = {
-            "cmd": "request.get",
-            "url": ddgUrl
-        }
-        const response: Response = await request(app).post("/v1").send(payload);
-        expect(response.statusCode).toBe(200);
-
-        const apiResponse: V1ResponseSolution = response.body;
-        expect(apiResponse.status).toBe("ok");
-        expect(apiResponse.message).toBe("");
-        expect(apiResponse.startTimestamp).toBeGreaterThan(1000);
-        expect(apiResponse.endTimestamp).toBeGreaterThan(apiResponse.startTimestamp);
-        expect(apiResponse.version).toBe(version);
-
-        const solution = apiResponse.solution;
-        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(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";
-        })[0].value
-        expect(cfCookie.length).toBeGreaterThan(10)
-    });
-
-    test("Cmd 'request.get' should return OK with Custom CloudFlare JS", async () => {
-        const payload = {
-            "cmd": "request.get",
-            "url": ccfUrl
-        }
-        const response: Response = await request(app).post("/v1").send(payload);
-        expect(response.statusCode).toBe(200);
-
-        const apiResponse: V1ResponseSolution = response.body;
-        expect(apiResponse.status).toBe("ok");
-        expect(apiResponse.message).toBe("");
-        expect(apiResponse.startTimestamp).toBeGreaterThan(1000);
-        expect(apiResponse.endTimestamp).toBeGreaterThan(apiResponse.startTimestamp);
-        expect(apiResponse.version).toBe(version);
-
-        const solution = apiResponse.solution;
-        expect(solution.url).toContain(ccfUrl)
-        expect(solution.status).toBe(200);
-        expect(Object.keys(solution.headers).length).toBeGreaterThan(0)
-        expect(solution.response).toContain("<html><head>")
-        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 == "ct_anti_ddos_key";
-        })[0].value
-        expect(cfCookie.length).toBeGreaterThan(10)
-    });
-
-    test("Cmd 'request.get' should return OK with 'cookies' param", async () => {
-        const payload = {
-            "cmd": "request.get",
-            "url": googleUrl,
-            "cookies": [
-                {
-                    "name": "testcookie1",
-                    "value": "testvalue1"
-                },
-                {
-                    "name": "testcookie2",
-                    "value": "testvalue2"
-                }
-            ]
-        }
-        const response: Response = await request(app).post("/v1").send(payload);
-        expect(response.statusCode).toBe(200);
-
-        const apiResponse: V1ResponseSolution = response.body;
-        expect(apiResponse.status).toBe("ok");
-
-        const solution = apiResponse.solution;
-        expect(solution.url).toContain(googleUrl)
-        expect(Object.keys(solution.cookies).length).toBeGreaterThan(1)
-        const cookie1: string = (solution.cookies as any[]).filter(function(cookie) {
-            return cookie.name == "testcookie1";
-        })[0].value
-        expect(cookie1).toBe("testvalue1")
-        const cookie2: string = (solution.cookies as any[]).filter(function(cookie) {
-            return cookie.name == "testcookie2";
-        })[0].value
-        expect(cookie2).toBe("testvalue2")
-    });
-
-    test("Cmd 'request.get' should return OK with 'returnOnlyCookies' param", async () => {
-        const payload = {
-            "cmd": "request.get",
-            "url": googleUrl,
-            "returnOnlyCookies": true
-        }
-        const response: Response = await request(app).post("/v1").send(payload);
-        expect(response.statusCode).toBe(200);
-
-        const apiResponse: V1ResponseSolution = response.body;
-
-        const solution = apiResponse.solution;
-        expect(solution.url).toContain(googleUrl)
-        expect(solution.status).toBe(200);
-        expect(solution.headers).toBe(null)
-        expect(solution.response).toBe(null)
-        expect(Object.keys(solution.cookies).length).toBeGreaterThan(0)
-        expect(solution.userAgent).toBe(null)
-    });
-
-    test("Cmd 'request.get' should return OK with HTTP 'proxy' param", async () => {
-        /*
-        To configure TinyProxy in local:
-           * sudo vim /etc/tinyproxy/tinyproxy.conf
-              * edit => LogFile "/tmp/tinyproxy.log"
-              * edit => Syslog Off
-           * sudo tinyproxy -d
-           * sudo tail -f /tmp/tinyproxy.log
-        */
-        const payload = {
-            "cmd": "request.get",
-            "url": googleUrl,
-            "proxy": {
-                "url": proxyUrl
-            }
-        }
-        const response: Response = await request(app).post("/v1").send(payload);
-        expect(response.statusCode).toBe(200);
-
-        const apiResponse: V1ResponseSolution = response.body;
-        expect(apiResponse.status).toBe("ok");
-
-        const solution = apiResponse.solution;
-        expect(solution.url).toContain(googleUrl)
-        expect(solution.status).toBe(200);
-    });
-
-    // todo: credentials are not working
-    test.skip("Cmd 'request.get' should return OK with HTTP 'proxy' param with credentials", async () => {
-        /*
-        To configure TinyProxy in local:
-           * sudo vim /etc/tinyproxy/tinyproxy.conf
-              * edit => LogFile "/tmp/tinyproxy.log"
-              * edit => Syslog Off
-              * add => BasicAuth testuser testpass
-           * sudo tinyproxy -d
-           * sudo tail -f /tmp/tinyproxy.log
-        */
-        const payload = {
-            "cmd": "request.get",
-            "url": googleUrl,
-            "proxy": {
-                "url": proxyUrl,
-                "username": "testuser",
-                "password": "testpass"
-            }
-        }
-        const response: Response = await request(app).post("/v1").send(payload);
-        expect(response.statusCode).toBe(200);
-
-        const apiResponse: V1ResponseSolution = response.body;
-        expect(apiResponse.status).toBe("ok");
-
-        const solution = apiResponse.solution;
-        expect(solution.url).toContain(googleUrl)
-        expect(solution.status).toContain(200)
-    });
-
-    test("Cmd 'request.get' should return OK with SOCKSv5 'proxy' param", async () => {
-        /*
-        To configure Dante in local:
-           * https://linuxhint.com/set-up-a-socks5-proxy-on-ubuntu-with-dante/
-           * sudo vim /etc/sockd.conf
-           * sudo systemctl restart sockd.service
-           * curl --socks5 socks5://127.0.0.1:1080 https://www.google.com
-        */
-        const payload = {
-            "cmd": "request.get",
-            "url": googleUrl,
-            "proxy": {
-                "url": proxySocksUrl
-            }
-        }
-        const response: Response = await request(app).post("/v1").send(payload);
-        expect(response.statusCode).toBe(200);
-
-        const apiResponse: V1ResponseSolution = response.body;
-        expect(apiResponse.status).toBe("ok");
-
-        const solution = apiResponse.solution;
-        expect(solution.url).toContain(googleUrl)
-        expect(solution.status).toBe(200);
-    });
-
-    test("Cmd 'request.get' should fail with wrong 'proxy' param", async () => {
-        const payload = {
-            "cmd": "request.get",
-            "url": googleUrl,
-            "proxy": {
-                "url": "http://127.0.0.1:43210"
-            }
-        }
-        const response: Response = await request(app).post("/v1").send(payload);
-        expect(response.statusCode).toBe(500);
-
-        const apiResponse: V1ResponseSolution = response.body;
-        expect(apiResponse.status).toBe("error");
-        expect(apiResponse.message).toBe("Error: Unable to process browser request. Error: NS_ERROR_PROXY_CONNECTION_REFUSED at https://www.google.com");
-    });
-
-    test("Cmd 'request.get' should return fail with timeout", async () => {
-        const payload = {
-            "cmd": "request.get",
-            "url": googleUrl,
-            "maxTimeout": 10
-        }
-        const response: Response = await request(app).post("/v1").send(payload);
-        expect(response.statusCode).toBe(500);
-
-        const apiResponse: V1ResponseBase = response.body;
-        expect(apiResponse.status).toBe("error");
-        expect(apiResponse.message).toBe("Error: Unable to process browser request. Error: Maximum timeout reached. maxTimeout=10 (ms)");
-        expect(apiResponse.startTimestamp).toBeGreaterThan(1000);
-        expect(apiResponse.endTimestamp).toBeGreaterThan(apiResponse.startTimestamp);
-        expect(apiResponse.version).toBe(version);
-    });
-
-    test("Cmd 'request.get' should return fail with bad domain", async () => {
-        const payload = {
-            "cmd": "request.get",
-            "url": "https://www.google.combad"
-        }
-        const response: Response = await request(app).post("/v1").send(payload);
-        expect(response.statusCode).toBe(500);
-
-        const apiResponse: V1ResponseBase = response.body;
-        expect(apiResponse.status).toBe("error");
-        expect(apiResponse.message).toBe("Error: Unable to process browser request. Error: NS_ERROR_UNKNOWN_HOST at https://www.google.combad");
-    });
-
-    test("Cmd 'request.get' should accept deprecated params", async () => {
-        const payload = {
-            "cmd": "request.get",
-            "url": googleUrl,
-            "userAgent": "Test User-Agent" // was removed in v2, not used
-        }
-        const response: Response = await request(app).post("/v1").send(payload);
-        expect(response.statusCode).toBe(200);
-
-        const apiResponse: V1ResponseSolution = response.body;
-        expect(apiResponse.status).toBe("ok");
-
-        const solution = apiResponse.solution;
-        expect(solution.url).toContain(googleUrl)
-        expect(solution.status).toBe(200);
-        expect(solution.userAgent).toContain("Firefox/")
-    });
-
-    test("Cmd 'request.post' should return OK with no Cloudflare", async () => {
-        const payload = {
-            "cmd": "request.post",
-            "url": postUrl + '/post',
-            "postData": "param1=value1&param2=value2"
-        }
-        const response: Response = await request(app).post("/v1").send(payload);
-        expect(response.statusCode).toBe(200);
-
-        const apiResponse: V1ResponseSolution = response.body;
-        expect(apiResponse.status).toBe("ok");
-        expect(apiResponse.message).toBe("");
-        expect(apiResponse.startTimestamp).toBeGreaterThan(1000);
-        expect(apiResponse.endTimestamp).toBeGreaterThan(apiResponse.startTimestamp);
-        expect(apiResponse.version).toBe(version);
-
-        const solution = apiResponse.solution;
-        expect(solution.url).toContain(postUrl)
-        expect(solution.status).toBe(200);
-        expect(Object.keys(solution.headers).length).toBeGreaterThan(0)
-        expect(solution.response).toContain(" I hope you have a lovely day!")
-        expect(Object.keys(solution.cookies).length).toBe(0)
-        expect(solution.userAgent).toContain("Firefox/")
-
-        // check that we sent the date
-        const payload2 = {
-            "cmd": "request.get",
-            "url": postUrl
-        }
-        const response2: Response = await request(app).post("/v1").send(payload2);
-        expect(response2.statusCode).toBe(200);
-
-        const apiResponse2: V1ResponseSolution = response2.body;
-        expect(apiResponse2.status).toBe("ok");
-
-        const solution2 = apiResponse2.solution;
-        expect(solution2.status).toBe(200);
-        expect(solution2.response).toContain(new Date().toISOString().split(':')[0].replace('T', ' '))
-    });
-
-    test("Cmd 'request.post' should fail without 'postData' param", async () => {
-        const payload = {
-            "cmd": "request.post",
-            "url": googleUrl
-        }
-        const response: Response = await request(app).post("/v1").send(payload);
-        expect(response.statusCode).toBe(500);
-
-        const apiResponse: V1ResponseBase = response.body;
-        expect(apiResponse.status).toBe("error");
-        expect(apiResponse.message).toBe("Error: Must send param \"postBody\" when sending a POST request.");
-        expect(apiResponse.startTimestamp).toBeGreaterThan(1000);
-        expect(apiResponse.endTimestamp).toBeGreaterThanOrEqual(apiResponse.startTimestamp);
-        expect(apiResponse.version).toBe(version);
-    });
-
-    test("Cmd 'sessions.create' should return OK", async () => {
-        const payload = {
-            "cmd": "sessions.create"
-        }
-        const response: Response = await request(app).post("/v1").send(payload);
-        expect(response.statusCode).toBe(200);
-
-        const apiResponse: V1ResponseSession = response.body;
-        expect(apiResponse.status).toBe("ok");
-        expect(apiResponse.message).toBe("Session created successfully.");
-        expect(apiResponse.startTimestamp).toBeGreaterThan(1000);
-        expect(apiResponse.endTimestamp).toBeGreaterThan(apiResponse.startTimestamp);
-        expect(apiResponse.version).toBe(version);
-        expect(apiResponse.session.length).toBe(36);
-    });
-
-    test("Cmd 'sessions.create' should return OK with session", async () => {
-        const payload = {
-            "cmd": "sessions.create",
-            "session": "2bc6bb20-2f56-11ec-9543-test"
-        }
-        const response: Response = await request(app).post("/v1").send(payload);
-        expect(response.statusCode).toBe(200);
-
-        const apiResponse: V1ResponseSession = response.body;
-        expect(apiResponse.status).toBe("ok");
-        expect(apiResponse.message).toBe("Session created successfully.");
-        expect(apiResponse.startTimestamp).toBeGreaterThan(1000);
-        expect(apiResponse.endTimestamp).toBeGreaterThan(apiResponse.startTimestamp);
-        expect(apiResponse.version).toBe(version);
-        expect(apiResponse.session).toBe("2bc6bb20-2f56-11ec-9543-test");
-    });
-
-    test("Cmd 'sessions.list' should return OK", async () => {
-        // create one session for testing
-        const payload0 = {
-            "cmd": "sessions.create"
-        }
-        const response0: Response = await request(app).post("/v1").send(payload0);
-        expect(response0.statusCode).toBe(200);
-
-        const payload = {
-            "cmd": "sessions.list"
-        }
-        const response: Response = await request(app).post("/v1").send(payload);
-        expect(response.statusCode).toBe(200);
-
-        const apiResponse: V1ResponseSessions = response.body;
-        expect(apiResponse.status).toBe("ok");
-        expect(apiResponse.message).toBe("");
-        expect(apiResponse.startTimestamp).toBeGreaterThan(1000);
-        expect(apiResponse.endTimestamp).toBeGreaterThanOrEqual(apiResponse.startTimestamp);
-        expect(apiResponse.version).toBe(version);
-        expect(apiResponse.sessions.length).toBeGreaterThan(0)
-    });
-
-    test("Cmd 'sessions.destroy' should return OK", async () => {
-        // create one session for testing
-        const payload0 = {
-            "cmd": "sessions.create"
-        }
-        const response0: Response = await request(app).post("/v1").send(payload0);
-        expect(response0.statusCode).toBe(200);
-        const apiResponse0: V1ResponseSession = response0.body;
-        const sessionId0 = apiResponse0.session
-
-        const payload = {
-            "cmd": "sessions.destroy",
-            "session": sessionId0
-        }
-        const response: Response = await request(app).post("/v1").send(payload);
-        expect(response.statusCode).toBe(200);
-
-        const apiResponse: V1ResponseBase = response.body;
-        expect(apiResponse.status).toBe("ok");
-        expect(apiResponse.message).toBe("The session has been removed.");
-        expect(apiResponse.startTimestamp).toBeGreaterThan(1000);
-        expect(apiResponse.endTimestamp).toBeGreaterThanOrEqual(apiResponse.startTimestamp);
-        expect(apiResponse.version).toBe(version);
-    });
-
-    test("Cmd 'sessions.destroy' should fail", async () => {
-        const payload = {
-            "cmd": "sessions.destroy",
-            "session": "bad-session"
-        }
-        const response: Response = await request(app).post("/v1").send(payload);
-        expect(response.statusCode).toBe(500);
-
-        const apiResponse: V1ResponseBase = response.body;
-        expect(apiResponse.status).toBe("error");
-        expect(apiResponse.message).toBe("Error: This session does not exist.");
-        expect(apiResponse.startTimestamp).toBeGreaterThan(1000);
-        expect(apiResponse.endTimestamp).toBeGreaterThan(apiResponse.startTimestamp);
-        expect(apiResponse.version).toBe(version);
-    });
-
-    test("Cmd 'request.get' should use session", async () => {
-        // create one session for testing
-        const payload0 = {
-            "cmd": "sessions.create"
-        }
-        const response0: Response = await request(app).post("/v1").send(payload0);
-        expect(response0.statusCode).toBe(200);
-        const apiResponse0: V1ResponseSession = response0.body;
-        const sessionId0 = apiResponse0.session
-
-        // first request should solve the challenge
-        const payload = {
-            "cmd": "request.get",
-            "url": cfUrl,
-            "session": sessionId0
-        }
-        const response: Response = await request(app).post("/v1").send(payload);
-        expect(response.statusCode).toBe(200);
-
-        const apiResponse: V1ResponseSolution = response.body;
-        expect(apiResponse.status).toBe("ok");
-        const cfCookie: string = (apiResponse.solution.cookies as any[]).filter(function(cookie) {
-            return cookie.name == "cf_clearance";
-        })[0].value
-        expect(cfCookie.length).toBeGreaterThan(30)
-
-        // second request should have the same cookie
-        const response2: Response = await request(app).post("/v1").send(payload);
-        expect(response2.statusCode).toBe(200);
-
-        const apiResponse2: V1ResponseSolution = response2.body;
-        expect(apiResponse2.status).toBe("ok");
-        const cfCookie2: string = (apiResponse2.solution.cookies as any[]).filter(function(cookie) {
-            return cookie.name == "cf_clearance";
-        })[0].value
-        expect(cfCookie2.length).toBeGreaterThan(30)
-        expect(cfCookie2).toBe(cfCookie)
-    });
-
-});

src/tests_sites.py

@@ -0,0 +1,100 @@
+import unittest
+
+from webtest import TestApp
+
+from dtos import V1ResponseBase, STATUS_OK
+import flaresolverr
+import utils
+
+
+def _find_obj_by_key(key: str, value: str, _list: list) -> dict | None:
+    for obj in _list:
+        if obj[key] == value:
+            return obj
+    return None
+
+
+def asset_cloudflare_solution(self, res, site_url, site_text):
+    self.assertEqual(res.status_code, 200)
+
+    body = V1ResponseBase(res.json)
+    self.assertEqual(STATUS_OK, body.status)
+    self.assertEqual("Challenge solved!", body.message)
+    self.assertGreater(body.startTimestamp, 10000)
+    self.assertGreaterEqual(body.endTimestamp, body.startTimestamp)
+    self.assertEqual(utils.get_flaresolverr_version(), body.version)
+
+    solution = body.solution
+    self.assertIn(site_url, solution.url)
+    self.assertEqual(solution.status, 200)
+    self.assertIs(len(solution.headers), 0)
+    self.assertIn(site_text, solution.response)
+    self.assertGreater(len(solution.cookies), 0)
+    self.assertIn("Chrome/", solution.userAgent)
+
+    cf_cookie = _find_obj_by_key("name", "cf_clearance", solution.cookies)
+    self.assertIsNotNone(cf_cookie, "Cloudflare cookie not found")
+    self.assertGreater(len(cf_cookie["value"]), 30)
+
+
+class TestFlareSolverr(unittest.TestCase):
+    app = TestApp(flaresolverr.app)
+
+    def test_v1_endpoint_request_get_cloudflare(self):
+        sites_get = [
+            ('nowsecure', 'https://nowsecure.nl', '<title>nowSecure</title>'),
+            ('0magnet', 'https://0magnet.com/search?q=2022', 'Torrent Search - ØMagnet'),
+            ('1337x', 'https://1337x.unblockit.cat/cat/Movies/time/desc/1/', ''),
+            ('avistaz', 'https://avistaz.to/api/v1/jackett/torrents?in=1&type=0&search=',
+             '<title>Access denied</title>'),
+            ('badasstorrents', 'https://badasstorrents.com/torrents/search/720p/date/desc',
+             '<title>Latest Torrents - BadassTorrents</title>'),
+            ('bt4g', 'https://bt4g.org/search/2022', '<title>Download 2022 Torrents - BT4G</title>'),
+            ('cinemaz', 'https://cinemaz.to/api/v1/jackett/torrents?in=1&type=0&search=',
+             '<title>Access denied</title>'),
+            ('epublibre', 'https://epublibre.unblockit.cat/catalogo/index/0/nuevo/todos/sin/todos/--/ajax',
+             '<title>epublibre - catálogo</title>'),
+            ('ext', 'https://ext.to/latest/?order=age&sort=desc',
+             '<title>Download Latest Torrents - EXT Torrents</title>'),
+            ('extratorrent', 'https://extratorrent.st/search/?srt=added&order=desc&search=720p&new=1&x=0&y=0',
+             'Page 1 - ExtraTorrent'),
+            ('idope', 'https://idope.se/browse.html', '<title>Recent Torrents</title>'),
+            ('limetorrents', 'https://limetorrents.unblockninja.com/latest100',
+             '<title>Latest 100 torrents - LimeTorrents</title>'),
+            ('privatehd', 'https://privatehd.to/api/v1/jackett/torrents?in=1&type=0&search=',
+             '<title>Access denied</title>'),
+            ('torrentcore', 'https://torrentcore.xyz/index', '<title>Torrent[CORE] - Torrent community.</title>'),
+            ('torrentqq223', 'https://torrentqq223.com/torrent/newest.html', 'https://torrentqq223.com/ads/'),
+            ('36dm', 'https://www.36dm.club/1.html', 'https://www.36dm.club/yesterday-1.html'),
+            ('erai-raws', 'https://www.erai-raws.info/feed/?type=magnet', '403 Forbidden'),
+            ('teamos', 'https://www.teamos.xyz/torrents/?filename=&freeleech=',
+             '<title>Log in | Team OS : Your Only Destination To Custom OS !!</title>'),
+            ('yts', 'https://yts.unblockninja.com/api/v2/list_movies.json?query_term=&limit=50&sort=date_added',
+             '{"movie_count":')
+        ]
+        for site_name, site_url, site_text in sites_get:
+            with self.subTest(msg=site_name):
+                res = self.app.post_json('/v1', {
+                    "cmd": "request.get",
+                    "url": site_url
+                })
+                asset_cloudflare_solution(self, res, site_url, site_text)
+
+    def test_v1_endpoint_request_post_cloudflare(self):
+        sites_post = [
+            ('nnmclub', 'https://nnmclub.to/forum/tracker.php', '<title>Трекер :: NNM-Club</title>',
+             'prev_sd=0&prev_a=0&prev_my=0&prev_n=0&prev_shc=0&prev_shf=1&prev_sha=1&prev_shs=0&prev_shr=0&prev_sht=0&f%5B%5D=-1&o=1&s=2&tm=-1&shf=1&sha=1&ta=-1&sns=-1&sds=-1&nm=&pn=&submit=%CF%EE%E8%F1%EA')
+        ]
+
+        for site_name, site_url, site_text, post_data in sites_post:
+            with self.subTest(msg=site_name):
+                res = self.app.post_json('/v1', {
+                    "cmd": "request.post",
+                    "url": site_url,
+                    "postData": post_data
+                })
+                asset_cloudflare_solution(self, res, site_url, site_text)
+
+
+if __name__ == '__main__':
+    unittest.main()

src/undetected_chromedriver/__init__.py

@@ -0,0 +1,704 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+import subprocess
+
+"""
+
+         888                                                  888         d8b
+         888                                                  888         Y8P
+         888                                                  888
+ .d8888b 88888b.  888d888 .d88b.  88888b.d88b.   .d88b.   .d88888 888d888 888 888  888  .d88b.  888d888
+d88P"    888 "88b 888P"  d88""88b 888 "888 "88b d8P  Y8b d88" 888 888P"   888 888  888 d8P  Y8b 888P"
+888      888  888 888    888  888 888  888  888 88888888 888  888 888     888 Y88  88P 88888888 888
+Y88b.    888  888 888    Y88..88P 888  888  888 Y8b.     Y88b 888 888     888  Y8bd8P  Y8b.     888
+ "Y8888P 888  888 888     "Y88P"  888  888  888  "Y8888   "Y88888 888     888   Y88P    "Y8888  888   88888888
+
+by UltrafunkAmsterdam (https://github.com/ultrafunkamsterdam)
+
+"""
+
+
+__version__ = "3.1.5r4"
+
+
+import json
+import logging
+import os
+import re
+import shutil
+import sys
+import tempfile
+import time
+import inspect
+import threading
+
+import selenium.webdriver.chrome.service
+import selenium.webdriver.chrome.webdriver
+import selenium.webdriver.common.service
+import selenium.webdriver.remote.webdriver
+
+from .cdp import CDP
+from .options import ChromeOptions
+from .patcher import IS_POSIX
+from .patcher import Patcher
+from .reactor import Reactor
+from .dprocess import start_detached
+
+__all__ = (
+    "Chrome",
+    "ChromeOptions",
+    "Patcher",
+    "Reactor",
+    "CDP",
+    "find_chrome_executable",
+)
+
+logger = logging.getLogger("uc")
+logger.setLevel(logging.getLogger().getEffectiveLevel())
+
+
+class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
+    """
+
+    Controls the ChromeDriver and allows you to drive the browser.
+
+    The webdriver file will be downloaded by this module automatically,
+    you do not need to specify this. however, you may if you wish.
+
+    Attributes
+    ----------
+
+    Methods
+    -------
+
+    reconnect()
+
+        this can be useful in case of heavy detection methods
+        -stops the chromedriver service which runs in the background
+        -starts the chromedriver service which runs in the background
+        -recreate session
+
+
+    start_session(capabilities=None, browser_profile=None)
+
+        differentiates from the regular method in that it does not
+        require a capabilities argument. The capabilities are automatically
+        recreated from the options at creation time.
+
+    --------------------------------------------------------------------------
+        NOTE:
+            Chrome has everything included to work out of the box.
+            it does not `need` customizations.
+            any customizations MAY lead to trigger bot migitation systems.
+
+    --------------------------------------------------------------------------
+    """
+
+    _instances = set()
+    session_id = None
+    debug = False
+
+    def __init__(
+        self,
+        options=None,
+        user_data_dir=None,
+        driver_executable_path=None,
+        browser_executable_path=None,
+        port=0,
+        enable_cdp_events=False,
+        service_args=None,
+        desired_capabilities=None,
+        advanced_elements=False,
+        service_log_path=None,
+        keep_alive=True,
+        log_level=0,
+        headless=False,
+        version_main=None,
+        patcher_force_close=False,
+        suppress_welcome=True,
+        use_subprocess=False,
+        debug=False,
+        windows_headless=False,
+        **kw
+    ):
+        """
+        Creates a new instance of the chrome driver.
+
+        Starts the service and then creates new instance of chrome driver.
+
+        Parameters
+        ----------
+
+        options: ChromeOptions, optional, default: None - automatic useful defaults
+            this takes an instance of ChromeOptions, mainly to customize browser behavior.
+            anything other dan the default, for example extensions or startup options
+            are not supported in case of failure, and can probably lowers your undetectability.
+
+
+        user_data_dir: str , optional, default: None (creates temp profile)
+            if user_data_dir is a path to a valid chrome profile directory, use it,
+            and turn off automatic removal mechanism at exit.
+
+        driver_executable_path: str, optional, default: None(=downloads and patches new binary)
+
+        browser_executable_path: str, optional, default: None - use find_chrome_executable
+            Path to the browser executable.
+            If not specified, make sure the executable's folder is in $PATH
+
+        port: int, optional, default: 0
+            port you would like the service to run, if left as 0, a free port will be found.
+
+        enable_cdp_events: bool, default: False
+            :: currently for chrome only
+            this enables the handling of wire messages
+            when enabled, you can subscribe to CDP events by using:
+
+                driver.add_cdp_listener("Network.dataReceived", yourcallback)
+                # yourcallback is an callable which accepts exactly 1 dict as parameter
+
+
+        service_args: list of str, optional, default: None
+            arguments to pass to the driver service
+
+        desired_capabilities: dict, optional, default: None - auto from config
+            Dictionary object with non-browser specific capabilities only, such as "item" or "loggingPref".
+
+        advanced_elements:  bool, optional, default: False
+            makes it easier to recognize elements like you know them from html/browser inspection, especially when working
+            in an interactive environment
+
+            default webelement repr:
+            <selenium.webdriver.remote.webelement.WebElement (session="85ff0f671512fa535630e71ee951b1f2", element="6357cb55-92c3-4c0f-9416-b174f9c1b8c4")>
+
+            advanced webelement repr
+            <WebElement(<a class="mobile-show-inline-block mc-update-infos init-ok" href="#" id="main-cat-switcher-mobile">)>
+
+            note: when retrieving large amounts of elements ( example: find_elements_by_tag("*") ) and print them, it does take a little more time.
+
+
+        service_log_path: str, optional, default: None
+             path to log information from the driver.
+
+        keep_alive: bool, optional, default: True
+             Whether to configure ChromeRemoteConnection to use HTTP keep-alive.
+
+        log_level: int, optional, default: adapts to python global log level
+
+        headless: bool, optional, default: False
+            can also be specified in the options instance.
+            Specify whether you want to use the browser in headless mode.
+            warning: this lowers undetectability and not fully supported.
+
+        version_main: int, optional, default: None (=auto)
+            if you, for god knows whatever reason, use
+            an older version of Chrome. You can specify it's full rounded version number
+            here. Example: 87 for all versions of 87
+
+        patcher_force_close: bool, optional, default: False
+            instructs the patcher to do whatever it can to access the chromedriver binary
+            if the file is locked, it will force shutdown all instances.
+            setting it is not recommended, unless you know the implications and think
+            you might need it.
+
+        suppress_welcome: bool, optional , default: True
+            a "welcome" alert might show up on *nix-like systems asking whether you want to set
+            chrome as your default browser, and if you want to send even more data to google.
+            now, in case you are nag-fetishist, or a diagnostics data feeder to google, you can set this to False.
+            Note: if you don't handle the nag screen in time, the browser loses it's connection and throws an Exception.
+
+        use_subprocess: bool, optional , default: False,
+
+            False (the default) makes sure Chrome will get it's own process (so no subprocess of chromedriver.exe or python
+                This fixes a LOT of issues, like multithreaded run, but mst importantly. shutting corectly after
+                program exits or using .quit()
+
+              unfortunately, there  is always an edge case in which one would like to write an single script with the only contents being:
+              --start script--
+              import undetected_chromedriver as uc
+              d = uc.Chrome()
+              d.get('https://somesite/')
+              ---end script --
+
+              and will be greeted with an error, since the program exists before chrome has a change to launch.
+              in that case you can set this to `True`. The browser will start via subprocess, and will keep running most of times.
+              ! setting it to True comes with NO support when being detected. !
+
+        """
+        self.debug = debug
+        patcher = Patcher(
+            executable_path=driver_executable_path,
+            force=patcher_force_close,
+            version_main=version_main,
+        )
+        patcher.auto()
+        self.patcher = patcher
+        if not options:
+            options = ChromeOptions()
+
+
+        try:
+            if hasattr(options, "_session") and options._session is not None:
+                #  prevent reuse of options,
+                #  as it just appends arguments, not replace them
+                #  you'll get conflicts starting chrome
+                raise RuntimeError("you cannot reuse the ChromeOptions object")
+        except AttributeError:
+            pass
+
+        options._session = self
+
+        debug_port = selenium.webdriver.common.service.utils.free_port()
+        debug_host = "127.0.0.1"
+
+        if not options.debugger_address:
+            options.debugger_address = "%s:%d" % (debug_host, debug_port)
+
+        if enable_cdp_events:
+            options.set_capability(
+                "goog:loggingPrefs", {"performance": "ALL", "browser": "ALL"}
+            )
+
+        options.add_argument("--remote-debugging-host=%s" % debug_host)
+        options.add_argument("--remote-debugging-port=%s" % debug_port)
+
+        if user_data_dir:
+            options.add_argument('--user-data-dir=%s' % user_data_dir)
+
+        language, keep_user_data_dir = None, bool(user_data_dir)
+
+        # see if a custom user profile is specified in options
+        for arg in options.arguments:
+
+            if "lang" in arg:
+                m = re.search("(?:--)?lang(?:[ =])?(.*)", arg)
+                try:
+                    language = m[1]
+                except IndexError:
+                    logger.debug("will set the language to en-US,en;q=0.9")
+                    language = "en-US,en;q=0.9"
+
+            if "user-data-dir" in arg:
+                m = re.search("(?:--)?user-data-dir(?:[ =])?(.*)", arg)
+                try:
+                    user_data_dir = m[1]
+                    logger.debug(
+                        "user-data-dir found in user argument %s => %s" % (arg, m[1])
+                    )
+                    keep_user_data_dir = True
+
+                except IndexError:
+                    logger.debug(
+                        "no user data dir could be extracted from supplied argument %s "
+                        % arg
+                    )
+
+        if not user_data_dir:
+
+            # backward compatiblity
+            # check if an old uc.ChromeOptions is used, and extract the user data dir
+
+            if hasattr(options, "user_data_dir") and getattr(
+                options, "user_data_dir", None
+            ):
+                import warnings
+
+                warnings.warn(
+                    "using ChromeOptions.user_data_dir might stop working in future versions."
+                    "use uc.Chrome(user_data_dir='/xyz/some/data') in case you need existing profile folder"
+                )
+                options.add_argument("--user-data-dir=%s" % options.user_data_dir)
+                keep_user_data_dir = True
+                logger.debug(
+                    "user_data_dir property found in options object: %s" % user_data_dir
+                )
+
+            else:
+                user_data_dir = os.path.normpath(tempfile.mkdtemp())
+                keep_user_data_dir = False
+                arg = "--user-data-dir=%s" % user_data_dir
+                options.add_argument(arg)
+                logger.debug(
+                    "created a temporary folder in which the user-data (profile) will be stored during this\n"
+                    "session, and added it to chrome startup arguments: %s" % arg
+                )
+
+        if not language:
+            try:
+                import locale
+
+                language = locale.getdefaultlocale()[0].replace("_", "-")
+            except Exception:
+                pass
+            if not language:
+                language = "en-US"
+
+        options.add_argument("--lang=%s" % language)
+
+        if not options.binary_location:
+            options.binary_location = (
+                browser_executable_path or find_chrome_executable()
+            )
+
+        self._delay = 3
+
+        self.user_data_dir = user_data_dir
+        self.keep_user_data_dir = keep_user_data_dir
+
+        if suppress_welcome:
+            options.arguments.extend(["--no-default-browser-check", "--no-first-run"])
+        if headless or options.headless:
+            options.headless = True
+            options.add_argument("--window-size=1920,1080")
+            options.add_argument("--start-maximized")
+            options.add_argument("--no-sandbox")
+            # fixes "could not connect to chrome" error when running
+            # on linux using privileged user like root (which i don't recommend)
+
+        options.add_argument(
+            "--log-level=%d" % log_level
+            or divmod(logging.getLogger().getEffectiveLevel(), 10)[0]
+        )
+
+        if hasattr(options, 'handle_prefs'):
+            options.handle_prefs(user_data_dir)
+
+        # fix exit_type flag to prevent tab-restore nag
+        try:
+            with open(
+                os.path.join(user_data_dir, "Default/Preferences"),
+                encoding="latin1",
+                mode="r+",
+            ) as fs:
+                config = json.load(fs)
+                if config["profile"]["exit_type"] is not None:
+                    # fixing the restore-tabs-nag
+                    config["profile"]["exit_type"] = None
+                fs.seek(0, 0)
+                json.dump(config, fs)
+                logger.debug("fixed exit_type flag")
+        except Exception as e:
+            logger.debug("did not find a bad exit_type flag ")
+
+        self.options = options
+
+        if not desired_capabilities:
+            desired_capabilities = options.to_capabilities()
+
+        if not use_subprocess and not windows_headless:
+            self.browser_pid = start_detached(
+                options.binary_location, *options.arguments
+            )
+        else:
+            startupinfo = subprocess.STARTUPINFO()
+            if os.name == 'nt' and windows_headless:
+                startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
+            browser = subprocess.Popen(
+                [options.binary_location, *options.arguments],
+                stdin=subprocess.PIPE,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                close_fds=IS_POSIX,
+                startupinfo=startupinfo
+            )
+            self.browser_pid = browser.pid
+
+        super(Chrome, self).__init__(
+            executable_path=patcher.executable_path,
+            port=port,
+            options=options,
+            service_args=service_args,
+            desired_capabilities=desired_capabilities,
+            service_log_path=service_log_path,
+            keep_alive=keep_alive,
+        )
+
+        self.reactor = None
+
+        if enable_cdp_events:
+            if logging.getLogger().getEffectiveLevel() == logging.DEBUG:
+                logging.getLogger(
+                    "selenium.webdriver.remote.remote_connection"
+                ).setLevel(20)
+            reactor = Reactor(self)
+            reactor.start()
+            self.reactor = reactor
+
+        if advanced_elements:
+            from .webelement import WebElement
+
+            self._web_element_cls = WebElement
+
+        if options.headless:
+            self._configure_headless()
+
+    def __getattribute__(self, item):
+
+        if not super().__getattribute__("debug"):
+            return super().__getattribute__(item)
+        else:
+            import inspect
+
+            original = super().__getattribute__(item)
+            if inspect.ismethod(original) and not inspect.isclass(original):
+
+                def newfunc(*args, **kwargs):
+                    logger.debug(
+                        "calling %s with args %s and kwargs %s\n"
+                        % (original.__qualname__, args, kwargs)
+                    )
+                    return original(*args, **kwargs)
+
+                return newfunc
+            return original
+
+    def _configure_headless(self):
+
+        orig_get = self.get
+        logger.info("setting properties for headless")
+
+        def get_wrapped(*args, **kwargs):
+            if self.execute_script("return navigator.webdriver"):
+                logger.info("patch navigator.webdriver")
+                self.execute_cdp_cmd(
+                    "Page.addScriptToEvaluateOnNewDocument",
+                    {
+                        "source": """
+
+                            Object.defineProperty(window, 'navigator', {
+                                value: new Proxy(navigator, {
+                                        has: (target, key) => (key === 'webdriver' ? false : key in target),
+                                        get: (target, key) =>
+                                                key === 'webdriver' ?
+                                                false :
+                                                typeof target[key] === 'function' ?
+                                                target[key].bind(target) :
+                                                target[key]
+                                        })
+                            });
+
+                    """
+                    },
+                )
+
+                logger.info("patch user-agent string")
+                self.execute_cdp_cmd(
+                    "Network.setUserAgentOverride",
+                    {
+                        "userAgent": self.execute_script(
+                            "return navigator.userAgent"
+                        ).replace("Headless", "")
+                    },
+                )
+                self.execute_cdp_cmd(
+                    "Page.addScriptToEvaluateOnNewDocument",
+                    {
+                        "source": """
+                            Object.defineProperty(navigator, 'maxTouchPoints', {
+                                    get: () => 1
+                            })"""
+                    },
+                )
+            return orig_get(*args, **kwargs)
+
+        self.get = get_wrapped
+
+    def __dir__(self):
+        return object.__dir__(self)
+
+    def _get_cdc_props(self):
+        return self.execute_script(
+            """
+            let objectToInspect = window,
+                result = [];
+            while(objectToInspect !== null)
+            { result = result.concat(Object.getOwnPropertyNames(objectToInspect));
+              objectToInspect = Object.getPrototypeOf(objectToInspect); }
+            return result.filter(i => i.match(/.+_.+_(Array|Promise|Symbol)/ig))
+            """
+        )
+
+    def _hook_remove_cdc_props(self):
+        self.execute_cdp_cmd(
+            "Page.addScriptToEvaluateOnNewDocument",
+            {
+                "source": """
+                    let objectToInspect = window,
+                        result = [];
+                    while(objectToInspect !== null) 
+                    { result = result.concat(Object.getOwnPropertyNames(objectToInspect));
+                      objectToInspect = Object.getPrototypeOf(objectToInspect); }
+                    result.forEach(p => p.match(/.+_.+_(Array|Promise|Symbol)/ig)
+                                        &&delete window[p]&&console.log('removed',p))
+                    """
+            },
+        )
+
+    def get(self, url):
+        if self._get_cdc_props():
+            self._hook_remove_cdc_props()
+        return super().get(url)
+
+    def add_cdp_listener(self, event_name, callback):
+        if (
+            self.reactor
+            and self.reactor is not None
+            and isinstance(self.reactor, Reactor)
+        ):
+            self.reactor.add_event_handler(event_name, callback)
+            return self.reactor.handlers
+        return False
+
+    def clear_cdp_listeners(self):
+        if self.reactor and isinstance(self.reactor, Reactor):
+            self.reactor.handlers.clear()
+
+    def tab_new(self, url: str):
+        """
+        this opens a url in a new tab.
+        apparently, that passes all tests directly!
+
+        Parameters
+        ----------
+        url
+
+        Returns
+        -------
+
+        """
+        if not hasattr(self, "cdp"):
+            from .cdp import CDP
+
+            cdp = CDP(self.options)
+            cdp.tab_new(url)
+
+    def reconnect(self, timeout=0.1):
+        try:
+            self.service.stop()
+        except Exception as e:
+            logger.debug(e)
+        time.sleep(timeout)
+        try:
+            self.service.start()
+        except Exception as e:
+            logger.debug(e)
+
+        try:
+            self.start_session()
+        except Exception as e:
+            logger.debug(e)
+
+    def start_session(self, capabilities=None, browser_profile=None):
+        if not capabilities:
+            capabilities = self.options.to_capabilities()
+        super(selenium.webdriver.chrome.webdriver.WebDriver, self).start_session(
+            capabilities, browser_profile
+        )
+        # super(Chrome, self).start_session(capabilities, browser_profile)
+
+    def quit(self):
+        logger.debug("closing webdriver")
+        if hasattr(self, "service") and getattr(self.service, "process", None):
+            self.service.process.kill()
+        try:
+            if self.reactor and isinstance(self.reactor, Reactor):
+                logger.debug("shutting down reactor")
+                self.reactor.event.set()
+        except Exception:  # noqa
+            pass
+        try:
+            logger.debug("killing browser")
+            os.kill(self.browser_pid, 15)
+
+        except TimeoutError as e:
+            logger.debug(e, exc_info=True)
+        except Exception:  # noqa
+            pass
+
+        if (
+            hasattr(self, "keep_user_data_dir")
+            and hasattr(self, "user_data_dir")
+            and not self.keep_user_data_dir
+        ):
+            for _ in range(5):
+                try:
+
+                    shutil.rmtree(self.user_data_dir, ignore_errors=False)
+                except FileNotFoundError:
+                    pass
+                except (RuntimeError, OSError, PermissionError) as e:
+                    logger.debug(
+                        "When removing the temp profile, a %s occured: %s\nretrying..."
+                        % (e.__class__.__name__, e)
+                    )
+                else:
+                    logger.debug("successfully removed %s" % self.user_data_dir)
+                    break
+                time.sleep(0.1)
+
+        # dereference patcher, so patcher can start cleaning up as well.
+        # this must come last, otherwise it will throw 'in use' errors
+        self.patcher = None
+
+    def __del__(self):
+        try:
+            super().quit()
+            # self.service.process.kill()
+        except:  # noqa
+            pass
+        self.quit()
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.service.stop()
+        time.sleep(self._delay)
+        self.service.start()
+        self.start_session()
+
+    def __hash__(self):
+        return hash(self.options.debugger_address)
+
+
+def find_chrome_executable():
+    """
+    Finds the chrome, chrome beta, chrome canary, chromium executable
+
+    Returns
+    -------
+    executable_path :  str
+        the full file path to found executable
+
+    """
+    candidates = set()
+    if IS_POSIX:
+        for item in os.environ.get("PATH").split(os.pathsep):
+            for subitem in (
+                "google-chrome",
+                "chromium",
+                "chromium-browser",
+                "chrome",
+                "google-chrome-stable",
+            ):
+                candidates.add(os.sep.join((item, subitem)))
+        if "darwin" in sys.platform:
+            candidates.update(
+                [
+                    "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
+                    "/Applications/Chromium.app/Contents/MacOS/Chromium",
+                ]
+            )
+    else:
+        for item in map(
+            os.environ.get, ("PROGRAMFILES", "PROGRAMFILES(X86)", "LOCALAPPDATA")
+        ):
+            for subitem in (
+                "Google/Chrome/Application",
+                "Google/Chrome Beta/Application",
+                "Google/Chrome Canary/Application",
+            ):
+                candidates.add(os.sep.join((item, subitem, "chrome.exe")))
+    for candidate in candidates:
+        if os.path.exists(candidate) and os.access(candidate, os.X_OK):
+            return os.path.normpath(candidate)

src/undetected_chromedriver/_compat.py

@@ -0,0 +1,259 @@
+#!/usr/bin/env python3
+# this module is part of undetected_chromedriver
+
+
+"""
+
+         888                                                  888         d8b
+         888                                                  888         Y8P
+         888                                                  888
+ .d8888b 88888b.  888d888 .d88b.  88888b.d88b.   .d88b.   .d88888 888d888 888 888  888  .d88b.  888d888
+d88P"    888 "88b 888P"  d88""88b 888 "888 "88b d8P  Y8b d88" 888 888P"   888 888  888 d8P  Y8b 888P"
+888      888  888 888    888  888 888  888  888 88888888 888  888 888     888 Y88  88P 88888888 888
+Y88b.    888  888 888    Y88..88P 888  888  888 Y8b.     Y88b 888 888     888  Y8bd8P  Y8b.     888
+ "Y8888P 888  888 888     "Y88P"  888  888  888  "Y8888   "Y88888 888     888   Y88P    "Y8888  888   88888888
+
+by UltrafunkAmsterdam (https://github.com/ultrafunkamsterdam)
+
+"""
+
+import io
+import logging
+import os
+import random
+import re
+import string
+import sys
+import zipfile
+from distutils.version import LooseVersion
+from urllib.request import urlopen, urlretrieve
+
+from selenium.webdriver import Chrome as _Chrome, ChromeOptions as _ChromeOptions
+
+TARGET_VERSION = 0
+logger = logging.getLogger("uc")
+
+
+class Chrome:
+    def __new__(cls, *args, emulate_touch=False, **kwargs):
+
+        if not ChromeDriverManager.installed:
+            ChromeDriverManager(*args, **kwargs).install()
+        if not ChromeDriverManager.selenium_patched:
+            ChromeDriverManager(*args, **kwargs).patch_selenium_webdriver()
+        if not kwargs.get("executable_path"):
+            kwargs["executable_path"] = "./{}".format(
+                ChromeDriverManager(*args, **kwargs).executable_path
+            )
+        if not kwargs.get("options"):
+            kwargs["options"] = ChromeOptions()
+        instance = object.__new__(_Chrome)
+        instance.__init__(*args, **kwargs)
+
+        instance._orig_get = instance.get
+
+        def _get_wrapped(*args, **kwargs):
+            if instance.execute_script("return navigator.webdriver"):
+                instance.execute_cdp_cmd(
+                    "Page.addScriptToEvaluateOnNewDocument",
+                    {
+                        "source": """
+
+                                   Object.defineProperty(window, 'navigator', {
+                                       value: new Proxy(navigator, {
+                                       has: (target, key) => (key === 'webdriver' ? false : key in target),
+                                       get: (target, key) =>
+                                           key === 'webdriver'
+                                           ? undefined
+                                           : typeof target[key] === 'function'
+                                           ? target[key].bind(target)
+                                           : target[key]
+                                       })
+                                   });
+                                    
+                                                            
+                        """
+                    },
+                )
+            return instance._orig_get(*args, **kwargs)
+
+        instance.get = _get_wrapped
+        instance.get = _get_wrapped
+        instance.get = _get_wrapped
+
+        original_user_agent_string = instance.execute_script(
+            "return navigator.userAgent"
+        )
+        instance.execute_cdp_cmd(
+            "Network.setUserAgentOverride",
+            {
+                "userAgent": original_user_agent_string.replace("Headless", ""),
+            },
+        )
+        if emulate_touch:
+            instance.execute_cdp_cmd(
+                "Page.addScriptToEvaluateOnNewDocument",
+                {
+                    "source": """
+                                   Object.defineProperty(navigator, 'maxTouchPoints', {
+                                       get: () => 1
+                               })"""
+                },
+            )
+        logger.info(f"starting undetected_chromedriver.Chrome({args}, {kwargs})")
+        return instance
+
+
+class ChromeOptions:
+    def __new__(cls, *args, **kwargs):
+        if not ChromeDriverManager.installed:
+            ChromeDriverManager(*args, **kwargs).install()
+        if not ChromeDriverManager.selenium_patched:
+            ChromeDriverManager(*args, **kwargs).patch_selenium_webdriver()
+
+        instance = object.__new__(_ChromeOptions)
+        instance.__init__()
+        instance.add_argument("start-maximized")
+        instance.add_experimental_option("excludeSwitches", ["enable-automation"])
+        instance.add_argument("--disable-blink-features=AutomationControlled")
+        return instance
+
+
+class ChromeDriverManager(object):
+    installed = False
+    selenium_patched = False
+    target_version = None
+
+    DL_BASE = "https://chromedriver.storage.googleapis.com/"
+
+    def __init__(self, executable_path=None, target_version=None, *args, **kwargs):
+
+        _platform = sys.platform
+
+        if TARGET_VERSION:
+            # use global if set
+            self.target_version = TARGET_VERSION
+
+        if target_version:
+            # use explicitly passed target
+            self.target_version = target_version  # user override
+
+        if not self.target_version:
+            # none of the above (default) and just get current version
+            self.target_version = self.get_release_version_number().version[
+                0
+            ]  # only major version int
+
+        self._base = base_ = "chromedriver{}"
+
+        exe_name = self._base
+        if _platform in ("win32",):
+            exe_name = base_.format(".exe")
+        if _platform in ("linux",):
+            _platform += "64"
+            exe_name = exe_name.format("")
+        if _platform in ("darwin",):
+            _platform = "mac64"
+            exe_name = exe_name.format("")
+        self.platform = _platform
+        self.executable_path = executable_path or exe_name
+        self._exe_name = exe_name
+
+    def patch_selenium_webdriver(self_):
+        """
+        Patches selenium package Chrome, ChromeOptions classes for current session
+
+        :return:
+        """
+        import selenium.webdriver.chrome.service
+        import selenium.webdriver
+
+        selenium.webdriver.Chrome = Chrome
+        selenium.webdriver.ChromeOptions = ChromeOptions
+        logger.info("Selenium patched. Safe to import Chrome / ChromeOptions")
+        self_.__class__.selenium_patched = True
+
+    def install(self, patch_selenium=True):
+        """
+        Initialize the patch
+
+        This will:
+         download chromedriver if not present
+         patch the downloaded chromedriver
+         patch selenium package if <patch_selenium> is True (default)
+
+        :param patch_selenium: patch selenium webdriver classes for Chrome and ChromeDriver (for current python session)
+        :return:
+        """
+        if not os.path.exists(self.executable_path):
+            self.fetch_chromedriver()
+            if not self.__class__.installed:
+                if self.patch_binary():
+                    self.__class__.installed = True
+
+        if patch_selenium:
+            self.patch_selenium_webdriver()
+
+    def get_release_version_number(self):
+        """
+        Gets the latest major version available, or the latest major version of self.target_version if set explicitly.
+
+        :return: version string
+        """
+        path = (
+            "LATEST_RELEASE"
+            if not self.target_version
+            else f"LATEST_RELEASE_{self.target_version}"
+        )
+        return LooseVersion(urlopen(self.__class__.DL_BASE + path).read().decode())
+
+    def fetch_chromedriver(self):
+        """
+        Downloads ChromeDriver from source and unpacks the executable
+
+        :return: on success, name of the unpacked executable
+        """
+        base_ = self._base
+        zip_name = base_.format(".zip")
+        ver = self.get_release_version_number().vstring
+        if os.path.exists(self.executable_path):
+            return self.executable_path
+        urlretrieve(
+            f"{self.__class__.DL_BASE}{ver}/{base_.format(f'_{self.platform}')}.zip",
+            filename=zip_name,
+        )
+        with zipfile.ZipFile(zip_name) as zf:
+            zf.extract(self._exe_name)
+        os.remove(zip_name)
+        if sys.platform != "win32":
+            os.chmod(self._exe_name, 0o755)
+        return self._exe_name
+
+    @staticmethod
+    def random_cdc():
+        cdc = random.choices(string.ascii_lowercase, k=26)
+        cdc[-6:-4] = map(str.upper, cdc[-6:-4])
+        cdc[2] = cdc[0]
+        cdc[3] = "_"
+        return "".join(cdc).encode()
+
+    def patch_binary(self):
+        """
+        Patches the ChromeDriver binary
+
+        :return: False on failure, binary name on success
+        """
+        linect = 0
+        replacement = self.random_cdc()
+        with io.open(self.executable_path, "r+b") as fh:
+            for line in iter(lambda: fh.readline(), b""):
+                if b"cdc_" in line:
+                    fh.seek(-len(line), 1)
+                    newline = re.sub(b"cdc_.{22}", replacement, line)
+                    fh.write(newline)
+                    linect += 1
+            return linect
+
+
+def install(executable_path=None, target_version=None, *args, **kwargs):
+    ChromeDriverManager(executable_path, target_version, *args, **kwargs).install()

src/undetected_chromedriver/cdp.py

@@ -0,0 +1,112 @@
+#!/usr/bin/env python3
+# this module is part of undetected_chromedriver
+
+import json
+import logging
+from collections.abc import Mapping, Sequence
+
+import requests
+import websockets
+
+log = logging.getLogger(__name__)
+
+
+class CDPObject(dict):
+    def __init__(self, *a, **k):
+        super().__init__(*a, **k)
+        self.__dict__ = self
+        for k in self.__dict__:
+            if isinstance(self.__dict__[k], dict):
+                self.__dict__[k] = CDPObject(self.__dict__[k])
+            elif isinstance(self.__dict__[k], list):
+                for i in range(len(self.__dict__[k])):
+                    if isinstance(self.__dict__[k][i], dict):
+                        self.__dict__[k][i] = CDPObject(self)
+
+    def __repr__(self):
+        tpl = f"{self.__class__.__name__}(\n\t{{}}\n\t)"
+        return tpl.format("\n  ".join(f"{k} = {v}" for k, v in self.items()))
+
+
+class PageElement(CDPObject):
+    pass
+
+
+class CDP:
+    log = logging.getLogger("CDP")
+
+    endpoints = CDPObject(
+        {
+            "json": "/json",
+            "protocol": "/json/protocol",
+            "list": "/json/list",
+            "new": "/json/new?{url}",
+            "activate": "/json/activate/{id}",
+            "close": "/json/close/{id}",
+        }
+    )
+
+    def __init__(self, options: "ChromeOptions"):  # noqa
+        self.server_addr = "http://{0}:{1}".format(*options.debugger_address.split(":"))
+
+        self._reqid = 0
+        self._session = requests.Session()
+        self._last_resp = None
+        self._last_json = None
+
+        resp = self.get(self.endpoints.json)  # noqa
+        self.sessionId = resp[0]["id"]
+        self.wsurl = resp[0]["webSocketDebuggerUrl"]
+
+    def tab_activate(self, id=None):
+        if not id:
+            active_tab = self.tab_list()[0]
+            id = active_tab.id  # noqa
+            self.wsurl = active_tab.webSocketDebuggerUrl  # noqa
+        return self.post(self.endpoints["activate"].format(id=id))
+
+    def tab_list(self):
+        retval = self.get(self.endpoints["list"])
+        return [PageElement(o) for o in retval]
+
+    def tab_new(self, url):
+        return self.post(self.endpoints["new"].format(url=url))
+
+    def tab_close_last_opened(self):
+        sessions = self.tab_list()
+        opentabs = [s for s in sessions if s["type"] == "page"]
+        return self.post(self.endpoints["close"].format(id=opentabs[-1]["id"]))
+
+    async def send(self, method: str, params: dict):
+        self._reqid += 1
+        async with websockets.connect(self.wsurl) as ws:
+            await ws.send(
+                json.dumps({"method": method, "params": params, "id": self._reqid})
+            )
+            self._last_resp = await ws.recv()
+            self._last_json = json.loads(self._last_resp)
+            self.log.info(self._last_json)
+
+    def get(self, uri):
+        resp = self._session.get(self.server_addr + uri)
+        try:
+            self._last_resp = resp
+            self._last_json = resp.json()
+        except Exception:
+            return
+        else:
+            return self._last_json
+
+    def post(self, uri, data: dict = None):
+        if not data:
+            data = {}
+        resp = self._session.post(self.server_addr + uri, json=data)
+        try:
+            self._last_resp = resp
+            self._last_json = resp.json()
+        except Exception:
+            return self._last_resp
+
+    @property
+    def last_json(self):
+        return self._last_json

src/undetected_chromedriver/devtool.py

@@ -0,0 +1,191 @@
+import asyncio
+import logging
+import time
+import traceback
+from collections.abc import Mapping
+from collections.abc import Sequence
+from typing import Any
+from typing import Awaitable
+from typing import Callable
+from typing import List
+from typing import Optional
+from contextlib import ExitStack
+import threading
+from functools import wraps, partial
+
+
+class Structure(dict):
+    """
+    This is a dict-like object structure, which you should subclass
+    Only properties defined in the class context are used on initialization.
+
+    See example
+    """
+
+    _store = {}
+
+    def __init__(self, *a, **kw):
+        """
+        Instantiate a new instance.
+
+        :param a:
+        :param kw:
+        """
+
+        super().__init__()
+
+        # auxiliar dict
+        d = dict(*a, **kw)
+        for k, v in d.items():
+            if isinstance(v, Mapping):
+                self[k] = self.__class__(v)
+            elif isinstance(v, Sequence) and not isinstance(v, (str, bytes)):
+                self[k] = [self.__class__(i) for i in v]
+            else:
+                self[k] = v
+        super().__setattr__("__dict__", self)
+
+    def __getattr__(self, item):
+        return getattr(super(), item)
+
+    def __getitem__(self, item):
+        return super().__getitem__(item)
+
+    def __setattr__(self, key, value):
+        self.__setitem__(key, value)
+
+    def __setitem__(self, key, value):
+        super().__setitem__(key, value)
+
+    def update(self, *a, **kw):
+        super().update(*a, **kw)
+
+    def __eq__(self, other):
+        return frozenset(other.items()) == frozenset(self.items())
+
+    def __hash__(self):
+        return hash(frozenset(self.items()))
+
+    @classmethod
+    def __init_subclass__(cls, **kwargs):
+        cls._store = {}
+
+    def _normalize_strings(self):
+        for k, v in self.copy().items():
+            if isinstance(v, (str)):
+                self[k] = v.strip()
+
+
+def timeout(seconds=3, on_timeout: Optional[Callable[[callable], Any]] = None):
+    def wrapper(func):
+        @wraps(func)
+        def wrapped(*args, **kwargs):
+            def function_reached_timeout():
+                if on_timeout:
+                    on_timeout(func)
+                else:
+                    raise TimeoutError("function call timed out")
+
+            t = threading.Timer(interval=seconds, function=function_reached_timeout)
+            t.start()
+            try:
+                return func(*args, **kwargs)
+            except:
+                t.cancel()
+                raise
+            finally:
+                t.cancel()
+
+        return wrapped
+
+    return wrapper
+
+
+def test():
+    import sys, os
+
+    sys.path.insert(0, os.path.abspath(os.path.dirname(__file__)))
+    import undetected_chromedriver as uc
+    import threading
+
+    def collector(
+        driver: uc.Chrome,
+        stop_event: threading.Event,
+        on_event_coro: Optional[Callable[[List[str]], Awaitable[Any]]] = None,
+        listen_events: Sequence = ("browser", "network", "performance"),
+    ):
+        def threaded(driver, stop_event, on_event_coro):
+            async def _ensure_service_started():
+                while (
+                    getattr(driver, "service", False)
+                    and getattr(driver.service, "process", False)
+                    and driver.service.process.poll()
+                ):
+                    print("waiting for driver service to come back on")
+                    await asyncio.sleep(0.05)
+                    # await asyncio.sleep(driver._delay or .25)
+
+            async def get_log_lines(typ):
+                await _ensure_service_started()
+                return driver.get_log(typ)
+
+            async def looper():
+                while not stop_event.is_set():
+                    log_lines = []
+                    try:
+                        for _ in listen_events:
+                            try:
+                                log_lines += await get_log_lines(_)
+                            except:
+                                if logging.getLogger().getEffectiveLevel() <= 10:
+                                    traceback.print_exc()
+                                continue
+                        if log_lines and on_event_coro:
+                            await on_event_coro(log_lines)
+                    except Exception as e:
+                        if logging.getLogger().getEffectiveLevel() <= 10:
+                            traceback.print_exc()
+
+            loop = asyncio.new_event_loop()
+            asyncio.set_event_loop(loop)
+            loop.run_until_complete(looper())
+
+        t = threading.Thread(target=threaded, args=(driver, stop_event, on_event_coro))
+        t.start()
+
+    async def on_event(data):
+        print("on_event")
+        print("data:", data)
+
+    def func_called(fn):
+        def wrapped(*args, **kwargs):
+            print(
+                "func called! %s  (args: %s, kwargs: %s)" % (fn.__name__, args, kwargs)
+            )
+            while driver.service.process and driver.service.process.poll() is not None:
+                time.sleep(0.1)
+            res = fn(*args, **kwargs)
+            print("func completed! (result: %s)" % res)
+            return res
+
+        return wrapped
+
+    logging.basicConfig(level=10)
+
+    options = uc.ChromeOptions()
+    options.set_capability(
+        "goog:loggingPrefs", {"performance": "ALL", "browser": "ALL", "network": "ALL"}
+    )
+
+    driver = uc.Chrome(version_main=96, options=options)
+
+    # driver.command_executor._request = timeout(seconds=1)(driver.command_executor._request)
+    driver.command_executor._request = func_called(driver.command_executor._request)
+    collector_stop = threading.Event()
+    collector(driver, collector_stop, on_event)
+
+    driver.get("https://nowsecure.nl")
+
+    time.sleep(10)
+
+    driver.quit()

src/undetected_chromedriver/dprocess.py

@@ -0,0 +1,75 @@
+import multiprocessing
+import os
+import platform
+import sys
+from subprocess import PIPE
+from subprocess import Popen
+import atexit
+import traceback
+import logging
+import signal
+
+CREATE_NEW_PROCESS_GROUP = 0x00000200
+DETACHED_PROCESS = 0x00000008
+
+REGISTERED = []
+
+
+def start_detached(executable, *args):
+    """
+    Starts a fully independent subprocess (with no parent)
+    :param executable: executable
+    :param args: arguments to the executable, eg: ['--param1_key=param1_val', '-vvv' ...]
+    :return: pid of the grandchild process
+    """
+
+    # create pipe
+    reader, writer = multiprocessing.Pipe(False)
+
+    # do not keep reference
+    multiprocessing.Process(
+        target=_start_detached,
+        args=(executable, *args),
+        kwargs={"writer": writer},
+        daemon=True,
+    ).start()
+    # receive pid from pipe
+    pid = reader.recv()
+    REGISTERED.append(pid)
+    # close pipes
+    writer.close()
+    reader.close()
+
+    return pid
+
+
+def _start_detached(executable, *args, writer: multiprocessing.Pipe = None):
+
+    # configure launch
+    kwargs = {}
+    if platform.system() == "Windows":
+        kwargs.update(creationflags=DETACHED_PROCESS | CREATE_NEW_PROCESS_GROUP)
+    elif sys.version_info < (3, 2):
+        # assume posix
+        kwargs.update(preexec_fn=os.setsid)
+    else:  # Python 3.2+ and Unix
+        kwargs.update(start_new_session=True)
+
+    # run
+    p = Popen([executable, *args], stdin=PIPE, stdout=PIPE, stderr=PIPE, **kwargs)
+
+    # send pid to pipe
+    writer.send(p.pid)
+    sys.exit()
+
+
+def _cleanup():
+    for pid in REGISTERED:
+        try:
+            logging.getLogger(__name__).debug("cleaning up pid %d " % pid)
+            os.kill(pid, signal.SIGTERM)
+        except:  # noqa
+            pass
+
+
+atexit.register(_cleanup)

src/undetected_chromedriver/options.py

@@ -0,0 +1,70 @@
+#!/usr/bin/env python3
+# this module is part of undetected_chromedriver
+
+
+import json
+import os
+
+from selenium.webdriver.chromium.options import ChromiumOptions as _ChromiumOptions
+
+
+class ChromeOptions(_ChromiumOptions):
+    _session = None
+    _user_data_dir = None
+
+    @property
+    def user_data_dir(self):
+        return self._user_data_dir
+
+    @user_data_dir.setter
+    def user_data_dir(self, path: str):
+        """
+        Sets the browser profile folder to use, or creates a new profile
+        at given <path>.
+
+        Parameters
+        ----------
+        path: str
+            the path to a chrome profile folder
+            if it does not exist, a new profile will be created at given location
+        """
+        apath = os.path.abspath(path)
+        self._user_data_dir = os.path.normpath(apath)
+
+    @staticmethod
+    def _undot_key(key, value):
+        """turn a (dotted key, value) into a proper nested dict"""
+        if "." in key:
+            key, rest = key.split(".", 1)
+            value = ChromeOptions._undot_key(rest, value)
+        return {key: value}
+
+    def handle_prefs(self, user_data_dir):
+        prefs = self.experimental_options.get("prefs")
+        if prefs:
+
+            user_data_dir = user_data_dir or self._user_data_dir
+            default_path = os.path.join(user_data_dir, "Default")
+            os.makedirs(default_path, exist_ok=True)
+
+            # undot prefs dict keys
+            undot_prefs = {}
+            for key, value in prefs.items():
+                undot_prefs.update(self._undot_key(key, value))
+
+            prefs_file = os.path.join(default_path, "Preferences")
+            if os.path.exists(prefs_file):
+                with open(prefs_file, encoding="latin1", mode="r") as f:
+                    undot_prefs.update(json.load(f))
+
+            with open(prefs_file, encoding="latin1", mode="w") as f:
+                json.dump(undot_prefs, f)
+
+            # remove the experimental_options to avoid an error
+            del self._experimental_options["prefs"]
+
+    @classmethod
+    def from_options(cls, options):
+        o = cls()
+        o.__dict__.update(options.__dict__)
+        return o

src/undetected_chromedriver/patcher.py

@@ -0,0 +1,276 @@
+#!/usr/bin/env python3
+# this module is part of undetected_chromedriver
+
+import io
+import logging
+import os
+import random
+import re
+import string
+import sys
+import time
+import zipfile
+from distutils.version import LooseVersion
+from urllib.request import urlopen, urlretrieve
+import secrets
+
+
+logger = logging.getLogger(__name__)
+
+IS_POSIX = sys.platform.startswith(("darwin", "cygwin", "linux"))
+
+
+class Patcher(object):
+    url_repo = "https://chromedriver.storage.googleapis.com"
+    zip_name = "chromedriver_%s.zip"
+    exe_name = "chromedriver%s"
+
+    platform = sys.platform
+    if platform.endswith("win32"):
+        zip_name %= "win32"
+        exe_name %= ".exe"
+    if platform.endswith("linux"):
+        zip_name %= "linux64"
+        exe_name %= ""
+    if platform.endswith("darwin"):
+        zip_name %= "mac64"
+        exe_name %= ""
+
+    if platform.endswith("win32"):
+        d = "~/appdata/roaming/undetected_chromedriver"
+    elif platform.startswith("linux"):
+        d = "~/.local/share/undetected_chromedriver"
+    elif platform.endswith("darwin"):
+        d = "~/Library/Application Support/undetected_chromedriver"
+    else:
+        d = "~/.undetected_chromedriver"
+    data_path = os.path.abspath(os.path.expanduser(d))
+
+    def __init__(self, executable_path=None, force=False, version_main: int = 0):
+        """
+
+        Args:
+            executable_path: None = automatic
+                             a full file path to the chromedriver executable
+            force: False
+                    terminate processes which are holding lock
+            version_main: 0 = auto
+                specify main chrome version (rounded, ex: 82)
+        """
+
+        self.force = force
+        self.executable_path = None
+        prefix = secrets.token_hex(8)
+
+        if not os.path.exists(self.data_path):
+            os.makedirs(self.data_path, exist_ok=True)
+
+        if not executable_path:
+            self.executable_path = os.path.join(
+                self.data_path, "_".join([prefix, self.exe_name])
+            )
+
+        if not IS_POSIX:
+            if executable_path:
+                if not executable_path[-4:] == ".exe":
+                    executable_path += ".exe"
+
+        self.zip_path = os.path.join(self.data_path, prefix)
+
+        if not executable_path:
+            self.executable_path = os.path.abspath(
+                os.path.join(".", self.executable_path)
+            )
+
+        self._custom_exe_path = False
+
+        if executable_path:
+            self._custom_exe_path = True
+            self.executable_path = executable_path
+        self.version_main = version_main
+        self.version_full = None
+
+    def auto(self, executable_path=None, force=False, version_main=None):
+        """"""
+        if executable_path:
+            self.executable_path = executable_path
+            self._custom_exe_path = True
+
+        if self._custom_exe_path:
+            ispatched = self.is_binary_patched(self.executable_path)
+            if not ispatched:
+                return self.patch_exe()
+            else:
+                return
+
+        if version_main:
+            self.version_main = version_main
+        if force is True:
+            self.force = force
+
+        try:
+            os.unlink(self.executable_path)
+        except PermissionError:
+            if self.force:
+                self.force_kill_instances(self.executable_path)
+                return self.auto(force=not self.force)
+            try:
+                if self.is_binary_patched():
+                    # assumes already running AND patched
+                    return True
+            except PermissionError:
+                pass
+            # return False
+        except FileNotFoundError:
+            pass
+
+        release = self.fetch_release_number()
+        self.version_main = release.version[0]
+        self.version_full = release
+        self.unzip_package(self.fetch_package())
+        return self.patch()
+
+    def patch(self):
+        self.patch_exe()
+        return self.is_binary_patched()
+
+    def fetch_release_number(self):
+        """
+        Gets the latest major version available, or the latest major version of self.target_version if set explicitly.
+        :return: version string
+        :rtype: LooseVersion
+        """
+        path = "/latest_release"
+        if self.version_main:
+            path += f"_{self.version_main}"
+        path = path.upper()
+        logger.debug("getting release number from %s" % path)
+        return LooseVersion(urlopen(self.url_repo + path).read().decode())
+
+    def parse_exe_version(self):
+        with io.open(self.executable_path, "rb") as f:
+            for line in iter(lambda: f.readline(), b""):
+                match = re.search(rb"platform_handle\x00content\x00([0-9.]*)", line)
+                if match:
+                    return LooseVersion(match[1].decode())
+
+    def fetch_package(self):
+        """
+        Downloads ChromeDriver from source
+
+        :return: path to downloaded file
+        """
+        u = "%s/%s/%s" % (self.url_repo, self.version_full.vstring, self.zip_name)
+        logger.debug("downloading from %s" % u)
+        # return urlretrieve(u, filename=self.data_path)[0]
+        return urlretrieve(u)[0]
+
+    def unzip_package(self, fp):
+        """
+        Does what it says
+
+        :return: path to unpacked executable
+        """
+        logger.debug("unzipping %s" % fp)
+        try:
+            os.unlink(self.zip_path)
+        except (FileNotFoundError, OSError):
+            pass
+
+        os.makedirs(self.zip_path, mode=0o755, exist_ok=True)
+        with zipfile.ZipFile(fp, mode="r") as zf:
+            zf.extract(self.exe_name, self.zip_path)
+        os.rename(os.path.join(self.zip_path, self.exe_name), self.executable_path)
+        os.remove(fp)
+        os.rmdir(self.zip_path)
+        os.chmod(self.executable_path, 0o755)
+        return self.executable_path
+
+    @staticmethod
+    def force_kill_instances(exe_name):
+        """
+        kills running instances.
+        :param: executable name to kill, may be a path as well
+
+        :return: True on success else False
+        """
+        exe_name = os.path.basename(exe_name)
+        if IS_POSIX:
+            r = os.system("kill -f -9 $(pidof %s)" % exe_name)
+        else:
+            r = os.system("taskkill /f /im %s" % exe_name)
+        return not r
+
+    @staticmethod
+    def gen_random_cdc():
+        cdc = random.choices(string.ascii_lowercase, k=26)
+        cdc[-6:-4] = map(str.upper, cdc[-6:-4])
+        cdc[2] = cdc[0]
+        cdc[3] = "_"
+        return "".join(cdc).encode()
+
+    def is_binary_patched(self, executable_path=None):
+        """simple check if executable is patched.
+
+        :return: False if not patched, else True
+        """
+        executable_path = executable_path or self.executable_path
+        with io.open(executable_path, "rb") as fh:
+            for line in iter(lambda: fh.readline(), b""):
+                if b"cdc_" in line:
+                    return False
+            else:
+                return True
+
+    def patch_exe(self):
+        """
+        Patches the ChromeDriver binary
+
+        :return: False on failure, binary name on success
+        """
+        logger.info("patching driver executable %s" % self.executable_path)
+
+        linect = 0
+        replacement = self.gen_random_cdc()
+        with io.open(self.executable_path, "r+b") as fh:
+            for line in iter(lambda: fh.readline(), b""):
+                if b"cdc_" in line:
+                    fh.seek(-len(line), 1)
+                    newline = re.sub(b"cdc_.{22}", replacement, line)
+                    fh.write(newline)
+                    linect += 1
+            return linect
+
+    def __repr__(self):
+        return "{0:s}({1:s})".format(
+            self.__class__.__name__,
+            self.executable_path,
+        )
+
+    def __del__(self):
+
+        if self._custom_exe_path:
+            # if the driver binary is specified by user
+            # we assume it is important enough to not delete it
+            return
+        else:
+            timeout = 3  # stop trying after this many seconds
+            t = time.monotonic()
+            while True:
+                now = time.monotonic()
+                if now - t > timeout:
+                    # we don't want to wait until the end of time
+                    logger.debug(
+                        "could not unlink %s in time (%d seconds)"
+                        % (self.executable_path, timeout)
+                    )
+                    break
+                try:
+                    os.unlink(self.executable_path)
+                    logger.debug("successfully unlinked %s" % self.executable_path)
+                    break
+                except (OSError, RuntimeError, PermissionError):
+                    time.sleep(0.1)
+                    continue
+                except FileNotFoundError:
+                    break

src/undetected_chromedriver/reactor.py

@@ -0,0 +1,102 @@
+#!/usr/bin/env python3
+# this module is part of undetected_chromedriver
+
+import asyncio
+import json
+import logging
+import threading
+
+logger = logging.getLogger(__name__)
+
+
+class Reactor(threading.Thread):
+    def __init__(self, driver: "Chrome"):
+        super().__init__()
+
+        self.driver = driver
+        self.loop = asyncio.new_event_loop()
+
+        self.lock = threading.Lock()
+        self.event = threading.Event()
+        self.daemon = True
+        self.handlers = {}
+
+    def add_event_handler(self, method_name, callback: callable):
+        """
+
+        Parameters
+        ----------
+        event_name: str
+            example "Network.responseReceived"
+
+        callback: callable
+            callable which accepts 1 parameter: the message object dictionary
+
+        Returns
+        -------
+
+        """
+        with self.lock:
+            self.handlers[method_name.lower()] = callback
+
+    @property
+    def running(self):
+        return not self.event.is_set()
+
+    def run(self):
+        try:
+            asyncio.set_event_loop(self.loop)
+            self.loop.run_until_complete(self.listen())
+        except Exception as e:
+            logger.warning("Reactor.run() => %s", e)
+
+    async def _wait_service_started(self):
+        while True:
+            with self.lock:
+                if (
+                    getattr(self.driver, "service", None)
+                    and getattr(self.driver.service, "process", None)
+                    and self.driver.service.process.poll()
+                ):
+                    await asyncio.sleep(self.driver._delay or 0.25)
+                else:
+                    break
+
+    async def listen(self):
+
+        while self.running:
+
+            await self._wait_service_started()
+            await asyncio.sleep(1)
+
+            try:
+                with self.lock:
+                    log_entries = self.driver.get_log("performance")
+
+                for entry in log_entries:
+
+                    try:
+
+                        obj_serialized: str = entry.get("message")
+                        obj = json.loads(obj_serialized)
+                        message = obj.get("message")
+                        method = message.get("method")
+
+                        if "*" in self.handlers:
+                            await self.loop.run_in_executor(
+                                None, self.handlers["*"], message
+                            )
+                        elif method.lower() in self.handlers:
+                            await self.loop.run_in_executor(
+                                None, self.handlers[method.lower()], message
+                            )
+
+                        # print(type(message), message)
+                    except Exception as e:
+                        raise e from None
+
+            except Exception as e:
+                if "invalid session id" in str(e):
+                    pass
+                else:
+                    logging.debug("exception ignored :", e)

src/undetected_chromedriver/v2.py

@@ -0,0 +1,4 @@
+# for backward compatibility
+import sys
+
+sys.modules[__name__] = sys.modules[__package__]

src/undetected_chromedriver/webelement.py

@@ -0,0 +1,37 @@
+import selenium.webdriver.remote.webelement
+
+
+class WebElement(selenium.webdriver.remote.webelement.WebElement):
+    """
+    Custom WebElement class which makes it easier to view elements when
+    working in an interactive environment.
+
+    standard webelement repr:
+    <selenium.webdriver.remote.webelement.WebElement (session="85ff0f671512fa535630e71ee951b1f2", element="6357cb55-92c3-4c0f-9416-b174f9c1b8c4")>
+
+    using this WebElement class:
+    <WebElement(<a class="mobile-show-inline-block mc-update-infos init-ok" href="#" id="main-cat-switcher-mobile">)>
+
+    """
+
+    @property
+    def attrs(self):
+        if not hasattr(self, "_attrs"):
+            self._attrs = self._parent.execute_script(
+                """
+                var items = {}; 
+                for (index = 0; index < arguments[0].attributes.length; ++index) 
+                {
+                 items[arguments[0].attributes[index].name] = arguments[0].attributes[index].value 
+                }; 
+                return items;
+                """,
+                self,
+            )
+        return self._attrs
+
+    def __repr__(self):
+        strattrs = " ".join([f'{k}="{v}"' for k, v in self.attrs.items()])
+        if strattrs:
+            strattrs = " " + strattrs
+        return f"{self.__class__.__name__} <{self.tag_name}{strattrs}>"

src/utils.py

@@ -0,0 +1,174 @@
+import json
+import logging
+import os
+import re
+import shutil
+
+from selenium.webdriver.chrome.webdriver import WebDriver
+import undetected_chromedriver as uc
+
+FLARESOLVERR_VERSION = None
+CHROME_MAJOR_VERSION = None
+USER_AGENT = None
+XVFB_DISPLAY = None
+PATCHED_DRIVER_PATH = None
+
+
+def get_config_log_html() -> bool:
+    return os.environ.get('LOG_HTML', 'false').lower() == 'true'
+
+
+def get_config_headless() -> bool:
+    return os.environ.get('HEADLESS', 'true').lower() == 'true'
+
+
+def get_flaresolverr_version() -> str:
+    global FLARESOLVERR_VERSION
+    if FLARESOLVERR_VERSION is not None:
+        return FLARESOLVERR_VERSION
+
+    package_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), os.pardir, 'package.json')
+    with open(package_path) as f:
+        FLARESOLVERR_VERSION = json.loads(f.read())['version']
+        return FLARESOLVERR_VERSION
+
+
+def get_webdriver() -> WebDriver:
+    global PATCHED_DRIVER_PATH
+    logging.debug('Launching web browser...')
+
+    # undetected_chromedriver
+    options = uc.ChromeOptions()
+    options.add_argument('--no-sandbox')
+    options.add_argument('--window-size=1920,1080')
+    # todo: this param shows a warning in chrome head-full
+    options.add_argument('--disable-setuid-sandbox')
+    options.add_argument('--disable-dev-shm-usage')
+
+    # note: headless mode is detected (options.headless = True)
+    # we launch the browser in head-full mode with the window hidden
+    windows_headless = False
+    if get_config_headless():
+        if os.name == 'nt':
+            windows_headless = True
+        else:
+            start_xvfb_display()
+
+    # if we are inside the Docker container, we avoid downloading the driver
+    driver_exe_path = None
+    version_main = None
+    if os.path.exists("/app/chromedriver"):
+        # running inside Docker
+        driver_exe_path = "/app/chromedriver"
+    else:
+        version_main = get_chrome_major_version()
+        if PATCHED_DRIVER_PATH is not None:
+            driver_exe_path = PATCHED_DRIVER_PATH
+
+    # downloads and patches the chromedriver
+    # if we don't set driver_executable_path it downloads, patches, and deletes the driver each time
+    driver = uc.Chrome(options=options, driver_executable_path=driver_exe_path, version_main=version_main,
+                       windows_headless=windows_headless)
+
+    # save the patched driver to avoid re-downloads
+    if driver_exe_path is None:
+        PATCHED_DRIVER_PATH = os.path.join(driver.patcher.data_path, driver.patcher.exe_name)
+        shutil.copy(driver.patcher.executable_path, PATCHED_DRIVER_PATH)
+
+    # selenium vanilla
+    # options = webdriver.ChromeOptions()
+    # options.add_argument('--no-sandbox')
+    # options.add_argument('--window-size=1920,1080')
+    # options.add_argument('--disable-setuid-sandbox')
+    # options.add_argument('--disable-dev-shm-usage')
+    # driver = webdriver.Chrome(options=options)
+
+    return driver
+
+
+def get_chrome_major_version() -> str:
+    global CHROME_MAJOR_VERSION
+    if CHROME_MAJOR_VERSION is not None:
+        return CHROME_MAJOR_VERSION
+
+    if os.name == 'nt':
+        try:
+            stream = os.popen(
+                'reg query "HKLM\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Google Chrome"')
+            output = stream.read()
+            # Example: '104.0.5112.79'
+            complete_version = extract_version_registry(output)
+        except Exception:
+            # Example: '104.0.5112.79'
+            complete_version = extract_version_folder()
+    else:
+        chrome_path = uc.find_chrome_executable()
+        process = os.popen(f'"{chrome_path}" --version')
+        # Example 1: 'Chromium 104.0.5112.79 Arch Linux\n'
+        # Example 2: 'Google Chrome 104.0.5112.79 Arch Linux\n'
+        complete_version = process.read()
+        process.close()
+
+    CHROME_MAJOR_VERSION = complete_version.split('.')[0].split(' ')[-1]
+    logging.info(f"Chrome major version: {CHROME_MAJOR_VERSION}")
+    return CHROME_MAJOR_VERSION
+
+
+def extract_version_registry(output) -> str:
+    try:
+        google_version = ''
+        for letter in output[output.rindex('DisplayVersion    REG_SZ') + 24:]:
+            if letter != '\n':
+                google_version += letter
+            else:
+                break
+        return google_version.strip()
+    except TypeError:
+        return ''
+
+
+def extract_version_folder() -> str:
+    # Check if the Chrome folder exists in the x32 or x64 Program Files folders.
+    for i in range(2):
+        path = 'C:\\Program Files' + (' (x86)' if i else '') + '\\Google\\Chrome\\Application'
+        if os.path.isdir(path):
+            paths = [f.path for f in os.scandir(path) if f.is_dir()]
+            for path in paths:
+                filename = os.path.basename(path)
+                pattern = '\d+\.\d+\.\d+\.\d+'
+                match = re.search(pattern, filename)
+                if match and match.group():
+                    # Found a Chrome version.
+                    return match.group(0)
+    return ''
+
+
+def get_user_agent(driver=None) -> str:
+    global USER_AGENT
+    if USER_AGENT is not None:
+        return USER_AGENT
+
+    try:
+        if driver is None:
+            driver = get_webdriver()
+        USER_AGENT = driver.execute_script("return navigator.userAgent")
+        return USER_AGENT
+    except Exception as e:
+        raise Exception("Error getting browser User-Agent. " + str(e))
+    finally:
+        if driver is not None:
+            driver.quit()
+
+
+def start_xvfb_display():
+    global XVFB_DISPLAY
+    if XVFB_DISPLAY is None:
+        from xvfbwrapper import Xvfb
+        XVFB_DISPLAY = Xvfb()
+        XVFB_DISPLAY.start()
+
+
+def object_to_dict(_object):
+    json_dict = json.loads(json.dumps(_object, default=lambda o: o.__dict__))
+    # remove hidden fields
+    return {k: v for k, v in json_dict.items() if not k.startswith('__')}

test-requirements.txt

@@ -0,0 +1 @@
+WebTest==3.0.0

tsconfig.json

@@ -1,21 +0,0 @@
-{
-  "compilerOptions": {
-    "moduleResolution": "node",
-    "target": "es2017",
-    "noImplicitAny": true,
-    "removeComments": true,
-    "preserveConstEnums": true,
-    "allowSyntheticDefaultImports": true,
-    "resolveJsonModule": true,
-    "lib": [
-      "es2015", "dom"
-    ],
-    "module": "commonjs",
-    "outDir": "dist",
-    "sourceMap": true
-  },
-  "include": [
-    "src", "node_modules/@types/puppeteer/index.d.ts"
-  ],
-  "exclude": ["node_modules"]
-}