@browserless.io/browserless 2.16.1 → 2.17.0-beta-2

package/build/browserless.js

@@ -135,7 +135,7 @@ export class Browserless extends EventEmitter {
         const [[internalHttpRouteFiles, internalWsRouteFiles], installedBrowsers] = await Promise.all([getRouteFiles(this.config), availableBrowsers]);
         const hasDebugger = await this.config.hasDebugger();
         const debuggerURL = hasDebugger &&
-            makeExternalURL(this.config.getExternalAddress(), `/debugger/?token=${this.config.getToken()}`);
+            makeExternalURL(this.config.getExternalAddress(), `/debugger/?token=xxx`);
         const docsLink = makeExternalURL(this.config.getExternalAddress(), '/docs');
         this.logger.info(printLogo(docsLink, debuggerURL));
         this.logger.info(`Running as user "${userInfo().username}"`);

package/build/browsers/browsers.cdp.js

@@ -121,6 +121,11 @@ export class ChromiumCDP extends EventEmitter {
             this.blockAds ? ublockPath : null,
             extensionLaunchArgs ? extensionLaunchArgs.split('=')[1] : null,
         ].filter((_) => !!_);
+        // 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 = [this.config.getHost()];
+            options.args.push(`--proxy-bypass-list=${bypassList.join(',')}`);
+        }
         const finalOptions = {
             ...options,
             args: [

package/build/config.d.ts

@@ -24,6 +24,9 @@ export declare class Config extends EventEmitter {
     protected allowCors: boolean;
     protected corsMethods: string;
     protected corsOrigin: string;
+    protected corsHeaders: string;
+    protected corsCredentials: string;
+    protected corsExposeHeaders: string;
     protected corsMaxAge: number;
     protected maxCpu: number;
     protected maxMemory: number;
@@ -162,8 +165,11 @@ export declare class Config extends EventEmitter {
      * and `CORS_MAX_AGE`
      */
     getCORSHeaders(): {
+        'Access-Control-Allow-Credentials': string;
+        'Access-Control-Allow-Headers': string;
         'Access-Control-Allow-Methods': string;
         'Access-Control-Allow-Origin': string;
+        'Access-Control-Expose-Headers': string;
         'Access-Control-Max-Age': number;
     };
     /**

package/build/config.js

@@ -132,6 +132,9 @@ export class Config extends EventEmitter {
     allowCors = !!parseEnvVars(false, 'CORS', 'ENABLE_CORS');
     corsMethods = process.env.CORS_ALLOW_METHODS ?? 'OPTIONS, POST, GET';
     corsOrigin = process.env.CORS_ALLOW_ORIGIN ?? '*';
+    corsHeaders = process.env.CORS_ALLOW_HEADERS ?? '*';
+    corsCredentials = process.env.CORS_ALLOW_CREDENTIALS ?? 'true';
+    corsExposeHeaders = process.env.CORS_EXPOSE_HEADERS ?? '*';
     corsMaxAge = +(process.env.CORS_MAX_AGE ?? '2592000');
     maxCpu = +(process.env.MAX_CPU_PERCENT ?? '99');
     maxMemory = +(process.env.MAX_MEMORY_PERCENT ?? '99');
@@ -443,8 +446,11 @@ export class Config extends EventEmitter {
      */
     getCORSHeaders() {
         return {
+            'Access-Control-Allow-Credentials': this.corsCredentials,
+            'Access-Control-Allow-Headers': this.corsHeaders,
             'Access-Control-Allow-Methods': this.corsMethods,
             'Access-Control-Allow-Origin': this.corsOrigin,
+            'Access-Control-Expose-Headers': this.corsExposeHeaders,
             'Access-Control-Max-Age': this.corsMaxAge,
         };
     }

package/build/routes/chrome/http/content.post.body.json

@@ -438,14 +438,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@11906": {
+                "__@toStringTag@11909": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@11906",
+                "__@toStringTag@11909",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -480,13 +480,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@11906": {
+        "__@toStringTag@11909": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@11906",
+        "__@toStringTag@11909",
         "byteLength"
       ]
     },
@@ -496,18 +496,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@11945": {
+        "__@species@11948": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@11906": {
+        "__@toStringTag@11909": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@11945",
-        "__@toStringTag@11906",
+        "__@species@11948",
+        "__@toStringTag@11909",
         "byteLength"
       ]
     },

package/build/routes/chrome/http/pdf.post.body.json

@@ -583,14 +583,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@106450": {
+                "__@toStringTag@94678": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@106450",
+                "__@toStringTag@94678",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -625,13 +625,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@106450": {
+        "__@toStringTag@94678": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@106450",
+        "__@toStringTag@94678",
         "byteLength"
       ]
     },
@@ -641,18 +641,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@106489": {
+        "__@species@94717": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@106450": {
+        "__@toStringTag@94678": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@106489",
-        "__@toStringTag@106450",
+        "__@species@94717",
+        "__@toStringTag@94678",
         "byteLength"
       ]
     },

package/build/routes/chrome/http/scrape.post.body.json

