@browserless.io/browserless 2.2.0-beta-8 → 2.2.0

package/extensions/ublock/js/static-filtering-parser.js

@@ -896,7 +896,8 @@ export class AstFilterParser {
         this.reResponseheaderPattern = /^\^responseheader\(.*\)$/;
         this.rePatternScriptletJsonArgs = /^\{.*\}$/;
         this.reGoodRegexToken = /[^\x01%0-9A-Za-z][%0-9A-Za-z]{7,}|[^\x01%0-9A-Za-z][%0-9A-Za-z]{1,6}[^\x01%0-9A-Za-z]/;
-        this.reBadCSP = /(?:=|;)\s*report-(?:to|uri)\b/;
+        this.reBadCSP = /(?:^|[;,])\s*report-(?:to|uri)\b/i;
+        this.reBadPP = /(?:^|[;,])\s*report-to\b/i;
         this.reNoopOption = /^_+$/;
         this.scriptletArgListParser = new ArgListParser(',');
     }
@@ -1400,7 +1401,11 @@ export class AstFilterParser {
                     realBad = this.isRegexPattern() === false;
                     break;
                 case NODE_TYPE_NET_OPTION_NAME_PERMISSIONS:
-                    realBad = modifierType !== 0 || (hasValue || isException) === false;
+                    realBad = modifierType !== 0 ||
+                        (hasValue || isException) === false ||
+                        this.reBadPP.test(
+                            this.getNetOptionValue(NODE_TYPE_NET_OPTION_NAME_PERMISSIONS)
+                        );
                     if ( realBad ) { break; }
                     modifierType = type;
                     break;
@@ -1496,7 +1501,7 @@ export class AstFilterParser {
                 }
                 break;
             }
