InjectRuntime 代码对齐 ContentRuntime

Author: cyfung1031

src/content.ts

@@ -30,5 +30,6 @@ internalMessage.syncSend("pageLoad", null).then((resp) => {
   logger.logger().debug("content start");
   // 通过flag与inject建立通讯
   const contentMessage = new MessageContent(scriptFlag, true);
-  new ContentRuntime(contentMessage, internalMessage).start(resp);
+  const contentRuntime = new ContentRuntime(contentMessage, internalMessage);
+  contentRuntime.start(resp);
 });

src/inject.ts

@@ -2,7 +2,6 @@ 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是后端注入时候生成的
@@ -19,9 +18,8 @@ const logger = new LoggerCore({
 });
 
 
-message.setHandler("pageLoad", (_action, data: { scripts: ScriptRunResource[], executionToken?: string }) => {
-  assignExecutionToken(`${data.executionToken || ""}`);
+message.setHandler("pageLoad", (_action, resp: { scripts: ScriptRunResource[], executionToken?: string }) => {
   logger.logger().debug("inject start");
-  const runtime = new InjectRuntime(message, data.scripts, flag);
-  runtime.start();
+  const runtime = new InjectRuntime(message, flag);
+  runtime.start(resp);
 });

src/runtime/content/inject.ts

@@ -3,10 +3,10 @@ import { type ScriptRunResource } from "@App/app/repo/scripts";
 import ExecScript, { type ValueUpdateData } from "./exec_script";
 import { addStyleSheet, type ScriptFunc } from "./utils";
 import { onInjectPageLoaded } from "./external";
+import { assignExecutionToken } from "./gm_api";
 
 // 注入脚本的沙盒环境
 export default class InjectRuntime {
-  scripts: ScriptRunResource[];
 
   flag: string;
 
@@ -16,16 +16,15 @@ export default class InjectRuntime {
 
   constructor(
     message: MessageContent,
-    scripts: ScriptRunResource[],
     flag: string
   ) {
     this.message = message;
-    this.scripts = scripts;
     this.flag = flag;
   }
 
-  start() {
-    this.scripts.forEach((script) => {
+  start(resp: { scripts: ScriptRunResource[], executionToken?: string }) {
+    assignExecutionToken(`${resp.executionToken || ""}`);
+    resp.scripts.forEach((script) => {
       // @ts-ignore
       const scriptFunc = window[script.flag];
       if (scriptFunc) {