@@ -485,14 +485,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@118448": {
+                "__@toStringTag@118478": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@118448",
+                "__@toStringTag@118478",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -527,13 +527,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@118448": {
+        "__@toStringTag@118478": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@118448",
+        "__@toStringTag@118478",
         "byteLength"
       ]
     },
@@ -543,18 +543,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@118487": {
+        "__@species@118517": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@118448": {
+        "__@toStringTag@118478": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@118487",
-        "__@toStringTag@118448",
+        "__@species@118517",
+        "__@toStringTag@118478",
         "byteLength"
       ]
     },

package/build/routes/chrome/http/screenshot.post.body.json

@@ -528,14 +528,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@154319": {
+                "__@toStringTag@130556": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@154319",
+                "__@toStringTag@130556",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -570,13 +570,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@154319": {
+        "__@toStringTag@130556": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@154319",
+        "__@toStringTag@130556",
         "byteLength"
       ]
     },
@@ -586,18 +586,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@154358": {
+        "__@species@130595": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@154319": {
+        "__@toStringTag@130556": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@154358",
-        "__@toStringTag@154319",
+        "__@species@130595",
+        "__@toStringTag@130556",
         "byteLength"
       ]
     },

package/build/routes/chromium/http/content.post.body.json

@@ -438,14 +438,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@142293": {
+                "__@toStringTag@142544": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@142293",
+                "__@toStringTag@142544",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -480,13 +480,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@142293": {
+        "__@toStringTag@142544": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@142293",
+        "__@toStringTag@142544",
         "byteLength"
       ]
     },
@@ -496,18 +496,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@142332": {
+        "__@species@142583": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@142293": {
+        "__@toStringTag@142544": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@142332",
-        "__@toStringTag@142293",
+        "__@species@142583",
+        "__@toStringTag@142544",
         "byteLength"
       ]
     },

package/build/routes/chromium/http/pdf.post.body.json

@@ -583,14 +583,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@225235": {
+                "__@toStringTag@225292": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@225235",
+                "__@toStringTag@225292",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -625,13 +625,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@225235": {
+        "__@toStringTag@225292": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@225235",
+        "__@toStringTag@225292",
         "byteLength"
       ]
     },
@@ -641,18 +641,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@225274": {
+        "__@species@225331": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@225235": {
+        "__@toStringTag@225292": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@225274",
-        "__@toStringTag@225235",
+        "__@species@225331",
+        "__@toStringTag@225292",
         "byteLength"
       ]
     },

package/build/routes/chromium/http/scrape.post.body.json

@@ -485,14 +485,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@249023": {
+                "__@toStringTag@249086": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@249023",
+                "__@toStringTag@249086",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -527,13 +527,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@249023": {
+        "__@toStringTag@249086": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@249023",
+        "__@toStringTag@249086",
         "byteLength"
       ]
     },
@@ -543,18 +543,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@249062": {
+        "__@species@249125": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@249023": {
+        "__@toStringTag@249086": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@249062",
-        "__@toStringTag@249023",
+        "__@species@249125",
+        "__@toStringTag@249086",
         "byteLength"
       ]
     },

package/build/routes/chromium/http/screenshot.post.body.json

@@ -528,14 +528,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@261095": {
+                "__@toStringTag@261161": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@261095",
+                "__@toStringTag@261161",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -570,13 +570,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@261095": {
+        "__@toStringTag@261161": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@261095",
+        "__@toStringTag@261161",
         "byteLength"
       ]
     },
@@ -586,18 +586,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@261134": {
+        "__@species@261200": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@261095": {
+        "__@toStringTag@261161": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@261134",
-        "__@toStringTag@261095",
+        "__@species@261200",
+        "__@toStringTag@261161",
         "byteLength"
       ]
     },

package/build/server.js

