uBlockOrigin
diff --git a/‎chromium/js/background.js‎
Lines changed: 18 additions & 0 deletions b/‎chromium/js/background.js‎
Lines changed: 18 additions & 0 deletions
diff --git a/‎chromium/js/backup-restore.js‎
Lines changed: 27 additions & 26 deletions b/‎chromium/js/backup-restore.js‎
Lines changed: 27 additions & 26 deletions
diff --git a/‎chromium/js/dnr-parser.js‎
Lines changed: 12 additions & 0 deletions b/‎chromium/js/dnr-parser.js‎
Lines changed: 12 additions & 0 deletions
diff --git a/‎chromium/js/filter-manager-ui.js‎
Lines changed: 2 additions & 1 deletion b/‎chromium/js/filter-manager-ui.js‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎chromium/js/filter-manager.js‎
Lines changed: 14 additions & 17 deletions b/‎chromium/js/filter-manager.js‎
Lines changed: 14 additions & 17 deletions
diff --git a/‎chromium/js/popup.js‎
Lines changed: 1 addition & 0 deletions b/‎chromium/js/popup.js‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎chromium/js/rw-dnr-editor.js‎
Lines changed: 2 additions & 0 deletions b/‎chromium/js/rw-dnr-editor.js‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎chromium/js/scripting-manager.js‎
Lines changed: 7 additions & 6 deletions b/‎chromium/js/scripting-manager.js‎
Lines changed: 7 additions & 6 deletions
diff --git a/‎chromium/js/ubo-parser.js‎
Lines changed: 2 additions & 0 deletions b/‎chromium/js/ubo-parser.js‎
Lines changed: 2 additions & 0 deletions
@@ -577,6 +577,24 @@ function onMessage(request, sender, callback) {
         })
         return true;
 
+    case 'addManyCustomFilters': {
+        const promises = [];
+        for ( const [ hostname, selectors ] of request.entries ) {
+            if ( typeof hostname !== 'string' ) { continue; }
+            if ( hostname === '' ) { continue; }
+            if ( Array.isArray(selectors) === false ) { continue; }
+            if ( selectors.length === 0 ) { continue; }
+            promises.push(addCustomFilters(hostname, selectors));
+        }
+        Promise.all(promises).then(results => {
+            if ( results.some(a => a) === false ) { return; }
+            return registerInjectables();
+        }).then(( ) => {
+            callback();
+        });
+        return true;
+    }
+
     case 'removeCustomFilters':
         removeCustomFilters(request.hostname, request.selectors).then(modified => {
             if ( modified !== true ) { return; }
 
@@ -59,14 +59,8 @@ export async function backupToObject(currentConfig) {
     }
     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;
+    if ( customFilters.length !== 0 ) {
+        out.customFilters = customFilters;
     }
     const dnrRules = await localRead('userDnrRules');
     if ( typeof dnrRules === 'string' && dnrRules.length !== 0 ) {
@@ -120,27 +114,34 @@ export async function restoreFromObject(targetConfig) {
     });
 
     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)
+    const cosmeticFilters = targetConfig.cosmeticFilters;
+    if ( Array.isArray(cosmeticFilters) ) {
+        const hostnameMap = new Map();
+        for ( const line of 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);
+        }
+        if ( hostnameMap.size !== 0 ) {
+            await sendMessage({ what: 'addManyCustomFilters',
+                entries: Array.from(hostnameMap),
+            });
         }
-        selectors.push(selector);
     }
