@browserless.io/browserless 2.33.0 → 2.34.0-beta-0

package/extensions/ublocklite/{rulesets/scripting/declarative/isr-0.js → js/scripting/css-user-terminate.js}

@@ -1,7 +1,7 @@
 /*******************************************************************************
 
     uBlock Origin Lite - a comprehensive, MV3-compliant content blocker
-    Copyright (C) 2014-present Raymond Hill
+    Copyright (C) 2019-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
@@ -19,24 +19,27 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-// ruleset: isr-0
-
-// Important!
-// Isolate from global scope
-(function uBOL_cssDeclarativeImport() {
+(function uBOL_cssUserTerminate() {
 
 /******************************************************************************/
 
-const argsList = ["","{\"selector\":\"html\",\"action\":[\"style\",\"height: auto !important; overflow: auto !important\"]}","{\"selector\":\"body\",\"action\":[\"style\",\"overflow: auto !important;\"]}"];
-const argsSeqs = [0,1,2];
-const hostnamesMap = new Map([["haaretz.co.il",1],["www-haaretz-co-il.eu1.proxy.openathens.net",1],["bhol.co.il",2]]);
-const hasEntities = false;
+const plainSelectors = self.customFilters?.plainSelectors;
+if ( plainSelectors ) {
+    chrome.runtime.sendMessage({
+        what: 'removeCSS',
+        css: `${plainSelectors.join(',\n')}{display:none!important;}`,
+    }).catch(( ) => {
+    });
+}
+
+if ( self.customProceduralFiltererAPI instanceof Object ) {
+    self.customProceduralFiltererAPI.reset();
+}
 
-self.declarativeImports = self.declarativeImports || [];
-self.declarativeImports.push({ argsList, argsSeqs, hostnamesMap, hasEntities });
+self.customFilters = undefined;
 
 /******************************************************************************/
 
 })();
 
-/******************************************************************************/
+void 0;

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

@@ -24,12 +24,23 @@
 /******************************************************************************/
 
 const docURL = new URL(document.baseURI);
-chrome.runtime.sendMessage({
+const details = await chrome.runtime.sendMessage({
     what: 'injectCustomFilters',
     hostname: docURL.hostname,
 }).catch(( ) => {
 });
 
+if ( details?.proceduralSelectors?.length ) {
+    if ( self.ProceduralFiltererAPI ) {
+        self.customProceduralFiltererAPI = new self.ProceduralFiltererAPI();
+        self.customProceduralFiltererAPI.addSelectors(
+            details.proceduralSelectors.map(a => JSON.parse(a))
+        );
+    }
+}
+
+self.customFilters = details;
+
 /******************************************************************************/
 
 })();