@@ -24,7 +24,7 @@ export class HTTPServer extends EventEmitter {
         this.Logger = Logger;
         this.host = config.getHost();
         this.port = config.getPort();
-        this.logger.info(`Server instantiated with host "${this.host}" on port "${this.port}" using token "${this.config.getToken()}"`);
+        this.logger.info(`Server instantiated with host "${this.host}" on port "${this.port}`);
     }
     onHTTPUnauthorized(_req, res) {
         this.logger.error(`HTTP request is not properly authorized, responding with 401`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@browserless.io/browserless",
-  "version": "2.16.1",
+  "version": "2.17.0-beta-2",
   "license": "SSPL",
   "description": "The browserless platform",
   "author": "browserless.io",
@@ -76,7 +76,7 @@
     "@types/http-proxy": "^1.17.15",
     "@types/micromatch": "^4.0.9",
     "@types/mocha": "^10.0.7",
-    "@types/node": "^22.1.0",
+    "@types/node": "^22.2.0",
     "@types/sinon": "^17.0.3",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",
@@ -91,7 +91,7 @@
     "extract-zip": "^2.0.1",
     "gunzip-maybe": "^1.4.2",
     "marked": "^14.0.0",
-    "mocha": "^10.7.0",
+    "mocha": "^10.7.3",
     "move-file": "^3.1.0",
     "prettier": "^3.3.3",
     "sinon": "^18.0.0",

package/src/browserless.ts

@@ -243,10 +243,7 @@ export class Browserless extends EventEmitter {
     const hasDebugger = await this.config.hasDebugger();
     const debuggerURL =
       hasDebugger &&
-      makeExternalURL(
-        this.config.getExternalAddress(),
-        `/debugger/?token=${this.config.getToken()}`,
-      );
+      makeExternalURL(this.config.getExternalAddress(), `/debugger/?token=xxx`);
     const docsLink = makeExternalURL(this.config.getExternalAddress(), '/docs');
 
     this.logger.info(printLogo(docsLink, debuggerURL));

package/src/browsers/browsers.cdp.ts

@@ -193,6 +193,12 @@ export class ChromiumCDP extends EventEmitter {
       extensionLaunchArgs ? extensionLaunchArgs.split('=')[1] : null,
     ].filter((_) => !!_);
 
+    // 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 = [this.config.getHost()];
+      options.args.push(`--proxy-bypass-list=${bypassList.join(',')}`);
+    }
+
     const finalOptions = {
       ...options,
       args: [

package/src/config.ts

@@ -157,6 +157,9 @@ export class Config extends EventEmitter {
   protected corsMethods =
     process.env.CORS_ALLOW_METHODS ?? 'OPTIONS, POST, GET';
   protected corsOrigin = process.env.CORS_ALLOW_ORIGIN ?? '*';
+  protected corsHeaders = process.env.CORS_ALLOW_HEADERS ?? '*';
+  protected corsCredentials = process.env.CORS_ALLOW_CREDENTIALS ?? 'true';
+  protected corsExposeHeaders = process.env.CORS_EXPOSE_HEADERS ?? '*';
   protected corsMaxAge = +(process.env.CORS_MAX_AGE ?? '2592000');
   protected maxCpu = +(process.env.MAX_CPU_PERCENT ?? '99');
   protected maxMemory = +(process.env.MAX_MEMORY_PERCENT ?? '99');
@@ -526,13 +529,19 @@ export class Config extends EventEmitter {
    * and `CORS_MAX_AGE`
    */
   public getCORSHeaders(): {
+    'Access-Control-Allow-Credentials': string;
+    'Access-Control-Allow-Headers': string;
     'Access-Control-Allow-Methods': string;
     'Access-Control-Allow-Origin': string;
+    'Access-Control-Expose-Headers': string;
     'Access-Control-Max-Age': number;
   } {
     return {
+      'Access-Control-Allow-Credentials': this.corsCredentials,
+      'Access-Control-Allow-Headers': this.corsHeaders,
       'Access-Control-Allow-Methods': this.corsMethods,
       'Access-Control-Allow-Origin': this.corsOrigin,
+      'Access-Control-Expose-Headers': this.corsExposeHeaders,
       'Access-Control-Max-Age': this.corsMaxAge,
     };
   }

package/src/server.ts

@@ -55,9 +55,7 @@ export class HTTPServer extends EventEmitter {
     this.port = config.getPort();
 
     this.logger.info(
-      `Server instantiated with host "${this.host}" on port "${
-        this.port
-      }" using token "${this.config.getToken()}"`,
+      `Server instantiated with host "${this.host}" on port "${this.port}`,
     );
   }
 

package/static/docs/swagger.json

@@ -255,14 +255,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@11906": {
+                "__@toStringTag@11909": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@11906",
+                "__@toStringTag@11909",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -297,13 +297,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@11906": {
+        "__@toStringTag@11909": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@11906",
+        "__@toStringTag@11909",
         "byteLength"
       ]
     },
@@ -313,18 +313,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@11945": {
+        "__@species@11948": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@11906": {
+        "__@toStringTag@11909": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@11945",
-        "__@toStringTag@11906",
+        "__@species@11948",
+        "__@toStringTag@11909",
         "byteLength"
       ]
     },
@@ -969,7 +969,7 @@
   },
   "info": {
     "title": "Browserless",
-    "version": "2.16.1",
+    "version": "2.17.0-beta-2",
     "x-logo": {
       "altText": "browserless logo",
       "url": "./docs/browserless-logo-inline.svg"

package/static/docs/swagger.min.json

@@ -255,14 +255,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@11906": {
+                "__@toStringTag@11909": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@11906",
+                "__@toStringTag@11909",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -297,13 +297,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@11906": {
+        "__@toStringTag@11909": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@11906",
+        "__@toStringTag@11909",
         "byteLength"
       ]
     },
@@ -313,18 +313,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@11945": {
+        "__@species@11948": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@11906": {
+        "__@toStringTag@11909": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@11945",
-        "__@toStringTag@11906",
+        "__@species@11948",
+        "__@toStringTag@11909",
         "byteLength"
       ]
     },
@@ -969,7 +969,7 @@
   },
   "info": {
     "title": "Browserless",
-    "version": "2.16.1",
+    "version": "2.17.0-beta-2",
     "x-logo": {
       "altText": "browserless logo",
       "url": "./docs/browserless-logo-inline.svg"