npm - @browserless.io/browserless - Versions diffs - 2.34.0-beta-0 → 2.34.1 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (351) hide show

package/extensions/ublocklite/dashboard.html CHANGED Viewed

@@ -20,13 +20,21 @@
 <body data-pane="settings" class="loading">
     <!-- -------- -->
-    <nav id="dashboard-nav">
-        <span class="logo"><img data-i18n-title="extName" src="img/ublock.svg" alt="uBO Lite"></span><!--
-     --><button class="tabButton" type="button" data-pane="settings" data-i18n="settingsPageName" tabindex="0"></button><!--
-     --><button class="tabButton" type="button" data-pane="rulesets" data-i18n="aboutFilterLists" tabindex="0"></button><!--
-     --><button class="tabButton" type="button" data-pane="develop" data-i18n="developPageName"tabindex="0"></button><!--
-     --><button class="tabButton" type="button" data-pane="about" data-i18n="aboutPageName" tabindex="0"></button>
-    </nav>
+    <header>
+        <nav id="dashboard-nav">
+            <span class="logo"><img data-i18n-title="extName" src="img/ublock.svg" alt="uBO Lite"></span><!--
+         --><button class="tabButton" type="button" data-pane="settings" data-i18n="settingsPageName" tabindex="0"></button><!--
+         --><button class="tabButton" type="button" data-pane="rulesets" data-i18n="aboutFilterLists" tabindex="0"></button><!--
+         --><button class="tabButton" type="button" data-pane="develop" data-i18n="developPageName"tabindex="0"></button><!--
+         --><button class="tabButton" type="button" data-pane="about" data-i18n="aboutPageName" tabindex="0"></button>
+        </nav>
+        <!-- -------- -->
+        <div data-pane-related="rulesets">
+            <p><span id="commit-spinner" class="fa-icon">spinner</span> <span id="listsOfBlockedHostsPrompt"></span></p>
+            <p id="dnrError"></p>
+            <p><input id="findInLists" type="search" spellcheck="false" placeholder="findListsPlaceholder" /></p>
+        </div>
+    </header>
     <!-- -------- -->
     <section data-pane="settings">
         <div>
@@ -92,10 +100,6 @@
     </section>
     <!-- -------- -->
     <section data-pane="rulesets">
-        <div>
-            <p id="listsOfBlockedHostsPrompt"></p>
-            <p><input id="findInLists" type="search" spellcheck="false" placeholder="findListsPlaceholder" /></p>
-        </div>
         <div id="lists"></div>
     </section>
     <!-- -------- -->
@@ -122,7 +126,7 @@
             <div class="liul">
                 <div class="li">Copyright (c) Raymond Hill 2014-present</div>
             </div>
-            <div class="li"><a href="https://github.com/gorhill/uBlock/wiki/Privacy-policy" data-i18n="aboutPrivacyPolicy"></a></div>
+            <div class="li"><a href="https://github.com/uBlockOrigin/uBOL-home/wiki/Privacy-policy" data-i18n="aboutPrivacyPolicy"></a></div>
             <div class="li"><a href="https://github.com/uBlockOrigin/uBOL-home/releases" data-i18n="aboutChangelog"></a></div>
             <div class="li"><a href="https://github.com/gorhill/uBlock" data-i18n="aboutCode"></a></div>
             <div class="li"><span data-i18n="aboutContributors"></span></div>

package/extensions/ublocklite/js/background.js CHANGED Viewed