-            case NODE_TYPE_NET_OPTION_NAME_URLTRANSFORM:
+            case NODE_TYPE_NET_OPTION_NAME_URLTRANSFORM: {
                 realBad = abstractTypeCount || behaviorTypeCount || unredirectableTypeCount;
                 if ( realBad ) { break; }
                 if ( isException !== true && this.options.trustedSource !== true ) {
@@ -1505,11 +1510,12 @@ export class AstFilterParser {
                     break;
                 }
                 const value = this.getNetOptionValue(NODE_TYPE_NET_OPTION_NAME_URLTRANSFORM);
-                if ( parseReplaceValue(value) === undefined ) {
+                if ( value !== '' && parseReplaceValue(value) === undefined ) {
                     this.astError = AST_ERROR_OPTION_BADVALUE;
                     realBad = true;
                 }
                 break;
+            }
             case NODE_TYPE_NET_OPTION_NAME_REMOVEPARAM:
                 realBad = abstractTypeCount || behaviorTypeCount;
                 break;
@@ -3297,10 +3303,9 @@ class ExtSelectorCompiler {
         if ( this.astHasType(parts, 'Error') ) { return; }
         if ( this.astHasType(parts, 'Selector') === false ) { return; }
         if ( this.astIsValidSelectorList(parts) === false ) { return; }
-        if (
-            this.astHasType(parts, 'ProceduralSelector') === false &&
-            this.astHasType(parts, 'ActionSelector') === false
-        ) {
+        if ( this.astHasType(parts, 'ProceduralSelector') ) {
+            if ( this.astHasType(parts, 'PseudoElementSelector') ) { return; }
+        } else if ( this.astHasType(parts, 'ActionSelector') === false ) {
             return this.astSerialize(parts);
         }
         const r = this.astCompile(parts);
@@ -4023,6 +4028,7 @@ class ExtSelectorCompiler {
     compileXpathExpression(s) {
         const r = this.unquoteString(s);
         if ( r.i !== s.length ) { return; }
+        if ( globalThis.document instanceof Object === false ) { return r.s; }
         try {
             globalThis.document.createExpression(r.s, null);
         } catch (e) {

package/extensions/ublock/js/static-net-filtering.js

@@ -4571,17 +4571,7 @@ FilterContainer.prototype.dnrFromCompiled = function(op, context, ...args) {
             }
             break;
         case 'uritransform': {
-            const path = rule.__modifierValue;
-            let priority = rule.priority || 1;
-            if ( rule.__modifierAction !== ALLOW_REALM ) {
-                const transform = { path };
-                rule.action.type = 'redirect';
-                rule.action.redirect = { transform };
-                rule.priority = priority + 1;
-            } else {
-                rule.action.type = 'block';
-                rule.priority = priority + 2;
-            }
+            dnrAddRuleError(rule, `Incompatible with DNR: uritransform=${rule.__modifierValue}`);
             break;
         }
         default:
@@ -5299,25 +5289,37 @@ FilterContainer.prototype.redirectRequest = function(redirectEngine, fctxt) {
 FilterContainer.prototype.transformRequest = function(fctxt) {
     const directives = this.matchAndFetchModifiers(fctxt, 'uritransform');
     if ( directives === undefined ) { return; }
-    const directive = directives[directives.length-1];
-    if ( (directive.bits & ALLOW_REALM) !== 0 ) { return directives; }
-    if ( directive.refs instanceof Object === false ) { return; }
-    const { refs } = directive;
-    if ( refs.$cache === null ) {
-        refs.$cache = sfp.parseReplaceValue(refs.value);
-    }
-    const cache = refs.$cache;
-    if ( cache === undefined ) { return; }
     const redirectURL = new URL(fctxt.url);
-    const before = redirectURL.pathname + redirectURL.search;
-    if ( cache.re.test(before) !== true ) { return; }
-    const after = before.replace(cache.re, cache.replacement);
-    if ( after === before ) { return; }
-    const searchPos = after.includes('?') && after.indexOf('?') || after.length;
-    redirectURL.pathname = after.slice(0, searchPos);
-    redirectURL.search = after.slice(searchPos);
-    fctxt.redirectURL = redirectURL.href;
-    return directives;
+    const out = [];
+    for ( const directive of directives ) {
+        if ( (directive.bits & ALLOW_REALM) !== 0 ) {
+            out.push(directive);
+            continue;
+        }
+        const { refs } = directive;
+        if ( refs instanceof Object === false ) { continue; }
+        if ( refs.$cache === null ) {
+            refs.$cache = sfp.parseReplaceValue(refs.value);
+        }
+        const cache = refs.$cache;
+        if ( cache === undefined ) { continue; }
+        const before = `${redirectURL.pathname}${redirectURL.search}${redirectURL.hash}`;
+        if ( cache.re.test(before) !== true ) { continue; }
+        const after = before.replace(cache.re, cache.replacement);
+        if ( after === before ) { continue; }
+        const hashPos = after.indexOf('#');
+        redirectURL.hash = hashPos !== -1 ? after.slice(hashPos) : '';
+        const afterMinusHash = hashPos !== -1 ? after.slice(0, hashPos) : after;
+        const searchPos = afterMinusHash.indexOf('?');
+        redirectURL.search = searchPos !== -1 ? afterMinusHash.slice(searchPos) : '';
+        redirectURL.pathname = searchPos !== -1 ? after.slice(0, searchPos) : after;
+        out.push(directive);
+    }
+    if ( out.length === 0 ) { return; }
+    if ( redirectURL.href !== fctxt.url ) {
+        fctxt.redirectURL = redirectURL.href;
+    }
+    return out;
 };
 
 function parseRedirectRequestValue(directive) {
@@ -5422,7 +5424,7 @@ FilterContainer.prototype.filterQuery = function(fctxt) {
         fctxt.redirectURL = url.slice(0, qpos);
         if ( params.size !== 0 ) {
             fctxt.redirectURL += '?' + Array.from(params).map(a =>
-                a[1] === '' ? a[0] : `${a[0]}=${a[1]}`
+                a[1] === '' ? `${a[0]}=` : `${a[0]}=${a[1]}`
             ).join('&');
         }
         if ( hpos !== url.length ) {

package/extensions/ublock/js/storage.js

@@ -628,6 +628,10 @@ onBroadcast(msg => {
     );
 };
 
+µb.userFiltersAreEnabled = function() {
+    return this.selectedFilterLists.includes(this.userFiltersPath);
+};
+
 /******************************************************************************/
 
 µb.autoSelectRegionalFilterLists = function(lists) {
@@ -845,8 +849,10 @@ onBroadcast(msg => {
     let loadingPromise;
     let t0 = 0;
 
+    const elapsed = ( ) => `${Date.now() - t0} ms`;
+
     const onDone = ( ) => {
-        ubolog(`loadFilterLists() took ${Date.now()-t0} ms`);
+        ubolog(`loadFilterLists() All filters in memory at ${elapsed()}`);
 
         staticNetFilteringEngine.freeze();
         staticExtFilteringEngine.freeze();
@@ -854,14 +860,16 @@ onBroadcast(msg => {
         vAPI.net.unsuspend();
         filteringBehaviorChanged();
 
-        vAPI.storage.set({ 'availableFilterLists': µb.availableFilterLists });
+        ubolog(`loadFilterLists() All filters ready at ${elapsed()}`);
 
         logger.writeOne({
             realm: 'message',
             type: 'info',
-            text: 'Reloading all filter lists: done'
+            text: `Reloading all filter lists: done, took ${elapsed()}`
         });
 
+        vAPI.storage.set({ 'availableFilterLists': µb.availableFilterLists });
+
         broadcast({
             what: 'staticFilteringDataChanged',
             parseCosmeticFilters: µb.userSettings.parseAllABPHideFilters,
@@ -877,6 +885,7 @@ onBroadcast(msg => {
     };
 
     const applyCompiledFilters = (assetKey, compiled) => {
+        ubolog(`loadFilterLists() Loading filters from ${assetKey} at ${elapsed()}`);
         const snfe = staticNetFilteringEngine;
         const sxfe = staticExtFilteringEngine;
         let acceptedCount = snfe.acceptedCount + sxfe.acceptedCount;
@@ -910,6 +919,8 @@ onBroadcast(msg => {
         µb.selfieManager.destroy();
         staticFilteringReverseLookup.resetLists();
 
+        ubolog(`loadFilterLists() All filters removed at ${elapsed()}`);
+
         // We need to build a complete list of assets to pull first: this is
         // because it *may* happens that some load operations are synchronous:
         // This happens for assets which do not exist, or assets with no
@@ -945,11 +956,14 @@ onBroadcast(msg => {
 
     µb.loadFilterLists = function() {
         if ( loadingPromise instanceof Promise ) { return loadingPromise; }
+        ubolog('loadFilterLists() Start');
         t0 = Date.now();
         loadedListKeys.length = 0;
         loadingPromise = Promise.all([
             this.getAvailableLists().then(lists => onFilterListsReady(lists)),
-            this.loadRedirectResources(),
+            this.loadRedirectResources().then(( ) => {
+                ubolog(`loadFilterLists() Redirects/scriptlets ready at ${elapsed()}`);
+            }),
         ]).then(( ) => {
             onDone();
         });

package/extensions/ublock/js/traffic.js

@@ -551,7 +551,7 @@ const onHeadersReceived = function(details) {
             }
         }
         if ( jobs.length !== 0 ) {
-            bodyFilterer.doFilter(fctxt, jobs);
+            bodyFilterer.doFilter(details.requestId, fctxt, jobs);
         }
     }
 
@@ -886,10 +886,10 @@ const bodyFilterer = (( ) => {
             this.str = s;
             this.modified = true;
         }
-        static doFilter(fctxt, jobs) {
+        static doFilter(requestId, fctxt, jobs) {
             if ( jobs.length === 0 ) { return; }
             const session = new Session(fctxt, mime, charset, jobs);
-            session.stream = browser.webRequest.filterResponseData(session.id);
+            session.stream = browser.webRequest.filterResponseData(requestId);
             session.stream.ondata = onStreamData;
             session.stream.onstop = onStreamStop;
             session.stream.onerror = onStreamError;

package/extensions/ublock/js/ublock.js

@@ -148,7 +148,7 @@ const matchBucket = function(url, hostname, bucket, start) {
         }
         bucket.push(directive);
         this.saveWhitelist();
-        filteringBehaviorChanged({ hostname: targetHostname });
+        filteringBehaviorChanged({ hostname: targetHostname, direction: -1 });
         return true;
     }
 

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

@@ -87,6 +87,19 @@ vAPI.app = {
     },
 };
 
+/******************************************************************************/
+
+// Generate segments of random six alphanumeric characters, thus one segment
+// is a value out of 36^6 = over 2x10^9 values.
+
+vAPI.generateSecret = (size = 1) => {
+    let secret = '';
+    while ( size-- ) {
+        secret += (Math.floor(Math.random() * 2176782336) + 2176782336).toString(36).slice(1);
+    }
+    return secret;
+};
+
 /*******************************************************************************
  * 
  * https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/storage/session
@@ -1165,11 +1178,6 @@ vAPI.messaging = {
 //   Support using a new secret for every network request.
 
 {
-    // Generate a 6-character alphanumeric string, thus one random value out
-    // of 36^6 = over 2x10^9 values.
-    const generateSecret = ( ) =>
-        (Math.floor(Math.random() * 2176782336) + 2176782336).toString(36).slice(1);
-
     const root = vAPI.getURL('/');
     const reSecret = /\?secret=(\w+)/;
     const shortSecrets = [];
@@ -1207,7 +1215,7 @@ vAPI.messaging = {
                 }
             }
             lastShortSecretTime = Date.now();
-            const secret = generateSecret();
+            const secret = vAPI.generateSecret();
             shortSecrets.push(secret);
             return secret;
         },
@@ -1215,7 +1223,7 @@ vAPI.messaging = {
             if ( previous !== undefined ) {
                 longSecrets.delete(previous);
             }
-            const secret = `${generateSecret()}${generateSecret()}${generateSecret()}`;
+            const secret = vAPI.generateSecret(3);
             longSecrets.add(secret);
             return secret;
         },

package/extensions/ublock/logger-ui.html

@@ -58,26 +58,34 @@
                         <input type="search" placeholder="logFilterPrompt" spellcheck="false">
                         <span id="filterExprButton" class="button fa-icon expanded" data-i18n-title="loggerRowFiltererBuiltinTip">angle-up</span>
                         <div id="filterExprPicker">
-                            <div><span data-filtex="!" data-i18n="loggerRowFiltererBuiltinNot"></span><span data-filtex="\t--\t|\t<<\t|\t##" data-i18n="loggerRowFiltererBuiltinBlocked"></span><span data-filtex="\t\+\+\t|\t\*\*\t|\t#@#" data-i18n="loggerRowFiltererBuiltinAllowed"></span><span data-filtex="[$,](?:csp|permissions|removeparam|redirect-rule|replace|urltransform)=|\t\<\<\t" data-i18n="loggerRowFiltererBuiltinModified"></span></div>
+                            <div><span data-filtex="!" data-i18n="loggerRowFiltererBuiltinNot"></span><span data-filtex="\x1F--\x1F|\x1F<<\x1F|\x1F##" data-i18n="loggerRowFiltererBuiltinBlocked"></span><span data-filtex="\x1F\+\+\x1F|\x1F\*\*\x1F|\x1F#@#" data-i18n="loggerRowFiltererBuiltinAllowed"></span><span data-filtex="[$,](?:csp|permissions|removeparam|redirect-rule|replace|urltransform)=|\x1F\<\<\x1F" data-i18n="loggerRowFiltererBuiltinModified"></span></div>
                             <div><span data-filtex="!" data-i18n="loggerRowFiltererBuiltinNot"></span>
                                 <span style="flex-direction: column;">
-                                    <div><span data-filtex="\t(?:css|(?:inline-)?font)\t">css/font</span><span data-filtex="\timage\t">image</span><span data-filtex="\tmedia\t">media</span><span data-filtex="\t(?:inline-)?script(?:ing)?\t">script</span></div>
-                                    <div><span data-filtex="\t(?:websocket|xhr)\t">xhr</span><span data-filtex="\t(?:frame|object)\t">frame</span><span data-filtex="\t(?:dom|g(?:eneric)?hide|s(?:pecific)?hide)\t">dom</span><span data-filtex="\t(?:scriptlet)\t">scriptlet</span><span data-filtex="\t(?:beacon|csp_report|doc|ping|popup|popunder|other)\t">other</span></div>
+                                    <div><span data-filtex="\x1F(?:css|(?:inline-)?font)\x1F">css/font</span><span data-filtex="\x1Fimage\x1F">image</span><span data-filtex="\x1Fmedia\x1F">media</span><span data-filtex="\x1F(?:inline-)?script(?:ing)?\x1F">script</span></div>
+                                    <div><span data-filtex="\x1F(?:websocket|xhr)\x1F">xhr</span><span data-filtex="\x1F(?:frame|object)\x1F">frame</span><span data-filtex="\x1F(?:dom|g(?:eneric)?hide|s(?:pecific)?hide)\x1F">dom</span><span data-filtex="\x1F(?:scriptlet)\x1F">scriptlet</span><span data-filtex="\x1F(?:beacon|csp_report|doc|ping|popup|popunder|other)\x1F">other</span></div>
                                 </span>
                             </div>
-                            <div><span data-filtex="!" data-i18n="loggerRowFiltererBuiltinNot"></span><span data-filtex="\t(?:0,)?1\t" data-i18n="loggerRowFiltererBuiltin1p"></span><span data-filtex="\t(?:3(?:,\d)?|0,3)\t" data-i18n="loggerRowFiltererBuiltin3p"></span><span data-filtex="\t0,\d\t">tabless</span></div>
-                            <div><span data-filtex="!" data-i18n="loggerRowFiltererBuiltinNot"></span><span data-filtex="\tget\t">get</span><span data-filtex="\thead\t">head</span><span data-filtex="\tpost\t">post</span></div>
+                            <div><span data-filtex="!" data-i18n="loggerRowFiltererBuiltinNot"></span><span data-filtex="\x1F(?:0,)?1\x1F" data-i18n="loggerRowFiltererBuiltin1p"></span><span data-filtex="\x1F(?:3(?:,\d)?|0,3)\x1F" data-i18n="loggerRowFiltererBuiltin3p"></span><span data-filtex="\x1F0,\d\x1F">tabless</span></div>
+                            <div><span data-filtex="!" data-i18n="loggerRowFiltererBuiltinNot"></span><span data-filtex="\x1Fget\x1F">get</span><span data-filtex="\x1Fhead\x1F">head</span><span data-filtex="\x1Fpost\x1F">post</span></div>
                             <div><span data-filtex="!" data-i18n="loggerRowFiltererBuiltinNot" class="on"></span>
                                 <span style="flex-direction: column;">
-                                    <div><span data-filtex="\bcsp=[^\t]+\t(?:--|\+\+)\t">csp</span><span data-filtex="\bpermissions=[^\t]+\t(?:--|\+\+)\t" class="on">permissions</span><span data-filtex="\bredirect-rule=[^\t]+\t(?:--|\+\+)\t">redirect</span></div>
-                                    <div><span data-filtex="\bremoveparam=[^\t]+\t(?:--|\+\+)\t">removeparam</span><span data-filtex="\burltransform=[^\t]+\t(?:--|\+\+)\t">urltransform</span></div>
+                                    <div><span data-filtex="\bcsp=[^\x1F]+\x1F(?:--|\+\+)\x1F">csp</span><span data-filtex="\bpermissions=[^\x1F]+\x1F(?:--|\+\+)\x1F" class="on">permissions</span><span data-filtex="\bredirect-rule=[^\x1F]+\x1F(?:--|\+\+)\x1F">redirect</span></div>
+                                    <div><span data-filtex="\bremoveparam=[^\x1F]+\x1F(?:--|\+\+)\x1F">removeparam</span><span data-filtex="\buritransform=[^\x1F]+\x1F(?:--|\+\+)\x1F">uritransform</span></div>
+                                </span>
+                            </div>
+                            <div id="filterExprCnameOf" style="display:none"><span data-filtex="!" data-i18n="loggerRowFiltererBuiltinNot"></span><span data-filtex="\x1FaliasURL=.">CNAME</span></div>
+                            <div><span data-filtex="!" data-i18n="loggerRowFiltererBuiltinNot"></span>
+                                <span style="flex-direction: column;">
+                                    <div><span data-filtex="\x1Finfo\x1F">info</span><span data-filtex="\x1Ferror\x1F">error</span></div>
                                 </span>
                             </div>
-                            <div id="filterExprCnameOf" style="display:none"><span data-filtex="!" data-i18n="loggerRowFiltererBuiltinNot"></span><span data-filtex="\taliasURL=.">CNAME</span></div>
                         </div>
                     </span>
                 </span>
             </div>
+            <div>
+                <button id="logLevel" class="iconified notext" title="Toggle verbose mode" type="button"><span class="fa-icon">volume-up</span><span class="hover"></span></button>
+            </div>
             <div>
                 <button id="loggerStats" class="iconified notext" style="display: none;"><span class="fa-icon">bar-chart</span><span class="hover"></span></button>
                 <button id="loggerExport" class="iconified notext"><span class="fa-icon">clipboard</span><span class="hover"></span></button>
@@ -92,7 +100,7 @@
                     </div>
                 </div>
                 <div id="vwLineSizer">
-                    <div class="logEntry oneLine"><div><span>00:00:00</span><span>&nbsp;</span><span>**</span><span>&nbsp;</span><span>3,3</span><span>options</span><span>inline-script</span><span>&nbsp;</span></div></div>
+                    <div class="logEntry oneLine"><div class="fields"><span>00:00:00</span><span>&nbsp;</span><span>**</span><span>&nbsp;</span><span>3,3</span><span>options</span><span>inline-script</span><span>&nbsp;</span></div></div>
                 </div>
             </div>
         </div>
@@ -109,7 +117,7 @@
 </div>
 
 <div id="templates" style="display: none;">
-    <div id="logEntryTemplate"><div><span></span>&#8203;<span></span>&#8203;<span></span>&#8203;<span></span>&#8203;<span></span>&#8203;<span></span>&#8203;<span></span>&#8203;<span></span></div></div>
+    <div id="logEntryTemplate"><div class="fields"><span></span>&#8203;<span></span>&#8203;<span></span>&#8203;<span></span>&#8203;<span></span>&#8203;<span></span>&#8203;<span></span>&#8203;<span></span></div></div>
 
     <div class="netFilteringDialog" data-pane="details">
         <div class="dialogControls">

package/extensions/ublock/manifest.json

@@ -30,6 +30,9 @@
     },
     "toggle-cosmetic-filtering": {
       "description": "__MSG_toggleCosmeticFiltering__"
+    },
+    "toggle-javascript": {
+      "description": "__MSG_toggleJavascript__"
     }
   },
   "content_scripts": [
@@ -108,7 +111,7 @@
   "storage": {
     "managed_schema": "managed_storage.json"
   },
-  "version": "1.55.0",
+  "version": "1.56.0",
   "web_accessible_resources": [
     "/web_accessible_resources/*"
   ]

package/extensions/ublock/web_accessible_resources/chartbeat.js

@@ -27,4 +27,7 @@
         activity: noopfn,
         virtualPage: noopfn
     };
+    for ( const hider of document.querySelectorAll('style[id^=chartbeat-flicker-control]') ) {
+        hider.remove();
+    }
 })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@browserless.io/browserless",
-  "version": "2.2.0-beta-8",
+  "version": "2.2.0",
   "license": "SSPL",
   "description": "The browserless platform",
   "author": "browserless.io",
@@ -14,8 +14,9 @@
     "browserless": "./bin/browserless.js"
   },
   "scripts": {
-    "build": "npm run clean && npm run build:ts && npm run install:adblock && npm run build:schemas && npm run build:selectors && npm run build:openapi",
+    "build": "npm run clean && npm run build:ts && npm run install:adblock && npm run build:schemas && npm run build:selectors && npm run build:devtools && npm run build:openapi",
     "build:dev": "npm run build && npm run build:function",
+    "build:devtools": "node scripts/install-devtools.js",
     "build:function": "node scripts/build-function.js",
     "build:schemas": "node scripts/build-schemas.js",
     "build:openapi": "node scripts/build-open-api.js",
@@ -24,7 +25,7 @@
     "clean": "node scripts/clean.js",
     "dev": "npm run build:dev && env-cmd -f .env node build",
     "install:adblock": "node scripts/install-adblock.js",
-    "install:browsers": "npx --yes playwright install chromium firefox webkit",
+    "install:browsers": "npx --yes playwright install chromium firefox webkit chrome",
     "install:dev": "npm run install:browsers",
     "lint": "eslint . --ext .ts --fix",
     "prepack": "npm run build:dev",
@@ -56,11 +57,11 @@
     "lighthouse": "^11.1.0",
     "micromatch": "^4.0.4",
     "playwright-core": "^1.41.2",
-    "puppeteer-core": "^22.0.0",
+    "puppeteer-core": "^22.1.0",
     "puppeteer-extra": "^3.3.6",
     "puppeteer-extra-plugin-stealth": "^2.11.2",
     "queue": "^7.0.0",
-    "systeminformation": "^5.21.24"
+    "systeminformation": "^5.22.0"
   },
   "optionalDependencies": {
     "@types/chai": "^4.3.11",
@@ -69,28 +70,28 @@
     "@types/http-proxy": "^1.17.14",
     "@types/micromatch": "^4.0.6",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^20.11.16",
+    "@types/node": "^20.11.19",
     "@types/sinon": "^17.0.3",
-    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/eslint-plugin": "^7.0.0",
     "@typescript-eslint/parser": "^6.21.0",
     "assert": "^2.0.0",
-    "chai": "^5.0.3",
+    "chai": "^5.1.0",
     "cross-env": "^7.0.3",
     "env-cmd": "^10.1.0",
-    "esbuild": "^0.20.0",
+    "esbuild": "^0.20.1",
     "esbuild-plugin-polyfill-node": "^0.3.0",
     "eslint": "^8.56.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-typescript-sort-keys": "^3.1.0",
     "extract-zip": "^2.0.1",
     "marked": "^12.0.0",
-    "mocha": "^10.0.0",
+    "mocha": "^10.3.0",
     "move-file": "^3.1.0",
     "prettier": "^3.2.5",
     "sinon": "^17.0.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.3.3",
-    "typescript-json-schema": "^0.62.0"
+    "typescript-json-schema": "^0.63.0"
   },
   "eslintConfig": {
     "root": true,

package/scripts/build-function.js

@@ -6,7 +6,7 @@ import { polyfillNode } from 'esbuild-plugin-polyfill-node';
 
 build({
   bundle: true,
-  entryPoints: ['src/routes/chromium/utils/function/client.ts'],
+  entryPoints: ['src/shared/utils/function/client.ts'],
   outfile: 'static/function/client.js',
   plugins: [
     polyfillNode({

package/scripts/build-open-api.js

@@ -98,12 +98,13 @@ const buildOpenAPI = async (
         const query = routeModule.replace('.js', '.query.json');
         const response = routeModule.replace('.js', '.response.json');
         const isWebSocket = routeModule.includes('/ws/') || name.endsWith('ws');
-
+        const path = Array.isArray(route.path)
+          ? route.path.join(' ')
+          : [route.path];
         const {
           tags,
           description,
           auth,
-          path,
           method,
           accepts,
           contentTypes,

package/scripts/clean.js

@@ -3,5 +3,10 @@
 import { deleteAsync } from 'del';
 
 (async () => {
-  await deleteAsync(['build', 'static/function/*js*']);
+  await deleteAsync([
+    'build',
+    'static/function/*js*',
+    'static/devtools*',
+    'static/debugger*',
+  ]);
 })();

package/scripts/install-debugger.js

@@ -0,0 +1,20 @@
+import { cp } from 'fs/promises';
+import { fileURLToPath } from 'url';
+import path from 'path';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+const from = path.join(
+  __dirname,
+  '..',
+  'node_modules',
+  'browserless-debugger',
+  'static',
+);
+const to = path.join(__dirname, '..', 'static', 'debugger');
+
+(async () => {
+  await cp(from, to, {
+    recursive: true,
+  });
+})();

package/scripts/install-devtools.js

@@ -0,0 +1,40 @@
+import { rename, rm, unlink } from 'fs/promises';
+import extract from 'extract-zip';
+import { fileURLToPath } from 'url';
+import fs from 'fs';
+import https from 'https';
+import path from 'path';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+// @TODO get this link dynamically
+const devtoolsUrl = `https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Mac%2F848005%2Fdevtools-frontend.zip?alt=media`;
+
+const staticDir = path.join(__dirname, '..', 'static');
+const zipPath = path.join(staticDir, 'devtools.zip');
+const extractPath = path.join(staticDir, 'devtools-temp');
+const finalPath = path.join(staticDir, 'devtools');
+const deepPath = path.join(
+  extractPath,
+  'devtools-frontend',
+  'resources',
+  'inspector',
+);
+const zipStream = fs.createWriteStream(zipPath);
+
+const cleanup = async () => {
+  return await Promise.all([
+    unlink(zipPath),
+    rm(extractPath, { recursive: true }),
+  ]);
+};
+
+(async () => {
+  await rm(finalPath, { recursive: true }).catch(() => {});
+  await new Promise((resolve, reject) =>
+    https.get(devtoolsUrl, (response) => {
+      response.pipe(zipStream).on('close', resolve).on('error', reject);
+    }),
+  );
+  await extract(zipPath, { dir: extractPath });
+  await rename(deepPath, finalPath);
+})().finally(cleanup);

package/src/browserless.ts

@@ -3,22 +3,23 @@ import {
   BrowserHTTPRoute,
   BrowserManager,
   BrowserWebsocketRoute,
-  CDPChromium,
+  ChromeCDP,
+  ChromiumCDP,
+  ChromiumPlaywright,
   Config,
   FileSystem,
+  FirefoxPlaywright,
   HTTPRoute,
   HTTPServer,
   IBrowserlessStats,
   Limiter,
   Metrics,
   Monitoring,
-  PlaywrightChromium,
-  PlaywrightFirefox,
-  PlaywrightWebkit,
   Router,
   Token,
   WebHooks,
   WebSocketRoute,
+  WebkitPlaywright,
   availableBrowsers,
   createLogger,
   getRouteFiles,
@@ -163,10 +164,11 @@ export class Browserless {
     const httpRoutes: Array<HTTPRoute | BrowserHTTPRoute> = [];
     const wsRoutes: Array<WebSocketRoute | BrowserWebsocketRoute> = [];
     const internalBrowsers = [
-      CDPChromium,
-      PlaywrightFirefox,
-      PlaywrightChromium,
-      PlaywrightWebkit,
+      ChromiumCDP,
+      ChromeCDP,
+      FirefoxPlaywright,
+      ChromiumPlaywright,
+      WebkitPlaywright,
     ];
 
     const [[httpRouteFiles, wsRouteFiles], installedBrowsers] =
@@ -273,7 +275,7 @@ export class Browserless {
         !installedBrowsers.some((b) => b.name === route.browser?.name)
       ) {
         throw new Error(
-          `Couldn't load route "${route.path}" due to missing browser of "${route.browser?.name}"`,
+          `Couldn't load route "${route.path}" due to missing browser binary for "${route.browser?.name}"`,
         );
       }
     });

package/src/browsers/chrome.cdp.ts

@@ -0,0 +1,10 @@
+import {
+  chromeExecutablePath,
+  createLogger,
+} from '@browserless.io/browserless';
+import { ChromiumCDP } from './chromium.cdp.js';
+
+export class ChromeCDP extends ChromiumCDP {
+  protected executablePath = chromeExecutablePath;
+  protected debug = createLogger('browsers:chrome:cdp');
+}