@browserless.io/browserless 2.20.1 → 2.21.0

package/extensions/ublock/js/storage.js

@@ -319,7 +319,8 @@ onBroadcast(msg => {
         cnameIgnoreRootDocument: µbhs.cnameIgnoreRootDocument,
         cnameMaxTTL: µbhs.cnameMaxTTL,
         cnameReplayFullURL: µbhs.cnameReplayFullURL,
-        cnameUncloakProxied: µbhs.cnameUncloakProxied,
+        dnsCacheTTL: µbhs.dnsCacheTTL,
+        dnsResolveEnabled: µbhs.dnsResolveEnabled,
     });
 });
 

package/extensions/ublock/js/traffic.js

@@ -188,17 +188,20 @@ const onBeforeRootFrameRequest = function(fctxt) {
     }
 
     if ( logger.enabled ) {
-        fctxt.setFilter(logData);
+        fctxt.setRealm('network').setFilter(logData);
     }
 
     // https://github.com/uBlockOrigin/uBlock-issues/issues/760
     //   Redirect non-blocked request?
-    if ( result !== 1 && trusted === false && pageStore !== null ) {
-        pageStore.redirectNonBlockedRequest(fctxt);
+    if ( trusted === false && pageStore !== null ) {
+        if ( result !== 1 ) {
+            pageStore.redirectNonBlockedRequest(fctxt);
+        }
+        pageStore.skipMainDocument(fctxt);
     }
 
     if ( logger.enabled ) {
-        fctxt.setRealm('network').toLogger();
+        fctxt.toLogger();
     }
 
     // Redirected
@@ -680,6 +683,7 @@ const bodyFilterer = (( ) => {
     const sessions = new Map();
     const reContentTypeCharset = /charset=['"]?([^'" ]+)/i;
     const otherValidMimes = new Set([
+        'application/dash+xml',
         'application/javascript',
         'application/json',
         'application/mpegurl',

package/extensions/ublock/js/vapi-background.js

@@ -958,6 +958,7 @@ vAPI.messaging = {
 
     onPortDisconnect: function(port) {
         this.ports.delete(port.name);
+        void browser.runtime.lastError;
     },
 
     // https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/runtime/Port

package/extensions/ublock/js/vapi-common.js

@@ -163,6 +163,7 @@ vAPI.webextFlavor = {
 
     // This is always true.
     soup.add('ublock').add('webext');
+    soup.add('ipaddress');
 
     // Whether this is a dev build.
     if ( /^\d+\.\d+\.\d+\D/.test(browser.runtime.getManifest().version) ) {

package/extensions/ublock/logger-ui.html

@@ -61,7 +61,7 @@
                         <input type="search" placeholder="logFilterPrompt" spellcheck="false">
                         <span id="filterExprButton" class="button fa-icon expanded" data-i18n-title="loggerRowFiltererBuiltinTip">angle-up</span>
                         <div id="filterExprPicker">
-                            <div><span data-filtex="!" data-i18n="loggerRowFiltererBuiltinNot"></span><span data-filtex="\x1F--\x1F|\x1F<<\x1F|\x1F##" data-i18n="loggerRowFiltererBuiltinBlocked"></span><span data-filtex="\x1F\+\+\x1F|\x1F\*\*\x1F|\x1F#@#" data-i18n="loggerRowFiltererBuiltinAllowed"></span><span data-filtex="[$,](?:csp|permissions|removeparam|redirect-rule|replace|urltransform)=|\x1F\<\<\x1F" data-i18n="loggerRowFiltererBuiltinModified"></span></div>
+                            <div><span data-filtex="!" data-i18n="loggerRowFiltererBuiltinNot"></span><span data-filtex="\x1F--\x1F|\x1F<<\x1F|\x1F##" data-i18n="loggerRowFiltererBuiltinBlocked"></span><span data-filtex="\x1F\+\+\x1F|\x1F\*\*\x1F|\x1F#@#" data-i18n="loggerRowFiltererBuiltinAllowed"></span><span data-filtex="[$,](?:csp|permissions|removeparam|redirect-rule|replace|urlskip|ur[il]transform)=|\x1F\<\<\x1F" data-i18n="loggerRowFiltererBuiltinModified"></span></div>
                             <div><span data-filtex="!" data-i18n="loggerRowFiltererBuiltinNot"></span>
                                 <span style="flex-direction: column;">
                                     <div><span data-filtex="\x1F(?:css|(?:inline-)?font)\x1F">css/font</span><span data-filtex="\x1Fimage\x1F">image</span><span data-filtex="\x1Fmedia\x1F">media</span><span data-filtex="\x1F(?:inline-)?script(?:ing)?\x1F">script</span></div>
@@ -72,8 +72,7 @@
                             <div><span data-filtex="!" data-i18n="loggerRowFiltererBuiltinNot"></span><span data-filtex="\x1Fget\x1F">get</span><span data-filtex="\x1Fhead\x1F">head</span><span data-filtex="\x1Fpost\x1F">post</span></div>
                             <div><span data-filtex="!" data-i18n="loggerRowFiltererBuiltinNot" class="on"></span>
                                 <span style="flex-direction: column;">
-                                    <div><span data-filtex="\bcsp=[^\x1F]+\x1F(?:--|\+\+)\x1F">csp</span><span data-filtex="\bpermissions=[^\x1F]+\x1F(?:--|\+\+)\x1F" class="on">permissions</span><span data-filtex="\bredirect-rule=[^\x1F]+\x1F(?:--|\+\+)\x1F">redirect</span></div>
-                                    <div><span data-filtex="\bremoveparam=[^\x1F]+\x1F(?:--|\+\+)\x1F">removeparam</span><span data-filtex="\buritransform=[^\x1F]+\x1F(?:--|\+\+)\x1F">uritransform</span></div>
+                                    <span data-filtex="\bcsp=[^\x1F]+\x1F(?:--|\+\+)\x1F">csp</span><span data-filtex="\bpermissions=[^\x1F]+\x1F(?:--|\+\+)\x1F" class="on">permissions</span><span data-filtex="\bredirect-rule=[^\x1F]+\x1F(?:--|\+\+)\x1F">redirect</span><span data-filtex="\bremoveparam=[^\x1F]+\x1F(?:--|\+\+)\x1F">removeparam</span><span data-filtex="\breplace=[^\x1F]+\x1F(?:--|\+\+)\x1F">replace</span><span data-filtex="\burlskip=[^\x1F]+\x1F(?:--|\+\+)\x1F">urlskip</span>
                                 </span>
                             </div>
                             <div id="filterExprCnameOf" style="display:none"><span data-filtex="!" data-i18n="loggerRowFiltererBuiltinNot"></span><span data-filtex="\x1FaliasURL=.">CNAME</span></div>

package/extensions/ublock/manifest.json

@@ -89,7 +89,7 @@
   },
   "incognito": "split",
   "manifest_version": 2,
-  "minimum_chrome_version": "73.0",
+  "minimum_chrome_version": "80.0",
   "name": "uBlock Origin",
   "options_ui": {
     "open_in_tab": true,
@@ -111,7 +111,7 @@
   "storage": {
     "managed_schema": "managed_storage.json"
   },
-  "version": "1.59.0",
+  "version": "1.60.0",
   "web_accessible_resources": [
     "/web_accessible_resources/*"
   ]

package/extensions/ublock/support.html

@@ -93,6 +93,7 @@
                     <option value="nuisance" data-i18n="supportS6Select1Option2"></option>
                     <option value="breakage" data-i18n="supportS6Select1Option5"></option>
                     <option value="privacy" data-i18n="supportS6Select1Option4"></option>
+                    <option value="badware" data-i18n="supportS6Select1Option7"></option>
                 </select>
             </p>
             <p>

package/extensions/ublock/web_accessible_resources/noop-vast2.xml

@@ -0,0 +1 @@
+<VAST version="2.0"></VAST>

package/extensions/ublock/web_accessible_resources/noop-vast3.xml

@@ -0,0 +1 @@
+<VAST version="3.0"></VAST>

package/extensions/ublock/web_accessible_resources/noop-vast4.xml

@@ -0,0 +1 @@
+<VAST version="4.0"></VAST>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@browserless.io/browserless",
-  "version": "2.20.1",
+  "version": "2.21.0",
   "license": "SSPL",
   "description": "The browserless platform",
   "author": "browserless.io",
@@ -57,12 +57,12 @@
     "http-proxy": "^1.18.1",
     "lighthouse": "^12.2.1",
     "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.47.0",
-    "puppeteer-core": "^23.3.0",
+    "playwright-1.45": "npm:playwright-core@1.45.3",
+    "playwright-1.46": "npm:playwright-core@1.46.1",
+    "playwright-core": "^1.47.2",
+    "puppeteer-core": "^23.4.1",
     "puppeteer-extra": "^3.3.6",
     "puppeteer-extra-plugin-stealth": "^2.11.2",
     "queue": "^7.0.0",
@@ -70,41 +70,41 @@
     "tar-fs": "^3.0.6"
   },
   "optionalDependencies": {
-    "@types/chai": "^4.3.18",
+    "@types/chai": "^5.0.0",
     "@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.5.4",
+    "@types/mocha": "^10.0.8",
+    "@types/node": "^22.7.3",
     "@types/sinon": "^17.0.3",
-    "@typescript-eslint/eslint-plugin": "^8.5.0",
-    "@typescript-eslint/parser": "^8.5.0",
+    "@typescript-eslint/eslint-plugin": "^8.7.0",
+    "@typescript-eslint/parser": "^8.7.0",
     "assert": "^2.0.0",
     "chai": "^5.1.1",
     "cross-env": "^7.0.3",
     "env-cmd": "^10.1.0",
-    "esbuild": "^0.23.1",
+    "esbuild": "^0.24.0",
     "esbuild-plugin-polyfill-node": "^0.3.0",
-    "eslint": "^9.10.0",
+    "eslint": "^9.11.1",
     "extract-zip": "^2.0.1",
     "gunzip-maybe": "^1.4.2",
     "marked": "^14.1.2",
     "mocha": "^10.7.3",
     "move-file": "^3.1.0",
     "prettier": "^3.3.3",
-    "sinon": "^18.0.1",
+    "sinon": "^19.0.2",
     "ts-node": "^10.9.2",
     "typescript": "^5.6.2",
     "typescript-json-schema": "^0.65.1"
   },
   "playwrightVersions": {
     "default": "playwright-core",
-    "1.45": "playwright-core",
+    "1.47": "playwright-core",
+    "1.46": "playwright-1.46",
+    "1.45": "playwright-1.45",
     "1.44": "playwright-1.44",
-    "1.43": "playwright-1.43",
-    "1.42": "playwright-1.42",
-    "1.41": "playwright-1.41"
+    "1.43": "playwright-1.43"
   },
   "eslintConfig": {
     "root": true,

package/src/browserless.ts

@@ -103,10 +103,11 @@ export class Browserless extends EventEmitter {
     this.token = token || new Token(this.config);
     this.hooks = hooks || new Hooks();
     this.webhooks = webhooks || new WebHooks(this.config);
-    this.browserManager =
-      browserManager || new BrowserManager(this.config, this.hooks);
     this.monitoring = monitoring || new Monitoring(this.config);
     this.fileSystem = fileSystem || new FileSystem(this.config);
+    this.browserManager =
+      browserManager ||
+      new BrowserManager(this.config, this.hooks, this.fileSystem);
     this.limiter =
       limiter ||
       new Limiter(

package/src/browsers/index.ts

@@ -14,6 +14,7 @@ import {
   ChromiumCDP,
   ChromiumPlaywright,
   Config,
+  FileSystem,
   FirefoxPlaywright,
   HTTPManagementRoutes,
   Hooks,
@@ -51,6 +52,7 @@ export class BrowserManager {
   constructor(
     protected config: Config,
     protected hooks: Hooks,
+    protected fileSystem: FileSystem,
   ) {}
 
   protected browserIsChrome(b: BrowserInstance) {

package/src/router.ts

@@ -70,7 +70,11 @@ export class Router extends EventEmitter {
         return Promise.resolve();
       }
       const logger = new this.logger(route.name, req);
-      if ('browser' in route && route.browser) {
+      if (
+        Object.getPrototypeOf(route) instanceof BrowserHTTPRoute &&
+        'browser' in route &&
+        route.browser
+      ) {
         const browser = await this.browserManager.getBrowserForRequest(
           req,
           route,
@@ -121,7 +125,11 @@ export class Router extends EventEmitter {
         return Promise.resolve();
       }
       const logger = new this.logger(route.name, req);
-      if ('browser' in route && route.browser) {
+      if (
+        Object.getPrototypeOf(route) instanceof BrowserWebsocketRoute &&
+        'browser' in route &&
+        route.browser
+      ) {
         const browser = await this.browserManager.getBrowserForRequest(
           req,
           route,

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

@@ -31,7 +31,8 @@ describe('/chrome/pdf API', function () {
         'content-type': 'application/json',
       },
       method: 'POST',
-    }).then((res) => {
+    }).then(async (res) => {
+      await res.body?.pipeTo(new WritableStream({}));
       expect(res.headers.get('x-response-code')).to.not.be.undefined;
       expect(res.headers.get('x-response-url')).to.not.be.undefined;
       expect(res.headers.get('x-response-ip')).to.not.be.undefined;
@@ -75,7 +76,8 @@ describe('/chrome/pdf API', function () {
         'content-type': 'application/json',
       },
       method: 'POST',
-    }).then((res) => {
+    }).then(async (res) => {
+      await res.body?.pipeTo(new WritableStream({}));
       expect(res.headers.get('content-type')).to.equal('application/pdf');
       expect(res.status).to.equal(200);
     });
@@ -99,7 +101,8 @@ describe('/chrome/pdf API', function () {
         'content-type': 'application/json',
       },
       method: 'POST',
-    }).then((res) => {
+    }).then(async (res) => {
+      await res.body?.pipeTo(new WritableStream({}));
       expect(res.headers.get('content-type')).to.equal('application/pdf');
       expect(res.status).to.equal(200);
     });
@@ -123,7 +126,8 @@ describe('/chrome/pdf API', function () {
         'content-type': 'application/json',
       },
       method: 'POST',
-    }).then((res) => {
+    }).then(async (res) => {
+      await res.body?.pipeTo(new WritableStream({}));
       expect(res.headers.get('content-type')).to.equal('application/pdf');
       expect(res.status).to.equal(200);
     });
@@ -150,7 +154,8 @@ describe('/chrome/pdf API', function () {
         'content-type': 'application/json',
       },
       method: 'POST',
-    }).then((res) => {
+    }).then(async (res) => {
+      await res.body?.pipeTo(new WritableStream({}));
       expect(res.headers.get('content-type')).to.equal('application/pdf');
       expect(res.status).to.equal(200);
     });
@@ -172,7 +177,8 @@ describe('/chrome/pdf API', function () {
         'content-type': 'application/json',
       },
       method: 'POST',
-    }).then((res) => {
+    }).then(async (res) => {
+      await res.body?.pipeTo(new WritableStream({}));
       expect(res.headers.get('content-type')).to.equal('application/pdf');
       expect(res.status).to.equal(200);
     });
@@ -255,7 +261,8 @@ describe('/chrome/pdf API', function () {
         'content-type': 'application/json',
       },
       method: 'POST',
-    }).then((res) => {
+    }).then(async (res) => {
+      await res.body?.pipeTo(new WritableStream({}));
       expect(res.headers.get('content-type')).to.equal('application/pdf');
       expect(res.status).to.equal(200);
     });
@@ -279,7 +286,8 @@ describe('/chrome/pdf API', function () {
         'content-type': 'application/json',
       },
       method: 'POST',
-    }).then((res) => {
+    }).then(async (res) => {
+      await res.body?.pipeTo(new WritableStream({}));
       expect(res.headers.get('content-type')).to.equal('application/pdf');
       expect(res.status).to.equal(200);
     });
@@ -300,7 +308,8 @@ describe('/chrome/pdf API', function () {
         'content-type': 'application/json',
       },
       method: 'POST',
-    }).then((res) => {
+    }).then(async (res) => {
+      await res.body?.pipeTo(new WritableStream({}));
       expect(res.headers.get('content-type')).to.equal('application/pdf');
       expect(res.status).to.equal(200);
     });
@@ -324,7 +333,8 @@ describe('/chrome/pdf API', function () {
         'content-type': 'application/json',
       },
       method: 'POST',
-    }).then((res) => {
+    }).then(async (res) => {
+      await res.body?.pipeTo(new WritableStream({}));
       expect(res.headers.get('content-type')).to.equal('application/pdf');
       expect(res.status).to.equal(200);
     });
@@ -350,7 +360,8 @@ describe('/chrome/pdf API', function () {
         'content-type': 'application/json',
       },
       method: 'POST',
-    }).then((res) => {
+    }).then(async (res) => {
+      await res.body?.pipeTo(new WritableStream({}));
       expect(res.headers.get('content-type')).to.equal('application/pdf');
       expect(res.status).to.equal(200);
     });
@@ -368,7 +379,8 @@ describe('/chrome/pdf API', function () {
         'content-type': 'application/json',
       },
       method: 'POST',
-    }).then((res) => {
+    }).then(async (res) => {
+      await res.body?.pipeTo(new WritableStream({}));
       expect(res.headers.get('x-response-code')).to.not.be.undefined;
       expect(res.headers.get('x-response-url')).to.not.be.undefined;
       expect(res.headers.get('x-response-ip')).to.not.be.undefined;

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

@@ -31,7 +31,8 @@ describe('/chromium/pdf API', function () {
         'content-type': 'application/json; charset=utf-8',
       },
       method: 'POST',
-    }).then((res) => {
+    }).then(async (res) => {
+      await res.body?.pipeTo(new WritableStream({}));
       expect(res.headers.get('x-response-code')).to.not.be.undefined;
       expect(res.headers.get('x-response-url')).to.not.be.undefined;
       expect(res.headers.get('x-response-ip')).to.not.be.undefined;
@@ -75,7 +76,8 @@ describe('/chromium/pdf API', function () {
         'content-type': 'application/json',
       },
       method: 'POST',
-    }).then((res) => {
+    }).then(async (res) => {
+      await res.body?.pipeTo(new WritableStream({}));
       expect(res.headers.get('content-type')).to.equal('application/pdf');
       expect(res.status).to.equal(200);
     });
@@ -99,7 +101,8 @@ describe('/chromium/pdf API', function () {
         'content-type': 'application/json',
       },
       method: 'POST',
-    }).then((res) => {
+    }).then(async (res) => {
+      await res.body?.pipeTo(new WritableStream({}));
       expect(res.headers.get('content-type')).to.equal('application/pdf');
       expect(res.status).to.equal(200);
     });
@@ -123,7 +126,8 @@ describe('/chromium/pdf API', function () {
         'content-type': 'application/json',
       },
       method: 'POST',
-    }).then((res) => {
+    }).then(async (res) => {
+      await res.body?.pipeTo(new WritableStream({}));
       expect(res.headers.get('content-type')).to.equal('application/pdf');
       expect(res.status).to.equal(200);
     });
@@ -150,7 +154,8 @@ describe('/chromium/pdf API', function () {
         'content-type': 'application/json',
       },
       method: 'POST',
-    }).then((res) => {
+    }).then(async (res) => {
+      await res.body?.pipeTo(new WritableStream({}));
       expect(res.headers.get('content-type')).to.equal('application/pdf');
       expect(res.status).to.equal(200);
     });
@@ -172,7 +177,8 @@ describe('/chromium/pdf API', function () {
         'content-type': 'application/json',
       },
       method: 'POST',
-    }).then((res) => {
+    }).then(async (res) => {
+      await res.body?.pipeTo(new WritableStream({}));
       expect(res.headers.get('content-type')).to.equal('application/pdf');
       expect(res.status).to.equal(200);
     });
@@ -255,7 +261,8 @@ describe('/chromium/pdf API', function () {
         'content-type': 'application/json',
       },
       method: 'POST',
-    }).then((res) => {
+    }).then(async (res) => {
+      await res.body?.pipeTo(new WritableStream({}));
       expect(res.headers.get('content-type')).to.equal('application/pdf');
       expect(res.status).to.equal(200);
     });
@@ -279,7 +286,8 @@ describe('/chromium/pdf API', function () {
         'content-type': 'application/json',
       },
       method: 'POST',
-    }).then((res) => {
+    }).then(async (res) => {
+      await res.body?.pipeTo(new WritableStream({}));
       expect(res.headers.get('content-type')).to.equal('application/pdf');
       expect(res.status).to.equal(200);
     });
@@ -300,7 +308,8 @@ describe('/chromium/pdf API', function () {
         'content-type': 'application/json',
       },
       method: 'POST',
-    }).then((res) => {
+    }).then(async (res) => {
+      await res.body?.pipeTo(new WritableStream({}));
       expect(res.headers.get('content-type')).to.equal('application/pdf');
       expect(res.status).to.equal(200);
     });
@@ -324,7 +333,8 @@ describe('/chromium/pdf API', function () {
         'content-type': 'application/json',
       },
       method: 'POST',
-    }).then((res) => {
+    }).then(async (res) => {
+      await res.body?.pipeTo(new WritableStream({}));
       expect(res.headers.get('content-type')).to.equal('application/pdf');
       expect(res.status).to.equal(200);
     });
@@ -350,7 +360,8 @@ describe('/chromium/pdf API', function () {
         'content-type': 'application/json',
       },
       method: 'POST',
-    }).then((res) => {
+    }).then(async (res) => {
+      await res.body?.pipeTo(new WritableStream({}));
       expect(res.headers.get('content-type')).to.equal('application/pdf');
       expect(res.status).to.equal(200);
     });
@@ -368,7 +379,8 @@ describe('/chromium/pdf API', function () {
         'content-type': 'application/json',
       },
       method: 'POST',
-    }).then((res) => {
+    }).then(async (res) => {
+      await res.body?.pipeTo(new WritableStream({}));
       expect(res.headers.get('x-response-code')).to.not.be.undefined;
       expect(res.headers.get('x-response-url')).to.not.be.undefined;
       expect(res.headers.get('x-response-ip')).to.not.be.undefined;

package/src/shared/pdf.http.ts

@@ -29,7 +29,6 @@ import {
 } from '@browserless.io/browserless';
 import { Page } from 'puppeteer-core';
 import { ServerResponse } from 'http';
-import { Stream } from 'stream';
 
 export interface BodySchema {
   addScriptTag?: Array<Parameters<Page['addScriptTag']>[0]>;
@@ -237,11 +236,16 @@ export default class ChromiumPDFPostRoute extends BrowserHTTPRoute {
       }
     }
 
-    const pdfBuffer = await page.pdf(options);
-    const readStream = new Stream.PassThrough();
-    readStream.end(pdfBuffer);
-
-    await new Promise((r) => readStream.pipe(res).once('close', r));
+    const pdfStream = await page.createPDFStream(options);
+    const writableStream = new WritableStream({
+      write(chunk) {
+        res.write(chunk);
+      },
+      close() {
+        res.end();
+      },
+    });
+    await pdfStream.pipeTo(writableStream);
 
     page.close().catch(noop);