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

package/extensions/ublocklite/rulesets/strictblock/vie-1.json

@@ -19,7 +19,6 @@
    "aj1047.online",
    "aj2393.online",
    "ajsc.yodimedia.com",
-   "aker.ajjkmozrreov.top",
    "amcdn.vn",
    "api.adfly.vn",
    "apinas.nct.vn",
@@ -50,6 +49,7 @@
    "mneydirec.com",
    "mt.deimosfestuca.com",
    "mwejhobumo.com",
+   "nb.passuplums.com",
    "ny.foonerne.com",
    "oursty.com",
    "platform.adlinknetwork.vn",
@@ -73,7 +73,8 @@
    "ut.uranininnage.com",
    "v9banners.com",
    "vads.net.vn",
-   "wr.brandonketting.com"
+   "wr.brandonketting.com",
+   "zr.mezcalumlaut.com"
   ],
   "resourceTypes": [
    "main_frame"

package/extensions/ublocklite/rulesets/urlskip/ublock-filters.json

@@ -107,6 +107,12 @@
    "?q"
   ]
  },
+ {
+  "re": "^[a-z-]+://(?:[^/?#]+\\.)?safelinks\\.protection\\.outlook\\.com/\\?url=",
+  "steps": [
+   "?url"
+  ]
+ },
  {
   "re": "^[a-z-]+://(?:[^/?#]+\\.)?anylinks\\.in/full\\S*?(?:[^%.0-9a-z_-]|$)url=ahr0c",
   "steps": [
@@ -128,6 +134,13 @@
    "+https"
   ]
  },
+ {
+  "re": "^[a-z-]+://(?:[^/?#]+\\.)?storz\\.ma/redigoto\\?to=ahr0c",
+  "steps": [
+   "?to",
+   "-base64"
+  ]
+ },
  {
   "re": "^[a-z-]+://(?:[^/?#]+\\.)?migmig\\.affilio\\.ir/api/v1/click(?:[^%.0-9a-z_-]|$)",
   "steps": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@browserless.io/browserless",
-  "version": "2.31.1",
+  "version": "2.32.0-beta-1",
   "license": "SSPL",
   "description": "The browserless platform",
   "author": "browserless.io",
@@ -30,7 +30,7 @@
     "lint": "cross-env ESLINT_USE_FLAT_CONFIG=false eslint . --ext .ts --fix",
     "prepack": "npm run build:dev",
     "prettier": "prettier '{src,functions,scripts,bin,external,.github}/**/*.{js,ts,json,yml,yaml,md}' --log-level error --write",
-    "test": "cross-env DEBUG=quiet mocha",
+    "test": "npm run build:ts && cross-env DEBUG=quiet mocha",
     "start": "env-cmd -f .env node build"
   },
   "files": [
@@ -48,26 +48,28 @@
     "tsconfig.json"
   ],
   "dependencies": {
+    "@hapi/bourne": "^3.0.0",
+    "@hapi/hoek": "^11.0.4",
     "debug": "^4.4.1",
     "del": "^8.0.0",
-    "enjoi": "^9.0.1",
     "file-type": "^21.0.0",
     "get-port": "^7.1.0",
     "gradient-string": "^3.0.0",
     "http-proxy": "^1.18.1",
+    "joi": "^17.13.3",
     "lighthouse": "^12.6.1",
     "micromatch": "^4.0.8",
-    "playwright-1.48": "npm:playwright-core@1.48.2",
     "playwright-1.49": "npm:playwright-core@1.49.1",
     "playwright-1.50": "npm:playwright-core@1.50.1",
     "playwright-1.51": "npm:playwright-core@1.51.1",
-    "playwright-core": "1.52.0",
-    "puppeteer-core": "24.10.0",
+    "playwright-1.52": "npm:playwright-core@1.52.0",
+    "playwright-core": "1.53.1",
+    "puppeteer-core": "24.10.2",
     "puppeteer-extra": "^3.3.6",
     "puppeteer-extra-plugin-stealth": "^2.11.2",
     "queue": "^7.0.0",
-    "systeminformation": "^5.27.1",
-    "tar-fs": "^3.0.9"
+    "systeminformation": "^5.27.6",
+    "tar-fs": "^3.0.10"
   },
   "optionalDependencies": {
     "@types/chai": "^5.2.2",
@@ -76,35 +78,38 @@
     "@types/http-proxy": "^1.17.16",
     "@types/micromatch": "^4.0.9",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^22.15.30",
+    "@types/node": "^24.0.3",
     "@types/sinon": "^17.0.4",
-    "@typescript-eslint/eslint-plugin": "^8.33.1",
-    "@typescript-eslint/parser": "^8.33.1",
+    "@typescript-eslint/eslint-plugin": "^8.34.1",
+    "@typescript-eslint/parser": "^8.34.1",
     "assert": "^2.0.0",
     "chai": "^5.2.0",
     "cross-env": "^7.0.3",
     "env-cmd": "^10.1.0",
     "esbuild": "^0.25.5",
     "esbuild-plugin-polyfill-node": "^0.3.0",
-    "eslint": "^9.28.0",
+    "eslint": "^9.29.0",
     "extract-zip": "^2.0.1",
     "gunzip-maybe": "^1.4.2",
     "marked": "^15.0.12",
-    "mocha": "^11.5.0",
+    "mocha": "^11.7.0",
     "move-file": "^3.1.0",
     "prettier": "^3.5.3",
-    "sinon": "^20.0.0",
+    "sinon": "^21.0.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.8.3",
     "typescript-json-schema": "^0.65.1"
   },
   "playwrightVersions": {
     "default": "playwright-core",
-    "1.52": "playwright-core",
+    "1.53": "playwright-core",
+    "1.52": "playwright-1.52",
     "1.51": "playwright-1.51",
     "1.50": "playwright-1.50",
-    "1.49": "playwright-1.49",
-    "1.48": "playwright-1.48"
+    "1.49": "playwright-1.49"
+  },
+  "engines": {
+    "node": ">= 24 < 25"
   },
   "eslintConfig": {
     "root": true,
@@ -153,10 +158,10 @@
   },
   "mocha": {
     "extension": [
-      "ts"
+      "js"
     ],
     "loader": "ts-node/esm",
-    "spec": "src/**/*.spec.ts",
+    "spec": "build/**/*.spec.js",
     "timeout": 45000,
     "slow": 5000
   },

