🐛 修复后台脚本读取userConfig的问题

Author: CodFrm

src/app/service/content/exec_script.ts

@@ -1,10 +1,9 @@
 import LoggerCore from "@App/app/logger/core";
 import Logger from "@App/app/logger/logger";
-import { ScriptRunResouce } from "@App/app/repo/scripts";
 import GMApi from "./gm_api";
 import { compileScript, createContext, proxyContext, ScriptFunc } from "./utils";
 import { Message } from "@Packages/message/server";
-import { PageLoadScript, ScriptMatchInfo } from "../service_worker/runtime";
+import { ScriptLoadInfo } from "../service_worker/runtime";
 
 export type ValueUpdateSender = {
   runFlag: string;
@@ -24,7 +23,7 @@ export class RuntimeMessage {}
 
 // 执行脚本,控制脚本执行与停止
 export default class ExecScript {
-  scriptRes: PageLoadScript;
+  scriptRes: ScriptLoadInfo;
 
   scriptFunc: ScriptFunc;
 
@@ -37,7 +36,7 @@ export default class ExecScript {
   GM_info: any;
 
   constructor(
-    scriptRes: PageLoadScript,
+    scriptRes: ScriptLoadInfo,
     envPrefix: "content" | "offscreen",
     message: Message,
     code: string | ScriptFunc,

src/app/service/content/exec_warp.ts

@@ -1,7 +1,7 @@
 import { ScriptRunResouce } from "@App/app/repo/scripts";
 import ExecScript from "./exec_script";
 import { Message } from "@Packages/message/server";
-import { PageLoadScript } from "../service_worker/runtime";
+import { ScriptLoadInfo } from "../service_worker/runtime";
 
 export class CATRetryError {
   msg: string;
@@ -23,7 +23,7 @@ export class BgExecScriptWarp extends ExecScript {
 
   setInterval: Map<number, boolean>;
 
-  constructor(scriptRes: PageLoadScript, message: Message) {
+  constructor(scriptRes: ScriptLoadInfo, message: Message) {
     const thisContext: { [key: string]: any } = {};
     const setTimeout = new Map<number, any>();
     const setInterval = new Map<number, any>();

src/app/service/content/gm_api.ts

@@ -1,5 +1,5 @@
 import { ScriptRunResouce } from "@App/app/repo/scripts";
-import { base64ToBlob, getMetadataStr, getUserConfigStr, parseUserConfig } from "@App/pkg/utils/script";
+import { base64ToBlob, parseUserConfig } from "@App/pkg/utils/script";
 import { ValueUpdateData } from "./exec_script";
 import { ExtVersion } from "@App/app/const";
 import { Message, MessageConnect } from "@Packages/message/server";
@@ -9,7 +9,7 @@ import { connect, sendMessage } from "@Packages/message/client";
 import EventEmitter from "eventemitter3";
 import { getStorageName } from "@App/pkg/utils/utils";
 import { MessageRequest } from "../service_worker/gm_api";
-import { PageLoadScript, ScriptMatchInfo } from "../service_worker/runtime";
+import { ScriptLoadInfo } from "../service_worker/runtime";
 
 interface ApiParam {
   depend?: string[];
@@ -113,7 +113,7 @@ export default class GMApi {
   }
 
   // 获取脚本信息和管理器信息
-  static GM_info(script: PageLoadScript) {
+  static GM_info(script: ScriptLoadInfo) {
     const options = {
       description: script.metadata.description?.[0] || null,
       matches: script.metadata.match || [],

src/app/service/sandbox/runtime.ts

@@ -14,7 +14,9 @@ import { proxyUpdateRunStatus } from "../offscreen/client";
 import { BgExecScriptWarp } from "../content/exec_warp";
 import ExecScript, { ValueUpdateData } from "../content/exec_script";
 import { getStorageName } from "@App/pkg/utils/utils";
-import { EmitEventRequest } from "../service_worker/runtime";
+import { EmitEventRequest, ScriptLoadInfo } from "../service_worker/runtime";
+import { CATRetryError } from "../content/exec_warp";
+import { getMetadataStr, getUserConfigStr } from "@App/pkg/utils/script";
 
 export class Runtime {
   cronJob: Map<string, Array<CronJob>> = new Map();
@@ -24,7 +26,7 @@ export class Runtime {
   logger: Logger;
 
   retryList: {
-    script: ScriptRunResouce;
+    script: ScriptLoadInfo;
     retryTime: number;
   }[] = [];
 
@@ -55,7 +57,7 @@ export class Runtime {
     }, 5000);
   }
 
-  joinRetryList(script: ScriptRunResouce) {
+  joinRetryList(script: ScriptLoadInfo) {
     if (script.nextruntime) {
       this.retryList.push({
         script,
@@ -80,13 +82,16 @@ export class Runtime {
     if (this.execScripts.has(script.uuid)) {
       await this.disableScript(script.uuid);
     }
+    const loadScript = script as ScriptLoadInfo;
+    loadScript.metadataStr = getMetadataStr(script.code) || "";
+    loadScript.userConfigStr = getUserConfigStr(script.code) || "";
     if (script.type === SCRIPT_TYPE_BACKGROUND) {
       // 后台脚本直接运行起来
-      return this.execScript(script);
+      return this.execScript(loadScript);
     } else {
       // 定时脚本加入定时任务
       await this.stopCronJob(script.uuid);
-      return this.crontabScript(script);
+      return this.crontabScript(loadScript);
     }
   }
 
@@ -103,7 +108,7 @@ export class Runtime {
   }
 
   // 执行脚本
-  async execScript(script: ScriptRunResouce, execOnce?: boolean) {
+  async execScript(script: ScriptLoadInfo, execOnce?: boolean) {
     const logger = this.logger.with({ script: script.uuid, name: script.name });
     if (this.execScripts.has(script.uuid)) {
       // 释放掉资源
@@ -158,7 +163,7 @@ export class Runtime {
     return ret;
   }
 
-  crontabScript(script: ScriptRunResouce) {
+  crontabScript(script: ScriptLoadInfo) {
     // 执行定时脚本 运行表达式
     if (!script.metadata.crontab) {
       throw new Error(script.name + " - 错误的crontab表达式");
@@ -209,7 +214,7 @@ export class Runtime {
     return !flag;
   }
 
-  crontabExec(script: ScriptRunResouce, oncePos: number) {
+  crontabExec(script: ScriptLoadInfo, oncePos: number) {
     if (oncePos) {
       return () => {
         // 没有最后一次执行时间表示之前都没执行过,直接执行
@@ -289,7 +294,10 @@ export class Runtime {
     if (exec) {
       await this.stopScript(script.uuid);
     }
-    return this.execScript(script, true);
+    const loadScript = script as ScriptLoadInfo;
+    loadScript.metadataStr = getMetadataStr(script.code) || "";
+    loadScript.userConfigStr = getUserConfigStr(script.code) || "";
+    return this.execScript(loadScript, true);
   }
 
   valueUpdate(data: ValueUpdateData) {

src/app/service/service_worker/runtime.ts

@@ -36,7 +36,7 @@ export interface ScriptMatchInfo extends ScriptRunResouce {
   customizeExcludeMatches: string[];
 }
 
-export interface PageLoadScript extends ScriptMatchInfo {
+export interface ScriptLoadInfo extends ScriptMatchInfo {
   metadataStr: string; // 脚本元数据字符串
   userConfigStr: string; // 用户配置字符串
 }
@@ -352,9 +352,9 @@ export class RuntimeService {
           return arr;
         }
       }
-      arr.push(scriptRes as PageLoadScript);
+      arr.push(scriptRes as ScriptLoadInfo);
       return arr;
-    }, [] as PageLoadScript[]);
+    }, [] as ScriptLoadInfo[]);
 
     await Promise.all([
       // 加载value