@@ -58,6 +58,7 @@ import {
     browser,
     localRead, localRemove, localWrite,
     runtime,
+    webextFlavor,
 } from './ext.js';
 import {
@@ -78,6 +79,7 @@ import {
     getMatchedRules,
     isSideloaded,
     toggleDeveloperMode,
+    ubolErr,
     ubolLog,
 } from './debug.js';
@@ -89,6 +91,7 @@ import {
 } from './config.js';
 import { dnr } from './ext-compat.js';
+import { getTroubleshootingInfo } from './troubleshooting.js';
 import { registerInjectables } from './scripting-manager.js';
 import { toggleToolbarIcon } from './action.js';
@@ -106,6 +109,18 @@ function getCurrentVersion() {
     return runtime.getManifest().version;
 }
+// The goal is just to be able to find out whether a specific version is older
+// than another one.
+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;
+}
 /******************************************************************************/
 async function onPermissionsRemoved() {
@@ -171,12 +186,14 @@ function onMessage(request, sender, callback) {
     case 'insertCSS': {
         if ( frameId === false ) { return false; }
+        // https://bugs.webkit.org/show_bug.cgi?id=262491
+        if ( frameId !== 0 && webextFlavor === 'safari' ) { return false; }
         browser.scripting.insertCSS({
             css: request.css,
             origin: 'USER',
             target: { tabId, frameIds: [ frameId ] },
         }).catch(reason => {
-            console.log(reason);
+            ubolErr(`insertCSS/${reason}`);
         });
         return false;
     }
@@ -188,7 +205,7 @@ function onMessage(request, sender, callback) {
             origin: 'USER',
             target: { tabId, frameIds: [ frameId ] },
         }).catch(reason => {
-            console.log(reason);
+            ubolErr(`removeCSS/${reason}`);
         });
         return false;
     }
@@ -227,7 +244,7 @@ function onMessage(request, sender, callback) {
             target: { tabId, frameIds: [ frameId ] },
             injectImmediately: true,
         }).catch(reason => {
-            console.log(reason);
+            ubolErr(`executeScript/${reason}`);
         }).then(( ) => {
             callback();
         });
