Bump version 2.2.8

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

README.md

@@ -4,9 +4,9 @@
 [![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 PayPal](https://img.shields.io/badge/Donate-PayPal-yellow.svg)](https://www.paypal.com/paypalme/diegoheras0xff)
-[![Donate Bitcoin](https://en.cryptobadges.io/badge/micro/13Hcv77AdnFWEUZ9qUpoPBttQsUT7q9TTh)](https://en.cryptobadges.io/donate/13Hcv77AdnFWEUZ9qUpoPBttQsUT7q9TTh)
+[![Donate Bitcoin](https://img.shields.io/badge/Donate-Bitcoin-f7931a.svg)](https://www.blockchain.com/btc/address/13Hcv77AdnFWEUZ9qUpoPBttQsUT7q9TTh)
-[![Donate Ethereum](https://en.cryptobadges.io/badge/micro/0x0D1549BbB00926BF3D92c1A8A58695e982f1BE2E)](https://en.cryptobadges.io/donate/0x0D1549BbB00926BF3D92c1A8A58695e982f1BE2E)
+[![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 and DDoS-GUARD protection.
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "flaresolverr",
-  "version": "2.2.5",
+  "version": "2.2.8",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "flaresolverr",
-  "version": "2.2.5",
+  "version": "2.2.8",
   "description": "Proxy server to bypass Cloudflare protection.",
   "scripts": {
     "install": "node install.js",

src/providers/cloudflare.ts

@@ -70,32 +70,6 @@ export default async function resolveChallenge(url: string, page: Page, response
             // captcha detected
             break
           }
-
-          // 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')
 

src/services/solver.ts

@@ -90,7 +90,7 @@ async function resolveChallenge(params: V1Request, session: SessionsCacheItem):
             // reload the page to be sure we get the real page
             log.debug("Reloading the page")
             try {
-                response = await gotoPage(params, page);
+                response = await gotoPage(params, page, params.method);
             } catch (e) {
                 log.warn("Page not reloaded (do not report!): Cause: " + e.toString())
             }
@@ -132,9 +132,10 @@ async function resolveChallenge(params: V1Request, session: SessionsCacheItem):
     }
 }
 
-async function gotoPage(params: V1Request, page: Page): Promise<HTTPResponse> {
+async function gotoPage(params: V1Request, page: Page, method: string = 'GET'): Promise<HTTPResponse> {
     let pageTimeout = params.maxTimeout / 3;
     let response: HTTPResponse
+
     try {
         response = await page.goto(params.url, {waitUntil: 'domcontentloaded', timeout: pageTimeout});
     } catch (e) {
@@ -142,47 +143,29 @@ async function gotoPage(params: V1Request, page: Page): Promise<HTTPResponse> {
         response = await page.goto(params.url, {waitUntil: 'domcontentloaded', timeout: pageTimeout});
     }
 
-    if (params.method == 'POST') {
+    if (method == 'POST') {
-        // post hack
+        // post hack, it only works with utf-8 encoding
-        await page.setContent(
+
-            `
+        let postForm = `<form id="hackForm" action="${params.url}" method="POST">`;
+        let queryString = params.postData;
+        let pairs = (queryString[0] === '?' ? queryString.substr(1) : queryString).split('&');
+        for (let i = 0; i < pairs.length; i++) {
+            let pair = pairs[i].split('=');
+            let name; try { name = decodeURIComponent(pair[0]) } catch { name = pair[0] }
+            if (name == 'submit') continue;
+            let value; try { value = decodeURIComponent(pair[1] || '') } catch { value = pair[1] || '' }
+            postForm += `<input type="text" name="${name}" value="${value}"><br>`;
+        }
+        postForm += `</form>`;
+
+        await page.setContent(`
             <!DOCTYPE html>
             <html>
             <body>
-<script>
+            ${postForm}
-
+            <script>document.getElementById('hackForm').submit();</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> 
+            </html>`
-            `
         );
         await page.waitForTimeout(2000)
         try {