@browserless.io/browserless 2.36.0 → 2.37.0

package/extensions/ublocklite/js/backup-restore.js

@@ -0,0 +1,153 @@
+/*******************************************************************************
+
+    uBlock Origin Lite - a comprehensive, MV3-compliant content blocker
+    Copyright (C) 2022-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
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see {http://www.gnu.org/licenses/}.
+
+    Home: https://github.com/gorhill/uBlock
+*/
+
+import {
+    localRead, localRemove, localWrite,
+    runtime,
+    sendMessage,
+} from './ext.js';
+
+/******************************************************************************/
+
+export async function backupToObject(currentConfig) {
+    const out = {};
+    const manifest = runtime.getManifest();
+    out.version = manifest.versionName ?? manifest.version;
+    const defaultConfig = await sendMessage({ what: 'getDefaultConfig' });
+    if ( currentConfig.autoReload !== defaultConfig.autoReload ) {
+        out.autoReload = currentConfig.autoReload;
+    }
+    if ( currentConfig.developerMode !== defaultConfig.developerMode ) {
+        out.developerMode = currentConfig.developerMode;
+    }
+    if ( currentConfig.showBlockedCount !== defaultConfig.showBlockedCount ) {
+        out.showBlockedCount = currentConfig.showBlockedCount;
+    }
+    if ( currentConfig.strictBlockMode !== defaultConfig.strictBlockMode ) {
+        out.strictBlockMode = currentConfig.strictBlockMode;
+    }
+    const { enabledRulesets } = currentConfig;
+    const customRulesets = [];
+    for ( const id of enabledRulesets ) {
+        if ( defaultConfig.rulesets.includes(id) ) { continue; }
+        customRulesets.push(`+${id}`);
+    }
+    for ( const id of defaultConfig.rulesets ) {
+        if ( enabledRulesets.includes(id) ) { continue; }
+        customRulesets.push(`-${id}`);
+    }
+    if ( customRulesets.length !== 0 ) {
+        out.rulesets = customRulesets;
+    }
+    out.filteringModes = await sendMessage({ what: 'getFilteringModeDetails' });
+    const customFilters = await sendMessage({ what: 'getAllCustomFilters' });
+    const filters = [];
+    for ( const [ hostname, selectors ] of customFilters ) {
+        for ( const selector of selectors ) {
+            filters.push(`${hostname}##${selector}`);
+        }
+    }
+    if ( filters.length !== 0 ) {
+        out.cosmeticFilters = filters;
+    }
+    const dnrRules = await localRead('userDnrRules');
+    if ( typeof dnrRules === 'string' && dnrRules.length !== 0 ) {
+        out.dnrRules = dnrRules.split(/\n+/);
+    }
+    return out;
+}
+
+/******************************************************************************/
+
+export async function restoreFromObject(targetConfig) {
+    const defaultConfig = await sendMessage({ what: 'getDefaultConfig' });
+
+    await sendMessage({
+        what: 'setAutoReload',
+        state: targetConfig.autoReload ?? defaultConfig.autoReload
+    });
+
+    await sendMessage({
+        what: 'setShowBlockedCount',
+        state: targetConfig.showBlockedCount ?? defaultConfig.showBlockedCount
+    });
+
+    await sendMessage({
+        what: 'setDeveloperMode',
+        state: targetConfig.developerMode ?? defaultConfig.developerMode
+    });
+
+    await sendMessage({
+        what: 'setStrictBlockMode',
+        state: targetConfig.strictBlockMode ?? defaultConfig.strictBlockMode
+    });
+
+    const enabledRulesets = new Set(defaultConfig.rulesets);
+    for ( const entry of targetConfig.rulesets || [] ) {
+        const id = entry.slice(1);
+        if ( entry.startsWith('+') ) {
+            enabledRulesets.add(id);
+        } else if ( entry.startsWith('-') ) {
+            enabledRulesets.delete(id);
+        }
+    }
+    await sendMessage({
+        what: 'applyRulesets',
+        enabledRulesets: Array.from(enabledRulesets),
+    });
+
+    await sendMessage({
+        what: 'setFilteringModeDetails',
+        modes: targetConfig.filteringModes ?? defaultConfig.filteringModes,
+    });
+
+    await sendMessage({ what: 'removeAllCustomFilters', hostname: '*' });
+    const hostnameMap = new Map();
+    for ( const line of targetConfig.cosmeticFilters ?? [] ) {
+        const i = line.indexOf('##');
+        if ( i === -1 ) { continue; }
+        const hostname = line.slice(0, i);
+        if ( hostname === '' ) { continue; }
+        const selector = line.slice(i+2);
+        if ( selector === '' ) { continue; }
+        const selectors = hostnameMap.get(hostname) || [];
+        if ( selectors.length === 0 ) {
+            hostnameMap.set(hostname, selectors)
+        }
+        selectors.push(selector);
+    }
+    const promises = [];
+    for ( const [ hostname, selectors ] of hostnameMap ) {
+        promises.push(
+            sendMessage({ what: 'addCustomFilters', hostname, selectors })
+        );
+    }
+    await Promise.all(promises);
+
+    const dnrRules = targetConfig.dnrRules ?? [];
+    if ( dnrRules.length !== 0 ) {
+        await localWrite('userDnrRules', dnrRules.join('\n'));
+    } else {
+        await localRemove('userDnrRules');
+    }
+    await sendMessage({ what: 'updateUserDnrRules' });
+
+}

