@browserless.io/browserless 2.33.0 → 2.34.0

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

@@ -34,6 +34,8 @@ import {
     subtractHostnameIters,
 } from './utils.js';
 
+import { ubolErr } from './debug.js';
+
 /******************************************************************************/
 
 export async function selectorsFromCustomFilters(hostname) {
@@ -50,7 +52,9 @@ export async function selectorsFromCustomFilters(hostname) {
     for ( let i = 0; i < promises.length; i++ ) {
         const selectors = results[i];
         if ( selectors === undefined ) { continue; }
-        selectors.forEach(selector => { out.push(selector.slice(1)); });
+        selectors.forEach(selector => {
+            out.push(selector.startsWith('0') ? selector.slice(1) : selector);
+        });
     }
     return out.sort();
 }
@@ -64,38 +68,71 @@ export async function hasCustomFilters(hostname) {
 
 /******************************************************************************/
 
-export async function injectCustomFilters(tabId, frameId, hostname) {
-    const selectors = await selectorsFromCustomFilters(hostname);
-    if ( selectors.length === 0 ) { return; }
-    await browser.scripting.insertCSS({
-        css: `${selectors.join(',\n')}{display:none!important;}`,
-        origin: 'USER',
+async function getAllCustomFilterKeys() {
+    const storageKeys = await localKeys() || [];
+    return storageKeys.filter(a => a.startsWith('site.'));
+}
+
+/******************************************************************************/
+
+export function startCustomFilters(tabId, frameId) {
+    return browser.scripting.executeScript({
+        files: [ '/js/scripting/css-user.js' ],
+        target: { tabId, frameIds: [ frameId ] },
+        injectImmediately: true,
+    }).catch(reason => {
+        ubolErr(reason);
+    })
+}
+
+export function terminateCustomFilters(tabId, frameId) {
+    return browser.scripting.executeScript({
+        files: [ '/js/scripting/css-user-terminate.js' ],
         target: { tabId, frameIds: [ frameId ] },
+        injectImmediately: true,
     }).catch(reason => {
-        console.log(reason);
-    });
-    return selectors;
+        ubolErr(reason);
+    })
 }
 
 /******************************************************************************/
 
-export async function uninjectCustomFilters(tabId, frameId, hostname) {
+export async function injectCustomFilters(tabId, frameId, hostname) {
     const selectors = await selectorsFromCustomFilters(hostname);
     if ( selectors.length === 0 ) { return; }
-    return browser.scripting.removeCSS({
-        css: `${selectors.join(',\n')}{display:none!important;}`,
-        origin: 'USER',
-        target: { tabId, frameIds: [ frameId ] },
-    }).catch(reason => {
-        console.log(reason);
-    });
+    const promises = [];
+    const plainSelectors = selectors.filter(a => a.startsWith('{') === false);
+    if ( plainSelectors.length !== 0 ) {
+        promises.push(
+            browser.scripting.insertCSS({
+                css: `${plainSelectors.join(',\n')}{display:none!important;}`,
+                origin: 'USER',
+                target: { tabId, frameIds: [ frameId ] },
+            }).catch(reason => {
+                ubolErr(reason);
+            })
+        );
+    }
+    const proceduralSelectors = selectors.filter(a => a.startsWith('{'));
+    if ( proceduralSelectors.length !== 0 ) {
+        promises.push(
+            browser.scripting.executeScript({
+                files: [ '/js/scripting/css-procedural-api.js' ],
+                target: { tabId, frameIds: [ frameId ] },
+                injectImmediately: true,
+            }).catch(reason => {
+                ubolErr(reason);
+            })
+        );
+    }
+    await Promise.all(promises);
+    return { plainSelectors, proceduralSelectors };
 }
 
 /******************************************************************************/
 
 export async function registerCustomFilters(context) {
-    const storageKeys = await localKeys() || [];
-    const siteKeys = storageKeys.filter(a => a.startsWith('site.'));
+    const siteKeys = await getAllCustomFilterKeys();
     if ( siteKeys.length === 0 ) { return; }
 
     const { none } = context.filteringModeDetails;
@@ -133,9 +170,8 @@ export async function registerCustomFilters(context) {
 export async function addCustomFilter(hostname, selector) {
     const key = `site.${hostname}`;
     const selectors = await localRead(key) || [];
-    const filter = `0${selector}`;
-    if ( selectors.includes(filter) ) { return false; }
-    selectors.push(filter);
+    if ( selectors.includes(selector) ) { return false; }
+    selectors.push(selector);
     selectors.sort();
     await localWrite(key, selectors);
     return true;
@@ -144,14 +180,30 @@ export async function addCustomFilter(hostname, selector) {
 /******************************************************************************/
 
 export async function removeCustomFilter(hostname, selector) {
-    const key = `site.${hostname}`;
+    const promises = [];
+    let hn = hostname;
+    while ( hn !== '' ) {
+        promises.push(
+            removeCustomFilterByKey(`site.${hn}`, selector).catch(( ) => false)
+        );
+        const pos = hn.indexOf('.');
+        if ( pos === -1 ) { break; }
+        hn = hn.slice(pos + 1);
+    }
+    const results = await Promise.all(promises);
+    return results.some(a => a);
+}
+
+async function removeCustomFilterByKey(key, selector) {
     const selectors = await localRead(key);
     if ( selectors === undefined ) { return false; }
-    const i = selectors.indexOf(`0${selector}`);
+    const i = selectors.indexOf(selector);
     if ( i === -1 ) { return false; }
     selectors.splice(i, 1);
-    await selectors.length !== 0
-        ? localWrite(key, selectors)
-        : localRemove(key);
+    if ( selectors.length !== 0 ) {
+        await localWrite(key, selectors);
+    } else {
+        await localRemove(key);
+    }
     return true;
 }

package/extensions/ublocklite/js/jsonpath.js

@@ -99,12 +99,19 @@ export class JSONPath {
         const r = this.#compile(query, 0);
         if ( r === undefined ) { return; }
         if ( r.i !== query.length ) {
-            if ( query.startsWith('+=', r.i) ) {
+            let val;
+            if ( query.startsWith('=', r.i) ) {
+                if ( /^=repl\(.+\)$/.test(query.slice(r.i)) ) {
+                    r.modify = 'repl';
+                    val = query.slice(r.i+6, -1);
+                } else {
+                    val = query.slice(r.i+1);
+                }
+            } else if ( query.startsWith('+=', r.i) ) {
                 r.modify = '+';
-                r.i += 1;
+                val = query.slice(r.i+2);
             }
-            if ( query.startsWith('=', r.i) === false ) { return; }
-            try { r.rval = JSON.parse(query.slice(r.i+1)); }
+            try { r.rval = JSON.parse(val); }
             catch { return; }
         }
         this.#compiled = r;
@@ -117,28 +124,25 @@ export class JSONPath {
         return paths;
     }
     apply(root) {
-        if ( this.valid === false ) { return 0; }
-        const { modify, rval } = this.#compiled;
-        this.#root = root;
+        if ( this.valid === false ) { return; }
+        const { rval } = this.#compiled;
+        this.#root = { '$': root };
         const paths = this.#evaluate(this.#compiled.steps, []);
-        const n = paths.length;
-        let i = n;
+        let i = paths.length
+        if ( i === 0 ) { this.#root = null; return; }
         while ( i-- ) {
             const { obj, key } = this.#resolvePath(paths[i]);
             if ( rval !== undefined ) {
-                if ( modify === '+' ) {
-                    this.#modifyVal(obj, key, rval);
-                } else {
-                    obj[key] = rval;
-                }
+                this.#modifyVal(obj, key);
             } else if ( Array.isArray(obj) && typeof key === 'number' ) {
                 obj.splice(key, 1);
             } else {
                 delete obj[key];
             }
         }
+        const result = this.#root['$'] ?? null;
         this.#root = null;
-        return n;
+        return result;
     }
     dump() {
         return JSON.stringify(this.#compiled);
@@ -163,8 +167,15 @@ export class JSONPath {
         if ( query.length === 0 ) { return; }
         const steps = [];
         let c = query.charCodeAt(i);
-        steps.push({ mv: c === 0x24 /* $ */ ? this.#ROOT : this.#CURRENT });
-        if ( c === 0x24 /* $ */ || c === 0x40 /* @ */ ) { i += 1; }
+        if ( c === 0x24 /* $ */ ) {
+            steps.push({ mv: this.#ROOT });
+            i += 1;
+        } else if ( c === 0x40 /* @ */ ) {
+            steps.push({ mv: this.#CURRENT });
+            i += 1;
+        } else {
+            steps.push({ mv: i === 0 ? this.#ROOT : this.#CURRENT });
+        }
         let mv = this.#UNDEFINED;
         for (;;) {
             if ( i === query.length ) { break; }
@@ -226,7 +237,8 @@ export class JSONPath {
             i = r.i + 1;
             mv = this.#UNDEFINED;
         }
-        if ( steps.length <= 1 ) { return; }
+        if ( steps.length === 0 ) { return; }
+        if ( mv !== this.#UNDEFINED ) { return; }
         return { steps, i };
     }
     #evaluate(steps, pathin) {
@@ -235,7 +247,7 @@ export class JSONPath {
         for ( const step of steps ) {
             switch ( step.mv ) {
             case this.#ROOT:
-                resultset = [ [] ];
+                resultset = [ [ '$' ] ];
                 break;
             case this.#CURRENT:
                 resultset = [ pathin ];
@@ -458,13 +470,40 @@ export class JSONPath {
         }
         if ( outcome ) { return k; }
     }
-    #modifyVal(obj, key, rval) {
-        const lval = obj[key];
-        if ( rval instanceof Object === false ) { return; }
-        if ( lval instanceof Object === false ) { return; }
-        if ( Array.isArray(lval) ) { return; }
-        for ( const [ k, v ] of Object.entries(rval) ) {
-            lval[k] = v;
+    #modifyVal(obj, key) {
+        const { modify, rval } = this.#compiled;
+        switch ( modify ) {
+        case undefined:
+            obj[key] = rval;
+            break;
+        case '+': {
+            if ( rval instanceof Object === false ) { return; }
+            const lval = obj[key];
+            if ( lval instanceof Object === false ) { return; }
+            if ( Array.isArray(lval) ) { return; }
+            for ( const [ k, v ] of Object.entries(rval) ) {
+                lval[k] = v;
+            }
+            break;
+        }
+        case 'repl': {
+            const lval = obj[key];
+            if ( typeof lval !== 'string' ) { return; }
+            if ( this.#compiled.re === undefined ) {
+                this.#compiled.re = null;
+                try {
+                    this.#compiled.re = rval.regex !== undefined
+                        ? new RegExp(rval.regex, rval.flags)
+                        : new RegExp(rval.pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
+                } catch {
+                }
+            }
+            if ( this.#compiled.re === null ) { return; }
+            obj[key] = lval.replace(this.#compiled.re, rval.replacement);
+            break;
+        }
+        default:
+            break;
         }
     }
 }

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

@@ -361,16 +361,20 @@ export async function syncWithBrowserPermissions() {
         const { optimal, complete } = filteringModes;
         for ( const hn of optimal ) {
             if ( allowedHostnames.has(hn) ) { continue; }
+            if ( isDescendantHostnameOfIter(hn, allowedHostnames) ) { continue; }
             optimal.delete(hn);
             modified = true;
         }
         for ( const hn of complete ) {
             if ( allowedHostnames.has(hn) ) { continue; }
+            if ( isDescendantHostnameOfIter(hn, allowedHostnames) ) { continue; }
             complete.delete(hn);
             modified = true;
         }
+        if ( modified ) {
+            await writeFilteringModeDetails(filteringModes);
+        }
     }
-    await writeFilteringModeDetails(filteringModes);
     return modified;
 }
 

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-    uBlock Origin - a comprehensive, efficient content blocker
+    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
@@ -21,26 +21,27 @@
 
 import { dom, qs$, qsa$ } from './dom.js';
 import { localRead, localWrite } from './ext.js';
+import { ExtSelectorCompiler } from './static-filtering-parser.js';
 import { toolOverlay } from './tool-overlay-ui.js';
 
 /******************************************************************************/
 
+const selectorCompiler = new ExtSelectorCompiler({ nativeCssHas: true });
+
 let selectorPartsDB = new Map();
 let sliderParts = [];
-let previewCSS = '';
+let sliderPartsPos = -1;
 
 /******************************************************************************/
 
-function isValidSelector(selector) {
-    isValidSelector.error = undefined;
-    if ( selector === '' ) { return false; }
-    try {
-        void document.querySelector(`${selector},a`);
-    } catch (reason) {
-        isValidSelector.error = reason;
-        return false;
+function validateSelector(selector) {
+    validateSelector.error = undefined;
+    if ( selector === '' ) { return; }
+    const result = {};
+    if ( selectorCompiler.compile(selector, result) ) {
+        return result.compiled;
     }
-    return true;
+    validateSelector.error = 'Error';
 }
 
 /******************************************************************************/
@@ -172,11 +173,12 @@ function selectorFromCandidates() {
 /******************************************************************************/
 
 function onSliderChanged(ev) {
-    updateSlider(ev.target.valueAsNumber);
+    updateSlider(Math.round(ev.target.valueAsNumber));
 }
 
 function updateSlider(i) {
-    qs$('#slider').value = i;
+    if ( i === sliderPartsPos ) { return; }
+    sliderPartsPos = i;
     dom.cl.remove('#candidateFilters [data-part]', 'on');
     const parts = sliderParts[i];
     for ( const address of parts ) {
@@ -217,31 +219,22 @@ function updatePreview(state) {
     } else {
         dom.cl.toggle(dom.root, 'preview', state)
     }
-    if ( previewCSS !== '' ) {
-        toolOverlay.postMessage({ what: 'removeCSS', css: previewCSS });
-        previewCSS = '';
-    }
-    if ( state === false ) { return; }
-    const selector = qs$('textarea').value;
-    if ( isValidSelector(selector) === false ) { return; }
-    previewCSS = `${selector}{display:none!important;}`;
-    toolOverlay.postMessage({ what: 'insertCSS', css: previewCSS });
+    const selector = state && validateSelector(qs$('textarea').value) || '';
+    return toolOverlay.postMessage({ what: 'previewSelector', selector });
 }
 
 /******************************************************************************/
 
 async function onCreateClicked() {
-    const selector = qs$('textarea').value;
-    if ( isValidSelector(selector) === false ) { return; }
-    await toolOverlay.postMessage({ what: 'uninjectCustomFilters' }).then(( ) =>
-        toolOverlay.sendMessage({
-            what: 'addCustomFilter',
-            hostname: toolOverlay.url.hostname,
-            selector,
-        })
-    ).then(( ) =>
-        toolOverlay.postMessage({ what: 'injectCustomFilters' })
-    );
+    const selector = validateSelector(qs$('textarea').value);
+    if ( selector === undefined ) { return; }
+    await toolOverlay.postMessage({ what: 'terminateCustomFilters' });
+    await toolOverlay.sendMessage({
+        what: 'addCustomFilter',
+        hostname: toolOverlay.url.hostname,
+        selector,
+    });
+    await toolOverlay.postMessage({ what: 'startCustomFilters' });
     qs$('textarea').value = '';
     dom.cl.remove(dom.root, 'preview');
     quitPicker();
@@ -314,21 +307,23 @@ function showDialog(msg) {
     }
 
     /* global */sliderParts = msg.sliderParts;
+    /* global */sliderPartsPos = -1;
     const slider = qs$('#slider');
     const last = sliderParts.length - 1;
     dom.attr(slider, 'max', last);
     dom.attr(slider, 'value', last);
     dom.attr(slider, 'disabled', last !== 0 ? null : '');
+    slider.value = last;
     updateSlider(last);
 }
 
 /******************************************************************************/
 
 function highlightCandidate() {
-    const selector = qs$('textarea').value;
-    if ( isValidSelector(selector) === false ) {
+    const selector = validateSelector(qs$('textarea').value);
+    if ( selector === undefined ) {
         toolOverlay.postMessage({ what: 'unhighlight' });
-        updateElementCount({ count: 0, error: isValidSelector.error });
+        updateElementCount({ count: 0, error: validateSelector.error });
         return;
     }
     toolOverlay.postMessage({
@@ -362,11 +357,7 @@ function pausePicker() {
 function unpausePicker() {
     dom.cl.remove(dom.root, 'paused', 'preview');
     dom.cl.add(dom.root, 'minimized');
-    updatePreview();
-    toolOverlay.postMessage({
-        what: 'togglePreview',
-        state: false,
-    });
+    updatePreview(false);
     toolOverlay.highlightElementUnderMouse(true);
 }
 

package/extensions/ublocklite/js/popup.js

@@ -32,12 +32,6 @@ const tabURL = new URL(runtime.getURL('/'));
 
 /******************************************************************************/
 
-function normalizedHostname(hn) {
-    return hn.replace(/^www\./, '');
-}
-
-/******************************************************************************/
-
 function renderAdminRules() {
     const { disabledFeatures: forbid = [] } = popupPanelData;
     if ( forbid.length === 0 ) { return; }
@@ -63,7 +57,7 @@ function setFilteringMode(level, commit = false) {
 
 async function commitFilteringMode() {
     if ( tabURL.hostname === '' ) { return; }
-    const targetHostname = normalizedHostname(tabURL.hostname);
+    const targetHostname = tabURL.hostname;
     const modeSlider = qs$('.filteringModeSlider');
     const afterLevel = parseInt(modeSlider.dataset.level, 10);
     const beforeLevel = parseInt(modeSlider.dataset.levelBefore, 10);
@@ -239,7 +233,7 @@ dom.on('#gotoReport', 'click', ev => {
     }
     if ( url === undefined ) { return; }
     const reportURL = new URL(runtime.getURL('/report.html'));
-    reportURL.searchParams.set('url', url.href);
+    reportURL.searchParams.set('url', tabURL.href);
     reportURL.searchParams.set('mode', popupPanelData.level);
     sendMessage({
         what: 'gotoURL',
@@ -271,7 +265,11 @@ dom.on('#gotoZapper', 'click', ( ) => {
 dom.on('#gotoPicker', 'click', ( ) => {
     if ( browser.scripting === undefined ) { return; }
     browser.scripting.executeScript({
-        files: [ '/js/scripting/tool-overlay.js', '/js/scripting/picker.js' ],
+        files: [
+            '/js/scripting/css-procedural-api.js',
+            '/js/scripting/tool-overlay.js',
+            '/js/scripting/picker.js',
+        ],
         target: { tabId: currentTab.id },
     });
     self.close();
@@ -282,7 +280,10 @@ dom.on('#gotoPicker', 'click', ( ) => {
 dom.on('#gotoUnpicker', 'click', ( ) => {
     if ( browser.scripting === undefined ) { return; }
     browser.scripting.executeScript({
-        files: [ '/js/scripting/tool-overlay.js', '/js/scripting/unpicker.js' ],
+        files: [
+            '/js/scripting/tool-overlay.js',
+            '/js/scripting/unpicker.js',
+        ],
         target: { tabId: currentTab.id },
     });
     self.close();
@@ -314,7 +315,6 @@ async function init() {
         const response = await sendMessage({
             what: 'popupPanelData',
             origin: url.origin,
-            normalHostname: normalizedHostname(tabURL.hostname),
             hostname: tabURL.hostname,
         });
         if ( response instanceof Object ) {

package/extensions/ublocklite/js/redirect-resources.js

@@ -94,6 +94,7 @@ export default new Map([
     } ],
     [ 'google-ima.js', {
         alias: 'google-ima3',                       /* adguard compatibility */
+        data: 'text',
     } ],
     [ 'googlesyndication_adsbygoogle.js', {
         alias: [

package/extensions/ublocklite/js/report.js

@@ -20,7 +20,6 @@
 */
 
 import { dom, qs$ } from './dom.js';
-import { getTroubleshootingInfo } from './troubleshooting.js';
 import { sendMessage } from './ext.js';
 
 /******************************************************************************/
@@ -93,7 +92,10 @@ async function reportSpecificFilterIssue() {
 
 /******************************************************************************/
 
-getTroubleshootingInfo(reportedPage.mode).then(config => {
+sendMessage({
+    what: 'getTroubleshootingInfo',
+    siteMode: 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

@@ -21,6 +21,7 @@
 
 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';
 
@@ -59,7 +60,11 @@ export class ReadOnlyDNREditor extends DNREditor {
         for ( const [ realm, dir ] of Object.entries(realms) ) {
             if ( Boolean(rulesetDetails.rules?.[realm]) === false ) { continue; }
             promises.push(
-                fetch(`./rulesets/${dir}/${this.id}.json`).then(response => response.json())
+                fetch(`./rulesets/${dir}/${this.id}.json`).then(response =>
+                    response.json()
+                ).then(rules =>
+                    normalizeDNRRules(rules)
+                )
             );
         }
         const parts = await Promise.all(promises);