✨ 开启开关单独控制隐身模式与主窗口 #571

Author: CodFrm

src/app/service/service_worker/runtime.ts

@@ -179,14 +179,21 @@ export class RuntimeService {
       });
     });
 
-    this.systemConfig.addListener("enable_script", (enable) => {
-      this.isEnableUserscribe = enable;
-      if (enable) {
-        this.registerUserscripts();
-      } else {
-        this.unregisterUserscripts();
+    this.systemConfig.addListener(
+      "enable_script" + (chrome.extension.inIncognitoContext ? "_incognito" : ""),
+      async (enable) => {
+        this.isEnableUserscribe = await this.systemConfig.getEnableScript();
+        if (chrome.extension.inIncognitoContext) {
+          // 隐身窗口不对注册了的脚本进行实际操作
+          return;
+        }
+        if (enable) {
+          this.registerUserscripts();
+        } else {
+          this.unregisterUserscripts();
+        }
       }
-    });
+    );
     // 检查是否开启
     this.isEnableUserscribe = await this.systemConfig.getEnableScript();
     if (this.isEnableUserscribe) {
@@ -380,6 +387,9 @@ export class RuntimeService {
   }
 
   async pageLoad(_: any, sender: GetSender) {
+    if (!this.isEnableUserscribe) {
+      return { flag: "", scripts: [] };
+    }
     // 判断是否黑名单
     const isBlack = this.blackMatch.match(sender.getSender().url!);
     if (isBlack.length > 0) {

src/pkg/config/config.ts

@@ -274,11 +274,22 @@ export class SystemConfig {
   }
 
   setEnableScript(enable: boolean) {
+    if (chrome.extension.inIncognitoContext) {
+      return this.set("enable_script_incognito", enable);
+    }
     this.set("enable_script", enable);
   }
 
-  getEnableScript(): Promise<boolean> {
-    return this.get("enable_script", true);
+  async getEnableScript(): Promise<boolean> {
+    const enableScript = await this.get("enable_script", true);
+    if (chrome.extension.inIncognitoContext) {
+      // 如果是隐身窗口，主窗口设置为false，直接返回false
+      if (enableScript === false) {
+        return false;
+      }
+      return this.get("enable_script_incognito", true);
+    }
+    return enableScript;
   }
 
   setBlacklist(blacklist: string) {