@browserless.io/browserless 2.17.1 → 2.18.0

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@browserless.io/browserless",
-  "version": "2.17.1",
+  "version": "2.18.0",
   "license": "SSPL",
   "description": "The browserless platform",
   "author": "browserless.io",
@@ -61,12 +61,12 @@
     "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.1.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": {
@@ -76,7 +76,7 @@
     "@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.0",
     "@types/sinon": "^17.0.3",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",
@@ -84,7 +84,7 @@
     "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",
@@ -97,7 +97,7 @@
     "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",

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/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/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',
     );