调整代码

Author: cyfung1031

src/app/repo/scripts.ts

@@ -84,7 +84,6 @@ export interface ScriptRunResource extends Script {
   grantMap: { [key: string]: string };
   value: { [key: string]: Value };
   flag: string;
-  executionToken?: string;
   resource: { [key: string]: Resource };
   sourceCode: string;
 }

src/inject.ts

@@ -1,6 +1,8 @@
 import LoggerCore from "./app/logger/core";
 import MessageWriter from "./app/logger/message_writer";
 import MessageContent from "./app/message/content";
+import { type ScriptRunResource } from "./app/repo/scripts";
+import { assignExecutionToken } from "./runtime/content/gm_api";
 import InjectRuntime from "./runtime/content/inject";
 
 // 通过flag与content建立通讯,这个ScriptFlag是后端注入时候生成的
@@ -17,7 +19,8 @@ const logger = new LoggerCore({
 });
 
 
-message.setHandler("pageLoad", (_action, data) => {
+message.setHandler("pageLoad", (_action, data: { scripts: ScriptRunResource[], executionToken?: string }) => {
+  assignExecutionToken(`${data.executionToken || ""}`);
   logger.logger().debug("inject start");
   const runtime = new InjectRuntime(message, data.scripts, flag);
   runtime.start();

src/runtime/background/gm_api.ts

@@ -50,28 +50,29 @@ export type Request = MessageRequest & {
 
 export type Api = (request: Request, connect?: Channel) => Promise<any>;
 
-export default class GMApi {
-  static executionMap = new Map<
-    string,
-    { scriptIds: Set<number>; tabId: number }
-  >();
-
-  static registerScriptExecution(scriptIds: number[], tabId: number) {
-    const token = uuidv4();
-    this.executionMap.set(token, {
-      scriptIds: new Set(scriptIds),
-      tabId,
-    });
-    return token;
-  }
+const executionMap = new Map<
+  string,
+  { scriptIds: Set<number>; tabId: number }
+>();
+
+export const registerScriptExecution = (scriptIds: number[], tabId: number): string => {
+  const token = uuidv4();
+  executionMap.set(token, {
+    scriptIds: new Set(scriptIds),
+    tabId,
+  });
+  return token;
+};
 
-  static removeTabExecutions(tabId: number) {
-    this.executionMap.forEach((execution, token) => {
-      if (execution.tabId === tabId) {
-        this.executionMap.delete(token);
-      }
-    });
-  }
+export const removeTabExecutions = (tabId: number) => {
+  executionMap.forEach((execution, token) => {
+    if (execution.tabId === tabId) {
+      executionMap.delete(token);
+    }
+  });
+};
+
+export default class GMApi {
 
   message: MessageHander;
 
@@ -191,7 +192,7 @@ export default class GMApi {
     if (!request.executionToken) {
       throw new Error("script execution is not trusted");
     }
-    const execution = GMApi.executionMap.get(request.executionToken);
+    const execution = executionMap.get(request.executionToken);
     if (!execution || !execution.scriptIds.has(request.scriptId)) {
       throw new Error("script execution is not trusted");
     }

src/runtime/background/runtime.ts

@@ -29,7 +29,7 @@ import Manager from "@App/app/service/manager";
 import Hook from "@App/app/service/hook";
 import { i18nName } from "@App/locales/locales";
 import { compileInjectScript, compileScriptCode } from "../content/utils";
-import GMApi, { type Request } from "./gm_api";
+import GMApi, { registerScriptExecution, removeTabExecutions, type Request } from "./gm_api";
 import { genScriptMenu } from "./utils";
 
 export type RuntimeEvent = "start" | "stop" | "watchRunStatus";
@@ -285,7 +285,7 @@ export default class Runtime extends Manager {
     };
     chrome.tabs.onRemoved.addListener((tabId) => {
       runScript.delete(tabId);
-      GMApi.removeTabExecutions(tabId);
+      removeTabExecutions(tabId);
     });
     // 给popup页面获取运行脚本,与菜单
     this.message.setHandler(
@@ -432,16 +432,18 @@ export default class Runtime extends Manager {
             return;
           }
 
-          const executionToken = GMApi.registerScriptExecution(
+          const executionToken = registerScriptExecution(
             filter.map((script) => script.id),
             sender.tabId!
           );
-          const runResources = filter.map((script) => ({
-            ...script,
-            executionToken,
-          }));
 
-          resolve({ scripts: runResources });
+          const runResources = filter;
+          // const runResources = filter.map((script) => ({
+          //   ...script,
+          //   executionToken,
+          // }));
+
+          resolve({ scripts: runResources, executionToken });
 
           // 注入脚本
           runResources.forEach((script) => {

src/runtime/content/content.ts

@@ -3,6 +3,7 @@ import MessageContent from "@App/app/message/content";
 import MessageInternal from "@App/app/message/internal";
 import { MessageHander, MessageManager } from "@App/app/message/message";
 import { ScriptRunResource } from "@App/app/repo/scripts";
+import { assignExecutionToken } from "./gm_api";
 
 // content页的处理
 export default class ContentRuntime {
@@ -18,7 +19,8 @@ export default class ContentRuntime {
     this.internalMessage = internalMessage;
   }
 
-  start(resp: { scripts: ScriptRunResource[] }) {
+  start(resp: { scripts: ScriptRunResource[], executionToken?: string }) {
+    assignExecutionToken(`${resp.executionToken || ""}`);
     // 由content到background
     // 转发gmApi消息
     this.contentMessage.setHandler("gmApi", (action, data) => {

src/runtime/content/gm_api.ts

@@ -11,6 +11,14 @@ import { parseUserConfig } from "@App/pkg/utils/yaml";
 import { v4 as uuidv4 } from "uuid";
 import { type ValueUpdateData } from "./exec_script";
 
+// content/page 环境的变数，不储存在任何object
+let currentExecutionToken = "";
+export const assignExecutionToken = (executionToken: string) => {
+  // content/page 环境 pageLoad 时储存由 background 生成的 executionToken
+  if (currentExecutionToken) throw new Error("currentExecutionToken cannot be re-assigned");
+  currentExecutionToken = executionToken;
+};
+
 interface ApiParam {
   depend?: string[];
   listener?: () => void;
@@ -77,7 +85,7 @@ export class GM_Base {
       scriptId: this.scriptRes.id,
       params,
       runFlag: this.runFlag,
-      executionToken: this.scriptRes.executionToken,
+      executionToken: currentExecutionToken,
     });
   }
 
@@ -91,7 +99,7 @@ export class GM_Base {
       scriptId: this.scriptRes.id,
       params,
       runFlag: this.runFlag,
-      executionToken: this.scriptRes.executionToken,
+      executionToken: currentExecutionToken,
     });
     return channel;
   }

src/runtime/gm_api.test.ts

@@ -1,7 +1,7 @@
 // gm api 单元测试
 // 初始化runtime环境
 import initTestEnv from "@App/pkg/utils/test_utils";
-import GMApi from "./background/gm_api";
+import GMApi, { registerScriptExecution } from "./background/gm_api";
 import LoggerCore from "@App/app/logger/core";
 import MessageCenter from "@App/app/message/center";
 import { ScriptDAO, ScriptRunResource } from "@App/app/repo/scripts";
@@ -111,7 +111,7 @@ describe("GM execution trust", () => {
   });
 
   it("accepts content messages with a matching execution token", async () => {
-    const executionToken = GMApi.registerScriptExecution([scriptRes.id], 1);
+    const executionToken = registerScriptExecution([scriptRes.id], 1);
     await expect(
       backgroundApi.parseRequest(
         {
@@ -129,7 +129,6 @@ describe("GM execution trust", () => {
       )
     ).resolves.toMatchObject({
       scriptId: scriptRes.id,
-      executionToken,
     });
   });
 });