🐛 修复注入代码构建问题

Author: CodFrm

src/app/service/content/content.ts

@@ -76,7 +76,7 @@ export default class ContentRuntime {
             let parentNode: EventTarget | undefined;
             // 判断是不是content脚本发过来的
             let msg: CustomEventMessage;
-            if (this.contentScript.has(data.uuid) || this.scriptExecutor.execList.has(data.uuid)) {
+            if (this.contentScript.has(data.uuid) || this.scriptExecutor.execMap.has(data.uuid)) {
               msg = this.scriptExecutorMsg;
             } else {
               msg = this.senderToInject;

src/app/service/content/script_executor.ts

@@ -14,7 +14,7 @@ export type ExecScriptEntry = {
 
 // 脚本执行器
 export class ScriptExecutor {
-  execList: Map<string, ExecScript> = new Map();
+  execMap: Map<string, ExecScript> = new Map();
 
   envInfo: GMInfoEnv | undefined;
   earlyScriptFlag: string[] = [];
@@ -27,15 +27,15 @@ export class ScriptExecutor {
 
   emitEvent(data: EmitEventRequest) {
     // 转发给脚本
-    const exec = this.execList.get(data.uuid);
+    const exec = this.execMap.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.values()) {
+    for (const val of this.execMap.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.values()) {
+        for (const val of this.execMap.values()) {
           if (val.scriptRes.flag === flag) {
             // 处理早期脚本的沙盒环境
             val.updateEarlyScriptGMInfo(this.envInfo!);
@@ -92,7 +92,7 @@ export class ScriptExecutor {
     const { scriptLoadInfo, scriptFunc, envInfo } = scriptEntry;
 
     const exec = new ExecScript(scriptLoadInfo, "content", this.msg, scriptFunc, envInfo);
-    this.execList.set(scriptLoadInfo.uuid, exec);
+    this.execMap.set(scriptLoadInfo.uuid, exec);
     const metadata = scriptLoadInfo.metadata || {};
     const resource = scriptLoadInfo.resource;
     // 注入css

src/app/service/content/utils.ts

@@ -106,7 +106,7 @@ export function compilePreInjectScript(
   const autoDeleteMountCode = autoDeleteMountFunction ? `try{delete window['${script.flag}']}catch(e){}` : "";
   return `window['${script.flag}'] = {
   scriptInfo: ${JSON.stringify(script)},
-  func: function(){${autoDeleteMountCode}${compileScriptCode(script, scriptCode)}}
+  func: function(){${autoDeleteMountCode}${scriptCode}}
   }`;
 }
 

src/app/service/service_worker/client.ts

@@ -257,7 +257,7 @@ export class RuntimeClient extends Client {
     return this.do("stopScript", uuid);
   }
 
-  pageLoad(): Promise<{ flag: string; scripts: ScriptLoadInfo[]; envInfo: GMInfoEnv }> {
+  pageLoad(): Promise<{ scripts: ScriptLoadInfo[]; envInfo: GMInfoEnv }> {
     return this.doThrow("pageLoad");
   }
 

src/app/service/service_worker/runtime.ts

@@ -972,8 +972,6 @@ export class RuntimeService {
       return { flag: "", scripts: [] };
     }
 
-    const scriptFlag = this.getMessageFlag();
-
     // 匹配当前页面的脚本（只包含有效脚本。自定义排除了的不包含）
     const matchingResult = this.getPageScriptMatchingResultByUrl(chromeSender.url!, false, false);
 
@@ -1180,7 +1178,6 @@ export class RuntimeService {
     }
 
     return {
-      flag: scriptFlag,
       scripts: enableScript,
       envInfo: {
         sandboxMode: "raw",

src/app/service/service_worker/utils.ts

@@ -5,6 +5,7 @@ import type { ScriptLoadInfo, ScriptMatchInfo } from "./types";
 import {
   compileInjectScript,
   compilePreInjectScript,
+  compileScriptCode,
   getScriptFlag,
   isEarlyStartScript,
   isInjectIntoContent,
@@ -181,10 +182,11 @@ export function parseScriptLoadInfo(script: ScriptRunResource): ScriptLoadInfo {
 export function compileInjectionCode(scriptRes: ScriptRunResource, scriptCode: string) {
   const preDocumentStartScript = isEarlyStartScript(scriptRes.metadata);
   let scriptInjectCode;
+  scriptCode = compileScriptCode(scriptRes, scriptCode);
   if (preDocumentStartScript) {
-    scriptInjectCode = compilePreInjectScript(parseScriptLoadInfo(scriptRes), scriptCode, true);
+    scriptInjectCode = compilePreInjectScript(parseScriptLoadInfo(scriptRes), scriptCode);
   } else {
-    scriptInjectCode = compileInjectScript(scriptRes, scriptCode, true);
+    scriptInjectCode = compileInjectScript(scriptRes, scriptCode);
   }
   return scriptInjectCode;
 }