package/extensions/ublocklite/js/scripting/picker.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
@@ -237,22 +237,55 @@ const excludedSelectors = [
 
 /******************************************************************************/
 
+async function previewSelector(selector) {
+    if ( selector === previewedSelector ) { return; }
+    if ( previewedSelector !== '' ) {
+        if ( previewedSelector.startsWith('{') ) {
+            if ( self.pickerProceduralFilteringAPI ) {
+                await self.pickerProceduralFilteringAPI.reset();
+            }
+        }
+        if ( previewedCSS !== '' ) {
+            await ubolOverlay.sendMessage({ what: 'removeCSS', css: previewedCSS });
+            previewedCSS = '';
+        }
+    }
+    previewedSelector = selector || '';
+    if ( selector === '' ) { return; }
+    if ( selector.startsWith('{') ) {
+        if ( self.ProceduralFiltererAPI === undefined ) { return; }
+        if ( self.pickerProceduralFilteringAPI === undefined ) {
+            self.pickerProceduralFilteringAPI = new self.ProceduralFiltererAPI();
+        }
+        self.pickerProceduralFilteringAPI.addSelectors([ JSON.parse(selector) ]);
+        return;
+    }
+    previewedCSS = `${selector}{display:none!important;}`;
+    await ubolOverlay.sendMessage({ what: 'insertCSS', css: previewedCSS });
+}
+
+let previewedSelector = '';
+let previewedCSS = '';
+
+/******************************************************************************/
+
+const previewProceduralFiltererAPI = new self.ProceduralFiltererAPI(); 
+
+/******************************************************************************/
+
 function onMessage(msg) {
     switch ( msg.what ) {
-    case 'injectCustomFilters':
-        return ubolOverlay.sendMessage({ what: 'injectCustomFilters',
-            hostname: ubolOverlay.url.hostname,
-        });
-    case 'uninjectCustomFilters':
-        return ubolOverlay.sendMessage({ what: 'uninjectCustomFilters',
-            hostname: ubolOverlay.url.hostname,
-        });
+    case 'quitTool':
+        previewProceduralFiltererAPI.reset();
+        break;
+    case 'startCustomFilters':
+        return ubolOverlay.sendMessage({ what: 'startCustomFilters' });
+    case 'terminateCustomFilters':
+        return ubolOverlay.sendMessage({ what: 'terminateCustomFilters' });
     case 'candidatesAtPoint':
         return candidatesAtPoint(msg.mx, msg.my, msg.broad);
-    case 'insertCSS':
-        return ubolOverlay.sendMessage(msg);
-    case 'removeCSS':
-        return ubolOverlay.sendMessage(msg);
+    case 'previewSelector':
+        return previewSelector(msg.selector);
     default:
         break;
     }

package/extensions/ublocklite/js/scripting/tool-overlay.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
@@ -254,14 +254,20 @@ self.ubolOverlay = {
     },
 
     qsa(node, selector) {
-        if ( node !== null ) {
-            try {
-                const elems = node.querySelectorAll(selector);
-                this.qsa.error = undefined;
-                return elems;
-            } catch (reason) {
-                this.qsa.error = `${reason}`;
+        if ( node === null ) { return []; }
+        if ( selector.startsWith('{') ) {
+            if ( this.proceduralFiltererAPI === undefined ) {
+                if ( self.ProceduralFiltererAPI === undefined ) { return []; }
+                this.proceduralFiltererAPI = new self.ProceduralFiltererAPI();
             }
+            return this.proceduralFiltererAPI.qsa(selector);
+        }
+        try {
+            const elems = node.querySelectorAll(selector);
+            this.qsa.error = undefined;
+            return elems;
+        } catch (reason) {
+            this.qsa.error = `${reason}`;
         }
         return [];
     },

package/extensions/ublocklite/js/scripting/unpicker.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
@@ -31,14 +31,10 @@ if ( ubolOverlay.file === '/unpicker-ui.html' ) { return; }
 
 function onMessage(msg) {
     switch ( msg.what ) {
-    case 'injectCustomFilters':
-        return ubolOverlay.sendMessage({ what: 'injectCustomFilters',
-            hostname: ubolOverlay.url.hostname,
-        });
-    case 'uninjectCustomFilters':
-        return ubolOverlay.sendMessage({ what: 'uninjectCustomFilters',
-            hostname: ubolOverlay.url.hostname,
-        });
+    case 'startCustomFilters':
+        return ubolOverlay.sendMessage({ what: 'startCustomFilters' });
+    case 'terminateCustomFilters':
+        return ubolOverlay.sendMessage({ what: 'terminateCustomFilters' });
     case 'removeCustomFilter':
         return ubolOverlay.sendMessage({ what: 'removeCustomFilter',
             hostname: ubolOverlay.url.hostname,

package/extensions/ublocklite/js/scripting/zapper.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

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

@@ -354,70 +354,6 @@ function registerProcedural(context) {
 
 /******************************************************************************/
 
-function registerDeclarative(context) {
-    const { before, filteringModeDetails, rulesetsDetails } = context;
-
-    const js = [];
-    for ( const rulesetDetails of rulesetsDetails ) {
-        const count = rulesetDetails.css?.declarative || 0;
-        if ( count === 0 ) { continue; }
-        js.push(`/rulesets/scripting/declarative/${rulesetDetails.id}.js`);
-    }
-    if ( js.length === 0 ) { return; }
-
-    const { none, basic, optimal, complete } = filteringModeDetails;
-    const matches = [
-        ...ut.matchesFromHostnames(optimal),
-        ...ut.matchesFromHostnames(complete),
-    ];
-    if ( matches.length === 0 ) { return; }
-
-    normalizeMatches(matches);
-
-    js.unshift('/js/scripting/isolated-api.js');
-    js.push('/js/scripting/css-declarative.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));
-    }
-
-    const registered = before.get('css-declarative');
-    before.delete('css-declarative'); // Important!
-
-    const directive = {
-        id: 'css-declarative',
-        js,
-        matches,
-        allFrames: true,
-        runAt: 'document_start',
-    };
-    if ( excludeMatches.length !== 0 ) {
-        directive.excludeMatches = excludeMatches;
-    }
-
-    // register
-    if ( registered === undefined ) {
-        context.toAdd.push(directive);
-        return;
-    }
-
-    // update
-    if (
-        ut.strArrayEq(registered.js, js, false) === false ||
-        ut.strArrayEq(registered.matches, matches) === false ||
-        ut.strArrayEq(registered.excludeMatches, excludeMatches) === false
-    ) {
-        context.toRemove.push('css-declarative');
-        context.toAdd.push(directive);
-    }
-}
-
-/******************************************************************************/
-
 function registerSpecific(context) {
     const { before, filteringModeDetails, rulesetsDetails } = context;
 
@@ -602,7 +538,6 @@ async function registerInjectables() {
     };
 
     await Promise.all([
-        registerDeclarative(context),
         registerProcedural(context),
         registerScriptlet(context, scriptletDetails),
         registerSpecific(context),

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

@@ -3199,8 +3199,8 @@ export const netOptionTokenDescriptors = new Map([
 // https://github.com/uBlockOrigin/uBlock-issues/issues/89
 //   Do not discard unknown pseudo-elements.
 
-class ExtSelectorCompiler {
-    constructor(instanceOptions) {
+export class ExtSelectorCompiler {
+    constructor(instanceOptions = {}) {
         this.reParseRegexLiteral = /^\/(.+)\/([imu]+)?$/;
 
         // Use a regex for most common CSS selectors known to be valid in any

package/extensions/ublocklite/js/tool-overlay-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

package/extensions/ublocklite/js/unpicker-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
@@ -33,8 +33,8 @@ function onMinimizeClicked() {
 
 function highlight() {
     const selectors = [];
-    for ( const selectorElem of qsa$('#customFilters .customFilter.on > span.selector') ) {
-        selectors.push(selectorElem.textContent);
+    for ( const selectorElem of qsa$('#customFilters .customFilter.on') ) {
+        selectors.push(selectorElem.dataset.selector);
     }
     if ( selectors.length !== 0 ) {
         toolOverlay.postMessage({
@@ -64,7 +64,7 @@ function onFilterClicked(ev) {
         highlight();
         return;
     }
-    const selector = selectorElem.textContent;
+    const selector = filterElem.dataset.selector;
     const trashElem = qs$(filterElem, ':scope > span.remove');
     if ( target === trashElem ) {
         dom.cl.add(filterElem, 'removed');
@@ -111,9 +111,16 @@ function populateFilters(selectors) {
     dom.clear(container);
     const rowTemplate = qs$('template#customFilterRow');
     for ( const selector of selectors ) {
-        const row = rowTemplate.content.cloneNode(true);
-        qs$(row, '.customFilter > span.selector').textContent = selector;
-        container.append(row);
+        const fragment = rowTemplate.content.cloneNode(true);
+        const row = qs$(fragment, '.customFilter');
+        row.dataset.selector = selector;
+        let text = selector;
+        if ( selector.startsWith('{') ) {
+            const o = JSON.parse(selector);
+            text = o.raw;
+        }
+        qs$(row, '.selector').textContent = text;
+        container.append(fragment);
     }
     faIconsInit(container);
     autoSelectFilter();
@@ -129,8 +136,8 @@ async function startUnpicker() {
     if ( selectors.length === 0 ) {
         return quitUnpicker();
     }
+    await toolOverlay.postMessage({ what: 'terminateCustomFilters' });
     await toolOverlay.postMessage({ what: 'startTool' });
-    await toolOverlay.postMessage({ what: 'uninjectCustomFilters' });
     populateFilters(selectors);
     dom.on('#minimize', 'click', onMinimizeClicked);
     dom.on('#customFilters', 'click', onFilterClicked);
@@ -140,7 +147,7 @@ async function startUnpicker() {
 /******************************************************************************/
 
 async function quitUnpicker() {
-    await toolOverlay.postMessage({ what: 'injectCustomFilters' });
+    await toolOverlay.postMessage({ what: 'startCustomFilters' });
     toolOverlay.stop();
 }
 

package/extensions/ublocklite/js/zapper-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
@@ -33,7 +33,8 @@ function onSvgClicked(ev) {
         my: ev.clientY,
         options: {
             stay: true,
-            highlight: ev.target !== toolOverlay.svgIslands,
+            highlight: dom.cl.has(dom.root, 'mobile') &&
+                ev.target !== toolOverlay.svgIslands,
         },
     });
 }

package/extensions/ublocklite/manifest.json

@@ -97,6 +97,11 @@
         "enabled": false,
         "path": "/rulesets/main/annoyances-others.json"
       },
+      {
+        "id": "ublock-experimental",
+        "enabled": false,
+        "path": "/rulesets/main/ublock-experimental.json"
+      },
       {
         "id": "stevenblack-hosts",
         "enabled": false,
@@ -314,7 +319,7 @@
   "storage": {
     "managed_schema": "managed_storage.json"
   },
-  "version": "2025.711.1256",
+  "version": "2025.804.1547",
   "web_accessible_resources": [
     {
       "resources": [
@@ -355,8 +360,8 @@
     {
       "resources": [
         "web_accessible_resources/noop.js",
-        "web_accessible_resources/amazon_apstag.js",
         "web_accessible_resources/google-ima.js",
+        "web_accessible_resources/amazon_apstag.js",
         "web_accessible_resources/noop.txt",
         "web_accessible_resources/noop.css",
         "web_accessible_resources/1x1.gif",

package/extensions/ublocklite/picker-ui.html

@@ -27,7 +27,7 @@
         <label for="slider" data-i18n="pickerSliderLabel">_</label>
         <span id="resultsetCount"></span>
     </span>
-    <input id="slider" type="range" min="0" max="10" step="1">
+    <input id="slider" type="range" min="0" max="10" step="any">
 </section>
 <section id="toolbar" data-view="0">
     <div>

package/extensions/ublocklite/report.html

@@ -19,7 +19,6 @@
 <section>
 
 <h2 data-i18n="supportS6H"></h2>
-<p class="safari warning"><b>Safari users:</b> Please do not report filter issues at the moment. The declarativeNetRequest engine on stable version of Safari is not yet fully implemented <a href="https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/declarativeNetRequest">as per specs</a>. As a consequence this leads to many cases of network requests not being blocked.</p>
 <p data-i18n="supportS3P1"></p>
 <div class="supportEntry">
     <hr>

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

@@ -174,6 +174,7 @@
     "chiemgau24.de",
     "chuppito.fr",
     "cimanow.cc",
+    "cinehax.com",
     "citytv.com",
     "ckk.ai",
     "claimbits.io",
@@ -290,7 +291,6 @@
     "dubznetwork.com",
     "duden.de",
     "duellinksmeta.com",
-    "duit.cc",
     "durtypass.com",
     "dvdporngay.com",
     "dynamicpapers.com",
@@ -317,6 +317,7 @@
     "emailn.de",
     "emailnator.com",
     "emailregex.com",
+    "embed.wcostream.com",
     "encoretvb.com",
     "endless-live.cz",
     "engquimicasantossp.com.br",
@@ -324,7 +325,6 @@
     "eodev.com",
     "erai-raws.info",
     "erepublik.tools",
-    "ero18.cc",
     "erovoice.us",
     "erzar.xyz",
     "escapegames24.com",
@@ -444,7 +444,6 @@
     "grafixfather.com",
     "granadaesnoticia.com",
     "granthamjournal.co.uk",
-    "gratisvps.net",
     "gsmware.com",
     "guiamuriae.com.br",
     "guided.news",
@@ -525,6 +524,7 @@
     "javplayer.com",
     "jbzd.com.pl",
     "jbzdy.com.pl",
+    "jelonka.com",
     "jetpunk.com",
     "jiocinema.com",
     "jkssbalerts.com",
@@ -735,7 +735,6 @@
     "pigy.cz",
     "pikafile.com",
     "pikwizard.com",
-    "pinsystem.co.uk",
     "planhub.ca",
     "play.history.com",
     "player.pl",
@@ -769,6 +768,7 @@
     "printerprojects.com",
     "prinxy.app",
     "proboards.com",
+    "procinehub.com",
     "programasve.blogspot.com",
     "programasvirtualespc.net",
     "promipool.com",
@@ -848,6 +848,7 @@
     "seopolarity.com",
     "seory.xyz",
     "seriesonline.one",
+    "servustv.com",
     "sfirmware.com",
     "sh.st",
     "shaboysglobal.com",
@@ -881,7 +882,6 @@
     "smscodeonline.com",
     "smsonline.cloud",
     "soccerinhd.com",
-    "soft98.ir",
     "software-on.com",
     "softwaredetail.com",
     "softwareengineer-de.translate.goog",
@@ -1039,6 +1039,7 @@
     "usandoapp.com",
     "userstyles.org",
     "ustv247.tv",
+    "uwupad.me",
     "vacation-et.work",
     "valueyourmusic.com",
     "vbnmll.com",
@@ -1240,6 +1241,7 @@
     "myaccount.google.com",
     "nebula.tv",
     "netflix.com",
+    "nfl.com",
     "notion.so",
     "oisd.nl",
     "onedrive.live.com",
@@ -1291,8 +1293,6 @@
     "twitch.tv",
     "up-load.io",
     "urlgalleries.net",
-    "vidoza.co",
-    "vidoza.net",
     "web.basemark.com",
     "web.telegram.org",
     "webex.com",
@@ -1729,7 +1729,6 @@
     "desatcabletntsof.blogspot.com",
     "desatcabletntsof.blogspot.de",
     "desatcabletntsof.blogspot.fr",
-    "japscan.lol",
     "olympine.com",
     "sofiotheque.info",
     "torrent9.uno",
@@ -1813,6 +1812,8 @@
     "intaa.net",
     "j-baseball.club",
     "j-basketball.club",
+    "j-rugby.club",
+    "j-volleyball.club",
     "jukenbbs.com",
     "koken.nicovideo.jp",
     "kyukyoku-matome.com",
@@ -1830,6 +1831,7 @@
     "sekai-kabuka.com",
     "shindanmaker.com",
     "shopping-now.jp",
+    "shukatsubbs.com",
     "studioglass.work",
     "tapestry.work",
     "teaceremony.work",
@@ -1968,7 +1970,6 @@
     "kg-portal.ru",
     "komarovskiy.net",
     "kote.ws",
-    "kulturologia.ru",
     "kvadratmetr.uz",
     "lecrabeinfo.net",
     "lifenews.ru",
@@ -2106,7 +2107,6 @@
     "projetomotog.blogspot.com",
     "radiotormentamx.com",
     "reidoplacar.com",
-    "seriesgato.com",
     "somosbinarios.es",
     "stiffgamerdown.com",
     "suaads.com",
@@ -2126,8 +2126,6 @@
   "swe-1",
   {
    "unhide": [
-    "akaviaaspekt.se",
-    "annonsborsen.se",
     "atl.nu",
     "citattorget.se",
     "citiboard.se",
@@ -2189,11 +2187,9 @@
     "truyenaudiocv.org",
     "vn-z.vn",
     "web1s.asia",
-    "web1s.com",
     "windowslite.net",
     "www.taimods.com",
     "www.tiengnhatdongian.com",
-    "ycongnghe.com",
     "yhocdata.com"
    ]
   }