@@ -248,15 +265,19 @@ function onMessage(request, sender, callback) {
     switch ( request.what ) {
     case 'applyRulesets': {
-        enableRulesets(request.enabledRulesets).then(( ) => {
-            rulesetConfig.enabledRulesets = request.enabledRulesets;
-            return saveRulesetConfig();
-        }).then(( ) => {
-            registerInjectables();
-            callback();
-            return dnr.getEnabledRulesets();
-        }).then(enabledRulesets => {
-            broadcastMessage({ enabledRulesets });
+        enableRulesets(request.enabledRulesets).then(result => {
+            if ( result === undefined || result.error ) {
+                callback(result);
+                return;
+            }
+            rulesetConfig.enabledRulesets = result.enabledRulesets;
+            return saveRulesetConfig().then(( ) => {
+                return registerInjectables();
+            }).then(( ) => {
+                callback(result);
+            });
+        }).finally(( ) => {
+            broadcastMessage({ enabledRulesets: rulesetConfig.enabledRulesets });
         });
         return true;
     }
@@ -490,6 +511,12 @@ function onMessage(request, sender, callback) {
         });
         return true;
+    case 'getTroubleshootingInfo':
+        getTroubleshootingInfo(request.siteMode).then(info => {
+            callback(info);
+        });
+        return true;
     default:
         break;
     }
@@ -539,6 +566,13 @@ async function startSession() {
     // obsolete ruleset to remove.
     if ( isNewVersion ) {
         ubolLog(`Version change: ${rulesetConfig.version} => ${currentVersion}`);
+        // https://github.com/uBlockOrigin/uBOL-home/issues/428#issuecomment-3172663563
+        if ( webextFlavor === 'safari' && rulesetConfig.strictBlockMode ) {
+            const before = intFromVersion(rulesetConfig.version);
+            if ( before <= intFromVersion('2025.804.2359') ) {
+                rulesetConfig.strictBlockMode = false;
+            }
+        }
         rulesetConfig.version = currentVersion;
         await patchDefaultRulesets();
         saveRulesetConfig();
@@ -547,7 +581,7 @@ async function startSession() {
     const rulesetsUpdated = await enableRulesets(rulesetConfig.enabledRulesets);
     // We need to update the regex rules only when ruleset version changes.
-    if ( rulesetsUpdated === false ) {
+    if ( rulesetsUpdated === undefined ) {
         if ( isNewVersion ) {
             updateDynamicRules();
         } else {
@@ -616,7 +650,7 @@ const isFullyInitialized = start().then(( ) => {
     localRemove('goodStart');
     return false;
 }).catch(reason => {
-    console.trace(reason);
+    ubolErr(reason);
     if ( process.wakeupRun ) { return; }
     return localRead('goodStart').then(goodStart => {
         if ( goodStart === false ) {

package/extensions/ublocklite/js/config.js CHANGED Viewed

@@ -22,6 +22,7 @@
 import {
     localRead, localWrite,
     sessionRead, sessionWrite,
+    webextFlavor,
 } from './ext.js';
 /******************************************************************************/
@@ -31,7 +32,7 @@ export const rulesetConfig = {
     enabledRulesets: [],
     autoReload: true,
     showBlockedCount: true,
-    strictBlockMode: true,
+    strictBlockMode: webextFlavor !== 'safari',
     developerMode: false,
     hasBroadHostPermissions: true,
 };

package/extensions/ublocklite/js/dashboard.js CHANGED Viewed

@@ -24,11 +24,10 @@ import {
     localRead,
     localRemove,
     localWrite,
+    runtime,
+    sendMessage,
 } from './ext.js';
-import { getTroubleshootingInfo } from './troubleshooting.js';
-import { runtime } from './ext.js';
 /******************************************************************************/
 {
@@ -53,9 +52,14 @@ localRead('dashboard.activePane').then(pane => {
     dom.body.dataset.pane = pane;
 });
-getTroubleshootingInfo().then(config => {
-    qs$('[data-i18n="supportS5H"] + pre').textContent = config;
+// Update troubleshooting on-demand
+const tsinfoObserver = new IntersectionObserver(entries => {
+    if ( entries.every(a => a.isIntersecting === false) ) { return; }
+    sendMessage({ what: 'getTroubleshootingInfo' }).then(config => {
+        qs$('[data-i18n="supportS5H"] + pre').textContent = config;
+    });
 });
+tsinfoObserver.observe(qs$('[data-i18n="supportS5H"] + pre'));
 /******************************************************************************/

package/extensions/ublocklite/js/debug.js CHANGED Viewed

@@ -19,26 +19,85 @@
     Home: https://github.com/gorhill/uBlock
 */
-import { dnr, normalizeDNRRules } from './ext-compat.js';
-import { browser } from './ext.js';
+import {
+    dnr,
+    normalizeDNRRules,
+    webext,
+} from './ext-compat.js';
+import {
+    sessionRead,
+    sessionWrite,
+} from './ext.js';
 /******************************************************************************/
 const isModern = dnr.onRuleMatchedDebug instanceof Object;
 export const isSideloaded = (( ) => {
-    const { permissions } = browser.runtime.getManifest();
+    const { permissions } = webext.runtime.getManifest();
     return permissions?.includes('declarativeNetRequestFeedback') ?? false;
 })();
 /******************************************************************************/
+const CONSOLE_MAX_LINES = 32;
+const consoleOutput = [];
+sessionRead('console').then(before => {
+    if ( Array.isArray(before) === false ) { return; }
+    for ( const s of before.reverse() ) {
+        consoleOutput.unshift(s);
+    }
+    consoleTruncate();
+});
+const consoleTruncate = ( ) => {
+    if ( consoleOutput.length <= CONSOLE_MAX_LINES ) { return; }
+    consoleOutput.copyWithin(0, -CONSOLE_MAX_LINES);
+    consoleOutput.length = CONSOLE_MAX_LINES;
+};
+const consoleAdd = (...args) => {
+    if ( args.length === 0 ) { return; }
+    const now = new Date();
+    const time = [
+        `${now.getUTCMonth()+1}`.padStart(2, '0'),
+        `${now.getUTCDate()}`.padStart(2, '0'),
+        '.',
+        `${now.getUTCHours()}`.padStart(2, '0'),
+        `${now.getUTCMinutes()}`.padStart(2, '0'),
+    ].join('');
+    for ( let i = 0; i < args.length; i++ ) {
+        const s = `[${time}]${args[i]}`;
+        if ( Boolean(s) === false ) { continue; }
+        if ( s === consoleOutput.at(-1) ) { continue; }
+        consoleOutput.push(s);
+    }
+    consoleTruncate();
+    sessionWrite('console', getConsoleOutput());
+}
 export const ubolLog = (...args) => {
     // Do not pollute dev console in stable releases.
     if ( isSideloaded !== true ) { return; }
     console.info('[uBOL]', ...args);
 };
+export const ubolErr = (...args) => {
+    if ( Array.isArray(args) === false ) { return; }
+    if ( globalThis.ServiceWorkerGlobalScope ) {
+        consoleAdd(...args);
+    }
+    // Do not pollute dev console in stable releases.
+    if ( isSideloaded !== true ) { return; }
+    console.error('[uBOL]', ...args);
+};
+export const getConsoleOutput = ( ) => {
+    return consoleOutput.slice();
+};
 /******************************************************************************/
 const rulesets = new Map();

package/extensions/ublocklite/js/ext.js CHANGED Viewed

@@ -27,6 +27,12 @@ export const browser = webext;
 export const i18n = browser.i18n;
 export const runtime = browser.runtime;
+export const webextFlavor = (( ) => {
+    const extURL = runtime.getURL('');
+    if ( extURL.startsWith('safari-web-extension:') ) { return 'safari'; }
+    return extURL.startsWith('moz-extension:') ? 'firefox' : 'chromium';
+})();
 /******************************************************************************/
 // The extension's service worker can be evicted at any time, so when we

package/extensions/ublocklite/js/fetch.js CHANGED Viewed

@@ -19,13 +19,15 @@
     Home: https://github.com/gorhill/uBlock
 */
+import { ubolErr } from './debug.js';
 /******************************************************************************/
 function fetchJSON(path) {
     return fetch(`${path}.json`).then(response =>
         response.json()
     ).catch(reason => {
-        console.info(reason);
+        ubolErr(`fetchJSON/${reason}`);
     });
 }

package/extensions/ublocklite/js/filter-lists.js CHANGED Viewed

@@ -397,6 +397,8 @@ dom.on('#findInLists', 'input', searchFilterLists);
 const applyEnabledRulesets = (( ) => {
     const apply = async ( ) => {
+        dom.cl.add(dom.body, 'committing');
         const enabledRulesets = [];
         for ( const liEntry of qsa$('#lists .listEntry[data-role="leaf"][data-rulesetid]') ) {
             const checked = qs$(liEntry, 'input[type="checkbox"]:checked') !== null;
@@ -408,14 +410,17 @@ const applyEnabledRulesets = (( ) => {
         dom.cl.remove('#lists .listEntry.toggled', 'toggled');
-        const unmodified = hashFromIterable(enabledRulesets) ===
+        const modified = hashFromIterable(enabledRulesets) !==
             hashFromIterable(cachedRulesetData.enabledRulesets);
-        if ( unmodified ) { return; }
+        if ( modified ) {
+            const result = await sendMessage({
+                what: 'applyRulesets',
+                enabledRulesets,
+            });
+            dom.text('#dnrError', result?.error || '');
+        }
-        await sendMessage({
-            what: 'applyRulesets',
-            enabledRulesets,
-        });
+        dom.cl.remove(dom.body, 'committing');
     };
     let timer;
@@ -433,7 +438,11 @@ const applyEnabledRulesets = (( ) => {
         }
         timer = self.setTimeout(( ) => {
             timer = undefined;
-            apply();
+            if ( dom.cl.has(dom.body, 'committing') ) {
+                applyEnabledRulesets();
+            } else {
+                apply();
+            }
         }, 997);
     }
 })();

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

@@ -34,6 +34,12 @@ import {
     subtractHostnameIters,
 } from './utils.js';
+import { ubolErr } from './debug.js';
+/******************************************************************************/
+const perSitePendingIO = new Map();
 /******************************************************************************/
 export async function selectorsFromCustomFilters(hostname) {
@@ -79,7 +85,7 @@ export function startCustomFilters(tabId, frameId) {
         target: { tabId, frameIds: [ frameId ] },
         injectImmediately: true,
     }).catch(reason => {
-        console.log(reason);
+        ubolErr(`startCustomFilters/${reason}`);
     })
 }
@@ -89,7 +95,7 @@ export function terminateCustomFilters(tabId, frameId) {
         target: { tabId, frameIds: [ frameId ] },
         injectImmediately: true,
     }).catch(reason => {
-        console.log(reason);
+        ubolErr(`terminateCustomFilters/${reason}`);
     })
 }
@@ -107,7 +113,7 @@ export async function injectCustomFilters(tabId, frameId, hostname) {
                 origin: 'USER',
                 target: { tabId, frameIds: [ frameId ] },
             }).catch(reason => {
-                console.log(reason);
+                ubolErr(`injectCustomFilters/insertCSS/${reason}`);
             })
         );
     }
@@ -119,7 +125,7 @@ export async function injectCustomFilters(tabId, frameId, hostname) {
                 target: { tabId, frameIds: [ frameId ] },
                 injectImmediately: true,
             }).catch(reason => {
-                console.log(reason);
+                ubolErr(`injectCustomFilters/executeScript/${reason}`);
             })
         );
     }
@@ -130,6 +136,9 @@ export async function injectCustomFilters(tabId, frameId, hostname) {
 /******************************************************************************/
 export async function registerCustomFilters(context) {
+    if ( perSitePendingIO.size !== 0 ) {
+        await Promise.all(Array.from(perSitePendingIO.values()));
+    }
     const siteKeys = await getAllCustomFilterKeys();
     if ( siteKeys.length === 0 ) { return; }
@@ -166,6 +175,20 @@ export async function registerCustomFilters(context) {
 /******************************************************************************/
 export async function addCustomFilter(hostname, selector) {
+    const pending = perSitePendingIO.get(hostname);
+    const promise = pending
+        ? pending.then(( ) => addCustomFilterByHostname(hostname, selector))
+        : addCustomFilterByHostname(hostname, selector);
+    perSitePendingIO.set(hostname, promise);
+    promise.then(( ) => {
+        if ( promise !== perSitePendingIO.get(hostname) ) { return; }
+        perSitePendingIO.delete(hostname);
+    });
+    return promise;
+}
+async function addCustomFilterByHostname(hostname, selector) {
+    if ( hostname === '' ) { return false; }
     const key = `site.${hostname}`;
     const selectors = await localRead(key) || [];
     if ( selectors.includes(selector) ) { return false; }
@@ -178,14 +201,45 @@ export async function addCustomFilter(hostname, selector) {
 /******************************************************************************/
 export async function removeCustomFilter(hostname, selector) {
+    const promises = [];
+    let hn = hostname;
+    while ( hn !== '' ) {
+        promises.push(removeCustomFilterByHostname(hn, selector));
+        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 removeCustomFilterByHostname(hostname, selector) {
+    const pending = perSitePendingIO.get(hostname);
     const key = `site.${hostname}`;
+    const promise = pending
+        ? pending.then(( ) => removeCustomFilterByKey(key, selector))
+        : removeCustomFilterByKey(key, selector);
+    perSitePendingIO.set(hostname, promise);
+    promise.then(( ) => {
+        if ( promise !== perSitePendingIO.get(hostname) ) { return; }
+        perSitePendingIO.delete(hostname);
+    });
+    return promise;
+}
+async function removeCustomFilterByKey(key, selector) {
     const selectors = await localRead(key);
     if ( selectors === undefined ) { return false; }
-    const i = selectors.indexOf(selector);
-    if ( i === -1 ) { return false; }
+    let i = selectors.indexOf(selector);
+    if ( i === -1 ) {
+        i = selectors.indexOf(`0${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;
 }