@browserless.io/browserless 2.30.1 → 2.31.1-beta-1

package/CHANGELOG.md

@@ -1,7 +1,14 @@
-# [Latest](https://github.com/browserless/chrome/compare/v2.30.1...main)
+# [Latest](https://github.com/browserless/chrome/compare/v2.31.0...main)
 
 - Dependency updates.
 
+# [v2.31.0](https://github.com/browserless/chrome/compare/v2.30.1...v2.31.0)
+
+- Dependency updates -- including fix for tar-fs.
+- Bumps `puppeteer-core` to `24.10.0`.
+- Remove stray console.log's in route building.
+- Fixes for duplicative user-data-dir flags (fixes CI issues).
+
 # [v2.30.1](https://github.com/browserless/chrome/compare/v2.30.0...v2.30.1)
 
 - Dependency updates.

package/build/browserless.d.ts

@@ -34,7 +34,7 @@ export declare class Browserless extends EventEmitter {
         token?: Browserless['token'];
         webhooks?: Browserless['webhooks'];
     });
-    protected filterRoutes(route: HTTPRoute | BrowserHTTPRoute | WebSocketRoute | BrowserWebsocketRoute): boolean;
+    protected filterNonMacArm64Browsers(route: HTTPRoute | BrowserHTTPRoute | WebSocketRoute | BrowserWebsocketRoute): boolean;
     protected loadPwVersions(): Promise<void>;
     protected saveMetrics(): Promise<void>;
     setMetricsSaveInterval(interval: number): void;

package/build/browserless.js

@@ -50,7 +50,7 @@ export class Browserless extends EventEmitter {
     }
     // Filter out routes that are not able to work on the arm64 architecture
     // and log a message as to why that is (can't run Chrome on non-apple arm64)
-    filterRoutes(route) {
+    filterNonMacArm64Browsers(route) {
         if (isArm64 &&
             !isMacOS &&
             'browser' in route &&
@@ -210,9 +210,14 @@ export class Browserless extends EventEmitter {
                 }
             }
         }
-        const allRoutes = [...httpRoutes, ...wsRoutes];
+        const allRoutes = [
+            [...httpRoutes].filter((r) => this.filterNonMacArm64Browsers(r)),
+            [...wsRoutes].filter((r) => this.filterNonMacArm64Browsers(r)),
+        ];
         // Validate that we have the browsers they are asking for
-        allRoutes.forEach((route) => {
+        allRoutes
+            .flat()
+            .map((route) => {
             if ('browser' in route &&
                 route.browser &&
                 internalBrowsers.includes(route.browser) &&
@@ -220,19 +225,16 @@ export class Browserless extends EventEmitter {
                 throw new Error(dedent(`Couldn't load route "${route.path}" due to missing browser binary for "${route.browser?.name}".
             Installed Browsers: ${installedBrowsers.map((b) => b.name).join(', ')}`));
             }
-        });
-        const duplicateNamedRoutes = allRoutes
+            return route;
+        })
             .filter((e, i, a) => a.findIndex((r) => r.name === e.name) !== i)
-            .map((r) => r.name);
-        if (duplicateNamedRoutes.length) {
-            this.logger.warn(`Found duplicate routing names. Route names must be unique:`, duplicateNamedRoutes);
-        }
-        httpRoutes
-            .filter((r) => this.filterRoutes(r))
-            .forEach((r) => this.router.registerHTTPRoute(r));
-        wsRoutes
-            .filter((r) => this.filterRoutes(r))
-            .forEach((r) => this.router.registerWebSocketRoute(r));
+            .map((r) => r.name)
+            .forEach((name) => {
+            this.logger.warn(`Found duplicate routing names. Route names must be unique: ${name}`);
+        });
+        const [filteredHTTPRoutes, filteredWSRoutes] = allRoutes;
+        filteredHTTPRoutes.forEach((r) => this.router.registerHTTPRoute(r));
+        filteredWSRoutes.forEach((r) => this.router.registerWebSocketRoute(r));
         this.logger.info(`Imported and validated all route files, starting up server.`);
         this.server = new HTTPServer(this.config, this.metrics, this.token, this.router, this.hooks, this.Logger);
         await this.loadPwVersions();

package/build/browsers/index.js

@@ -356,6 +356,9 @@ export class BrowserManager {
         const manualUserDataDir = launchOptions.args
             ?.find((arg) => arg.includes('--user-data-dir='))
             ?.split('=')[1] || launchOptions.userDataDir;
+        if (manualUserDataDir && launchOptions.args) {
+            launchOptions.args = launchOptions.args.filter((arg) => !arg.includes('--user-data-dir='));
+        }
         // Always specify a user-data-dir since plugins can "inject" their own
         // unless it's playwright which takes care of its own data-dirs
         const userDataDir = manualUserDataDir ||

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

@@ -463,14 +463,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@14939": {
+                "__@toStringTag@15012": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@14939",
+                "__@toStringTag@15012",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -505,13 +505,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@14939": {
+        "__@toStringTag@15012": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@14939",
+        "__@toStringTag@15012",
         "byteLength"
       ]
     },
@@ -521,18 +521,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@14977": {
+        "__@species@15050": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@14939": {
+        "__@toStringTag@15012": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@14977",
-        "__@toStringTag@14939",
+        "__@species@15050",
+        "__@toStringTag@15012",
         "byteLength"
       ]
     },

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

