🐛 修复 early 脚本 GM_info.scriptMetaStr 问题 #801

Author: CodFrm

src/app/repo/scripts.ts

@@ -82,7 +82,7 @@ export type ScriptAndCode = Script & ScriptCode;
 
 // 脚本运行时的资源,包含已经编译好的脚本与脚本需要的资源
 export interface ScriptRunResource extends Script {
-  code: string;
+  code: string; // 原始代码
   value: { [key: string]: any };
   flag: string;
   resource: { [key: string]: { base64?: string } & Omit<Resource, "base64"> }; // 资源列表,包含脚本需要的资源

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}${scriptCode}}
+  func: function(){${autoDeleteMountCode}${compileScriptCode(script, scriptCode)}}
   }`;
 }
 

src/app/service/service_worker/runtime.ts

@@ -29,7 +29,6 @@ import { sendMessage } from "@Packages/message/client";
 import type { CompileScriptCodeResource } from "../content/utils";
 import {
   compileInjectScriptByFlag,
-  compileScriptCode,
   compileScriptCodeByResource,
   getScriptFlag,
   isEarlyStartScript,
@@ -304,7 +303,7 @@ export class RuntimeService {
 
   async updateResourceOnScriptChange(script: Script) {
     if (script.type !== SCRIPT_TYPE_NORMAL || script.status !== SCRIPT_STATUS_ENABLE) {
-      throw "Invalid Calling of updateResourceOnScriptChange";
+      throw new Error("Invalid Calling of updateResourceOnScriptChange");
     }
     // 安装，启用，或earlyStartScript的value更新
     const ret = await this.buildAndSaveCompiledResourceFromScript(script, true);
@@ -645,8 +644,7 @@ export class RuntimeService {
 
     let jsCode = "";
     if (withCode) {
-      const scriptCode = scriptRes.code;
-      const code = compileInjectionCode(scriptMatchInfo, scriptCode);
+      const code = compileInjectionCode(scriptRes, scriptRes.code);
       registerScript.js[0].code = jsCode = code;
     }
 
@@ -662,7 +660,7 @@ export class RuntimeService {
     const scriptUrlPatterns = scriptMatchInfo.scriptUrlPatterns;
     const originalUrlPatterns = scriptMatchInfo.originalUrlPatterns;
     const result = {
-      flag: scriptMatchInfo.flag,
+      flag: scriptRes.flag,
       name: script.name,
       require: resourceUrls, // 仅储存url
       uuid: script.uuid,
@@ -682,15 +680,14 @@ export class RuntimeService {
     return { compiledResource: result, jsCode, apiScript: registerScript };
   }
 
+  // 从CompiledResource中还原脚本代码
   async restoreJSCodeFromCompiledResource(script: Script, result: CompiledResource) {
     const earlyScript = isEarlyStartScript(script.metadata);
     // 如果是预加载脚本，需要另外的处理方式
     if (earlyScript) {
       const scriptRes = await this.script.buildScriptRunResource(script);
       if (!scriptRes) return "";
-      const scriptMatchInfo = await this.applyScriptMatchInfo(scriptRes);
-      if (!scriptMatchInfo) return "";
-      return compileInjectionCode(scriptMatchInfo, scriptRes.code);
+      return compileInjectionCode(scriptRes, scriptRes.code);
     }
 
     const originalCode = await this.script.scriptCodeDAO.get(result.uuid);
@@ -1141,8 +1138,7 @@ export class RuntimeService {
         const scriptRes = scriptsWithUpdatedResources.get(targetUUID);
         const scriptDAOCode = scriptCodes[targetUUID];
         if (scriptRes && scriptDAOCode) {
-          const scriptCode = compileScriptCode(scriptRes, scriptDAOCode);
-          const scriptInjectCode = compileInjectionCode(scriptRes, scriptCode);
+          const scriptInjectCode = compileInjectionCode(scriptRes, scriptDAOCode);
           scriptRegisterInfo.js = [
             {
               code: scriptInjectCode,
@@ -1301,7 +1297,7 @@ export class RuntimeService {
   }
 
   /**
-   * applyScriptMatchInfo 会进行 scriptMatch 的更新
+   * applyScriptMatchInfo 对脚本进行URL匹配信息的处理
    */
   async applyScriptMatchInfo(scriptRes: ScriptRunResource) {
     const o = scriptURLPatternResults(scriptRes);

src/app/service/service_worker/script.ts

@@ -26,7 +26,7 @@ import { type IMessageQueue } from "@Packages/message/message_queue";
 import { createScriptInfo, type ScriptInfo, type InstallSource } from "@App/pkg/utils/scriptInstall";
 import { type ResourceService } from "./resource";
 import { type ValueService } from "./value";
-import { compileScriptCode, isEarlyStartScript } from "../content/utils";
+import { isEarlyStartScript } from "../content/utils";
 import { type SystemConfig } from "@App/pkg/config/config";
 import { localePath } from "@App/locales/locales";
 import { arrayMove } from "@dnd-kit/sortable";
@@ -530,7 +530,6 @@ export class ScriptService {
       ret.value = value;
       ret.resource = resource;
       ret.code = code.code;
-      ret.code = compileScriptCode(ret);
       return ret;
     });
   }

src/app/service/service_worker/types.ts

@@ -12,7 +12,7 @@ export type SearchType = "auto" | "name" | "script_code";
  * 脚本匹配信息。
  * 扩展自 ScriptRunResource。
  */
-export interface ScriptMatchInfo extends ScriptRunResource {
+export interface ScriptMatchInfo extends Script {
   /** 已被自定义覆盖的 UrlPatterns */
   scriptUrlPatterns: URLRuleEntry[];
   /** 脚本原本的 UrlPatterns */

src/app/service/service_worker/utils.ts

@@ -178,7 +178,7 @@ export function parseScriptLoadInfo(script: ScriptRunResource): ScriptLoadInfo {
   };
 }
 
-export function compileInjectionCode(scriptRes: ScriptLoadInfo | ScriptMatchInfo, scriptCode: string) {
+export function compileInjectionCode(scriptRes: ScriptRunResource, scriptCode: string) {
   const preDocumentStartScript = isEarlyStartScript(scriptRes.metadata);
   let scriptInjectCode;
   if (preDocumentStartScript) {