-    const promises = [];
-    for ( const [ hostname, selectors ] of hostnameMap ) {
-        promises.push(
-            sendMessage({ what: 'addCustomFilters', hostname, selectors })
-        );
+    const customFilters = targetConfig.customFilters;
+    if ( Array.isArray(customFilters) ) {
+        await sendMessage({ what: 'addManyCustomFilters',
+            entries: customFilters,
+        });
     }
-    await Promise.all(promises);
 
     const dnrRules = targetConfig.dnrRules ?? [];
     if ( dnrRules.length !== 0 ) {
 
@@ -280,6 +280,8 @@ const perScopeParsers = {
         case 'excludedInitiatorDomains':
         case 'requestDomains':
         case 'excludedRequestDomains':
+        case 'topDomains':
+        case 'excludedTopDomains':
         case 'resourceTypes':
         case 'excludedResourceTypes':
         case 'requestMethods':
@@ -328,6 +330,16 @@ const perScopeParsers = {
         rule.condition.excludedRequestDomains.push(node.val);
         return true;
     },
+    'condition.topDomains': function(scope, rule, node) {
+        if ( node.list !== true ) { return false; }
+        rule.condition.topDomains.push(node.val);
+        return true;
+    },
+    'condition.excludedTopDomains': function(scope, rule, node) {
+        if ( node.list !== true ) { return false; }
+        rule.condition.excludedTopDomains.push(node.val);
+        return true;
+    },
     'condition.resourceTypes': function(scope, rule, node) {
         if ( node.list !== true ) { return false; }
         if ( validResourceTypeValues.includes(node.val) === false ) { return false; }
 
@@ -532,7 +532,8 @@ function importFromFile() {
 function exportToFile() {
     const lines = [];
     for ( const hostnameNode of qsa$('.hostnames li.hostname') ) {
-        const hostname = punycode.toUnicode(hostnameFromNode(hostnameNode));
+        const hostname = punycode.toUnicode(hostnameFromNode(hostnameNode) || '');
+        if ( hostname === '' ) { continue; }
         const selectors = selectorsFromNode(hostnameNode);
         for ( const selector of selectors ) {
             lines.push(`${hostname}##${toPrettySelector(selector)}`);
 
@@ -47,33 +47,27 @@ const isCSS = a => isProcedural(a) === false && isScriptlet(a) === false;
 
 /******************************************************************************/
 
-async function flushWrites() {
-    while ( pendingWrites.length !== 0 ) {
-        const promises = pendingWrites;
-        pendingWrites.length = 0;
-        await Promise.all(promises);
-    }
-}
-
 async function keysFromStorage() {
-    await flushWrites();
-    return localKeys();
+    pendingStorageOp = pendingStorageOp.then(( ) => localKeys());
+    return pendingStorageOp;
 }
 
 async function readFromStorage(key) {
-    await flushWrites();
-    return localRead(key);
+    pendingStorageOp = pendingStorageOp.then(( ) => localRead(key));
+    return pendingStorageOp;
 }
 
 async function writeToStorage(key, value) {
-    pendingWrites.push(localWrite(key, value));
+    pendingStorageOp = pendingStorageOp.then(( ) => localWrite(key, value));
+    return pendingStorageOp;
 }
 
 async function removeFromStorage(key) {
-    pendingWrites.push(localRemove(key));
+    pendingStorageOp = pendingStorageOp.then(( ) => localRemove(key));
+    return pendingStorageOp;
 }
 
-const pendingWrites = [];
+let pendingStorageOp = Promise.resolve();
 
 /******************************************************************************/
 
@@ -117,7 +111,7 @@ async function getAllCustomFilterKeys() {
 export async function getAllCustomFilters() {
     const collect = async key => {
         const selectors = await readFromStorage(key);
-        return [ key.slice(5), selectors ];
+        return [ key.slice(5), selectors ?? [] ];
     };
     const keys = await getAllCustomFilterKeys();
     const promises = keys.map(k => collect(k));
@@ -168,7 +162,10 @@ export async function injectCustomFilters(tabId, frameId, hostname) {
     if ( proceduralSelectors.length !== 0 ) {
         promises.push(
             browser.scripting.executeScript({
-                files: [ '/js/scripting/css-procedural-api.js' ],
+                files: [
+                    '/js/scripting/css-api.js',
+                    '/js/scripting/css-procedural-api.js',
+                ],
                 target: { tabId, frameIds: [ frameId ] },
                 injectImmediately: true,
             }).catch(reason => {
 
@@ -284,6 +284,7 @@ dom.on('#gotoUnpicker', 'click', ( ) => {
     if ( browser.scripting === undefined ) { return; }
     browser.scripting.executeScript({
         files: [
+            '/js/scripting/css-procedural-api.js',
             '/js/scripting/tool-overlay.js',
             '/js/scripting/unpicker.js',
         ],
 
@@ -194,6 +194,8 @@ export class ReadWriteDNREditor extends DNREditor {
                     { token: 'excludedInitiatorDomains:', after: '\n    - ' },
                     { token: 'requestDomains:', after: '\n    - ' },
                     { token: 'excludedRequestDomains:', after: '\n    - ' },
+                    { token: 'topDomains:', after: '\n    - ' },
+                    { token: 'excludedTopDomains:', after: '\n    - ' },
                     { token: 'resourceTypes:', after: '\n    - ' },
                     { token: 'excludedResourceTypes:', after: '\n    - ' },
                     { token: 'requestMethods:', after: '\n    - ' },
 
@@ -371,10 +371,13 @@ function registerScriptlet(context, scriptletDetails) {
 
 export async function registerInjectables() {
     if ( browser.scripting === undefined ) { return false; }
+    registerInjectables.pendingOp =
+        registerInjectables.pendingOp.then(( ) => registerInjectables.register());
+    return registerInjectables.pendingOp;
+}
+registerInjectables.pendingOp = Promise.resolve();
 
-    if ( registerInjectables.barrier ) { return true; }
-    registerInjectables.barrier = true;
-
+registerInjectables.register = async function register() {
     const [
         filteringModeDetails,
         rulesetsDetails,
@@ -423,10 +426,8 @@ export async function registerInjectables() {
 
     await resetCSSCache();
 
-    registerInjectables.barrier = false;
-
     return true;
-}
+};
 
 /******************************************************************************/
 
 
@@ -162,6 +162,8 @@ function minimizeRuleset(rules) {
     rules = mergeArrays(rules, 'condition.excludedRequestDomains');
     rules = mergeArrays(rules, 'condition.initiatorDomains');
     rules = mergeArrays(rules, 'condition.excludedInitiatorDomains');
+    rules = mergeArrays(rules, 'condition.topDomains');
+    rules = mergeArrays(rules, 'condition.excludedTopDomains');
     rules = mergeArrays(rules, 'condition.resourceTypes');
     rules = mergeArrays(rules, 'condition.excludedRequestMethods');
     rules = mergeArrays(rules, 'condition.requestMethods');