@browserless.io/browserless 2.36.0 → 2.37.0

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

@@ -16,7 +16,6 @@
    "adtima-static.zascdn.me",
    "adtimaserver.vn",
    "ae.carnelbawrel.com",
-   "afzamltca.com",
    "aiactiv.io",
    "aj1047.online",
    "aj2393.online",
@@ -45,7 +44,6 @@
    "iads.staticscdn.net",
    "iads.vision",
    "img.yeuketqua.net",
-   "immaculate-suspect.com",
    "js.aiservice.vn",
    "jsc.yodimedia.com",
    "lepidpomps.com",
@@ -63,7 +61,6 @@
    "pub.akadigital.vn",
    "pub.lavamedia.vn",
    "qc.violet.vn",
-   "qcv5.blogtruyenmoi.com",
    "sbbanner.com",
    "sourcetobin.com",
    "ss.yomedia.vn",

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

@@ -417,11 +417,15 @@
   ]
  },
  {
-  "re": "^[a-z-]+://(?:[^/?#]+\\.)?click\\.pstmrk\\.it/\\S*?/",
+  "re": "^[a-z-]+://(?:[^/?#]+\\.)?pstmrk\\.it/\\S*?/",
   "steps": [
    "/\\.pstmrk\\.it\\/[23][mst]{0,2}\\/([^\\/?#]+)/",
    "-uricomponent",
    "+https"
+  ],
+  "hostnames": [
+   "click.pstmrk.it",
+   "track.pstmrk.it"
   ]
  },
  {
@@ -1092,6 +1096,32 @@
    "?goto"
   ]
  },
