fix: use alarms to remove declarativeNetRequest session rules

dessant · Oct 31, 2023 · 941d1ee · 941d1ee
1 parent be031ea
commit 941d1ee
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/src/background/main.js b/src/background/main.js
@@ -16,7 +16,8 @@ import {
   isAndroid,
   isMobile,
   getActiveTab,
-  getPlatform
+  getPlatform,
+  stringToInt
 } from 'utils/common';
 import {
   getEnabledEngines,
@@ -720,11 +721,9 @@ async function setupNewEngineTab(tabId, tabUrl, token, engine) {
           ]
         });
 
-        window.setTimeout(function () {
-          browser.declarativeNetRequest.updateSessionRules({
-            removeRuleIds: [tabId]
-          });
-        }, 60000);
+        browser.alarms.create(`delete-net-request-session-rule_${tabId}`, {
+          delayInMinutes: 1
+        });
       } else {
         await showNotification({messageId: 'error_engineSafariOutdated'});
       }
@@ -1355,6 +1354,11 @@ async function onAlarm({name}) {
   if (name.startsWith('delete-storage-item')) {
     const storageId = name.split('_')[1];
     await registry.deleteStorageItem({storageId});
+  } else if (name.startsWith('delete-net-request-session-rule')) {
+    const ruleId = stringToInt(name.split('_')[1]);
+    await browser.declarativeNetRequest.updateSessionRules({
+      removeRuleIds: [ruleId]
+    });
   }
 }
 

diff --git a/src/utils/common.js b/src/utils/common.js
@@ -667,6 +667,10 @@ async function isValidTab({tab, tabId = null} = {}) {
   }
 }
 
+function stringToInt(string) {
+  return parseInt(string, 10);
+}
+
 export {
   onError,
   onComplete,
@@ -707,5 +711,6 @@ export {
   addCssClass,
   waitForDocumentLoad,
   makeDocumentVisible,
-  isValidTab
+  isValidTab,
+  stringToInt
 };