@browserless.io/browserless 2.25.0 → 2.25.2

package/build/routes/chromium/tests/kill-sessions.spec.js

@@ -38,7 +38,7 @@ describe('/kill API', function () {
         }
         expect(errorThrown1.message).contains('closed');
         expect(errorThrown2.message).contains('closed');
-    }).timeout(45000);
+    });
     it('Kill session by browserId', async () => {
         await start();
         const browser = await puppeteer.connect({

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

@@ -3,9 +3,6 @@ import puppeteer, { Connection } from 'puppeteer-core';
 import { NodeWebSocketTransport } from 'puppeteer-core/lib/esm/puppeteer/node/NodeWebSocketTransport.js';
 import { expect } from 'chai';
 describe('WebSocket Page API', function () {
-    // Server shutdown can take a few seconds
-    // and so can these tests :/
-    this.timeout(5000);
     let browserless;
     const start = ({ config = new Config(), metrics = new Metrics(), } = {}) => {
         browserless = new Browserless({ config, metrics });

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

@@ -4,9 +4,6 @@ import { deleteAsync } from 'del';
 import { expect } from 'chai';
 import puppeteer from 'puppeteer-core';
 describe('Chromium WebSocket API', function () {
-    // Server shutdown can take a few seconds
-    // and so can these tests :/
-    this.timeout(5000);
     let browserless;
     const start = ({ config = new Config(), metrics = new Metrics(), } = {}) => {
         browserless = new Browserless({ config, metrics });

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

@@ -312,7 +312,7 @@
           "type": "string"
         },
         "partitionKey": {
-          "description": "Cookie partition key. In Chrome, it matches the top-level site the\npartitioned cookie is available in. In Firefox, it matches the\nsource origin\n(https://w3c.github.io/webdriver-bidi/#type-storage-PartitionKey).",
+          "description": "Cookie partition key. In Chrome, it matches the top-level site the\npartitioned cookie is available in. In Firefox, it matches the\nsource origin in the\n{@link https://w3c.github.io/webdriver-bidi/#type-storage-PartitionKey PartitionKey}.",
           "anyOf": [
             {
               "$ref": "#/definitions/CookiePartitionKey"
@@ -463,14 +463,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@301850": {
+                "__@toStringTag@276600": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@301850",
+                "__@toStringTag@276600",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -505,13 +505,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@301850": {
+        "__@toStringTag@276600": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@301850",
+        "__@toStringTag@276600",
         "byteLength"
       ]
     },
@@ -521,18 +521,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@301888": {
+        "__@species@276638": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@301850": {
+        "__@toStringTag@276600": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@301888",
-        "__@toStringTag@301850",
+        "__@species@276638",
+        "__@toStringTag@276600",
         "byteLength"
       ]
     },

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

@@ -314,7 +314,7 @@
           "type": "string"
         },
         "partitionKey": {
-          "description": "Cookie partition key. In Chrome, it matches the top-level site the\npartitioned cookie is available in. In Firefox, it matches the\nsource origin\n(https://w3c.github.io/webdriver-bidi/#type-storage-PartitionKey).",
+          "description": "Cookie partition key. In Chrome, it matches the top-level site the\npartitioned cookie is available in. In Firefox, it matches the\nsource origin in the\n{@link https://w3c.github.io/webdriver-bidi/#type-storage-PartitionKey PartitionKey}.",
           "anyOf": [
             {
               "$ref": "#/definitions/CookiePartitionKey"
@@ -608,14 +608,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@339568": {
+                "__@toStringTag@389578": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@339568",
+                "__@toStringTag@389578",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -650,13 +650,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@339568": {
+        "__@toStringTag@389578": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@339568",
+        "__@toStringTag@389578",
         "byteLength"
       ]
     },
@@ -666,18 +666,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@339606": {
+        "__@species@389616": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@339568": {
+        "__@toStringTag@389578": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@339606",
-        "__@toStringTag@339568",
+        "__@species@389616",
+        "__@toStringTag@389578",
         "byteLength"
       ]
     },

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

@@ -323,7 +323,7 @@
           "type": "string"
         },
         "partitionKey": {
-          "description": "Cookie partition key. In Chrome, it matches the top-level site the\npartitioned cookie is available in. In Firefox, it matches the\nsource origin\n(https://w3c.github.io/webdriver-bidi/#type-storage-PartitionKey).",
+          "description": "Cookie partition key. In Chrome, it matches the top-level site the\npartitioned cookie is available in. In Firefox, it matches the\nsource origin in the\n{@link https://w3c.github.io/webdriver-bidi/#type-storage-PartitionKey PartitionKey}.",
           "anyOf": [
             {
               "$ref": "#/definitions/CookiePartitionKey"
@@ -510,14 +510,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@389787": {
+                "__@toStringTag@402284": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@389787",
+                "__@toStringTag@402284",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -552,13 +552,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@389787": {
+        "__@toStringTag@402284": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@389787",
+        "__@toStringTag@402284",
         "byteLength"
       ]
     },
@@ -568,18 +568,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@389825": {
+        "__@species@402322": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@389787": {
+        "__@toStringTag@402284": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@389825",
-        "__@toStringTag@389787",
+        "__@species@402322",
+        "__@toStringTag@402284",
         "byteLength"
       ]
     },

package/build/routes/edge/http/scrape.post.response.json

@@ -247,7 +247,7 @@
           "type": "string"
         },
         "partitionKey": {
-          "description": "Cookie partition key. In Chrome, it is the top-level site the\npartitioned cookie is available in. In Firefox, it matches the\nsource origin\n(https://w3c.github.io/webdriver-bidi/#type-storage-PartitionKey).",
+          "description": "Cookie partition key. In Chrome, it is the top-level site the\npartitioned cookie is available in. In Firefox, it matches the\nsource origin in the\n{@link https://w3c.github.io/webdriver-bidi/#type-storage-PartitionKey PartitionKey}.",
           "anyOf": [
             {
               "$ref": "#/definitions/CookiePartitionKey"

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

@@ -320,7 +320,7 @@
           "type": "string"
         },
         "partitionKey": {
-          "description": "Cookie partition key. In Chrome, it matches the top-level site the\npartitioned cookie is available in. In Firefox, it matches the\nsource origin\n(https://w3c.github.io/webdriver-bidi/#type-storage-PartitionKey).",
+          "description": "Cookie partition key. In Chrome, it matches the top-level site the\npartitioned cookie is available in. In Firefox, it matches the\nsource origin in the\n{@link https://w3c.github.io/webdriver-bidi/#type-storage-PartitionKey PartitionKey}.",
           "anyOf": [
             {
               "$ref": "#/definitions/CookiePartitionKey"
@@ -553,14 +553,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@402569": {
+                "__@toStringTag@427556": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@402569",
+                "__@toStringTag@427556",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -595,13 +595,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@402569": {
+        "__@toStringTag@427556": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@402569",
+        "__@toStringTag@427556",
         "byteLength"
       ]
     },
@@ -611,18 +611,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@402607": {
+        "__@species@427594": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@402569": {
+        "__@toStringTag@427556": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@402607",
-        "__@toStringTag@402569",
+        "__@species@427594",
+        "__@toStringTag@427556",
         "byteLength"
       ]
     },

package/build/routes/edge/tests/page-websocket.spec.js

@@ -3,9 +3,6 @@ import puppeteer, { Connection } from 'puppeteer-core';
 import { NodeWebSocketTransport } from 'puppeteer-core/lib/esm/puppeteer/node/NodeWebSocketTransport.js';
 import { expect } from 'chai';
 describe('WebSocket Page API', function () {
-    // Server shutdown can take a few seconds
-    // and so can these tests :/
-    this.timeout(5000);
     let browserless;
     const start = ({ config = new Config(), metrics = new Metrics(), } = {}) => {
         browserless = new Browserless({ config, metrics });

package/build/routes/firefox/tests/kill-sessions.spec.js

@@ -34,7 +34,7 @@ describe('/kill API firefox', function () {
         }
         expect(errorThrown1.message).contains('closed');
         expect(errorThrown2.message).contains('closed');
-    }).timeout(45000);
+    });
     it('Kill session by browserId', async () => {
         await start();
         const browser = await firefox.connect(`ws://localhost:3000/playwright/firefox?token=browserless`);

package/build/routes/webkit/tests/kill-sessions.spec.js

@@ -34,7 +34,7 @@ describe('/kill API webkit', function () {
         }
         expect(errorThrown1.message).contains('closed');
         expect(errorThrown2.message).contains('closed');
-    }).timeout(45000);
+    });
     it('Kill session by browserId', async () => {
         await start();
         const browser = await webkit.connect(`ws://localhost:3000/webkit/playwright?token=browserless`);

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

@@ -2,9 +2,6 @@ import { Browserless, Config, Metrics, sleep, } from '@browserless.io/browserles
 import { expect } from 'chai';
 import { webkit } from 'playwright-core';
 describe('Webkit Websocket API', function () {
-    // Server shutdown can take a few seconds
-    // and so can these tests :/
-    this.timeout(5000);
     let browserless;
     const start = ({ config = new Config(), metrics = new Metrics(), } = {}) => {
         browserless = new Browserless({ config, metrics });

package/docker/multi/Dockerfile

@@ -28,17 +28,17 @@ RUN echo "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula sele
   fonts-open-sans \
   libwebp-dev
 
-# Chrome stable is only supported on non-ARM builds
+# Chrome stable and Edge is only supported on non-ARM builds
 # so it's installation is conditional on whether or not amd64
 RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
-  ./node_modules/playwright-core/cli.js install --with-deps chrome; \
+  ./node_modules/playwright-core/cli.js install --with-deps chrome msedge; \
   else \
-  rm -rf ./src/routes/chrome; \
+  rm -rf ./src/routes/chrome ./src/routes/edge; \
   fi
 
 # NOTE it's important to not use npx playwright-core here since it'll likely install
 # a more recent version than we potentially have in our own package.json
-RUN ./node_modules/playwright-core/cli.js install --with-deps chromium firefox webkit msedge &&\
+RUN ./node_modules/playwright-core/cli.js install --with-deps chromium firefox webkit &&\
   npm run build &&\
   npm run build:function &&\
   npm prune production &&\

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@browserless.io/browserless",
-  "version": "2.25.0",
+  "version": "2.25.2",
   "license": "SSPL",
   "description": "The browserless platform",
   "author": "browserless.io",
@@ -51,18 +51,18 @@
     "debug": "^4.4.0",
     "del": "^8.0.0",
     "enjoi": "^9.0.1",
-    "file-type": "^20.1.0",
+    "file-type": "^20.4.0",
     "get-port": "^7.1.0",
     "gradient-string": "^3.0.0",
     "http-proxy": "^1.18.1",
-    "lighthouse": "^12.3.0",
+    "lighthouse": "^12.4.0",
     "micromatch": "^4.0.8",
     "playwright-1.46": "npm:playwright-core@1.46.1",
     "playwright-1.47": "npm:playwright-core@1.47.2",
     "playwright-1.48": "npm:playwright-core@1.48.2",
     "playwright-1.49": "npm:playwright-core@1.49.1",
     "playwright-core": "1.50.1",
-    "puppeteer-core": "24.2.1",
+    "puppeteer-core": "24.3.0",
     "puppeteer-extra": "^3.3.6",
     "puppeteer-extra-plugin-stealth": "^2.11.2",
     "queue": "^7.0.0",
@@ -76,23 +76,23 @@
     "@types/http-proxy": "^1.17.16",
     "@types/micromatch": "^4.0.9",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^22.13.4",
-    "@types/sinon": "^17.0.3",
-    "@typescript-eslint/eslint-plugin": "^8.24.1",
-    "@typescript-eslint/parser": "^8.24.1",
+    "@types/node": "^22.13.8",
+    "@types/sinon": "^17.0.4",
+    "@typescript-eslint/eslint-plugin": "^8.25.0",
+    "@typescript-eslint/parser": "^8.25.0",
     "assert": "^2.0.0",
     "chai": "^5.2.0",
     "cross-env": "^7.0.3",
     "env-cmd": "^10.1.0",
     "esbuild": "^0.25.0",
     "esbuild-plugin-polyfill-node": "^0.3.0",
-    "eslint": "^9.20.1",
+    "eslint": "^9.21.0",
     "extract-zip": "^2.0.1",
     "gunzip-maybe": "^1.4.2",
     "marked": "^15.0.7",
     "mocha": "^11.1.0",
     "move-file": "^3.1.0",
-    "prettier": "^3.5.1",
+    "prettier": "^3.5.3",
     "sinon": "^19.0.2",
     "ts-node": "^10.9.2",
     "typescript": "^5.7.3",
@@ -157,7 +157,7 @@
     ],
     "loader": "ts-node/esm",
     "spec": "src/**/*.spec.ts",
-    "timeout": 30000,
+    "timeout": 45000,
     "slow": 5000
   },
   "prettier": {

package/scripts/test.sh

@@ -17,4 +17,4 @@ then
 fi
 
 # Run the tests
-./node_modules/.bin/_mocha --timeout 30000 --slow 10000 --exit $@ && kill -TERM $xvfb
+./node_modules/.bin/_mocha --timeout 45000 --slow 10000 --exit $@ && kill -TERM $xvfb

package/src/browsers/index.ts

@@ -229,17 +229,18 @@ export class BrowserManager {
     browser: BrowserInstance,
     session: BrowserlessSession,
   ) {
-    const serverAddress = this.config.getExternalAddress();
+    const serverHTTPAddress = this.config.getExternalAddress();
+    const serverWSAddress = this.config.getExternalWebSocketAddress();
 
     const sessions = [
       {
         ...session,
         browser: browser.constructor.name,
         browserId: session.id,
-        initialConnectURL: new URL(session.initialConnectURL, serverAddress)
+        initialConnectURL: new URL(session.initialConnectURL, serverHTTPAddress)
           .href,
         killURL: session.id
-          ? makeExternalURL(serverAddress, '/kill/', session.id)
+          ? makeExternalURL(serverHTTPAddress, '/kill/', session.id)
           : null,
         running: browser.isRunning(),
         timeAliveMs: Date.now() - session.startedOn,
@@ -247,25 +248,48 @@ export class BrowserManager {
       },
     ];
 
-    const wsEndpoint = browser.wsEndpoint();
-    if (this.browserIsChrome(browser) && wsEndpoint) {
-      const port = new URL(wsEndpoint).port;
-      const response = await fetch(`http://127.0.0.1:${port}/json/list`, {
-        headers: {
-          Host: '127.0.0.1',
+    const internalWSEndpoint = browser.wsEndpoint();
+    const externalURI = new URL(serverHTTPAddress);
+    const externalProtocol = externalURI.protocol === 'https:' ? 'wss' : 'ws';
+
+    if (this.browserIsChrome(browser) && internalWSEndpoint) {
+      const browserURI = new URL(internalWSEndpoint);
+      const response = await fetch(
+        `http://127.0.0.1:${browserURI.port}/json/list`,
+        {
+          headers: {
+            Host: '127.0.0.1',
+          },
         },
-      });
+      );
       if (response.ok) {
-        const externalUrl = new URL(serverAddress);
-        const protocol = externalUrl.protocol === 'https:' ? 'wss' : 'ws';
         const body = await response.json();
         for (const page of body) {
-          const devtoolsFrontendUrl = `/devtools/inspector.html?${protocol}=${externalUrl.host}${externalUrl.pathname}/devtools/page/${page.id}`;
+          const pageURI = new URL(page.webSocketDebuggerUrl);
+          const devtoolsFrontendUrl =
+            `/devtools/inspector.html?${externalProtocol}=${externalURI.host}${externalURI.pathname}${pageURI.pathname}`.replace(
+              /\/\//gi,
+              '/',
+            );
+
+          // /devtools/browser/b733c56b-8543-489c-b27b-28e12d966c01
+          const browserWSEndpoint = new URL(
+            browserURI.pathname,
+            serverWSAddress,
+          ).href;
+
+          // /devtools/page/802B1FDAD5F75E9BCE92D066DFF13253
+          const webSocketDebuggerUrl = new URL(
+            pageURI.pathname,
+            serverWSAddress,
+          ).href;
+
           sessions.push({
             ...sessions[0],
             ...page,
-            browserWSEndpoint: wsEndpoint,
+            browserWSEndpoint,
             devtoolsFrontendUrl,
+            webSocketDebuggerUrl,
           });
         }
       }

package/src/limiter.spec.ts

@@ -65,7 +65,7 @@ describe(`Limiter`, () => {
         resolve(undefined);
       });
     });
-  }).timeout(5000);
+  });
 
   it('passes through arguments', () =>
     new Promise((resolve, reject) => {

package/src/routes/chrome/tests/kill-sessions.spec.ts

@@ -47,7 +47,7 @@ describe('/kill API', function () {
     }
     expect((errorThrown1 as Error).message).contains('closed');
     expect((errorThrown2 as Error).message).contains('closed');
-  }).timeout(45000);
+  });
 
   it('Kill session by browserId', async () => {
     await start();

package/src/routes/chrome/tests/page-websocket.spec.ts

@@ -4,10 +4,6 @@ import { NodeWebSocketTransport } from 'puppeteer-core/lib/esm/puppeteer/node/No
 import { expect } from 'chai';
 
 describe('WebSocket Page API', function () {
-  // Server shutdown can take a few seconds
-  // and so can these tests :/
-  this.timeout(5000);
-
   let browserless: Browserless;
 
   const start = ({

package/src/routes/chromium/tests/kill-sessions.spec.ts

@@ -47,7 +47,7 @@ describe('/kill API', function () {
     }
     expect((errorThrown1 as Error).message).contains('closed');
     expect((errorThrown2 as Error).message).contains('closed');
-  }).timeout(45000);
+  });
 
   it('Kill session by browserId', async () => {
     await start();

package/src/routes/chromium/tests/page-websocket.spec.ts

@@ -4,10 +4,6 @@ import { NodeWebSocketTransport } from 'puppeteer-core/lib/esm/puppeteer/node/No
 import { expect } from 'chai';
 
 describe('WebSocket Page API', function () {
-  // Server shutdown can take a few seconds
-  // and so can these tests :/
-  this.timeout(5000);
-
   let browserless: Browserless;
 
   const start = ({

package/src/routes/chromium/tests/websocket.spec.ts

@@ -13,10 +13,6 @@ import { expect } from 'chai';
 import puppeteer from 'puppeteer-core';
 
 describe('Chromium WebSocket API', function () {
-  // Server shutdown can take a few seconds
-  // and so can these tests :/
-  this.timeout(5000);
-
   let browserless: Browserless;
 
   const start = ({

package/src/routes/edge/tests/page-websocket.spec.ts

@@ -4,10 +4,6 @@ import { NodeWebSocketTransport } from 'puppeteer-core/lib/esm/puppeteer/node/No
 import { expect } from 'chai';
 
 describe('WebSocket Page API', function () {
-  // Server shutdown can take a few seconds
-  // and so can these tests :/
-  this.timeout(5000);
-
   let browserless: Browserless;
 
   const start = ({

package/src/routes/firefox/tests/kill-sessions.spec.ts

@@ -47,7 +47,7 @@ describe('/kill API firefox', function () {
     }
     expect((errorThrown1 as Error).message).contains('closed');
     expect((errorThrown2 as Error).message).contains('closed');
-  }).timeout(45000);
+  });
 
   it('Kill session by browserId', async () => {
     await start();

package/src/routes/webkit/tests/kill-sessions.spec.ts

@@ -47,7 +47,7 @@ describe('/kill API webkit', function () {
     }
     expect((errorThrown1 as Error).message).contains('closed');
     expect((errorThrown2 as Error).message).contains('closed');
-  }).timeout(45000);
+  });
 
   it('Kill session by browserId', async () => {
     await start();

package/src/routes/webkit/tests/websocket.spec.ts

@@ -8,10 +8,6 @@ import { expect } from 'chai';
 import { webkit } from 'playwright-core';
 
 describe('Webkit Websocket API', function () {
-  // Server shutdown can take a few seconds
-  // and so can these tests :/
-  this.timeout(5000);
-
   let browserless: Browserless;
 
   const start = ({