+ {
+  "re": "^[a-z-]+://(?:[^/?#]+\\.)?sourceforge\\.net/software/link\\?\\S*?__oadest=http",
+  "steps": [
+   "/__oadest=(http[^#&]+)/",
+   "-uricomponent"
+  ]
+ },
+ {
+  "re": "^[a-z-]+://(?:[^/?#]+\\.)?5ch\\.net/jump/to\\?url=http",
+  "steps": [
+   "?url"
+  ]
+ },
+ {
+  "re": "^[a-z-]+://(?:[^/?#]+\\.)?adj\\.st/\\S*?(?:[^%.0-9a-z_-]|$)url=http",
+  "steps": [
+   "?url"
+  ]
+ },
+ {
+  "re": "^[a-z-]+://(?:[^/?#]+\\.)?lit\\.link/redirects/link-ad\\?redirecturl=ahr0c",
+  "steps": [
+   "?redirectUrl",
+   "-base64"
+  ]
+ },
  {
   "re": "/vp/player/to/\\?u=http",
   "steps": [

package/extensions/ublocklite/web_accessible_resources/google-ima.js

@@ -18,6 +18,7 @@
  * 
  * Related issue:
  * - https://github.com/uBlockOrigin/uBlock-issues/issues/2158
+ * - https://github.com/uBlockOrigin/uAssets/issues/30134
  * 
 **/
  
@@ -388,21 +389,23 @@ if (!window.google || !window.google.ima || !window.google.ima.VERSION) {
     getVersion() {
       return VERSION;
     }
-    requestAds(/*r, c*/) {
+    requestAds(_r, _c) {
       // If autoplay is disabled and the page is trying to autoplay a tracking
       // ad, then IMA fails with an error, and the page is expected to request
       // ads again later when the user clicks to play.
       CheckCanAutoplay().then(
         () => {
           const { ADS_MANAGER_LOADED } = AdsManagerLoadedEvent.Type;
-          this._dispatch(new ima.AdsManagerLoadedEvent(ADS_MANAGER_LOADED));
+          this._dispatch(new ima.AdsManagerLoadedEvent(ADS_MANAGER_LOADED, _r, _c));
         },
         () => {
           const e = new ima.AdError(
             "adPlayError",
             1205,
             1205,
-            "The browser prevented playback initiated without user interaction."
+            "The browser prevented playback initiated without user interaction.",
+            _r,
+            _c
           );
           this._dispatch(new ima.AdErrorEvent(e));
         }
@@ -638,10 +641,12 @@ if (!window.google || !window.google.ima || !window.google.ima.VERSION) {
   }
 
   class AdError {
-    constructor(type, code, vast, message) {
+    constructor(type, code, vast, message, request, context) {
       this.errorCode = code;
       this.message = message;
       this.type = type;
+      this.adsRequest = request;
+      this.userRequestContext = context;
       this.vastErrorCode = vast;
     }
     getErrorCode() {
@@ -738,7 +743,7 @@ if (!window.google || !window.google.ima || !window.google.ima.VERSION) {
       return this.error;
     }
     getUserRequestContext() {
-      return {};
+      return this.error?.userRequestContext || {};
     }
   }
   AdErrorEvent.Type = {
@@ -748,8 +753,10 @@ if (!window.google || !window.google.ima || !window.google.ima.VERSION) {
   const manager = new AdsManager();
 
   class AdsManagerLoadedEvent {
-    constructor(type) {
+    constructor(type, request, context) {
       this.type = type;
+      this.adsRequest = request;
+      this.userRequestContext = context;
     }
     getAdsManager(c, settings) {
       if (settings && settings.enablePreloading) {
@@ -758,7 +765,7 @@ if (!window.google || !window.google.ima || !window.google.ima.VERSION) {
       return manager;
     }
     getUserRequestContext() {
-      return {};
+      return this.userRequestContext || {};
     }
   }
   AdsManagerLoadedEvent.Type = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@browserless.io/browserless",
-  "version": "2.36.0",
+  "version": "2.37.0",
   "license": "SSPL",
   "description": "The browserless platform",
   "author": "browserless.io",
@@ -64,8 +64,8 @@
     "playwright-1.52": "npm:playwright-core@1.52.0",
     "playwright-1.53": "npm:playwright-core@1.53.2",
     "playwright-1.54": "npm:playwright-core@1.54.2",
-    "playwright-core": "1.55.0",
-    "puppeteer-core": "24.22.0",
+    "playwright-core": "1.55.1",
+    "puppeteer-core": "24.22.3",
     "puppeteer-extra": "^3.3.6",
     "puppeteer-extra-plugin-stealth": "^2.11.2",
     "queue": "^7.0.0",
@@ -81,16 +81,16 @@
     "@types/mocha": "^10.0.10",
     "@types/node": "^24.5.2",
     "@types/sinon": "^17.0.4",
-    "@typescript-eslint/eslint-plugin": "^8.44.0",
-    "@typescript-eslint/parser": "^8.42.0",
+    "@typescript-eslint/eslint-plugin": "^8.44.1",
+    "@typescript-eslint/parser": "^8.44.1",
     "assert": "^2.0.0",
     "c8": "^10.1.3",
-    "chai": "^6.0.1",
+    "chai": "^6.2.0",
     "cross-env": "^10.0.0",
     "env-cmd": "^11.0.0",
     "esbuild": "^0.25.10",
     "esbuild-plugin-polyfill-node": "^0.3.0",
-    "eslint": "^9.35.0",
+    "eslint": "^9.36.0",
     "extract-zip": "^2.0.1",
     "gunzip-maybe": "^1.4.2",
     "marked": "^16.3.0",

package/src/browsers/index.ts

@@ -40,6 +40,7 @@ import micromatch from 'micromatch';
 import path from 'path';
 
 export class BrowserManager {
+  protected reconnectionPatterns = ['/devtools/browser', '/function/connect'];
   protected browsers: Map<BrowserInstance, BrowserlessSession> = new Map();
   protected timers: Map<string, NodeJS.Timeout> = new Map();
   protected log = new Logger('browser-manager');
@@ -461,12 +462,12 @@ export class BrowserManager {
     let parsedLaunchOptions: BrowserServerOptions | CDPLaunchOptions;
 
     // Handle browser re-connects here
-    if (req.parsed.pathname.includes('/devtools/browser')) {
+    if (
+      this.reconnectionPatterns.some((p) => req.parsed.pathname.includes(p))
+    ) {
       const sessions = Array.from(this.browsers);
       const id = req.parsed.pathname.split('/').pop() as string;
-      const found = sessions.find(([b]) =>
-        b.wsEndpoint()?.includes(req.parsed.pathname),
-      );
+      const found = sessions.find(([b]) => b.wsEndpoint()?.includes(id));
 
       if (found) {
         const [browser, session] = found;

package/src/http.ts

@@ -88,12 +88,13 @@ export enum WebsocketRoutes {
   '/' = '?(/)',
   browser = '/devtools/browser/*',
   chrome = '/chrome?(/)',
-  edge = '/edge?(/)',
   chromePlaywright = '/chrome/playwright?(/)',
-  edgePlaywright = '/edge/playwright?(/)',
   chromium = '/chromium?(/)',
   chromiumPlaywright = '/chromium/playwright?(/)',
+  edge = '/edge?(/)',
+  edgePlaywright = '/edge/playwright?(/)',
   firefoxPlaywright = '/firefox/playwright?(/)',
+  functionClientConnect = '/function/connect/*',
   page = '/devtools/page/*',
   playwrightChrome = '/playwright/chrome?(/)',
   playwrightChromium = '/playwright/chromium?(/)',

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

@@ -23,9 +23,6 @@ describe('/kill API', function () {
     const browser1 = await puppeteer.connect({
       browserWSEndpoint: `ws://localhost:3000/chrome?token=6R0W53R135510`,
     });
-    const browser2 = await puppeteer.connect({
-      browserWSEndpoint: `ws://localhost:3000/chrome?token=6R0W53R135510`,
-    });
 
     await fetch('http://localhost:3000/kill/all?token=6R0W53R135510').then(
       async (res) => {
@@ -39,14 +36,7 @@ describe('/kill API', function () {
     } catch (e) {
       errorThrown1 = e;
     }
-    let errorThrown2;
-    try {
-      await browser2.newPage();
-    } catch (e) {
-      errorThrown2 = e;
-    }
     expect((errorThrown1 as Error).message).contains('closed');
-    expect((errorThrown2 as Error).message).contains('closed');
   });
 
   it('Kill session by browserId', async () => {

package/src/routes/chrome/ws/function-connect.ts

@@ -0,0 +1,12 @@
+import { BrowserlessRoutes, ChromeCDP } from '@browserless.io/browserless';
+import {
+  default as FunctionConnect,
+  QuerySchema,
+} from '../../../shared/function-connect.ws.js';
+
+export default class ChromeFunctionConnectWebSocketRoute extends FunctionConnect {
+  name = BrowserlessRoutes.ChromeFunctionConnectWebSocketRoute;
+  browser = ChromeCDP;
+}
+
+export { QuerySchema };

package/src/routes/chromium/ws/function-connect.ts

@@ -0,0 +1 @@
+export { default, QuerySchema } from '../../../shared/function-connect.ws.js';

package/src/routes/edge/ws/function-connect.ts

@@ -0,0 +1,12 @@
+import { BrowserlessRoutes, EdgeCDP } from '@browserless.io/browserless';
+import {
+  default as FunctionConnect,
+  QuerySchema,
+} from '../../../shared/function-connect.ws.js';
+
+export default class EdgeFunctionConnectWebSocketRoute extends FunctionConnect {
+  name = BrowserlessRoutes.EdgeFunctionConnectWebSocketRoute;
+  browser = EdgeCDP;
+}
+
+export { QuerySchema };

package/src/sdk-utils.ts

@@ -118,7 +118,7 @@ export const prompt = async (question: string) => {
 export const installDependencies = async (
   workingDirectory: string,
 ): Promise<void> => {
-  await waitForCommand('npm clean-install', workingDirectory);
+  await waitForCommand('npm install', workingDirectory);
   await installBrowsers(workingDirectory);
 };
 

package/src/shared/function-connect.ws.ts

@@ -0,0 +1,38 @@
+import {
+  APITags,
+  BrowserWebsocketRoute,
+  BrowserlessRoutes,
+  CDPLaunchOptions,
+  ChromiumCDP,
+  Logger,
+  Request,
+  SystemQueryParameters,
+  WebsocketRoutes,
+  dedent,
+} from '@browserless.io/browserless';
+import { Duplex } from 'stream';
+
+export interface QuerySchema extends SystemQueryParameters {
+  launch?: CDPLaunchOptions | string;
+}
+
+export default class ChromiumFunctionConnectWebSocketRoute extends BrowserWebsocketRoute {
+  name = BrowserlessRoutes.ChromiumFunctionConnectWebSocketRoute;
+  auth = true;
+  concurrency = false;
+  browser = ChromiumCDP;
+  description = dedent(
+    `Internally used by the POST /function API to connect the underlying client-side code to. Not intended for direct use but documented for completeness and to distinguish between other reconnect style calls.`,
+  );
+  path = WebsocketRoutes.functionClientConnect;
+  tags = [APITags.browserWS];
+  async handler(
+    req: Request,
+    socket: Duplex,
+    head: Buffer,
+    _logger: Logger,
+    browser: ChromiumCDP,
+  ): Promise<void> {
+    return browser.proxyWebSocket(req, socket, head);
+  }
+}

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

@@ -12,7 +12,6 @@ import {
   convertIfBase64,
   exists,
   getTokenFromRequest,
-  id,
   makeExternalURL,
   mimeTypes,
 } from '@browserless.io/browserless';
@@ -63,17 +62,23 @@ export default (config: Config, logger: Logger, options: HandlerOptions = {}) =>
 
     const context = JSON.stringify(rawContext);
     const code = convertIfBase64(rawCode);
-    const browserWSEndpoint = browser.publicWSEndpoint(
-      getTokenFromRequest(req) ?? '',
-    );
+    const privateWSEndpoint = browser.wsEndpoint();
 
-    if (!browserWSEndpoint) {
+    if (!privateWSEndpoint) {
       throw new ServerError(
         `No browser endpoint was found, is the browser running?`,
       );
     }
 
-    const functionCodeJS = `browserless-function-${id()}.js`;
+    const browserID = privateWSEndpoint.split('/').pop() as string;
+    const browserWSEndpoint = makeExternalURL(
+      config.getExternalWebSocketAddress(),
+      'function',
+      'connect',
+      browserID,
+      '?token=' + getTokenFromRequest(req),
+    );
+    const functionCodeJS = `browserless-function-${browserID}.js`;
     const page = (await browser.newPage()) as UnwrapPromise<
       ReturnType<ChromiumCDP['newPage']>
     >;

package/src/types.ts

@@ -651,6 +651,7 @@ export const BrowserlessChromeRoutes = {
   ChromeCDPWebSocketRoute: 'ChromeCDPWebSocketRoute',
   ChromeContentPostRoute: 'ChromeContentPostRoute',
   ChromeDownloadPostRoute: 'ChromeDownloadPostRoute',
+  ChromeFunctionConnectWebSocketRoute: 'ChromeFunctionConnectWebSocketRoute',
   ChromeFunctionPostRoute: 'ChromeFunctionPostRoute',
   ChromeJSONListGetRoute: 'ChromeJSONListGetRoute',
   ChromeJSONNewPutRoute: 'ChromeJSONNewPutRoute',
@@ -669,6 +670,7 @@ export const BrowserlessEdgeRoutes = {
   EdgeCDPWebSocketRoute: 'EdgeCDPWebSocketRoute',
   EdgeContentPostRoute: 'EdgeContentPostRoute',
   EdgeDownloadPostRoute: 'EdgeDownloadPostRoute',
+  EdgeFunctionConnectWebSocketRoute: 'EdgeFunctionConnectWebSocketRoute',
   EdgeFunctionPostRoute: 'EdgeFunctionPostRoute',
   EdgeJSONListGetRoute: 'EdgeJSONListGetRoute',
   EdgeJSONNewPutRoute: 'EdgeJSONNewPutRoute',
@@ -687,6 +689,8 @@ export const BrowserlessChromiumRoutes = {
   ChromiumCDPWebSocketRoute: 'ChromiumCDPWebSocketRoute',
   ChromiumContentPostRoute: 'ChromiumContentPostRoute',
   ChromiumDownloadPostRoute: 'ChromiumDownloadPostRoute',
+  ChromiumFunctionConnectWebSocketRoute:
+    'ChromiumFunctionConnectWebSocketRoute',
   ChromiumFunctionPostRoute: 'ChromiumFunctionPostRoute',
   ChromiumJSONListGetRoute: 'ChromiumJSONListGetRoute',
   ChromiumJSONNewPutRoute: 'ChromiumJSONNewPutRoute',