@browserless.io/browserless 2.36.0 → 2.37.1

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

@@ -53,6 +53,13 @@ export const    MODE_BASIC = 1;
 export const  MODE_OPTIMAL = 2;
 export const MODE_COMPLETE = 3;
 
+export const defaultFilteringModes = {
+    none: [],
+    basic: [],
+    optimal: [ 'all-urls' ],
+    complete: [],
+};
+
 /******************************************************************************/
 
 const pruneDescendantHostnamesFromSet = (hostname, hnSet) => {
@@ -225,7 +232,7 @@ export async function readFilteringModeDetails(bypassCache = false) {
         }
     }
     let [
-        userModes = { optimal: [ 'all-urls' ] },
+        userModes = structuredClone(defaultFilteringModes),
         adminDefaultFiltering,
         adminNoFiltering,
     ] = await Promise.all([

package/extensions/ublocklite/js/picker-ui.js

@@ -230,9 +230,9 @@ async function onCreateClicked() {
     if ( selector === undefined ) { return; }
     await toolOverlay.postMessage({ what: 'terminateCustomFilters' });
     await toolOverlay.sendMessage({
-        what: 'addCustomFilter',
+        what: 'addCustomFilters',
         hostname: toolOverlay.url.hostname,
-        selector,
+        selectors: [ selector ],
     });
     await toolOverlay.postMessage({ what: 'startCustomFilters' });
     qs$('textarea').value = '';

package/extensions/ublocklite/js/popup.js

@@ -189,27 +189,27 @@ dom.on(
     }
 );
 
-dom.on(
-    '.filteringModeSlider',
-    'mouseenter',
-    '.filteringModeSlider span[data-level]',
-    ev => {
-        const span = ev.target;
-        const level = parseInt(span.dataset.level, 10);
-        dom.text('#filteringModeText > span:nth-of-type(2)',
-            i18n$(`filteringMode${level}Name`)
-        );
-    }
-);
+if ( dom.cl.has(dom.html, 'mobile') === false ) {
+    dom.on('.filteringModeSlider',
+        'mouseenter',
+        '.filteringModeSlider span[data-level]',
+        ev => {
+            const span = ev.target;
+            const level = parseInt(span.dataset.level, 10);
+            dom.text('#filteringModeText > span:nth-of-type(2)',
+                i18n$(`filteringMode${level}Name`)
+            );
+        }
+    );
 
-dom.on(
-    '.filteringModeSlider',
-    'mouseleave',
-    '.filteringModeSlider span[data-level]',
-    ( ) => {
-        dom.text('#filteringModeText > span:nth-of-type(2)', '');
-    }
-);
+    dom.on('.filteringModeSlider',
+        'mouseleave',
+        '.filteringModeSlider span[data-level]',
+        ( ) => {
+            dom.text('#filteringModeText > span:nth-of-type(2)', '');
+        }
+    );
+}
 
 /******************************************************************************/
 

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/ro-dnr-editor.js

@@ -19,10 +19,10 @@
     Home: https://github.com/gorhill/uBlock
 */
 
+import { runtime, sendMessage } from './ext.js';
 import { DNREditor } from './dnr-editor.js';
 import { i18n$ } from './i18n.js';
 import { normalizeDNRRules } from './ext-compat.js';
-import { sendMessage } from './ext.js';
 import { textFromRules } from './dnr-parser.js';
 
 /******************************************************************************/
@@ -49,18 +49,22 @@ export class ReadOnlyDNREditor extends DNREditor {
         const allRulesetDetails = await sendMessage({ what: 'getRulesetDetails' });
         const rulesetDetails = allRulesetDetails.find(a => a.id === this.id);
         if ( rulesetDetails === undefined ) { return; }
+        const manifestRulesets = runtime.getManifest().declarative_net_request.rule_resources;
+        const mainPathMap = new Map(
+            manifestRulesets.map(({ id, path }) => [ id, path ])
+        );
         const realms = {
             plain: 'main',
             regex: 'regex',
-            redirect: 'redirect',
-            modifyHeaders: 'modify-headers',
-            removeparam: 'removeparam',
         };
         const promises = [];
         for ( const [ realm, dir ] of Object.entries(realms) ) {
             if ( Boolean(rulesetDetails.rules?.[realm]) === false ) { continue; }
+            const url = dir === 'main'
+                ? mainPathMap.get(this.id)
+                : `./rulesets/${dir}/${this.id}.json`;
             promises.push(
-                fetch(`./rulesets/${dir}/${this.id}.json`).then(response =>
+                fetch(url).then(response =>
                     response.json()
                 ).then(rules =>
                     normalizeDNRRules(rules)

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

@@ -24,6 +24,7 @@ import {
     localRead, localRemove, localWrite,
     runtime,
     sessionRead, sessionRemove, sessionWrite,
+    webextFlavor,
 } from './ext.js';
 
 import {
@@ -74,12 +75,11 @@ function getRulesetDetails() {
     if ( getRulesetDetails.rulesetDetailsPromise !== undefined ) {
         return getRulesetDetails.rulesetDetailsPromise;
     }
-    getRulesetDetails.rulesetDetailsPromise = fetchJSON('/rulesets/ruleset-details').then(entries => {
-        const rulesMap = new Map(
-            entries.map(entry => [ entry.id, entry ])
-        );
-        return rulesMap;
-    });
+    getRulesetDetails.rulesetDetailsPromise =
+        fetchJSON('/rulesets/ruleset-details').then(entries => {
+            const rulesMap = new Map(entries.map(entry => [ entry.id, entry ]));
+            return rulesMap;
+        });
     return getRulesetDetails.rulesetDetailsPromise;
 }
 
@@ -237,6 +237,11 @@ async function updateStrictBlockRules(currentRules, addRules, removeRuleIds) {
 
     if ( rulesetConfig.strictBlockMode === false ) { return; }
 
+    // https://github.com/uBlockOrigin/uBOL-home/issues/428#issuecomment-3172663563
+    // https://bugs.webkit.org/show_bug.cgi?id=298199
+    // https://developer.apple.com/forums/thread/756214
+    if ( webextFlavor === 'safari' ) { return; }
+
     const [
         hasOmnipotence,
         rulesetDetails,
@@ -404,7 +409,7 @@ async function filteringModesToDNR(modes) {
 
 /******************************************************************************/
 
-async function defaultRulesetsFromEnv() {
+export async function getDefaultRulesetsFromEnv() {
     const dropCountry = lang => {
         const pos = lang.indexOf('-');
         if ( pos === -1 ) { return lang; }
@@ -460,7 +465,7 @@ async function patchDefaultRulesets() {
         staticRulesetIds,
     ] = await Promise.all([
         localRead('defaultRulesetIds'),
-        defaultRulesetsFromEnv(),
+        getDefaultRulesetsFromEnv(),
         getStaticRulesets().then(r => r.map(a => a.id)),
     ]);
     const toAdd = [];

package/extensions/ublocklite/js/scripting/unpicker.js

@@ -35,10 +35,10 @@ function onMessage(msg) {
         return ubolOverlay.sendMessage({ what: 'startCustomFilters' });
     case 'terminateCustomFilters':
         return ubolOverlay.sendMessage({ what: 'terminateCustomFilters' });
-    case 'removeCustomFilter':
-        return ubolOverlay.sendMessage({ what: 'removeCustomFilter',
+    case 'removeCustomFilters':
+        return ubolOverlay.sendMessage({ what: 'removeCustomFilters',
             hostname: ubolOverlay.url.hostname,
-            selector: msg.selector,
+            selectors: [ msg.selector ],
         });
     default:
         break;

package/extensions/ublocklite/js/settings.js

@@ -132,6 +132,49 @@ dom.on(
 
 /******************************************************************************/
 
+async function backupSettings() {
+    const api = await import('./backup-restore.js');
+    const data = await api.backupToObject(cachedRulesetData);
+    if ( data instanceof Object === false ) { return; }
+    const json = JSON.stringify(data, null, 2)  + '\n';
+    const a = document.createElement('a');
+    a.href = `data:text/plain;charset=utf-8,${encodeURIComponent(json)}`;
+    dom.attr(a, 'download', 'my-ubol-settings.json');
+    dom.attr(a, 'type', 'application/json');
+    a.click();
+}
+
+async function restoreSettings() {
+    const input = qs$('section[data-pane="settings"] input[type="file"]');
+    input.onchange = ev => {
+        input.onchange = null;
+        const file = ev.target.files[0];
+        if ( file === undefined || file.name === '' ) { return; }
+        const fr = new FileReader();
+        fr.onload = ( ) => {
+            fr.onload = null;
+            if ( typeof fr.result !== 'string' ) { return; }
+            let data;
+            try {
+                data = JSON.parse(fr.result);
+            } catch {
+            }
+            if ( data instanceof Object === false ) { return; }
+            import('./backup-restore.js').then(api => {
+                api.restoreFromObject(data);
+            });
+        };
+        fr.readAsText(file);
+    };
+    // Reset to empty string, this will ensure a change event is properly
+    // triggered if the user pick a file, even if it's the same as the last
+    // one picked.
+    input.value = '';
+    input.click();
+}
+
+/******************************************************************************/
+
 dom.on('#autoReload input[type="checkbox"]', 'change', ev => {
     sendMessage({
         what: 'setAutoReload',
@@ -159,6 +202,14 @@ dom.on('#developerMode input[type="checkbox"]', 'change', ev => {
     dom.body.dataset.develop = `${state}`;
 });
 
+dom.on('section[data-pane="settings"] [data-i18n="backupButton"]', 'click', ( ) => {
+    backupSettings();
+});
+
+dom.on('section[data-pane="settings"] [data-i18n="restoreButton"]', 'click', ( ) => {
+    restoreSettings();
+});
+
 /******************************************************************************/
 
 function listen() {

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

@@ -1200,7 +1200,7 @@ export class AstFilterParser {
             prev = this.linkRight(prev, next);
             patternBeg += 2;
         }
-        let anchorBeg = this.indexOfNetAnchor(parentStr, patternBeg);
+        let anchorBeg = this.indexOfNetAnchor(parentStr);
         if ( anchorBeg === -1 ) { return 0; }
         anchorBeg += parentBeg;
         if ( anchorBeg !== parentEnd ) {
@@ -1508,9 +1508,9 @@ export class AstFilterParser {
         }
     }
 
-    indexOfNetAnchor(s, start = 0) {
+    indexOfNetAnchor(s) {
         const end = s.length;
-        if ( end === start ) { return end; }
+        if ( end === 0 ) { return end; }
         let j = s.lastIndexOf('$');
         if ( j === -1 ) { return end; }
         if ( (j+1) === end ) { return end; }
@@ -1518,7 +1518,7 @@ export class AstFilterParser {
             const before = s.charAt(j-1);
             if ( before === '$' ) { return -1; }
             if ( this.reNetOptionTokens.test(s.slice(j+1)) ) { return j; }
-            if ( j === start ) { break; }
+            if ( j === 0 ) { break; }
             j = s.lastIndexOf('$', j-1);
             if ( j === -1 ) { break; }
         }

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,43 @@ export async function getTroubleshootingInfo(siteMode) {
     const manifest = runtime.getManifest();
     const [
         platformInfo,
-        rulesets,
+        defaultConfig,
+        enabledRulesets,
         defaultMode,
         userRules,
+        consoleOutput,
     ] = await Promise.all([
         runtime.getPlatformInfo(),
-        dnr.getEnabledRulesets(),
-        getDefaultFilteringMode(),
-        getEffectiveUserRules(),
+        sendMessage({ what: 'getDefaultConfig' }),
+        sendMessage({ what: 'getEnabledRulesets' }),
+        sendMessage({ what: 'getDefaultFilteringMode' }),
+        sendMessage({ what: 'getEffectiveUserRules' }),
+        sendMessage({ what: 'getConsoleOutput' }),
     ]);
     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' ];
@@ -104,8 +107,17 @@ export async function getTroubleshootingInfo(siteMode) {
     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/unpicker-ui.js

@@ -69,9 +69,9 @@ function onFilterClicked(ev) {
     if ( target === trashElem ) {
         dom.cl.add(filterElem, 'removed');
         dom.cl.remove(filterElem, 'on');
-        toolOverlay.sendMessage({ what: 'removeCustomFilter',
+        toolOverlay.sendMessage({ what: 'removeCustomFilters',
             hostname: toolOverlay.url.hostname,
-            selector,
+            selectors: [ selector ],
         }).then(( ) => {
             autoSelectFilter();
         });
@@ -80,9 +80,9 @@ function onFilterClicked(ev) {
     const undoElem = qs$(filterElem, ':scope > span.undo');
     if ( target === undoElem ) {
         dom.cl.remove(filterElem, 'removed');
-        toolOverlay.sendMessage({ what: 'addCustomFilter',
+        toolOverlay.sendMessage({ what: 'addCustomFilters',
             hostname: toolOverlay.url.hostname,
-            selector,
+            selectors: [ selector ],
         }).then(( ) => {
             dom.cl.remove('.customFilter.on', 'on');
             dom.cl.add(filterElem, 'on');
@@ -130,7 +130,7 @@ function populateFilters(selectors) {
 
 async function startUnpicker() {
     const selectors = await toolOverlay.sendMessage({
-        what: 'selectorsFromCustomFilters',
+        what: 'customFiltersFromHostname',
         hostname: toolOverlay.url.hostname,
     })
     if ( selectors.length === 0 ) {

package/extensions/ublocklite/js/utils.js

@@ -195,6 +195,20 @@ const strArrayEq = (a = [], b = [], sort = true) => {
 
 /******************************************************************************/
 
+// The goal is just to be able to find out whether a specific version is older
+// than another one.
+
+export function intFromVersion(version) {
+    const match = /^(\d+)\.(\d+)\.(\d+)$/.exec(version);
+    if ( match === null ) { return 0; }
+    const year = parseInt(match[1], 10);
+    const monthday = parseInt(match[2], 10);
+    const min = parseInt(match[3], 10);
+    return (year - 2022) * (1232 * 2400) + monthday * 2400 + min;
+}
+
+/******************************************************************************/
+
 export {
     broadcastMessage,
     parsedURLromOrigin,

package/extensions/ublocklite/manifest.json

@@ -324,7 +324,7 @@
   "storage": {
     "managed_schema": "managed_storage.json"
   },
-  "version": "2025.911.1335",
+  "version": "2025.1002.1210",
   "web_accessible_resources": [
     {
       "resources": [
@@ -367,9 +367,10 @@
         "web_accessible_resources/noop.js",
         "web_accessible_resources/amazon_apstag.js",
         "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",
@@ -377,7 +378,6 @@
         "web_accessible_resources/amazon_ads.js",
         "web_accessible_resources/googletagservices_gpt.js",
         "web_accessible_resources/google-analytics_analytics.js",
-        "web_accessible_resources/fingerprint2.js",
         "web_accessible_resources/nofab.js",
         "web_accessible_resources/hd-main.js",
         "web_accessible_resources/popads.js",

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

@@ -1200,7 +1200,6 @@
     "games.pch.com",
     "gaybeeg.info",
     "geekzone.co.nz",
-    "gelbooru.com",
     "gemini.google.com",
     "github.com",
     "github.io",
@@ -1475,6 +1474,7 @@
     "affyun.com",
     "ahhhhfs.com",
     "ak77now.pixnet.net",
+    "akashio.com",
     "am730.com.hk",
     "ani.gamer.com.tw",
     "annhe.net",
@@ -1762,7 +1762,6 @@
     "dramaencode.com",
     "eirudo.com",
     "gadget2reviews.com",
-    "infotekno.net",
     "kaze-batch.blogspot.com",
     "majalahikan.com",
     "mivo.com",
@@ -1989,7 +1988,6 @@
     "motocitizen.info",
     "motogon.ru",
     "nabazare.blogspot.ru",
-    "newxboxone.ru",
     "nookea.com",
     "octavius.mail.ru",
     "omsi2mod.ru",
@@ -2189,6 +2187,7 @@
     "misskon.com",
     "molympiad.net",
     "thuvienloigiai.com",
+    "tinhte.vn",
     "traderviet.tv",
     "truyenaudiocv.org",
     "vn-z.vn",