@browserless.io/browserless 2.29.0 → 2.30.0

package/build/routes/edge/http/screenshot.post.body.json

@@ -553,14 +553,14 @@
                 "length": {
                   "type": "number"
                 },
-                "__@toStringTag@475223": {
+                "__@toStringTag@476965": {
                   "type": "string",
                   "const": "Uint8Array"
                 }
               },
               "required": [
                 "BYTES_PER_ELEMENT",
-                "__@toStringTag@475223",
+                "__@toStringTag@476965",
                 "buffer",
                 "byteLength",
                 "byteOffset",
@@ -595,13 +595,13 @@
         "byteLength": {
           "type": "number"
         },
-        "__@toStringTag@475223": {
+        "__@toStringTag@476965": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@toStringTag@475223",
+        "__@toStringTag@476965",
         "byteLength"
       ]
     },
@@ -611,18 +611,18 @@
         "byteLength": {
           "type": "number"
         },
-        "__@species@475261": {
+        "__@species@477003": {
           "$ref": "#/definitions/SharedArrayBuffer"
         },
-        "__@toStringTag@475223": {
+        "__@toStringTag@476965": {
           "type": "string",
           "const": "SharedArrayBuffer"
         }
       },
       "additionalProperties": false,
       "required": [
-        "__@species@475261",
-        "__@toStringTag@475223",
+        "__@species@477003",
+        "__@toStringTag@476965",
         "byteLength"
       ]
     },

package/build/types.d.ts

@@ -13,6 +13,7 @@ export interface AfterResponse {
     req: Request;
     start: number;
     status: 'successful' | 'error' | 'timedout';
+    error?: Error;
 }
 export interface BrowserHook {
     browser: BrowserInstance;

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

@@ -4,7 +4,7 @@
     "description": "extension name."
   },
   "extShortDesc": {
-    "message": "Un bloqueador de contenido con menos permisos. Bloquea anuncios, rastreadores, criptomineros y aún más.",
+    "message": "Un bloqueador de contenido eficiente. Bloquea anuncios, rastreadores, criptomineros y aún más.",
     "description": "this will be in the Chrome web store: must be 132 characters or less"
   },
   "perRulesetStats": {

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

@@ -4,7 +4,7 @@
     "description": "extension name."
   },
   "extShortDesc": {
-    "message": "En behörighetslös innehållsblockerare. Blockerar annonser, spårare, miners och mer omedelbart efter installationen.",
+    "message": "En effektiv innehållsblockerare. Blockerar annonser, spårare, miners och mer direkt efter den har installerats.",
     "description": "this will be in the Chrome web store: must be 132 characters or less"
   },
   "perRulesetStats": {

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

@@ -112,7 +112,7 @@
     "description": "First paragraph of 'Filter issues' section in Support pane"
   },
   "supportS5H": {
-    "message": "Troubleshooting information",
+    "message": "Thông tin chẩn đoán lỗi",
     "description": "Label of 'Troubleshooting information' section in 'Report a filter issue' page"
   },
   "supportS6P1S1": {
@@ -276,11 +276,11 @@
     "description": "A button to navigate to the blocked page"
   },
   "zapperTipEnter": {
-    "message": "Enter element zapper mode",
+    "message": "Chuyển sang chế độ chặn phần tử tạm thời",
     "description": "Tooltip for the button used to enter zapper mode"
   },
   "zapperTipQuit": {
-    "message": "Exit element zapper mode",
+    "message": "Thoát khỏi chế độ chặn phần tử tạm thời",
     "description": "Tooltip for the button used to exit zapper mode"
   }
 }

package/extensions/ublocklite/css/filtering-mode.css

@@ -1,5 +1,6 @@
 .filteringModeSlider {
     align-items: center;
+    container-type: size;
     display: flex;
     height: 60px;
     justify-content: center;
@@ -11,9 +12,9 @@
     background-color: var(--surface-1);
     box-sizing: border-box;
     border-radius: 30% 15% / 15% 30%;
-    height: 100%;
+    height: calc(25cqw + 2px);
     position: absolute;
-    width: calc(25% + 2px);
+    width: calc(25cqw + 2px);
     z-index: 10;
     }
 

package/extensions/ublocklite/css/popup.css

@@ -70,9 +70,14 @@ body[data-forbid~="dashboard"] #gotoDashboard {
     display: none;
     }
 
+.lrspacer {
+    padding-left: var(--default-gap-small);
+    padding-right: var(--default-gap-small);
+    }
+
 #filteringModeText {
     color: var(--ink-3);