@@ -608,14 +608,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@104089": {
+                "__@toStringTag@89694": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@104089",
+                "__@toStringTag@89694",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -650,13 +650,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@104089": {
+        "__@toStringTag@89694": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@104089",
+        "__@toStringTag@89694",
         "byteLength"
       ]
     },
@@ -666,18 +666,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@104127": {
+        "__@species@89732": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@104089": {
+        "__@toStringTag@89694": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@104127",
-        "__@toStringTag@104089",
+        "__@species@89732",
+        "__@toStringTag@89694",
         "byteLength"
       ]
     },

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

@@ -510,14 +510,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@223288": {
+                "__@toStringTag@119728": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@223288",
+                "__@toStringTag@119728",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -552,13 +552,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@223288": {
+        "__@toStringTag@119728": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@223288",
+        "__@toStringTag@119728",
         "byteLength"
       ]
     },
@@ -568,18 +568,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@223326": {
+        "__@species@119766": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@223288": {
+        "__@toStringTag@119728": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@223326",
-        "__@toStringTag@223288",
+        "__@species@119766",
+        "__@toStringTag@119728",
         "byteLength"
       ]
     },

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

@@ -464,7 +464,20 @@
         },
         "path": {
           "description": "The file path to save the image to. The screenshot type will be inferred\nfrom file extension. If path is a relative path, then it is resolved\nrelative to current working directory. If no path is provided, the image\nwon't be saved to the disk.",
-          "type": "string"
+          "anyOf": [
+            {
+              "type": "string",
+              "pattern": "^.*\\.webp$"
+            },
+            {
+              "type": "string",
+              "pattern": "^.*\\.jpeg$"
+            },
+            {
+              "type": "string",
+              "pattern": "^.*\\.png$"
+            }
+          ]
         },
         "clip": {
           "description": "Specifies the region of the page/element to clip.",
@@ -553,14 +566,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@163825": {
+                "__@toStringTag@164690": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@163825",
+                "__@toStringTag@164690",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -595,13 +608,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@163825": {
+        "__@toStringTag@164690": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@163825",
+        "__@toStringTag@164690",
         "byteLength"
       ]
     },
@@ -611,18 +624,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@163863": {
+        "__@species@164728": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@163825": {
+        "__@toStringTag@164690": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@163863",
-        "__@toStringTag@163825",
+        "__@species@164728",
+        "__@toStringTag@164690",
         "byteLength"
       ]
     },

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