package/extensions/ublocklite/js/config.js

@@ -37,6 +37,8 @@ export const rulesetConfig = {
     hasBroadHostPermissions: true,
 };
 
+export const defaultConfig = Object.assign({}, rulesetConfig);
+
 export const process = {
     firstRun: false,
     wakeupRun: false,

package/extensions/ublocklite/js/dashboard.js

@@ -26,10 +26,15 @@ import {
     localWrite,
     runtime,
     sendMessage,
+    webextFlavor,
 } from './ext.js';
+import { faIconsInit } from './fa-icons.js';
+import { i18n } from './i18n.js';
 
 /******************************************************************************/
 
+dom.body.dataset.platform = webextFlavor;
+
 {
     const manifest = runtime.getManifest();
     dom.text('#aboutNameVer', `${manifest.name} ${manifest.version}`);
@@ -63,7 +68,21 @@ tsinfoObserver.observe(qs$('[data-i18n="supportS5H"] + pre'));
 
 /******************************************************************************/
 
+export function nodeFromTemplate(templateId, nodeSelector) {
+    const template = qs$(`template#${templateId}`);
+    const fragment = template.content.cloneNode(true);
+    const node = nodeSelector !== undefined
+        ? qs$(fragment, nodeSelector)
+        : fragment.firstElementChild;
+    faIconsInit(node);
+    i18n.render(node);
+    return node;
+}
+
+/******************************************************************************/
+
 export function hashFromIterable(iter) {
+    if ( Boolean(iter) === false ) { return ''; }
     return Array.from(iter).sort().join('\n');
 }
 

package/extensions/ublocklite/js/develop.js

@@ -517,7 +517,7 @@ class Editor {
     importFromFile() {
         const editor = this.editor;
         if ( typeof editor.importFromFile !== 'function' ) { return; }
-        const input = qs$('input[type="file"]');
+        const input = qs$('section[data-pane="develop"] input[type="file"]');
         input.accept = editor.ioAccept || '';
         input.onchange = ev => {
             input.onchange = null;
@@ -619,15 +619,6 @@ async function start() {
     });
 }
 
-let observer = new IntersectionObserver(entries => {
-    for ( const entry of entries ) {
-        if ( entry.isIntersecting === false ) { continue; }
-        start();
-        observer.disconnect();
-        observer = null;
-        break;
-    }
-});
-observer.observe(qs$('section[data-pane="develop"]'));
+dom.onFirstShown(start, qs$('section[data-pane="develop"]'));
 
 /******************************************************************************/

package/extensions/ublocklite/js/dom.js

@@ -156,6 +156,16 @@ class dom {
             elem.removeEventListener(type, callback, options);
         }
     }
+
+    static onFirstShown(fn, elem) {
+        let observer = new IntersectionObserver(entries => {
+            if ( entries.every(a => a.isIntersecting === false) ) { return; }
+            try { fn(); } catch { }
+            observer.disconnect();
+            observer = undefined;
+        });
+        observer.observe(elem);
+    }
 }
 
 dom.cl = class {

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

@@ -20,9 +20,9 @@
 */
 
 import { dom, qs$, qsa$ } from './dom.js';
+import { hashFromIterable, nodeFromTemplate } from './dashboard.js';
 import { i18n, i18n$ } from './i18n.js';
 import { localRead, localWrite, sendMessage } from './ext.js';
-import { hashFromIterable } from './dashboard.js';
 
 /******************************************************************************/
 
@@ -162,16 +162,16 @@ export function renderFilterLists(rulesetData) {
 
     const createListEntry = (listDetails, depth) => {
         if ( listDetails.lists === undefined ) {
-            return dom.clone('#templates .listEntry[data-role="leaf"]');
+            return nodeFromTemplate('listEntryLeaf', '.listEntry');
         }
         if ( depth !== 0 ) {
-            return dom.clone('#templates .listEntry[data-role="node"]');
+            return nodeFromTemplate('listEntryNode', '.listEntry');
         }
-        return dom.clone('#templates .listEntry[data-role="rootnode"]');
+        return nodeFromTemplate('listEntryRoot', '.listEntry');
     };
 
     const createListEntries = (parentkey, listTree, depth = 0) => {
-        const listEntries = dom.clone('#templates .listEntries');
+        const listEntries = nodeFromTemplate('listEntries', '.listEntries');
         const treeEntries = Object.entries(listTree);
         if ( depth !== 0 ) {
             const reEmojis = /\p{Emoji}+/gu;