🐛 修复早期启动脚本无法使用GM_addElement的问题 #801

CodFrm · CodFrm · commit 7a8c0b32ee88 · 2025-10-13T21:20:19.000+08:00
diff --git a/src/app/service/content/content.ts b/src/app/service/content/content.ts
@@ -5,7 +5,8 @@ import type { MessageSend } from "@Packages/message/types";
 import type { GMInfoEnv } from "./types";
 import type { ScriptLoadInfo } from "../service_worker/types";
 import type { ScriptExecutor } from "./script_executor";
-import { isInjectIntoContent } from "./utils";
+import { definePropertyListener, isInjectIntoContent } from "./utils";
+import { RuntimeClient } from "../service_worker/client";
 
 // content页的处理
 export default class ContentRuntime {
@@ -75,7 +76,7 @@ export default class ContentRuntime {
             let parentNode: EventTarget | undefined;
             // 判断是不是content脚本发过来的
             let msg: CustomEventMessage;
-            if (this.contentScript.has(data.uuid)) {
+            if (this.contentScript.has(data.uuid) || this.scriptExecutor.execList.has(data.uuid)) {
               msg = this.scriptExecutorMsg;
             } else {
               msg = this.senderToInject;
@@ -125,6 +126,19 @@ export default class ContentRuntime {
     );
   }
 
+  pageLoad() {
+    // 处理content EarlyScript
+    definePropertyListener(window, "EarlyScriptFlag", (flag: string[]) => {
+      this.scriptExecutor.checkEarlyStartScript(flag);
+    });
+
+    const client = new RuntimeClient(this.senderToExt);
+    // 向service_worker请求脚本列表
+    client.pageLoad().then((data) => {
+      this.start(data.scripts, data.envInfo);
+    });
+  }
+
   start(scripts: ScriptLoadInfo[], envInfo: GMInfoEnv) {
     // 启动脚本
     const client = new Client(this.senderToInject, "inject");
diff --git a/src/app/service/content/script_executor.ts b/src/app/service/content/script_executor.ts
@@ -3,18 +3,18 @@ import { getStorageName } from "@App/pkg/utils/utils";
 import type { EmitEventRequest, ScriptLoadInfo } from "../service_worker/types";
 import ExecScript from "./exec_script";
 import type { GMInfoEnv, ScriptFunc, PreScriptFunc, ValueUpdateDataEncoded } from "./types";
-import { addStyle } from "./utils";
+import { addStyle, definePropertyListener } from "./utils";
 
 export type ExecScriptEntry = {
-  scriptLoadInfo: any;
+  scriptLoadInfo: ScriptLoadInfo;
   scriptFlag: string;
   envInfo: any;
   scriptFunc: any;
 };
 
 // 脚本执行器
 export class ScriptExecutor {
-  execList: ExecScript[] = [];
+  execList: Map<string, ExecScript> = new Map();
 
   envInfo: GMInfoEnv | undefined;
   earlyScriptFlag: string[] = [];
@@ -27,15 +27,15 @@ export class ScriptExecutor {
 
   emitEvent(data: EmitEventRequest) {
     // 转发给脚本
-    const exec = this.execList.find((val) => val.scriptRes.uuid === data.uuid);
+    const exec = this.execList.get(data.uuid);
     if (exec) {
       exec.emitEvent(data.event, data.eventId, data.data);
     }
   }
 
   valueUpdate(data: ValueUpdateDataEncoded) {
     const { uuid, storageName } = data;
-    for (const val of this.execList) {
+    for (const val of this.execList.values()) {
       if (val.scriptRes.uuid === uuid || getStorageName(val.scriptRes) === storageName) {
         val.valueUpdate(data);
       }
@@ -55,7 +55,7 @@ export class ScriptExecutor {
       const flag = script.flag;
       // 如果是EarlyScriptFlag，处理沙盒环境
       if (this.earlyScriptFlag.includes(flag)) {
-        for (const val of this.execList) {
+        for (const val of this.execList.values()) {
           if (val.scriptRes.flag === flag) {
             // 处理早期脚本的沙盒环境
             val.updateEarlyScriptGMInfo(this.envInfo!);
@@ -64,23 +64,10 @@ export class ScriptExecutor {
         }
         return;
       }
-      // @ts-ignore
-      const scriptFunc = window[flag];
-      if (scriptFunc) {
-        // @ts-ignore
-        window[flag] = null; // 释放物件参考
-        loadExec(script, scriptFunc);
-      } else {
-        // 监听脚本加载,和屏蔽读取
-        Object.defineProperty(window, flag, {
-          configurable: true,
-          set: (val: ScriptFunc) => {
-            // @ts-ignore
-            delete window[flag]; // 删除 property setter 避免重复呼叫
-            loadExec(script, val);
-          },
-        });
-      }
+
+      definePropertyListener(window, flag, (val: ScriptFunc) => {
+        loadExec(script, val);
+      });
     });
   }
 
@@ -95,33 +82,17 @@ export class ScriptExecutor {
       });
     };
     this.earlyScriptFlag.forEach((flag) => {
-      // @ts-ignore
-      const scriptFunc = window[flag] as PreScriptFunc;
-      if (scriptFunc) {
-        // @ts-ignore
-        window[flag] = null; // 释放物件参考
-        loadExec(flag, scriptFunc);
-      } else {
-        // 监听脚本加载,和屏蔽读取
-        Object.defineProperty(window, flag, {
-          configurable: true,
-          set: (val: PreScriptFunc) => {
-            // @ts-ignore
-            delete window[flag]; // 取消 property setter 避免重复呼叫
-            loadExec(flag, val);
-          },
-        });
-      }
+      definePropertyListener(window, flag, (val: PreScriptFunc) => {
+        loadExec(flag, val);
+      });
     });
   }
 
   execScriptEntry(scriptEntry: ExecScriptEntry) {
-    const { scriptFlag, scriptLoadInfo, scriptFunc, envInfo } = scriptEntry;
+    const { scriptLoadInfo, scriptFunc, envInfo } = scriptEntry;
 
-    // @ts-ignore
-    delete window[scriptFlag];
     const exec = new ExecScript(scriptLoadInfo, "content", this.msg, scriptFunc, envInfo);
-    this.execList.push(exec);
+    this.execList.set(scriptLoadInfo.uuid, exec);
     const metadata = scriptLoadInfo.metadata || {};
     const resource = scriptLoadInfo.resource;
     // 注入css
diff --git a/src/app/service/content/utils.ts b/src/app/service/content/utils.ts
@@ -137,3 +137,19 @@ export const getScriptFlag = (uuid: string) => {
   // 实作内容有待检讨
   return `#-${uuid}`;
 };
+
+// 监听属性设置
+export function definePropertyListener<T>(obj: any, prop: string, listener: (val: T) => void) {
+  if (obj[prop] !== undefined) {
+    listener(obj[prop]);
+    delete obj[prop];
+    return;
+  }
+  Object.defineProperty(obj, prop, {
+    configurable: true,
+    set: (val: any) => {
+      delete obj[prop]; // 删除 property setter
+      listener(val);
+    },
+  });
+}
diff --git a/src/app/service/service_worker/runtime.ts b/src/app/service/service_worker/runtime.ts
@@ -1232,7 +1232,7 @@ export class RuntimeService {
     return [
       {
         id: "scriptcat-early-start-flag",
-        js: [{ code: "window.EarlyScriptFlag=" + flagParam + ";" }],
+        js: [{ code: `window.EarlyScriptFlag=${flagParam};window.MessageFlag="${messageFlag}"` }],
         matches: ["<all_urls>"],
         allFrames: true,
         world: "USER_SCRIPT",
diff --git a/src/content.ts b/src/content.ts
@@ -2,69 +2,55 @@ import LoggerCore from "./app/logger/core";
 import MessageWriter from "./app/logger/message_writer";
 import { ExtensionMessage } from "@Packages/message/extension_message";
 import { CustomEventMessage } from "@Packages/message/custom_event_message";
-import { RuntimeClient } from "./app/service/service_worker/client";
 import { Server } from "@Packages/message/server";
 import ContentRuntime from "./app/service/content/content";
 import { ScriptExecutor } from "./app/service/content/script_executor";
 import { randomMessageFlag } from "./pkg/utils/utils";
 import type { Message } from "@Packages/message/types";
+import { definePropertyListener } from "./app/service/content/utils";
 
 declare global {
   interface Window {
     EarlyScriptFlag?: string[];
+    MessageFlag?: string;
   }
 }
 
 if (typeof chrome?.runtime?.onMessage?.addListener !== "function") {
   // ScriptCat 未支持 Firefox MV3
   console.error("Firefox MV3 UserScripts is not yet supported by ScriptCat");
 } else {
-  // 建立与service_worker页面的连接
-  const extMsgComm: Message = new ExtensionMessage(false);
+  const start = (messageFlag: string) => {
+    // 建立与service_worker页面的连接
+    const extMsgComm: Message = new ExtensionMessage(false);
+    // 初始化日志组件
+    const loggerCore = new LoggerCore({
+      writer: new MessageWriter(extMsgComm),
+      labels: { env: "content" },
+    });
 
-  // 处理scriptExecutor
-  const scriptExecutorFlag = randomMessageFlag();
-  const scriptExecutorMsg = new CustomEventMessage(scriptExecutorFlag, true);
-  const scriptExecutor = new ScriptExecutor(new CustomEventMessage(scriptExecutorFlag, false));
+    loggerCore.logger().debug("content start");
 
-  const loadEarlyScriptFlag = (flag: string[]) => {
-    scriptExecutor.checkEarlyStartScript(flag);
-  };
-  // 处理EarlyScript
-  const earylyFlag = window.EarlyScriptFlag;
-  if (earylyFlag) {
-    // @ts-ignore
-    window.EarlyScriptFlag = null; // 释放物件参考
-    loadEarlyScriptFlag(earylyFlag);
-  } else {
-    // 监听属性设置
-    Object.defineProperty(window, "EarlyScriptFlag", {
-      configurable: true,
-      set: (val: string[]) => {
-        delete window.EarlyScriptFlag; // 删除 property setter 避免重复呼叫
-        loadEarlyScriptFlag(val);
-      },
-    });
-  }
+    const msgInject = new CustomEventMessage(messageFlag, true);
 
-  // 初始化日志组件
-  const loggerCore = new LoggerCore({
-    writer: new MessageWriter(extMsgComm),
-    labels: { env: "content" },
-  });
+    // 处理scriptExecutor
+    const scriptExecutorFlag = randomMessageFlag();
+    const scriptExecutorMsg = new CustomEventMessage(scriptExecutorFlag, true);
+    const scriptExecutor = new ScriptExecutor(new CustomEventMessage(scriptExecutorFlag, false));
 
-  const client = new RuntimeClient(extMsgComm);
-  client.pageLoad().then((data) => {
-    loggerCore.logger().debug("content start");
-    const msgInject = new CustomEventMessage(data.flag, true);
     const server = new Server("content", [msgInject, scriptExecutorMsg]);
+
     // Opera中没有chrome.runtime.onConnect，并且content也不需要chrome.runtime.onConnect
     // 所以不需要处理连接，设置为false
     const extServer = new Server("content", extMsgComm, false);
     // scriptExecutor的消息接口
     // 初始化运行环境
     const runtime = new ContentRuntime(extServer, server, extMsgComm, msgInject, scriptExecutorMsg, scriptExecutor);
     runtime.init();
-    runtime.start(data.scripts, data.envInfo);
-  });
+    // 页面加载，注入脚本
+    runtime.pageLoad();
+  };
+
+  // 监听MessageFlag
+  definePropertyListener(window, "MessageFlag", start);
 }

Original file line number	Diff line number	Diff line change
`@@ -1232,7 +1232,7 @@ export class RuntimeService {`
`1232`	`1232`	`return [`
`1233`	`1233`	`{`
`1234`	`1234`	`id: "scriptcat-early-start-flag",`
`1235`		`- js: [{ code: "window.EarlyScriptFlag=" + flagParam + ";" }],`
	`1235`	+ js: [{ code: `window.EarlyScriptFlag=${flagParam};window.MessageFlag="${messageFlag}"` }],
`1236`	`1236`	`matches: ["<all_urls>"],`
`1237`	`1237`	`allFrames: true,`
`1238`	`1238`	`world: "USER_SCRIPT",`