@@ -463,14 +463,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@148766": {
+                "__@toStringTag@179781": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@148766",
+                "__@toStringTag@179781",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -505,13 +505,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@148766": {
+        "__@toStringTag@179781": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@148766",
+        "__@toStringTag@179781",
         "byteLength"
       ]
     },
@@ -521,18 +521,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@148804": {
+        "__@species@179819": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@148766": {
+        "__@toStringTag@179781": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@148804",
-        "__@toStringTag@148766",
+        "__@species@179819",
+        "__@toStringTag@179781",
         "byteLength"
       ]
     },

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

@@ -608,14 +608,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@268037": {
+                "__@toStringTag@254448": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@268037",
+                "__@toStringTag@254448",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -650,13 +650,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@268037": {
+        "__@toStringTag@254448": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@268037",
+        "__@toStringTag@254448",
         "byteLength"
       ]
     },
@@ -666,18 +666,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@268075": {
+        "__@species@254486": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@268037": {
+        "__@toStringTag@254448": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@268075",
-        "__@toStringTag@268037",
+        "__@species@254486",
+        "__@toStringTag@254448",
         "byteLength"
       ]
     },

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

@@ -510,14 +510,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@297891": {
+                "__@toStringTag@314487": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@297891",
+                "__@toStringTag@314487",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -552,13 +552,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@297891": {
+        "__@toStringTag@314487": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@297891",
+        "__@toStringTag@314487",
         "byteLength"
       ]
     },
@@ -568,18 +568,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@297929": {
+        "__@species@314525": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@297891": {
+        "__@toStringTag@314487": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@297929",
-        "__@toStringTag@297891",
+        "__@species@314525",
+        "__@toStringTag@314487",
         "byteLength"
       ]
     },

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

@@ -464,7 +464,20 @@
         },
         "path": {
           "description": "The file path to save the image to. The screenshot type will be inferred\nfrom file extension. If path is a relative path, then it is resolved\nrelative to current working directory. If no path is provided, the image\nwon't be saved to the disk.",
-          "type": "string"
+          "anyOf": [
+            {
+              "type": "string",
+              "pattern": "^.*\\.webp$"
+            },
+            {
+              "type": "string",
+              "pattern": "^.*\\.jpeg$"
+            },
+            {
+              "type": "string",
+              "pattern": "^.*\\.png$"
+            }
+          ]
         },
         "clip": {
           "description": "Specifies the region of the page/element to clip.",
@@ -553,14 +566,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@387326": {
+                "__@toStringTag@299386": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@387326",
+                "__@toStringTag@299386",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -595,13 +608,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@387326": {
+        "__@toStringTag@299386": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@387326",
+        "__@toStringTag@299386",
         "byteLength"
       ]
     },
@@ -611,18 +624,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@387364": {
+        "__@species@299424": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@387326": {
+        "__@toStringTag@299386": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@387364",
-        "__@toStringTag@387326",
+        "__@species@299424",
+        "__@toStringTag@299386",
         "byteLength"
       ]
     },

package/build/routes/chromium/tests/websocket.spec.js

@@ -161,7 +161,7 @@ describe('Chromium WebSocket API', function () {
         expect(await exists(userDataDir)).to.be.false;
     });
     it('allows specified user-data-dirs', async () => {
-        const dataDir = '/tmp/data-dir';
+        const dataDir = '/tmp/data-dir-1';
         const config = new Config();
         config.setToken('browserless');
         const metrics = new Metrics();

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

@@ -463,14 +463,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@327805": {
+                "__@toStringTag@329647": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@327805",
+                "__@toStringTag@329647",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -505,13 +505,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@327805": {
+        "__@toStringTag@329647": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@327805",
+        "__@toStringTag@329647",
         "byteLength"
       ]
     },
@@ -521,18 +521,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@327843": {
+        "__@species@329685": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@327805": {
+        "__@toStringTag@329647": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@327843",
-        "__@toStringTag@327805",
+        "__@species@329685",
+        "__@toStringTag@329647",
         "byteLength"
       ]
     },