package/src/routes/management/tests/management.spec.ts

@@ -106,6 +106,31 @@ describe('Management APIs', function () {
       );
     });
 
+    it('allows glob-matched OPTIONS requests with OR patterns across two domains', async () => {
+      const config = new Config();
+      config.enableCORS(true);
+      config.setCORSOrigin(
+        '(https://(abc|xyz).example.com|https://deploy-preview-*.netlify.app)',
+      );
+      await start({ config });
+
+      const r = await fetch(
+        'http://localhost:3000/config?token=6R0W53R135510',
+        {
+          method: 'OPTIONS',
+          headers: {
+            Origin:
+              'https://deploy-preview-123--funky-monkey-12345.netlify.app',
+          },
+        },
+      );
+
+      expect(r.status).to.equal(204);
+      expect(r.headers.get('access-control-allow-origin')).to.equal(
+        'https://deploy-preview-123--funky-monkey-12345.netlify.app',
+      );
+    });
+
     it('should 404 when the origin does not match the CORS origin pattern', async () => {
       const config = new Config();
       config.enableCORS(true);

package/src/server.ts

@@ -26,8 +26,7 @@ import {
 } from '@browserless.io/browserless';
 import { EventEmitter } from 'events';
 
-// @ts-ignore
-import Enjoi from 'enjoi';
+import EnjoiResolver from './shared/utils/enjoi-resolver.js';
 
 export interface HTTPServerOptions {
   concurrent: number;
@@ -223,7 +222,7 @@ export class HTTPServer extends EventEmitter {
     if (route.querySchema) {
       this.logger.trace(`Validating route query-params with QUERY schema`);
       try {
-        const schema = Enjoi.schema(route.querySchema);
+        const schema = EnjoiResolver.schema(route.querySchema);
         const valid = schema.validate(req.queryParams, {
           abortEarly: false,
         });
@@ -268,7 +267,7 @@ export class HTTPServer extends EventEmitter {
     if (route.bodySchema) {
       this.logger.trace(`Validating route payload with BODY schema`);
       try {
-        const schema = Enjoi.schema(route.bodySchema);
+        const schema = EnjoiResolver.schema(route.bodySchema);
         const valid = schema.validate(body, { abortEarly: false });
 
         if (valid.error) {
@@ -353,7 +352,7 @@ export class HTTPServer extends EventEmitter {
       if (route.querySchema) {
         this.logger.trace(`Validating route query-params with QUERY schema`);
         try {
-          const schema = Enjoi.schema(route.querySchema);
+          const schema = EnjoiResolver.schema(route.querySchema);
           const valid = schema.validate(req.queryParams, {
             abortEarly: false,
           });