-    margin: var(--default-gap-small);
+    margin-bottom: var(--default-gap-small);
     margin-top: 0;
     text-align: center;
     text-transform: lowercase;
@@ -95,7 +100,8 @@ body[data-forbid~="dashboard"] #gotoDashboard {
 
 .filteringModeSlider {
     align-self: center;
-    margin: var(--popup-gap);
+    margin-bottom: var(--popup-gap);
+    margin-top: var(--popup-gap);
     width: calc(var(--popup-main-min-width) - 1em);
     }
 

package/extensions/ublocklite/dashboard.html

@@ -3,6 +3,7 @@
 <head>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1">
+<meta name="color-scheme" content="light dark" />
 <title data-i18n="dashboardName"></title>
 <link rel="stylesheet" href="css/default.css">
 <link rel="stylesheet" href="css/common.css">

package/extensions/ublocklite/js/action.js

@@ -19,8 +19,8 @@
     Home: https://github.com/gorhill/uBlock
 */
 
+import { matchesFromHostnames, strArrayEq } from './utils.js';
 import { browser } from './ext.js';
-import { getFilteringModeDetails } from './mode-manager.js';
 
 /******************************************************************************/
 
@@ -28,14 +28,6 @@ let reverseMode = false;
 
 /******************************************************************************/
 
