@browserless.io/browserless 2.22.0 → 2.24.0-beta-1

package/extensions/ublock/js/vapi-background-ext.js

@@ -19,10 +19,6 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-/* globals browser */
-
-'use strict';
-
 /******************************************************************************/
 
 // https://github.com/uBlockOrigin/uBlock-issues/issues/1659
@@ -90,71 +86,47 @@ vAPI.Tabs = class extends vAPI.Tabs {
         ['gif','image'],['ico','image'],['jpeg','image'],['jpg','image'],['png','image'],['webp','image']
     ]);
 
-    const headerValue = (headers, name) => {
-        let i = headers.length;
-        while ( i-- ) {
-            if ( headers[i].name.toLowerCase() === name ) {
-                return headers[i].value.trim();
-            }
-        }
-        return '';
-    };
-
     const parsedURL = new URL('https://www.example.org/');
 
-    // Extend base class to normalize as per platform.
+    // Extend base class to normalize as per platform
 
     vAPI.Net = class extends vAPI.Net {
         normalizeDetails(details) {
             // Chromium 63+ supports the `initiator` property, which contains
-            // the URL of the origin from which the network request was made.
-            if (
-                typeof details.initiator === 'string' &&
-                details.initiator !== 'null'
-            ) {
+            // the URL of the origin from which the network request was made
+            if ( details.initiator && details.initiator !== 'null' ) {
                 details.documentUrl = details.initiator;
             }
-
-            let type = details.type;
-
+            const type = details.type;
             if ( type === 'imageset' ) {
                 details.type = 'image';
                 return;
             }
-
-            // The rest of the function code is to normalize type
             if ( type !== 'other' ) { return; }
-
-            // Try to map known "extension" part of URL to request type.
-            parsedURL.href = details.url;
-            const path = parsedURL.pathname,
-                  pos = path.indexOf('.', path.length - 6);
-            if ( pos !== -1 && (type = extToTypeMap.get(path.slice(pos + 1))) ) {
-                details.type = type;
+            // Try to map known "extension" part of URL to request type
+            if ( details.responseHeaders === undefined ) {
+                parsedURL.href = details.url;
+                const path = parsedURL.pathname;
+                const pos = path.indexOf('.', path.length - 6);
+                if ( pos !== -1 ) {
+                    details.type = extToTypeMap.get(path.slice(pos + 1)) || type;
+                }
                 return;
             }
-
-            // Try to extract type from response headers if present.
-            if ( details.responseHeaders ) {
-                type = headerValue(details.responseHeaders, 'content-type');
-                if ( type.startsWith('font/') ) {
-                    details.type = 'font';
-                    return;
-                }
-                if ( type.startsWith('image/') ) {
-                    details.type = 'image';
-                    return;
-                }
-                if ( type.startsWith('audio/') || type.startsWith('video/') ) {
-                    details.type = 'media';
-                    return;
-                }
+            // Try to extract type from response headers
+            const ctype = this.headerValue(details.responseHeaders, 'content-type');
+            if ( ctype.startsWith('font/') ) {
+                details.type = 'font';
+            } else if ( ctype.startsWith('image/') ) {
+                details.type = 'image';
+            } else if ( ctype.startsWith('audio/') || ctype.startsWith('video/') ) {
+                details.type = 'media';
             }
         }
 
         // https://www.reddit.com/r/uBlockOrigin/comments/9vcrk3/
         //   Some types can be mapped from 'other', thus include 'other' if and
-        //   only if the caller is interested in at least one of those types.
+        //   only if the caller is interested in at least one of those types
         denormalizeTypes(types) {
             if ( types.length === 0 ) {
                 return Array.from(this.validTypes);

package/extensions/ublock/js/vapi-background.js

@@ -1382,6 +1382,14 @@ vAPI.Net = class {
         if ( this.suspendDepth !== 0 ) { return; }
         this.unsuspendAllRequests(discard);
     }
+    headerValue(headers, name) {
+        for ( const header of headers ) {
+            if ( header.name.toLowerCase() === name ) {
+                return header.value.trim();
+            }
+        }
+        return '';
+    }
     static canSuspend() {
         return false;
     }

package/extensions/ublock/manifest.json

@@ -111,7 +111,7 @@
   "storage": {
     "managed_schema": "managed_storage.json"
   },
-  "version": "1.60.0",
+  "version": "1.61.2",
   "web_accessible_resources": [
     "/web_accessible_resources/*"
   ]

package/extensions/ublock/web_accessible_resources/googlesyndication_adsbygoogle.js

@@ -38,7 +38,9 @@
             const cfr = document.createElement('iframe');
             cfr.id = `google_ads_frame${i}`;
             fr.appendChild(cfr);
-            phs[i].appendChild(fr);
+            const ph = phs[i];
+            ph.appendChild(fr);
+            ph.setAttribute('data-adsbygoogle-status', 'done');
         }
     };
     if (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@browserless.io/browserless",
-  "version": "2.22.0",
+  "version": "2.24.0-beta-1",
   "license": "SSPL",
   "description": "The browserless platform",
   "author": "browserless.io",
@@ -25,7 +25,7 @@
     "dev": "npm run build:dev && env-cmd -f .env node build",
     "install:adblock": "node scripts/install-adblock.js",
     "install:debugger": "node scripts/install-debugger.js",
-    "install:browsers": "npx --no playwright-core install chromium firefox webkit",
+    "install:browsers": "node node_modules/playwright-core/cli.js install chromium firefox webkit",
     "install:dev": "npm run install:browsers && npm run install:debugger",
     "lint": "cross-env ESLINT_USE_FLAT_CONFIG=false eslint . --ext .ts --fix",
     "prepack": "npm run build:dev",
@@ -55,14 +55,14 @@
     "get-port": "^7.1.0",
     "gradient-string": "^3.0.0",
     "http-proxy": "^1.18.1",
-    "lighthouse": "^12.2.1",
+    "lighthouse": "^12.2.2",
     "micromatch": "^4.0.8",
-    "playwright-1.44": "npm:playwright-core@1.44.1",
     "playwright-1.45": "npm:playwright-core@1.45.3",
     "playwright-1.46": "npm:playwright-core@1.46.1",
     "playwright-1.47": "npm:playwright-core@1.47.2",
-    "playwright-core": "^1.48.1",
-    "puppeteer-core": "^23.6.0",
+    "playwright-1.48": "npm:playwright-core@1.48.2",
+    "playwright-core": "^1.49.0",
+    "puppeteer-core": "^23.9.0",
     "puppeteer-extra": "^3.3.6",
     "puppeteer-extra-plugin-stealth": "^2.11.2",
     "queue": "^7.0.0",
@@ -70,27 +70,27 @@
     "tar-fs": "^3.0.6"
   },
   "optionalDependencies": {
-    "@types/chai": "^5.0.0",
+    "@types/chai": "^5.0.1",
     "@types/debug": "^4.1.12",
     "@types/gradient-string": "^1.1.6",
     "@types/http-proxy": "^1.17.15",
     "@types/micromatch": "^4.0.9",
-    "@types/mocha": "^10.0.9",
-    "@types/node": "^22.7.9",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^22.9.1",
     "@types/sinon": "^17.0.3",
-    "@typescript-eslint/eslint-plugin": "^8.11.0",
-    "@typescript-eslint/parser": "^8.11.0",
+    "@typescript-eslint/eslint-plugin": "^8.15.0",
+    "@typescript-eslint/parser": "^8.15.0",
     "assert": "^2.0.0",
-    "chai": "^5.1.1",
+    "chai": "^5.1.2",
     "cross-env": "^7.0.3",
     "env-cmd": "^10.1.0",
     "esbuild": "^0.24.0",
     "esbuild-plugin-polyfill-node": "^0.3.0",
-    "eslint": "^9.13.0",
+    "eslint": "^9.14.0",
     "extract-zip": "^2.0.1",
     "gunzip-maybe": "^1.4.2",
-    "marked": "^14.1.3",
-    "mocha": "^10.7.3",
+    "marked": "^15.0.2",
+    "mocha": "^10.8.2",
     "move-file": "^3.1.0",
     "prettier": "^3.3.3",
     "sinon": "^19.0.2",
@@ -100,11 +100,11 @@
   },
   "playwrightVersions": {
     "default": "playwright-core",
-    "1.48": "playwright-core",
+    "1.49": "playwright-core",
+    "1.48": "playwright-1.48",
     "1.47": "playwright-1.47",
     "1.46": "playwright-1.46",
-    "1.45": "playwright-1.45",
-    "1.44": "playwright-1.44"
+    "1.45": "playwright-1.45"
   },
   "eslintConfig": {
     "root": true,

package/src/browsers/browsers.cdp.ts

@@ -195,11 +195,22 @@ export class ChromiumCDP extends EventEmitter {
 
     // Bypass the host we bind to so things like /function can work with proxies
     if (options.args?.some((arg) => arg.includes('--proxy-server'))) {
-      const bypassList = [
+      const defaultBypassList = [
         this.config.getHost(),
         new URL(this.config.getExternalAddress()).hostname,
       ];
-      options.args.push(`--proxy-bypass-list=${bypassList.join(',')}`);
+      const bypassProxyListIdx = options.args?.findIndex((arg) =>
+        arg.includes('--proxy-bypass-list'),
+      );
+      if (bypassProxyListIdx !== -1) {
+        options.args[bypassProxyListIdx] =
+          `--proxy-bypass-list=` +
+          [options.args[bypassProxyListIdx].split('=')[1], ...defaultBypassList]
+            .filter((_) => !!_)
+            .join(';');
+      } else {
+        options.args.push(`--proxy-bypass-list=${defaultBypassList.join(';')}`);
+      }
     }
 
     const finalOptions = {