@browserless.io/browserless 2.38.0 → 2.38.2

package/CHANGELOG.md

@@ -1,4 +1,29 @@
-# [Latest](https://github.com/browserless/chrome/compare/v2.38.0...main)
+# [Latest](https://github.com/browserless/chrome/compare/v2.38.2...main)
+
+# [v2.38.2](https://github.com/browserless/browserless/compare/v2.38.1...v2.38.2)
+
+- Standardizes on how path parsing works internally, exports the utility as well.
+- Supports the following libraries and browsers:
+  - puppeteer-core: `24.26.1`
+  - playwright-core: `1.56.1`, `1.55.1`, `1.54.2`, `1.53.2`, and `1.52.0`.
+  - Chromium: `141.0.7390.37`
+  - Chrome: `141.0.7390.123` (amd64 only)
+  - Firefox: `142.0.1`
+  - Webkit: `26.0`
+  - Edge: `141.0.3537.99` (amd64 only)
+
+# [v2.38.1](https://github.com/browserless/browserless/compare/v2.38.0...v2.38.1)
+
+- Dependency updates.
+- Bugfix when a trailing slash is present in /function API call.
+- Supports the following libraries and browsers:
+  - puppeteer-core: `24.26.1`
+  - playwright-core: `1.56.1`, `1.55.1`, `1.54.2`, `1.53.2`, and `1.52.0`.
+  - Chromium: `141.0.7390.37`
+  - Chrome: `141.0.7390.123` (amd64 only)
+  - Firefox: `142.0.1`
+  - Webkit: `26.0`
+  - Edge: `141.0.3537.99` (amd64 only)
 
 # [v2.38.0](https://github.com/browserless/chrome/compare/v2.37.1...v2.38.0)
 

package/build/browsers/index.js

@@ -1,4 +1,4 @@
-import { BLESS_PAGE_IDENTIFIER, BadRequest, ChromeCDP, ChromePlaywright, ChromiumCDP, ChromiumPlaywright, EdgeCDP, EdgePlaywright, FirefoxPlaywright, Logger, NotFound, ServerError, WebKitPlaywright, availableBrowsers, convertIfBase64, exists, generateDataDir, makeExternalURL, noop, parseBooleanParam, parseStringParam, pwVersionRegex, } from '@browserless.io/browserless';
+import { BLESS_PAGE_IDENTIFIER, BadRequest, ChromeCDP, ChromePlaywright, ChromiumCDP, ChromiumPlaywright, EdgeCDP, EdgePlaywright, FirefoxPlaywright, Logger, NotFound, ServerError, WebKitPlaywright, availableBrowsers, convertIfBase64, exists, generateDataDir, getFinalPathSegment, makeExternalURL, noop, parseBooleanParam, parseStringParam, pwVersionRegex, } from '@browserless.io/browserless';
 import { deleteAsync } from 'del';
 import micromatch from 'micromatch';
 import path from 'path';