-function toggleToolbarIcon(tabId) {
-    if ( reverseMode ) {
-        enableToolbarIcon(tabId);
-    } else {
-        disableToolbarIcon(tabId);
-    }
-}
-
 function disableToolbarIcon(tabId) {
     const details = {
         path: {
@@ -68,9 +60,12 @@ function enableToolbarIcon(tabId) {
 
 /******************************************************************************/
 
-function toolbarIconListener(details) {
-    if ( details.frameId !== 0 ) { return; }
-    toggleToolbarIcon(details.tabId);
+export function toggleToolbarIcon(tabId) {
+    if ( reverseMode ) {
+        enableToolbarIcon(tabId);
+    } else {
+        disableToolbarIcon(tabId);
+    }
 }
 
 /******************************************************************************/
@@ -78,13 +73,8 @@ function toolbarIconListener(details) {
 // https://github.com/uBlockOrigin/uBOL-home/issues/198
 //  Ensure the toolbar icon reflects the no-filtering mode of "trusted sites"
 
-export async function syncToolbarIcon(wakeup) {
-    const { webNavigation } = browser;
-    if ( typeof webNavigation !== 'object' ) { return; }
-
-    webNavigation.onCommitted.removeListener(toolbarIconListener);
-
-    const { none, basic, optimal, complete } = await getFilteringModeDetails();
+export async function registerToolbarIconToggler(context) {
+    const { none, basic, optimal, complete } = context.filteringModeDetails;
     const reverseModeAfter = none.delete('all-urls');
     const toToggle = reverseModeAfter ?
         new Set([ ...basic, ...optimal, ...complete ])
@@ -101,20 +91,20 @@ export async function syncToolbarIcon(wakeup) {
 
     if ( toToggle.size === 0 ) { return; }
 
-    webNavigation.onCommitted.addListener(toolbarIconListener, {
-        url:  Array.from(toToggle).map(a => ({
-            originAndPathMatches: `^https?://([^.].*\\.)?${a.replaceAll('.', '\\.')}/`
-        })),
-    });
+    const registered = context.before.get('toolbar-icon');
+    context.before.delete('toolbar-icon'); // Important!
 
-    if ( wakeup === undefined ) { return; }
-
-    // If waking up, update icon for existing tabs
-    const tabs = await browser.tabs.query({
-        url: Array.from(toToggle).map(a => `*://*.${a}/*`)
-    }).catch(( ) => ([]));
+    const directive = {
+        id: 'toolbar-icon',
+        js: [ '/js/scripting/toolbar-icon.js' ],
+        matches: matchesFromHostnames(toToggle),
+        runAt: 'document_start',
+    };
 
-    for ( const tab of tabs ) {
-        toggleToolbarIcon(tab.id);
+    if ( registered === undefined ) {
+        context.toAdd.push(directive);
+    } else if ( strArrayEq(registered.matches, directive.matches) === false ) {
+        context.toRemove.push('toolbar-icon');
+        context.toAdd.push(directive);
     }
 }

package/extensions/ublocklite/js/background.js

@@ -21,7 +21,6 @@
 
 import {
     MODE_BASIC,
-    MODE_NONE,
     MODE_OPTIMAL,
     getDefaultFilteringMode,
     getFilteringMode,
@@ -78,7 +77,7 @@ import {
 
 import { dnr } from './ext-compat.js';
 import { registerInjectables } from './scripting-manager.js';
-import { syncToolbarIcon } from './action.js';
+import { toggleToolbarIcon } from './action.js';
 
 /******************************************************************************/
 
@@ -170,6 +169,14 @@ function onMessage(request, sender, callback) {
         return false;
     }
 
+    case 'toggleToolbarIcon': {
+        const tabId = sender?.tab?.id ?? false;
+        if ( tabId ) {
+            toggleToolbarIcon(tabId);
+        }
+        return false;
+    }
+
     default:
         break;
     }
@@ -313,17 +320,11 @@ function onMessage(request, sender, callback) {
         break;
 
     case 'setFilteringMode': {
-        let trustedSitesChanged = false;
         getFilteringMode(request.hostname).then(beforeLevel => {
             if ( request.level === beforeLevel ) { return beforeLevel; }
-            trustedSitesChanged = beforeLevel === MODE_NONE;
             return setFilteringMode(request.hostname, request.level);
         }).then(afterLevel => {
             registerInjectables();
-            trustedSitesChanged ||= afterLevel === MODE_NONE;
-            if ( trustedSitesChanged ) {
-                syncToolbarIcon();
-            }
             callback(afterLevel);
         });
         return true;
@@ -357,7 +358,6 @@ function onMessage(request, sender, callback) {
     case 'setTrustedSites':
         setTrustedSites(request.hostnames).then(( ) => {
             registerInjectables();
-            syncToolbarIcon(true);
             return Promise.all([
                 getDefaultFilteringMode(),
                 getTrustedSites(),
@@ -485,7 +485,6 @@ async function start() {
         await startSession();
     }
 
-    syncToolbarIcon(process.wakeupRun);
     toggleDeveloperMode(rulesetConfig.developerMode);
 }
 

package/extensions/ublocklite/js/popup.js

@@ -109,10 +109,13 @@ async function commitFilteringMode() {
         setFilteringMode(actualLevel);
     }
     if ( actualLevel !== beforeLevel && popupPanelData.autoReload ) {
+        const justReload = tabURL.href === currentTab.url;
         self.setTimeout(( ) => {
-            browser.tabs.update(currentTab.id, {
-                url: tabURL.href,
-            });
+            if ( justReload ) {
+                browser.tabs.reload(currentTab.id);
+            } else {
+                browser.tabs.update(currentTab.id, { url: tabURL.href });
+            }
         }, 437);
     }
 }

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

@@ -49,10 +49,18 @@ let sessionRegexCount = 0;
 
 const isStrictBlockRule = rule => {
     if ( rule.priority !== STRICTBLOCK_PRIORITY ) { return false; }
-    if ( rule.action.type !== 'redirect' ) { return false; }
-    const substitution = rule.action.redirect.regexSubstitution;
-    return substitution !== undefined &&
-        substitution.includes('/strictblock.');
+    if ( rule.condition?.resourceTypes === undefined ) { return false; }
+    if ( rule.condition.resourceTypes.length !== 1 ) { return false; }
+    if ( rule.condition.resourceTypes[0] !== 'main_frame' ) { return false; }
+    if ( rule.action.type === 'redirect' ) {
+        const substitution = rule.action.redirect.regexSubstitution;
+        return substitution !== undefined &&
+            substitution.includes('/strictblock.');
+    }
+    if ( rule.action.type === 'allow' ) {
+        return Array.isArray(rule.condition?.requestDomains);
+    }
+    return false;
 };
 
 /******************************************************************************/
@@ -365,7 +373,7 @@ async function updateStrictBlockRules(currentRules, addRules, removeRuleIds) {
 
     const allExcluded = permanentlyExcluded.concat(temporarilyExcluded);
     if ( allExcluded.length === 0 ) { return; }
-    addRules.push({
+    addRules.unshift({
         action: { type: 'allow' },
         condition: {
             requestDomains: allExcluded,

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

@@ -103,18 +103,14 @@ for ( const selector of exceptedSelectors ) {
 
 if ( sheetText.length === 0 ) { return; }
 
-(function uBOL_injectCSS(css, count = 10) {
-    chrome.runtime.sendMessage({ what: 'insertCSS', css }).catch(( ) => {
-        count -= 1;
-        if ( count === 0 ) { return; }
-        uBOL_injectCSS(css, count);
-    });
-})(sheetText.join('\n'));
+chrome.runtime.sendMessage({
+    what: 'insertCSS',
+    css: sheetText.join('\n'),
+}).catch(( ) => {
+});
 
 /******************************************************************************/
 
 })();
 
-/******************************************************************************/
-
 void 0;

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

@@ -214,11 +214,11 @@ const uBOL_processChanges = mutations => {
 
 /******************************************************************************/
 
-const uBOL_injectCSS = (css, count = 10) => {
-    chrome.runtime.sendMessage({ what: 'insertCSS', css }).catch(( ) => {
-        count -= 1;
-        if ( count === 0 ) { return; }
-        uBOL_injectCSS(css, count);
+const uBOL_injectCSS = css => {
+    chrome.runtime.sendMessage({
+        what: 'insertCSS',
+        css,
+    }).catch(( ) => {
     });
 };
 

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

@@ -65,11 +65,11 @@ if ( exceptedSelectors.length === 0 ) { return; }
 
 /******************************************************************************/
 
-const uBOL_injectCSS = (css, count = 10) => {
-    chrome.runtime.sendMessage({ what: 'insertCSS', css }).catch(( ) => {
-        count -= 1;
-        if ( count === 0 ) { return; }
-        uBOL_injectCSS(css, count);
+const uBOL_injectCSS = css => {
+    chrome.runtime.sendMessage({
+        what: 'insertCSS',
+        css,
+    }).catch(( ) => {
     });
 };
 

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

@@ -63,20 +63,14 @@ const exceptedSelectors = exceptions.length !== 0
     : selectors;
 if ( exceptedSelectors.length === 0 ) { return; }
 
-/******************************************************************************/
-
-(function uBOL_injectCSS(css, count = 10) {
-    chrome.runtime.sendMessage({ what: 'insertCSS', css }).catch(( ) => {
-        count -= 1;
-        if ( count === 0 ) { return; }
-        uBOL_injectCSS(css, count);
-    });
-})(`${exceptedSelectors.join(',')}{display:none!important;}`);
+chrome.runtime.sendMessage({
+    what: 'insertCSS',
+    css: `${exceptedSelectors.join(',')}{display:none!important;}`,
+}).catch(( ) => {
+});
 
 /******************************************************************************/
 
 })();
 
-/******************************************************************************/
-
 void 0;

package/extensions/ublocklite/{rulesets/scripting/generichigh/irn-0.css → js/scripting/toolbar-icon.js}

@@ -1,7 +1,7 @@
 /*******************************************************************************
 
     uBlock Origin Lite - a comprehensive, MV3-compliant content blocker
-    Copyright (C) 2014-present Raymond Hill
+    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
@@ -19,9 +19,9 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-/* irn-0 */
-
-a[href^="https://arongroups.co/"],
-a[href^="https://arongroups.site/"] {
-    display: none !important;
-}
+(function uBOL_toggleToolbarIcon() {
+    chrome.runtime.sendMessage({
+        what: 'toggleToolbarIcon',
+    }).catch(( ) => {
+    });
+})();

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

@@ -25,6 +25,7 @@ import { browser } from './ext.js';
 import { fetchJSON } from './fetch.js';
 import { getEnabledRulesetsDetails } from './ruleset-manager.js';
 import { getFilteringModeDetails } from './mode-manager.js';
+import { registerToolbarIconToggler } from './action.js';
 import { ubolLog } from './debug.js';
 
 /******************************************************************************/
@@ -53,19 +54,6 @@ function getGenericDetails() {
 
 /******************************************************************************/
 
-// Important: We need to sort the arrays for fast comparison
-const arrayEq = (a = [], b = [], sort = true) => {
-    const alen = a.length;
-    if ( alen !== b.length ) { return false; }
-    if ( sort ) { a.sort(); b.sort(); }
-    for ( let i = 0; i < alen; i++ ) {
-        if ( a[i] !== b[i] ) { return false; }
-    }
-    return true;
-};
-
-/******************************************************************************/
-
 const normalizeMatches = matches => {
     if ( matches.length <= 1 ) { return; }
     if ( matches.includes('<all_urls>') === false ) {
@@ -168,9 +156,9 @@ function registerHighGeneric(context, genericDetails) {
 
     // update
     if (
-        arrayEq(registered.css, css, false) === false ||
-        arrayEq(registered.matches, matches) === false ||
-        arrayEq(registered.excludeMatches, excludeMatches) === false
+        ut.strArrayEq(registered.css, css, false) === false ||
+        ut.strArrayEq(registered.matches, matches) === false ||
+        ut.strArrayEq(registered.excludeMatches, excludeMatches) === false
     ) {
         context.toRemove.push('css-generichigh');
         context.toAdd.push(directive);
@@ -231,8 +219,8 @@ function registerGeneric(context, genericDetails) {
         if ( registered === undefined ) { // register
             context.toAdd.push(directive);
         } else if ( // update
-            arrayEq(registered.js, js, false) === false ||
-            arrayEq(registered.matches, directive.matches) === false
+            ut.strArrayEq(registered.js, js, false) === false ||
+            ut.strArrayEq(registered.matches, directive.matches) === false
         ) {
             context.toRemove.push('css-generic-some');
             context.toAdd.push(directive);
@@ -257,8 +245,8 @@ function registerGeneric(context, genericDetails) {
     if ( registeredAll === undefined ) { // register
         context.toAdd.push(directiveAll);
     } else if ( // update
-        arrayEq(registeredAll.js, js, false) === false ||
-        arrayEq(registeredAll.excludeMatches, directiveAll.excludeMatches) === false
+        ut.strArrayEq(registeredAll.js, js, false) === false ||
+        ut.strArrayEq(registeredAll.excludeMatches, directiveAll.excludeMatches) === false
     ) {
         context.toRemove.push('css-generic-all');
         context.toAdd.push(directiveAll);
@@ -281,8 +269,8 @@ function registerGeneric(context, genericDetails) {
     if ( registeredSome === undefined ) { // register
         context.toAdd.push(directiveSome);
     } else if ( // update
-        arrayEq(registeredSome.js, js, false) === false ||
-        arrayEq(registeredSome.matches, directiveSome.matches) === false
+        ut.strArrayEq(registeredSome.js, js, false) === false ||
+        ut.strArrayEq(registeredSome.matches, directiveSome.matches) === false
     ) {
         context.toRemove.push('css-generic-some');
         context.toAdd.push(directiveSome);
@@ -342,9 +330,9 @@ function registerProcedural(context) {
 
     // update
     if (
-        arrayEq(registered.js, js, false) === false ||
-        arrayEq(registered.matches, matches) === false ||
-        arrayEq(registered.excludeMatches, excludeMatches) === false
+        ut.strArrayEq(registered.js, js, false) === false ||
+        ut.strArrayEq(registered.matches, matches) === false ||
+        ut.strArrayEq(registered.excludeMatches, excludeMatches) === false
     ) {
         context.toRemove.push('css-procedural');
         context.toAdd.push(directive);
@@ -404,9 +392,9 @@ function registerDeclarative(context) {
 
     // update
     if (
-        arrayEq(registered.js, js, false) === false ||
-        arrayEq(registered.matches, matches) === false ||
-        arrayEq(registered.excludeMatches, excludeMatches) === false
+        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);
@@ -466,9 +454,9 @@ function registerSpecific(context) {
 
     // update
     if (
-        arrayEq(registered.js, js, false) === false ||
-        arrayEq(registered.matches, matches) === false ||
-        arrayEq(registered.excludeMatches, excludeMatches) === false
+        ut.strArrayEq(registered.js, js, false) === false ||
+        ut.strArrayEq(registered.matches, matches) === false ||
+        ut.strArrayEq(registered.excludeMatches, excludeMatches) === false
     ) {
         context.toRemove.push('css-specific');
         context.toAdd.push(directive);
@@ -545,8 +533,8 @@ function registerScriptlet(context, scriptletDetails) {
 
             // update
             if (
-                arrayEq(registered.matches, matches) === false ||
-                arrayEq(registered.excludeMatches, excludeMatches) === false
+                ut.strArrayEq(registered.matches, matches) === false ||
+                ut.strArrayEq(registered.excludeMatches, excludeMatches) === false
             ) {
                 context.toRemove.push(id);
                 context.toAdd.push(directive);
@@ -599,6 +587,7 @@ async function registerInjectables() {
     registerSpecific(context);
     registerGeneric(context, genericDetails);
     registerHighGeneric(context, genericDetails);
+    registerToolbarIconToggler(context);
 
     toRemove.push(...Array.from(before.keys()));
 

package/extensions/ublocklite/js/utils.js

@@ -182,6 +182,19 @@ async function gotoURL(url, type) {
 
 /******************************************************************************/
 
+// Important: We need to sort the arrays for fast comparison
+const strArrayEq = (a = [], b = [], sort = true) => {
+    const alen = a.length;
+    if ( alen !== b.length ) { return false; }
+    if ( sort ) { a.sort(); b.sort(); }
+    for ( let i = 0; i < alen; i++ ) {
+        if ( a[i] !== b[i] ) { return false; }
+    }
+    return true;
+};
+
+/******************************************************************************/
+
 export {
     broadcastMessage,
     parsedURLromOrigin,
@@ -195,4 +208,5 @@ export {
     hostnamesFromMatches,
     hasBroadHostPermissions,
     gotoURL,
+    strArrayEq,
 };