@browserless.io/browserless 2.37.0 → 2.38.0

package/extensions/ublocklite/js/jsonpath.js

@@ -49,6 +49,7 @@
  *   - ^=: stringified value starts with 
  *   - $=: stringified value ends with
  *   - *=: stringified value includes
+ *   - =/.../: regular expression matches
  * 
  * - Examples (from "JSONPath examples" at reference link)
  *   - .store.book[*].author
@@ -376,7 +377,7 @@ export class JSONPath {
                 continue;
             }
             if ( c0 === 0x27 /* ' */ ) {
-                const r = this.#consumeQuotedIdentifier(query, i+1);
+                const r = this.#untilChar(query, 0x27 /* ' */, i+1)
                 if ( r === undefined ) { return; }
                 keys.push(r.s);
                 i = r.i;
@@ -397,22 +398,27 @@ export class JSONPath {
         }
         return { s: keys.length === 1 ? keys[0] : keys, i };
     }
-    #consumeQuotedIdentifier(query, i) {
+    #consumeUnquotedIdentifier(query, i) {
+        const match = this.#reUnquotedIdentifier.exec(query.slice(i));
+        if ( match === null ) { return; }
+        return match[0];
+    }
+    #untilChar(query, targetCharCode, i) {
         const len = query.length;
         const parts = [];
         let beg = i, end = i;
         for (;;) {
             if ( end === len ) { return; }
             const c = query.charCodeAt(end);
-            if ( c === 0x27 /* ' */ ) {
+            if ( c === targetCharCode ) {
                 parts.push(query.slice(beg, end));
                 end += 1;
                 break;
             }
             if ( c === 0x5C /* \ */ && (end+1) < len ) {
                 parts.push(query.slice(beg, end));
-                const d = query.chatCodeAt(end+1);
-                if ( d === 0x27 || d === 0x5C ) {
+                const d = query.charCodeAt(end+1);
+                if ( d === targetCharCode || d === 0x5C ) {
                     end += 1;
                     beg = end;
                 }
@@ -421,12 +427,20 @@ export class JSONPath {
         }
         return { s: parts.join(''), i: end };
     }
-    #consumeUnquotedIdentifier(query, i) {
-        const match = this.#reUnquotedIdentifier.exec(query.slice(i));
-        if ( match === null ) { return; }
-        return match[0];
-    }
     #compileExpr(query, step, i) {
+        if ( query.startsWith('=/', i) ) {
+            const r = this.#untilChar(query, 0x2F /* / */, i+2);
+            if ( r === undefined ) { return i; }
+            const match = /^[i]/.exec(query.slice(r.i));
+            try {
+                step.rval = new RegExp(r.s, match && match[0] || undefined);
+            } catch {
+                return i;
+            }
+            step.op = 're';
+            if ( match ) { r.i += match[0].length; }
+            return r.i;
+        }
         const match = this.#reExpr.exec(query.slice(i));
         if ( match === null ) { return i; }
         try {
@@ -466,6 +480,7 @@ export class JSONPath {
         case '^=': outcome = `${v}`.startsWith(step.rval) === target; break;
         case '$=': outcome = `${v}`.endsWith(step.rval) === target; break;
         case '*=': outcome = `${v}`.includes(step.rval) === target; break;
+        case 're': outcome = step.rval.test(`${v}`); break;
         default: outcome = hasOwn === target; break;
         }
         if ( outcome ) { return k; }

package/extensions/ublocklite/js/mode-manager.js

@@ -365,17 +365,15 @@ export async function syncWithBrowserPermissions() {
     if ( afterMode > MODE_BASIC ) { return afterMode !== beforeMode; }
     const filteringModes = await getFilteringModeDetails();
     if ( allowedHostnames.has('all-urls') === false ) {
-        const { optimal, complete } = filteringModes;
-        for ( const hn of optimal ) {
-            if ( allowedHostnames.has(hn) ) { continue; }
-            if ( isDescendantHostnameOfIter(hn, allowedHostnames) ) { continue; }
-            optimal.delete(hn);
+        const { none, basic, optimal, complete } = filteringModes;
+        for ( const hn of new Set([ ...optimal, ...complete ]) ) {
+            applyFilteringMode(filteringModes, hn, afterMode);
             modified = true;
         }
-        for ( const hn of complete ) {
-            if ( allowedHostnames.has(hn) ) { continue; }
-            if ( isDescendantHostnameOfIter(hn, allowedHostnames) ) { continue; }
-            complete.delete(hn);
+        for ( const hn of allowedHostnames ) {
+            if ( optimal.has(hn) || complete.has(hn) ) { continue; }
+            if ( basic.has(hn) || none.has(hn) ) { continue; }
+            applyFilteringMode(filteringModes, hn, MODE_OPTIMAL);
             modified = true;
         }
         if ( modified ) {

package/extensions/ublocklite/js/report.js

@@ -20,6 +20,7 @@
 */
 
 import { dom, qs$ } from './dom.js';
+import { getTroubleshootingInfo } from './troubleshooting.js';
 import { sendMessage } from './ext.js';
 
 /******************************************************************************/
@@ -92,10 +93,7 @@ async function reportSpecificFilterIssue() {
 
 /******************************************************************************/
 
-sendMessage({
-    what: 'getTroubleshootingInfo',
-    siteMode: reportedPage.mode,
-}).then(config => {
+getTroubleshootingInfo(reportedPage.mode).then(config => {
     qs$('[data-i18n="supportS5H"] + pre').textContent = config;
 
     dom.on('[data-url]', 'click', ev => {

package/extensions/ublocklite/js/scripting/css-api.js

@@ -0,0 +1,33 @@
+/*******************************************************************************
+
+    uBlock Origin Lite - a comprehensive, MV3-compliant content blocker
+    Copyright (C) 2025-present Raymond Hill
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see {http://www.gnu.org/licenses/}.
+
+    Home: https://github.com/gorhill/uBlock
+*/
+
+(api => {
+    if ( typeof api === 'object' ) { return; }
+    self.cssAPI = {
+        insert(css) {
+            chrome.runtime.sendMessage({
+                what: 'insertCSS',
+                css,
+            }).catch(( ) => {
+            });
+        },
+    };
+})(self.cssAPI);

package/extensions/ublocklite/js/scripting/css-generic.js

@@ -61,7 +61,7 @@ const hashFromStr = (type, s) => {
     for ( let i = 0; i < len; i += step ) {
         hash = (hash << 5) + hash ^ s.charCodeAt(i);
     }
-    return hash & 0xFFFFFF;
+    return hash & 0xFFF;
 };
 
 /******************************************************************************/
@@ -188,7 +188,7 @@ const uBOL_processNodes = ( ) => {
     if ( styleSheetTimer !== undefined ) { return; }
     styleSheetTimer = self.requestAnimationFrame(( ) => {
         styleSheetTimer = undefined;
-        uBOL_injectCSS(`${styleSheetSelectors.join(',')}{display:none!important;}`);
+        self.cssAPI.insert(`${styleSheetSelectors.join(',')}{display:none!important;}`);
         styleSheetSelectors.length = 0;
     });
 };
@@ -214,17 +214,7 @@ const uBOL_processChanges = mutations => {
 
 /******************************************************************************/
 
-const uBOL_injectCSS = css => {
-    chrome.runtime.sendMessage({
-        what: 'insertCSS',
-        css,
-    }).catch(( ) => {
-    });
-};
-
-/******************************************************************************/
-
-const stopAll = reason => {
+const stopAll = ( ) => {
     if ( domChangeTimer !== undefined ) {
         self.clearTimeout(domChangeTimer);
         domChangeTimer = undefined;

package/extensions/ublocklite/js/scripting/css-procedural-api.js

@@ -29,14 +29,6 @@ if ( self.ProceduralFiltererAPI !== undefined ) {
 
 /******************************************************************************/
 
-const uBOL_injectCSS = css => {
-    chrome.runtime.sendMessage({
-        what: 'insertCSS',
-        css,
-    }).catch(( ) => {
-    });
-};
-
 const nonVisualElements = {
     head: true,
     link: true,
@@ -688,7 +680,7 @@ class ProceduralFilterer {
         if ( styleToken !== undefined ) { return styleToken; }
         styleToken = randomToken();
         this.styleTokenMap.set(style, styleToken);
-        uBOL_injectCSS(`[${styleToken}]\n{${style}}\n`);
+        self.cssAPI.insert(`[${styleToken}]\n{${style}}\n`);
         return styleToken;
     }
 

package/extensions/ublocklite/js/scripting/css-procedural.js

@@ -103,11 +103,7 @@ if ( declaratives.length !== 0 ) {
         sheetText.push(ruleText);
     }
     if ( sheetText.length !== 0 ) {
-        chrome.runtime.sendMessage({
-            what: 'insertCSS',
-            css: sheetText.join('\n'),
-        }).catch(( ) => {
-        });
+        self.cssAPI.insert(sheetText.join('\n'));
     }
 }
 

package/extensions/ublocklite/js/scripting/css-specific.js

@@ -65,11 +65,7 @@ const exceptedSelectors = exceptions.length !== 0
     : selectors;
 if ( exceptedSelectors.length === 0 ) { return; }
 
-chrome.runtime.sendMessage({
-    what: 'insertCSS',
-    css: `${exceptedSelectors.join(',')}{display:none!important;}`,
-}).catch(( ) => {
-});
+self.cssAPI.insert(`${exceptedSelectors.join(',')}{display:none!important;}`);
 
 /******************************************************************************/
 

package/extensions/ublocklite/js/scripting-manager.js

@@ -194,7 +194,7 @@ function registerGeneric(context, genericDetails) {
 
     if ( js.length === 0 ) { return; }
 
-    js.unshift('/js/scripting/isolated-api.js');
+    js.unshift('/js/scripting/css-api.js', '/js/scripting/isolated-api.js');
     js.push('/js/scripting/css-generic.js');
 
     const { none, basic, optimal, complete } = filteringModeDetails;
@@ -306,15 +306,18 @@ function registerProcedural(context) {
 
     normalizeMatches(matches);
 
-    js.unshift('/js/scripting/isolated-api.js');
+    js.unshift('/js/scripting/css-api.js', '/js/scripting/isolated-api.js');
     js.push('/js/scripting/css-procedural.js');
 
     const excludeMatches = [];
-    if ( none.has('all-urls') === false ) {
-        excludeMatches.push(...ut.matchesFromHostnames(none));
-    }
-    if ( basic.has('all-urls') === false ) {
-        excludeMatches.push(...ut.matchesFromHostnames(basic));
+    if ( none.has('all-urls') === false && basic.has('all-urls') === false ) {
+        const toExclude = [
+            ...ut.matchesFromHostnames(none),
+            ...ut.matchesFromHostnames(basic),
+        ];
+        for ( const hn of toExclude ) {
+            excludeMatches.push(hn);
+        }
     }
 
     const registered = before.get('css-procedural');
@@ -370,7 +373,7 @@ function registerSpecific(context) {
 
     normalizeMatches(matches);
 
-    js.unshift('/js/scripting/isolated-api.js');
+    js.unshift('/js/scripting/css-api.js', '/js/scripting/isolated-api.js');
     js.push('/js/scripting/css-specific.js');
 
     const excludeMatches = [];

package/extensions/ublocklite/js/troubleshooting.js

@@ -19,11 +19,7 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-import { dnr } from './ext-compat.js';
-import { getConsoleOutput } from './debug.js';
-import { getDefaultFilteringMode } from './mode-manager.js';
-import { getEffectiveUserRules } from './ruleset-manager.js';
-import { runtime } from './ext.js';
+import { runtime, sendMessage } from './ext.js';
 
 /******************************************************************************/
 
@@ -57,36 +53,45 @@ export async function getTroubleshootingInfo(siteMode) {
     const manifest = runtime.getManifest();
     const [
         platformInfo,
-        rulesets,
+        defaultConfig,
+        enabledRulesets,
         defaultMode,
         userRules,
+        consoleOutput,
+        hasOmnipotence,
     ] = await Promise.all([
         runtime.getPlatformInfo(),
-        dnr.getEnabledRulesets(),
-        getDefaultFilteringMode(),
-        getEffectiveUserRules(),
+        sendMessage({ what: 'getDefaultConfig' }),
+        sendMessage({ what: 'getEnabledRulesets' }),
+        sendMessage({ what: 'getDefaultFilteringMode' }),
+        sendMessage({ what: 'getEffectiveUserRules' }),
+        sendMessage({ what: 'getConsoleOutput' }),
+        sendMessage({ what: 'hasBroadHostPermissions' }),
     ]);
     const browser = (( ) => {
         const extURL = runtime.getURL('');
-        let agent = '';
+        let agent = '', version = '?';
         if ( extURL.startsWith('moz-extension:') ) {
             agent = 'Firefox';
+            const match = /\bFirefox\/(\d+\.\d+)\b/.exec(navigator.userAgent);
+            version = match && match[1] || '?';
         } else if ( extURL.startsWith('safari-web-extension:') ) {
             agent = 'Safari';
+            const match = /\bVersion\/(\d+\.\d+)\b/.exec(navigator.userAgent);
+            version = match && match[1] || '?';
         } else if ( /\bEdg\/\b/.test(navigator.userAgent) ) {
             agent = 'Edge';
+            const match = /\bEdg\/(\d+)\b/.exec(navigator.userAgent);
+            version = match && match[1] || '?';
         } else {
             agent = 'Chrome';
+            const match = /\bChrome\/(\d+)\b/.exec(navigator.userAgent);
+            version = match && match[1] || '?';
         }
         if ( /\bMobile\b/.test(navigator.userAgent) ) {
             agent += ' Mobile';
         }
-        const reVersion = new RegExp(`\\b${agent.slice(0,3)}[^/]*/(\\d+)`);
-        const match = reVersion.exec(navigator.userAgent);
-        if ( match ) {
-            agent += ` ${match[1]}`;
-        }
-        agent += ` (${platformInfo.os})`
+        agent += ` ${version} (${platformInfo.os})`
         return agent;
     })();
     const modes = [ 'no filtering', 'basic', 'optimal', 'complete' ];
@@ -100,12 +105,22 @@ export async function getTroubleshootingInfo(siteMode) {
         version: manifest.version,
         browser,
         filtering,
+        permission: hasOmnipotence ? 'all' : 'ask',
     };
     if ( userRules.length !== 0 ) {
         config['user rules'] = userRules.length;
     }
-    config.rulesets = rulesets;
-    const consoleOutput = getConsoleOutput();
+    const defaultRulesets = defaultConfig.rulesets;
+    for ( let i = 0; i < enabledRulesets.length; i++ ) {
+        const id = enabledRulesets[i];
+        if ( defaultRulesets.includes(id) ) { continue; }
+        enabledRulesets[i] = `+${id}`;
+    }
+    for ( const id of defaultRulesets ) {
+        if ( enabledRulesets.includes(id) ) { continue; }
+        enabledRulesets.push(`-${id}`);
+    }
+    config.rulesets = enabledRulesets.sort();
     if ( consoleOutput.length !== 0 ) {
         config.console = siteMode
             ? consoleOutput.slice(-8)

package/extensions/ublocklite/js/utils.js

@@ -105,10 +105,10 @@ const subtractHostnameIters = (itera, iterb) => {
 
 /******************************************************************************/
 
-const matchFromHostname = hn =>
+export const matchFromHostname = hn =>
     hn === '*' || hn === 'all-urls' ? '<all_urls>' : `*://*.${hn}/*`;
 
-const matchesFromHostnames = hostnames => {
+export const matchesFromHostnames = hostnames => {
     const out = [];
     for ( const hn of hostnames ) {
         out.push(matchFromHostname(hn));
@@ -116,20 +116,25 @@ const matchesFromHostnames = hostnames => {
     return out;
 };
 
-const hostnamesFromMatches = origins => {
+export const hostnameFromMatch = origin => {
+    if ( origin === '<all_urls>' || origin === '*://*/*' ) { return 'all-urls'; }
+    const match = reOriginToHostname.exec(origin);
+    if ( match === null ) { return ''; }
+    return match[1];
+};
+
+export const hostnamesFromMatches = origins => {
     const out = [];
     for ( const origin of origins ) {
-        if ( origin === '<all_urls>' || origin === '*://*/*' ) {
-            out.push('all-urls');
-            continue;
-        }
-        const match = /^\*:\/\/(?:\*\.)?([^/]+)\/\*/.exec(origin);
-        if ( match === null ) { continue; }
-        out.push(match[1]);
+        const hn = hostnameFromMatch(origin);
+        if ( hn === '' ) { continue; }
+        out.push(hn);
     }
     return out;
 };
 
+const reOriginToHostname = /^\*:\/\/(?:\*\.)?([^/]+)\/\*/;
+
 /******************************************************************************/
 
 const broadcastMessage = message => {
@@ -217,9 +222,6 @@ export {
     isDescendantHostnameOfIter,
     intersectHostnameIters,
     subtractHostnameIters,
-    matchFromHostname,
-    matchesFromHostnames,
-    hostnamesFromMatches,
     hasBroadHostPermissions,
     gotoURL,
     strArrayEq,

package/extensions/ublocklite/manifest.json

@@ -304,6 +304,7 @@
   "host_permissions": [
     "<all_urls>"
   ],
+  "incognito": "split",
   "icons": {
     "16": "img/icon_16.png",
     "32": "img/icon_32.png",
@@ -324,7 +325,7 @@
   "storage": {
     "managed_schema": "managed_storage.json"
   },
-  "version": "2025.928.1920",
+  "version": "2025.1019.1656",
   "web_accessible_resources": [
     {
       "resources": [
@@ -369,8 +370,8 @@
         "web_accessible_resources/google-ima.js",
         "web_accessible_resources/fingerprint2.js",
         "web_accessible_resources/noop.txt",
-        "web_accessible_resources/noop.css",
         "web_accessible_resources/1x1.gif",
+        "web_accessible_resources/noop.css",
         "web_accessible_resources/32x32.png",
         "web_accessible_resources/2x2.png",
         "web_accessible_resources/empty",

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

@@ -261,6 +261,7 @@
     "distro.tv",
     "diudemy.com",
     "diyprojectslab.com",
+    "djamix.net",
     "dl.apkmoddone.com",
     "dlink.mobilejsr.com",
     "dobreprogramy.pl",
@@ -280,7 +281,6 @@
     "downloader.la",
     "downloadfreecourse.com",
     "dragons.com.au",
-    "dragontea.ink",
     "drivelinks.me",
     "driveup.in",
     "dropcoins.xyz",
@@ -446,6 +446,7 @@
     "gutesexfilme.com",
     "gyanitheme.com",
     "h-flash.com",
+    "haaretz.com",
     "hacknetfl1x.net",
     "hackshort.me",
     "handelsblatt.com",
@@ -994,7 +995,6 @@
     "tryzt.xyz",
     "tsubasa.im",
     "tube8-pornos.com",
-    "tubitv.com",
     "tumblr.com",
     "turbogvideos.com",
     "turkdown.com",
@@ -2170,6 +2170,7 @@
   "vie-1",
   {
    "unhide": [
+    "audiotruyenfull.com",
     "cotuong.top",
     "cungthi.online",
     "dafontvn.com",
@@ -2184,6 +2185,7 @@
     "itudong.com",
     "laptrinhcanban.com",
     "lehait.net",
+    "lxmanga.my",
     "misskon.com",
     "molympiad.net",
     "thuvienloigiai.com",