@browserless.io/browserless 2.17.1 → 2.19.0

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

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

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

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

package/build/server.js

@@ -241,7 +241,9 @@ export class HTTPServer extends EventEmitter {
     async shutdown() {
         this.logger.info(`HTTP Server is shutting down`);
         await new Promise((r) => this.server.close(r));
-        this.server && this.server.removeAllListeners();
+        if (this.server) {
+            this.server.removeAllListeners();
+        }
         // @ts-ignore garbage collect this reference
         this.server = null;
         this.logger.info(`HTTP Server shutdown complete`);

package/build/shared/json-version.http.js

@@ -25,6 +25,7 @@ export default class ChromiumJSONVersionGetRoute extends HTTPRoute {
             return jsonResponse(res, 200, this.cachedJSON);
         }
         catch (err) {
+            logger.warn(`Error handling request`, err);
             return writeResponse(res, 500, 'There was an error handling your request', contentTypes.text);
         }
     }

package/build/shared/utils/function/handler.js

@@ -3,9 +3,10 @@ import fs from 'fs';
 import path from 'path';
 export default (config, logger, options = {}) => async (req, browser) => {
     const isJson = req.headers['content-type']?.includes('json');
+    const functionPath = HTTPRoutes.function.replace('?(/)', '');
     const functionAssetLocation = path.join(config.getStatic(), 'function');
-    const functionRequestPath = makeExternalURL(config.getExternalAddress(), HTTPRoutes.function);
-    const functionIndexHTML = makeExternalURL(config.getExternalAddress(), HTTPRoutes.function, '/index.html');
+    const functionRequestPath = makeExternalURL(config.getExternalAddress(), functionPath);
+    const functionIndexHTML = makeExternalURL(config.getExternalAddress(), functionPath, '/index.html');
     const { code: rawCode, context: rawContext } = isJson
         ? req.body
         : {

package/build/shared/utils/performance/main.js

@@ -20,7 +20,8 @@ export default async ({ browser, context, logger, timeout, }) => {
                 return;
             if (pid)
                 process.kill(pid, 'SIGINT');
-            timeoutId && clearTimeout(timeoutId);
+            if (timeoutId)
+                clearTimeout(timeoutId);
             closed = true;
             timeoutId = null;
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@browserless.io/browserless",
-  "version": "2.17.1",
+  "version": "2.19.0",
   "license": "SSPL",
   "description": "The browserless platform",
   "author": "browserless.io",
@@ -56,48 +56,47 @@
     "gradient-string": "^2.0.0",
     "http-proxy": "^1.18.1",
     "lighthouse": "^12.2.0",
-    "micromatch": "^4.0.7",
+    "micromatch": "^4.0.8",
     "playwright-1.41": "npm:playwright-core@1.41.2",
     "playwright-1.42": "npm:playwright-core@1.42.1",
     "playwright-1.43": "npm:playwright-core@1.43.1",
     "playwright-1.44": "npm:playwright-core@1.44.1",
-    "playwright-core": "^1.46.0",
-    "puppeteer-core": "^23.1.0",
+    "playwright-core": "^1.46.1",
+    "puppeteer-core": "^23.2.1",
     "puppeteer-extra": "^3.3.6",
     "puppeteer-extra-plugin-stealth": "^2.11.2",
     "queue": "^7.0.0",
-    "systeminformation": "^5.23.4",
+    "systeminformation": "^5.23.5",
     "tar-fs": "^3.0.6"
   },
   "optionalDependencies": {
-    "@types/chai": "^4.3.17",
+    "@types/chai": "^4.3.18",
     "@types/debug": "^4.1.12",
     "@types/gradient-string": "^1.1.6",
     "@types/http-proxy": "^1.17.15",
     "@types/micromatch": "^4.0.9",
     "@types/mocha": "^10.0.7",
-    "@types/node": "^22.3.0",
+    "@types/node": "^22.5.2",
     "@types/sinon": "^17.0.3",
-    "@typescript-eslint/eslint-plugin": "^7.18.0",
-    "@typescript-eslint/parser": "^7.18.0",
+    "@typescript-eslint/eslint-plugin": "^8.4.0",
+    "@typescript-eslint/parser": "^8.4.0",
     "assert": "^2.0.0",
     "chai": "^5.1.1",
     "cross-env": "^7.0.3",
     "env-cmd": "^10.1.0",
-    "esbuild": "^0.23.0",
+    "esbuild": "^0.23.1",
     "esbuild-plugin-polyfill-node": "^0.3.0",
     "eslint": "^8.57.0",
-    "eslint-plugin-typescript-sort-keys": "^3.2.0",
     "extract-zip": "^2.0.1",
     "gunzip-maybe": "^1.4.2",
-    "marked": "^14.0.0",
+    "marked": "^14.1.0",
     "mocha": "^10.7.3",
     "move-file": "^3.1.0",
     "prettier": "^3.3.3",
     "sinon": "^18.0.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.5.4",
-    "typescript-json-schema": "^0.64.0"
+    "typescript-json-schema": "^0.65.1"
   },
   "playwrightVersions": {
     "default": "playwright-core",
@@ -111,32 +110,23 @@
     "root": true,
     "parser": "@typescript-eslint/parser",
     "plugins": [
-      "@typescript-eslint",
-      "typescript-sort-keys"
+      "@typescript-eslint"
     ],
     "extends": [
       "eslint:recommended",
       "plugin:@typescript-eslint/eslint-recommended",
-      "plugin:@typescript-eslint/recommended",
-      "plugin:typescript-sort-keys/recommended"
+      "plugin:@typescript-eslint/recommended"
     ],
     "ignorePatterns": [
       "node_modules/*",
+      "static/*",
+      "**.spec.ts",
       "build/*",
       ".DS_Store",
       ".no-git/*",
       "*.log"
     ],
     "rules": {
-      "sort-keys": [
-        "error",
-        "asc",
-        {
-          "caseSensitive": true,
-          "natural": false,
-          "minKeys": 2
-        }
-      ],
       "semi": [
         2,
         "always"

package/scripts/build-open-api.js

@@ -109,9 +109,10 @@ 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 path = (
+          Array.isArray(route.path) ? route.path.join(' ') : route.path
+        ).replace(/\?\(\/\)/g, '');
+
         const {
           tags,
           description,

package/src/browsers/index.ts

@@ -255,12 +255,16 @@ export class BrowserManager {
         },
       });
       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}`;
           sessions.push({
             ...sessions[0],
             ...page,
             browserWSEndpoint: wsEndpoint,
+            devtoolsFrontendUrl,
           });
         }
       }
@@ -299,8 +303,8 @@ export class BrowserManager {
         global.setTimeout(() => {
           const session = this.browsers.get(browser);
           if (session) {
-            this.log.trace(`Timer hit for "${session.id}"`),
-              this.close(browser, session);
+            this.log.trace(`Timer hit for "${session.id}"`);
+            this.close(browser, session);
           }
         }, timeout),
       );

package/src/http.ts

@@ -82,54 +82,54 @@ export enum Methods {
 export enum WebsocketRoutes {
   '/' = '?(/)',
   browser = '/devtools/browser/*',
-  chrome = '/chrome',
-  chromePlaywright = '/chrome/playwright',
-  chromium = '/chromium',
-  chromiumPlaywright = '/chromium/playwright',
-  firefoxPlaywright = '/firefox/playwright',
+  chrome = '/chrome?(/)',
+  chromePlaywright = '/chrome/playwright?(/)',
+  chromium = '/chromium?(/)',
+  chromiumPlaywright = '/chromium/playwright?(/)',
+  firefoxPlaywright = '/firefox/playwright?(/)',
   page = '/devtools/page/*',
-  playwrightChrome = '/playwright/chrome',
-  playwrightChromium = '/playwright/chromium',
-  playwrightFirefox = '/playwright/firefox',
-  playwrightWebkit = '/playwright/webkit',
-  webkitPlaywright = '/webkit/playwright',
+  playwrightChrome = '/playwright/chrome?(/)',
+  playwrightChromium = '/playwright/chromium?(/)',
+  playwrightFirefox = '/playwright/firefox?(/)',
+  playwrightWebkit = '/playwright/webkit?(/)',
+  webkitPlaywright = '/webkit/playwright?(/)',
 }
 
 export enum HTTPRoutes {
-  chromeContent = '/chrome/content',
-  chromeDownload = '/chrome/download',
-  chromeFunction = '/chrome/function',
-  chromePdf = '/chrome/pdf',
-  chromePerformance = '/chrome/performance',
-  chromeScrape = '/chrome/scrape',
-  chromeScreenshot = '/chrome/screenshot',
-  chromiumContent = '/chromium/content',
-  chromiumDownload = '/chromium/download',
-  chromiumFunction = '/chromium/function',
-  chromiumPdf = '/chromium/pdf',
-  chromiumPerformance = '/chromium/performance',
-  chromiumScrape = '/chromium/scrape',
-  chromiumScreenshot = '/chromium/screenshot',
-  content = '/content',
-  download = '/download',
-  function = '/function',
-  jsonList = '/json/list',
-  jsonNew = '/json/new',
-  jsonProtocol = '/json/protocol',
-  jsonVersion = '/json/version',
-  pdf = '/pdf',
-  performance = '/performance',
-  scrape = '/scrape',
-  screenshot = '/screenshot',
+  chromeContent = '/chrome/content?(/)',
+  chromeDownload = '/chrome/download?(/)',
+  chromeFunction = '/chrome/function?(/)',
+  chromePdf = '/chrome/pdf?(/)',
+  chromePerformance = '/chrome/performance?(/)',
+  chromeScrape = '/chrome/scrape?(/)',
+  chromeScreenshot = '/chrome/screenshot?(/)',
+  chromiumContent = '/chromium/content?(/)',
+  chromiumDownload = '/chromium/download?(/)',
+  chromiumFunction = '/chromium/function?(/)',
+  chromiumPdf = '/chromium/pdf?(/)',
+  chromiumPerformance = '/chromium/performance?(/)',
+  chromiumScrape = '/chromium/scrape?(/)',
+  chromiumScreenshot = '/chromium/screenshot?(/)',
+  content = '/content?(/)',
+  download = '/download?(/)',
+  function = '/function?(/)',
+  jsonList = '/json/list?(/)',
+  jsonNew = '/json/new?(/)',
+  jsonProtocol = '/json/protocol?(/)',
+  jsonVersion = '/json/version?(/)',
+  pdf = '/pdf?(/)',
+  performance = '/performance?(/)',
+  scrape = '/scrape?(/)',
+  screenshot = '/screenshot?(/)',
 }
 
 export enum HTTPManagementRoutes {
-  active = '/active',
-  config = '/config',
-  metrics = '/metrics',
-  metricsTotal = '/metrics/total',
-  pressure = '/pressure',
-  sessions = '/sessions',
+  active = '/active?(/)',
+  config = '/config?(/)',
+  metrics = '/metrics?(/)',
+  metricsTotal = '/metrics/total?(/)',
+  pressure = '/pressure?(/)',
+  sessions = '/sessions?(/)',
   static = '/',
 }
 

package/src/limiter.spec.ts

@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-expressions */
 import {
   Config,
   Hooks,

package/src/routes/chrome/tests/content.spec.ts

@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-expressions */
 import {
   Browserless,
   Config,

package/src/routes/chrome/ws/page.ts

@@ -4,6 +4,7 @@ import { default as Page, QuerySchema } from '../../../shared/page.ws.js';
 export default class ChromePageWebSocketRoute extends Page {
   name = BrowserlessRoutes.ChromePageWebSocketRoute;
   browser = ChromeCDP;
+  auth = false;
 }
 
 export { QuerySchema };

package/src/server.ts

@@ -415,7 +415,10 @@ export class HTTPServer extends EventEmitter {
   public async shutdown(): Promise<void> {
     this.logger.info(`HTTP Server is shutting down`);
     await new Promise((r) => this.server.close(r));
-    this.server && this.server.removeAllListeners();
+
+    if (this.server) {
+      this.server.removeAllListeners();
+    }
 
     // @ts-ignore garbage collect this reference
     this.server = null;

package/src/shared/json-version.http.ts

@@ -45,6 +45,7 @@ export default class ChromiumJSONVersionGetRoute extends HTTPRoute {
       }
       return jsonResponse(res, 200, this.cachedJSON);
     } catch (err) {
+      logger.warn(`Error handling request`, err);
       return writeResponse(
         res,
         500,

package/src/shared/utils/function/handler.ts

@@ -41,15 +41,15 @@ export default (config: Config, logger: Logger, options: HandlerOptions = {}) =>
     browser: BrowserInstance,
   ): Promise<{ contentType: string; page: Page; payload: unknown }> => {
     const isJson = req.headers['content-type']?.includes('json');
-
+    const functionPath = HTTPRoutes.function.replace('?(/)', '');
     const functionAssetLocation = path.join(config.getStatic(), 'function');
     const functionRequestPath = makeExternalURL(
       config.getExternalAddress(),
-      HTTPRoutes.function,
+      functionPath,
     );
     const functionIndexHTML = makeExternalURL(
       config.getExternalAddress(),
-      HTTPRoutes.function,
+      functionPath,
       '/index.html',
     );
 

package/src/shared/utils/performance/main.ts

@@ -38,7 +38,7 @@ export default async ({
     const close = (pid?: number) => {
       if (closed) return;
       if (pid) process.kill(pid, 'SIGINT');
-      timeoutId && clearTimeout(timeoutId);
+      if (timeoutId) clearTimeout(timeoutId);
       closed = true;
       timeoutId = null;
     };