統一在 dnr.ts

Author: cyfung1031

src/app/service/service_worker/dnr.ts

@@ -25,3 +25,34 @@ export const addSessionRules = async (rules: chrome.declarativeNetRequest.Rule[]
     }
   );
 };
+
+export const sessionRuleDynamicAdd = (rule: chrome.declarativeNetRequest.Rule, resolve?: ResolveFn) => {
+  chrome.declarativeNetRequest.updateSessionRules(
+    {
+      removeRuleIds: [rule.id],
+      addRules: [rule],
+    },
+    () => {
+      const lastError = chrome.runtime.lastError;
+      if (lastError) {
+        console.error("chrome.declarativeNetRequest.updateSessionRules:", lastError);
+      }
+      resolve?.();
+    }
+  );
+};
+
+export const sessionRuleDynamicRemove = (ruleId: number, resolve?: ResolveFn) => {
+  chrome.declarativeNetRequest.updateSessionRules(
+    {
+      removeRuleIds: [ruleId],
+    },
+    () => {
+      const lastError = chrome.runtime.lastError;
+      if (lastError) {
+        console.error("chrome.declarativeNetRequest.updateSessionRules:", lastError);
+      }
+      resolve?.();
+    }
+  );
+};

src/app/service/service_worker/gm_api/gm_api.ts

@@ -54,7 +54,7 @@ import { headerModifierMap, headersReceivedMap } from "./gm_xhr";
 import { BgGMXhr } from "@App/pkg/utils/xhr/bg_gm_xhr";
 import { mightPrepareSetClipboard, setClipboard } from "../clipboard";
 import { nativePageWindowOpen } from "../../offscreen/gm_api";
-import { addSessionRules } from "../dnr";
+import { addSessionRules, sessionRuleDynamicAdd, sessionRuleDynamicRemove } from "../dnr";
 
 let generatedUniqueMarkerIDs = "";
 let generatedUniqueMarkerIDWhen = "";
@@ -197,37 +197,6 @@ export const getConnectMatched = (
   return ConnectMatch.NONE;
 };
 
-const sessionRuleDynamicAdd = (rule: chrome.declarativeNetRequest.Rule, resolve?: ResolveFn) => {
-  chrome.declarativeNetRequest.updateSessionRules(
-    {
-      removeRuleIds: [rule.id],
-      addRules: [rule],
-    },
-    () => {
-      const lastError = chrome.runtime.lastError;
-      if (lastError) {
-        console.error("chrome.declarativeNetRequest.updateSessionRules:", lastError);
-      }
-      resolve?.();
-    }
-  );
-};
-
-const sessionRuleDynamicRemove = (ruleId: number, resolve?: ResolveFn) => {
-  chrome.declarativeNetRequest.updateSessionRules(
-    {
-      removeRuleIds: [ruleId],
-    },
-    () => {
-      const lastError = chrome.runtime.lastError;
-      if (lastError) {
-        console.error("chrome.declarativeNetRequest.updateSessionRules:", lastError);
-      }
-      resolve?.();
-    }
-  );
-};
-
 type NotificationData = {
   uuid: string;
   details: GMTypes.NotificationDetails;