@@ -299,7 +299,10 @@ export class BrowserManager {
         // Handle browser re-connects here
         if (this.reconnectionPatterns.some((p) => req.parsed.pathname.includes(p))) {
             const sessions = Array.from(this.browsers);
-            const id = req.parsed.pathname.split('/').pop();
+            const id = getFinalPathSegment(req.parsed.pathname);
+            if (!id) {
+                throw new NotFound(`Couldn't locate browser ID from path "${req.parsed.pathname}"`);
+            }
             const found = sessions.find(([b]) => b.wsEndpoint()?.includes(id));
             if (found) {
                 const [browser, session] = found;
@@ -311,8 +314,8 @@ export class BrowserManager {
         }
         // Handle page connections here
         if (req.parsed.pathname.includes('/devtools/page')) {
-            const id = req.parsed.pathname.split('/').pop();
-            if (!id.includes(BLESS_PAGE_IDENTIFIER)) {
+            const id = getFinalPathSegment(req.parsed.pathname);
+            if (!id?.includes(BLESS_PAGE_IDENTIFIER)) {
                 const browsers = Array.from(this.browsers).map(([browser]) => browser);
                 const allPages = await Promise.all(browsers
                     .filter((b) => !!b.wsEndpoint())
@@ -358,7 +361,10 @@ export class BrowserManager {
         if (proxyServerParam) {
             const existingArgs = launchOptions.args || [];
             const filteredArgs = existingArgs.filter((arg) => !arg.includes('--proxy-server='));
-            launchOptions.args = [...filteredArgs, `--proxy-server=${proxyServerParam}`];
+            launchOptions.args = [
+                ...filteredArgs,
+                `--proxy-server=${proxyServerParam}`,
+            ];
         }
         const manualUserDataDir = launchOptions.args
             ?.find((arg) => arg.includes('--user-data-dir='))
@@ -410,7 +416,7 @@ export class BrowserManager {
         });
         await this.hooks.browser({ browser, req });
         const session = {
-            id: browser.wsEndpoint()?.split('/').pop(),
+            id: getFinalPathSegment(browser.wsEndpoint()),
             initialConnectURL: path.join(req.parsed.pathname, req.parsed.search) || '',
             isTempDataDir: !manualUserDataDir,
             launchOptions,

package/build/routes/management/http/kill.get.js

@@ -1,4 +1,4 @@
-import { APITags, BrowserlessRoutes, HTTPManagementRoutes, HTTPRoute, Methods, contentTypes, writeResponse, } from '@browserless.io/browserless';
+import { APITags, BrowserlessRoutes, HTTPManagementRoutes, HTTPRoute, Methods, contentTypes, getFinalPathSegment, writeResponse, } from '@browserless.io/browserless';
 export default class KillGetRoute extends HTTPRoute {
     name = BrowserlessRoutes.KillGetRoute;
     accepts = [contentTypes.any];
@@ -11,7 +11,7 @@ export default class KillGetRoute extends HTTPRoute {
     path = HTTPManagementRoutes.kill;
     tags = [APITags.management];
     async handler(req, res) {
-        const target = req.parsed.pathname.split('/')[2];
+        const target = getFinalPathSegment(req.parsed.pathname);
         const browserManager = this.browserManager();
         await browserManager.killSessions(target);
         return writeResponse(res, 204, '');

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

@@ -1,4 +1,4 @@
-import { BadRequest, HTTPRoutes, ServerError, contentTypes, convertIfBase64, exists, getTokenFromRequest, makeExternalURL, mimeTypes, } from '@browserless.io/browserless';
+import { BadRequest, HTTPRoutes, ServerError, contentTypes, convertIfBase64, exists, getFinalPathSegment, getTokenFromRequest, makeExternalURL, mimeTypes, } from '@browserless.io/browserless';
 import fs from 'fs';
 import path from 'path';
 export default (config, logger, options = {}) => async (req, browser) => {
@@ -19,7 +19,7 @@ export default (config, logger, options = {}) => async (req, browser) => {
     if (!privateWSEndpoint) {
         throw new ServerError(`No browser endpoint was found, is the browser running?`);
     }
-    const browserID = privateWSEndpoint.split('/').pop();
+    const browserID = getFinalPathSegment(privateWSEndpoint);
     const browserWSEndpoint = makeExternalURL(config.getExternalWebSocketAddress(), 'function', 'connect', browserID, '?token=' + getTokenFromRequest(req));
     const functionCodeJS = `browserless-function-${browserID}.js`;
     const page = (await browser.newPage());

package/build/utils.d.ts

@@ -140,4 +140,5 @@ export declare const printLogo: (docsLink: string, debugURL?: string | boolean)
 export declare const getCDPClient: (page: Page) => CDPSession;
 export declare const ublockLitePath: string;
 export declare const isMatch: (text: string, pattern: string) => boolean;
+export declare const getFinalPathSegment: (pathname: string) => string | undefined;
 export {};

package/build/utils.js

@@ -654,3 +654,4 @@ export const ublockLitePath = path.join(__dirname, '..', 'extensions', 'ublockli
 export const isMatch = (text, pattern) => {
     return micromatch.isMatch(text, pattern, { bash: true });
 };
+export const getFinalPathSegment = (pathname) => pathname.split(/[?#&]/)[0].split('/').filter(Boolean).pop();

package/build/utils.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/build/utils.spec.js

@@ -0,0 +1,27 @@
+import { expect } from 'chai';
+import { getFinalPathSegment } from '@browserless.io/browserless';
+describe('Utils', () => {
+    describe('#getFinalPathSegment', () => {
+        it('returns the final path segment', () => {
+            expect(getFinalPathSegment('https://www.browserless.io/some/random/path/segment')).to.equal('segment');
+        });
+        it('returns the final path segment with trailing slashes', () => {
+            expect(getFinalPathSegment('https://www.browserless.io/some/random/path/segment/')).to.equal('segment');
+        });
+        it('returns the final path segment with URLs that have query params', () => {
+            expect(getFinalPathSegment('https://www.browserless.io/some/random/path/segment?foo=bar')).to.equal('segment');
+        });
+        it('returns the final path segment with URLs that have fragments', () => {
+            expect(getFinalPathSegment('https://www.browserless.io/some/random/path/segment#foo=bar')).to.equal('segment');
+        });
+        it('returns the final path segment with trailing slashes, query-params and fragments', () => {
+            expect(getFinalPathSegment('https://www.browserless.io/some/random/path/segment/?foo=bar&baz=qux#hello=world')).to.equal('segment');
+        });
+        it('returns the final path segment with trailing slashes, query-params and fragments on websockets', () => {
+            expect(getFinalPathSegment('wss://www.browserless.io/some/random/path/segment/?foo=bar&baz=qux#hello=world')).to.equal('segment');
+        });
+        it('returns the final path segment with malformed URLs', () => {
+            expect(getFinalPathSegment('wss://www.browserless.io/some/random/path/segment/&bad=query')).to.equal('segment');
+        });
+    });
+});

package/extensions/ublocklite/_locales/be/messages.json

@@ -264,15 +264,15 @@
     "description": "Short description for a checkbox in the options page"
   },
   "settingsBackupRestoreLabel": {
-    "message": "Backup",
+    "message": "Рэзервовая копія",
     "description": "The header text for the back up/restore section"
   },
   "settingsBackupRestoreSummary": {
-    "message": "Back up your custom settings to a file, or restore your custom settings from a file.",
+    "message": "Стварыць рэзервовую копію ўласных налад у файл або аднавіць уласныя налады з файла.",
     "description": "A summary description of the back up/restore section."
   },
   "settingsBackupRestoreLegend": {
-    "message": "Restoring will overwrite all your current custom settings.",
+    "message": "Аднаўленне перазапіша ўсе вашыя бягучыя ўласныя налады.",
     "description": "Important information about the back up/restore section."
   },
   "findListsPlaceholder": {
@@ -376,11 +376,11 @@
     "description": "Text for buttons used to export content"
   },
   "backupButton": {
-    "message": "Back up…",
+    "message": "Стварыць копію…",
     "description": "Text for buttons used to back up content"
   },
   "restoreButton": {
-    "message": "Restore…",
+    "message": "Аднавіць…",
     "description": "Text for buttons used to restore content"
   },
   "dnrRulesWarning": {

package/extensions/ublocklite/_locales/id/messages.json

@@ -20,7 +20,7 @@
     "description": "appears as tab name in dashboard"
   },
   "customFiltersPageName": {
-    "message": "Custom filters",
+    "message": "Filter khusus",
     "description": "appears as tab name in dashboard"
   },
   "developPageName": {
@@ -88,11 +88,11 @@
     "description": "Header for a ruleset section in 'Filter lists pane'"
   },
   "customFiltersImportExportLabel": {
-    "message": "Import / Export",
+    "message": "Impor / Ekspor",
     "description": "Text label heading the import/export area of custom filters"
   },
   "customFiltersImportTextareaPlaceholder": {
-    "message": "Paste here specific cosmetic filters to add",
+    "message": "Tambahkan filter kosmetik dengan menempel di sini",
     "description": "Placeholder text which describes the purpose of the textarea widget"
   },
   "aboutChangelog": {
@@ -264,15 +264,15 @@
     "description": "Short description for a checkbox in the options page"
   },
   "settingsBackupRestoreLabel": {
-    "message": "Backup",
+    "message": "Cadangan",
     "description": "The header text for the back up/restore section"
   },
   "settingsBackupRestoreSummary": {
-    "message": "Back up your custom settings to a file, or restore your custom settings from a file.",
+    "message": "Cadangkan settingan khusus ke berkas, atau pulihkan settingan khusus dari berkas.",
     "description": "A summary description of the back up/restore section."
   },
   "settingsBackupRestoreLegend": {
-    "message": "Restoring will overwrite all your current custom settings.",
+    "message": "Pemulihan akan menimpa semua settingan khusus saat ini.",
     "description": "Important information about the back up/restore section."
   },
   "findListsPlaceholder": {
@@ -364,7 +364,7 @@
     "description": "Text for buttons used to revert changes"
   },
   "addButton": {
-    "message": "Add",
+    "message": "Tambah",
     "description": "Text for buttons used to add content"
   },
   "importAndAppendButton": {
@@ -376,11 +376,11 @@
     "description": "Text for buttons used to export content"
   },
   "backupButton": {
-    "message": "Back up…",
+    "message": "Cadangkan…",
     "description": "Text for buttons used to back up content"
   },
   "restoreButton": {
-    "message": "Restore…",
+    "message": "Pulihkan…",
     "description": "Text for buttons used to restore content"
   },
   "dnrRulesWarning": {

package/extensions/ublocklite/_locales/ja/messages.json

@@ -20,7 +20,7 @@
     "description": "appears as tab name in dashboard"
   },
   "customFiltersPageName": {
-    "message": "Custom filters",
+    "message": "カスタムフィルター",
     "description": "appears as tab name in dashboard"
   },
   "developPageName": {
@@ -88,11 +88,11 @@
     "description": "Header for a ruleset section in 'Filter lists pane'"
   },
   "customFiltersImportExportLabel": {
-    "message": "Import / Export",
+    "message": "インポート又はエクスポート",
     "description": "Text label heading the import/export area of custom filters"
   },
   "customFiltersImportTextareaPlaceholder": {
-    "message": "Paste here specific cosmetic filters to add",
+    "message": "ここに追加したいコスメティックフィルターをペースト",
     "description": "Placeholder text which describes the purpose of the textarea widget"
   },
   "aboutChangelog": {
@@ -364,7 +364,7 @@
     "description": "Text for buttons used to revert changes"
   },
   "addButton": {
-    "message": "Add",
+    "message": "追加",
     "description": "Text for buttons used to add content"
   },
   "importAndAppendButton": {

package/extensions/ublocklite/_locales/pt_PT/messages.json

@@ -88,7 +88,7 @@
     "description": "Header for a ruleset section in 'Filter lists pane'"
   },
   "customFiltersImportExportLabel": {
-    "message": "Importar / Exportar",
+    "message": "Importar/Exportar",
     "description": "Text label heading the import/export area of custom filters"
   },
   "customFiltersImportTextareaPlaceholder": {

package/extensions/ublocklite/_locales/th/messages.json

@@ -20,7 +20,7 @@
     "description": "appears as tab name in dashboard"
   },
   "customFiltersPageName": {
-    "message": "Custom filters",
+    "message": "กำหนดตัวกรอง",
     "description": "appears as tab name in dashboard"
   },
   "developPageName": {
@@ -88,7 +88,7 @@
     "description": "Header for a ruleset section in 'Filter lists pane'"
   },
   "customFiltersImportExportLabel": {
-    "message": "Import / Export",
+    "message": "นำเข้า / ส่งออก",
     "description": "Text label heading the import/export area of custom filters"
   },
   "customFiltersImportTextareaPlaceholder": {

package/extensions/ublocklite/_locales/uk/messages.json

@@ -20,7 +20,7 @@
     "description": "appears as tab name in dashboard"
   },
   "customFiltersPageName": {
-    "message": "Custom filters",
+    "message": "Користувацькі фільтри",
     "description": "appears as tab name in dashboard"
   },
   "developPageName": {
@@ -88,11 +88,11 @@
     "description": "Header for a ruleset section in 'Filter lists pane'"
   },
   "customFiltersImportExportLabel": {
-    "message": "Import / Export",
+    "message": "Імпорт / Експорт",
     "description": "Text label heading the import/export area of custom filters"
   },
   "customFiltersImportTextareaPlaceholder": {
-    "message": "Paste here specific cosmetic filters to add",
+    "message": "Вставте сюди конкретні косметичні фільтри, які потрібно додати",
     "description": "Placeholder text which describes the purpose of the textarea widget"
   },
   "aboutChangelog": {
@@ -264,15 +264,15 @@
     "description": "Short description for a checkbox in the options page"
   },
   "settingsBackupRestoreLabel": {
-    "message": "Backup",
+    "message": "Резервне копіювання",
     "description": "The header text for the back up/restore section"
   },
   "settingsBackupRestoreSummary": {
-    "message": "Back up your custom settings to a file, or restore your custom settings from a file.",
+    "message": "Створіть резервну копію власних налаштувань у файлі або відновіть власні налаштування з файлу.",
     "description": "A summary description of the back up/restore section."
   },
   "settingsBackupRestoreLegend": {
-    "message": "Restoring will overwrite all your current custom settings.",
+    "message": "Відновлення призведе до перезапису всіх ваших поточних налаштувань.",
     "description": "Important information about the back up/restore section."
   },
   "findListsPlaceholder": {
@@ -364,7 +364,7 @@
     "description": "Text for buttons used to revert changes"
   },
   "addButton": {
-    "message": "Add",
+    "message": "Додати",
     "description": "Text for buttons used to add content"
   },
   "importAndAppendButton": {
@@ -376,11 +376,11 @@
     "description": "Text for buttons used to export content"
   },
   "backupButton": {
-    "message": "Back up…",
+    "message": "Створити…",
     "description": "Text for buttons used to back up content"
   },
   "restoreButton": {
-    "message": "Restore…",
+    "message": "Відновити…",
     "description": "Text for buttons used to restore content"
   },
   "dnrRulesWarning": {

package/extensions/ublocklite/_locales/vi/messages.json

@@ -20,7 +20,7 @@
     "description": "appears as tab name in dashboard"
   },
   "customFiltersPageName": {
-    "message": "Custom filters",
+    "message": "Bộ lọc tự tạo",
     "description": "appears as tab name in dashboard"
   },
   "developPageName": {
@@ -88,11 +88,11 @@
     "description": "Header for a ruleset section in 'Filter lists pane'"
   },
   "customFiltersImportExportLabel": {
-    "message": "Import / Export",
+    "message": "Nhập / Xuất",
     "description": "Text label heading the import/export area of custom filters"
   },
   "customFiltersImportTextareaPlaceholder": {
-    "message": "Paste here specific cosmetic filters to add",
+    "message": "Dán vào đây các bộ lọc cụ thể",
     "description": "Placeholder text which describes the purpose of the textarea widget"
   },
   "aboutChangelog": {
@@ -272,7 +272,7 @@
     "description": "A summary description of the back up/restore section."
   },
   "settingsBackupRestoreLegend": {
-    "message": "Restoring will overwrite all your current custom settings.",
+    "message": "Khôi phục sẽ ghi đè lên những tùy chọn hiện tại của bạn.",
     "description": "Important information about the back up/restore section."
   },
   "findListsPlaceholder": {
@@ -364,7 +364,7 @@
     "description": "Text for buttons used to revert changes"
   },
   "addButton": {
-    "message": "Add",
+    "message": "Thêm",
     "description": "Text for buttons used to add content"
   },
   "importAndAppendButton": {

package/extensions/ublocklite/_locales/zh_CN/messages.json

@@ -4,7 +4,7 @@
     "description": "extension name."
   },
   "extShortDesc": {
-    "message": "一个不需要权限的内容屏蔽工具。安装即可屏蔽广告、跟踪器、挖矿脚本等网页内容。",
+    "message": "一款高效的内容屏蔽工具。安装即可屏蔽广告、跟踪器、挖矿脚本等网页内容。",
     "description": "this will be in the Chrome web store: must be 132 characters or less"
   },
   "perRulesetStats": {
@@ -140,7 +140,7 @@
     "description": "A paragraph in the filter issue reporter section"
   },
   "supportFindSpecificButton": {
-    "message": "找到相似报告",
+    "message": "在 GitHub 上寻找相似报告",
     "description": "A clickable link in the filter issue reporter section"
   },
   "supportS6URL": {
@@ -280,7 +280,7 @@
     "description": "Placeholder for the input field used to find lists"
   },
   "strictblockTitle": {
-    "message": "被拦截的页面",
+    "message": "页面已被拦截",
     "description": "Webpage title for the strict-blocked page"
   },
   "strictblockSentence1": {
@@ -308,7 +308,7 @@
     "description": "A button to close the current tab"
   },
   "strictblockDontWarn": {
-    "message": "不要再警告我有关此网站",
+    "message": "不再针对此网站作出警告",
     "description": "Label for checkbox in document-blocked page"
   },
   "strictblockProceed": {
@@ -320,19 +320,19 @@
     "description": "Tooltip for the button used to enter zapper mode"
   },
   "zapperTipQuit": {
-    "message": "退出临时元素移除模式",
+    "message": "退出临时移除元素模式",
     "description": "Tooltip for the button used to exit zapper mode"
   },
   "pickerTipEnter": {
-    "message": "创建自定义过滤器",
+    "message": "创建自定义过滤规则",
     "description": "Label for the menu entry to create cosmetic filters"
   },
   "unpickerTipEnter": {
-    "message": "移除自定义过滤器",
+    "message": "移除自定义过滤规则",
     "description": "Label for the menu entry to delete cosmetic filters"
   },
   "developDropdownLabel": {
-    "message": "视图:",
+    "message": "查看：",
     "description": "A label of a dropdown list"
   },
   "developOptionFilteringModeDetails": {

package/extensions/ublocklite/js/jsonpath.js

@@ -416,9 +416,9 @@ export class JSONPath {
                 break;
             }
             if ( c === 0x5C /* \ */ && (end+1) < len ) {
-                parts.push(query.slice(beg, end));
                 const d = query.charCodeAt(end+1);
-                if ( d === targetCharCode || d === 0x5C ) {
+                if ( d === targetCharCode ) {
+                    parts.push(query.slice(beg, end));
                     end += 1;
                     beg = end;
                 }

package/extensions/ublocklite/js/static-filtering-parser.js

@@ -1371,7 +1371,9 @@ export class AstFilterParser {
                 realBad = hasValue;
                 if ( realBad ) { break; }
                 requestTypeCount += 1;
-                unredirectableTypeCount += 1;
+                if ( (flags & NODE_FLAG_IS_NEGATED) === 0 ) {
+                    unredirectableTypeCount += 1;
+                }
                 break;
             case NODE_TYPE_NET_OPTION_NAME_POPUNDER:
             case NODE_TYPE_NET_OPTION_NAME_POPUP:

package/extensions/ublocklite/js/utils.js

@@ -118,7 +118,7 @@ export const matchesFromHostnames = hostnames => {
 
 export const hostnameFromMatch = origin => {
     if ( origin === '<all_urls>' || origin === '*://*/*' ) { return 'all-urls'; }
-    const match = reOriginToHostname.exec(origin);
+    const match = /^\*:\/\/(?:\*\.)?([^/]+)\/\*/.exec(origin);
     if ( match === null ) { return ''; }
     return match[1];
 };
@@ -133,8 +133,6 @@ export const hostnamesFromMatches = origins => {
     return out;
 };
 
-const reOriginToHostname = /^\*:\/\/(?:\*\.)?([^/]+)\/\*/;
-
 /******************************************************************************/
 
 const broadcastMessage = message => {

package/extensions/ublocklite/manifest.json

@@ -325,7 +325,7 @@
   "storage": {
     "managed_schema": "managed_storage.json"
   },
-  "version": "2025.1019.1656",
+  "version": "2025.1028.1744",
   "web_accessible_resources": [
     {
       "resources": [

package/extensions/ublocklite/rulesets/generic-details.json

@@ -689,6 +689,7 @@
     "okdebrid.com",
     "oko.sh",
     "omekon.blogspot.com",
+    "omuzaani.me",
     "onbatch.my.id",
     "ondemandkorea.com",
     "onemanhua.com",
@@ -897,6 +898,7 @@
     "startimez.com",
     "startseite.to",
     "starxinvestor.com",
+    "stateless.me",
     "stgeorgeutah.com",
     "stltoday.com",
     "stokerpiller.dk",