🐛 修复GM_getValue与GM_info问题 #393

Author: CodFrm

package.json

@@ -1,6 +1,6 @@
 {
   "name": "scriptcat",
-  "version": "0.17.0-beta.1",
+  "version": "0.17.0-beta.2",
   "description": "脚本猫,一个可以执行用户脚本的浏览器扩展,万物皆可脚本化,让你的浏览器可以做更多的事情!",
   "author": "CodFrm",
   "license": "GPLv3",

src/app/service/content/exec_script.ts

@@ -4,7 +4,7 @@ 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 { EmitEventRequest } from "../service_worker/runtime";
+import { PageLoadScript, ScriptMatchInfo } from "../service_worker/runtime";
 
 export type ValueUpdateSender = {
   runFlag: string;
@@ -24,7 +24,7 @@ export class RuntimeMessage {}
 
 // 执行脚本,控制脚本执行与停止
 export default class ExecScript {
-  scriptRes: ScriptRunResouce;
+  scriptRes: PageLoadScript;
 
   scriptFunc: ScriptFunc;
 
@@ -37,7 +37,7 @@ export default class ExecScript {
   GM_info: any;
 
   constructor(
-    scriptRes: ScriptRunResouce,
+    scriptRes: PageLoadScript,
     envPrefix: "content" | "offscreen",
     message: Message,
     code: string | ScriptFunc,

src/app/service/content/exec_warp.ts

@@ -1,6 +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";
 
 export class CATRetryError {
   msg: string;
@@ -22,7 +23,7 @@ export class BgExecScriptWarp extends ExecScript {
 
   setInterval: Map<number, boolean>;
 
-  constructor(scriptRes: ScriptRunResouce, message: Message) {
+  constructor(scriptRes: PageLoadScript, 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

@@ -9,6 +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";
 
 interface ApiParam {
   depend?: string[];
@@ -112,9 +113,7 @@ export default class GMApi {
   }
 
   // 获取脚本信息和管理器信息
-  static GM_info(script: ScriptRunResouce) {
-    const metadataStr = getMetadataStr(script.code);
-    const userConfigStr = getUserConfigStr(script.code) || "";
+  static GM_info(script: PageLoadScript) {
     const options = {
       description: script.metadata.description?.[0] || null,
       matches: script.metadata.match || [],
@@ -123,7 +122,7 @@ export default class GMApi {
       "run-in": script.metadata["run-in"] || [],
       icon: script.metadata.icon?.[0] || null,
       icon64: script.metadata.icon64?.[0] || null,
-      header: metadataStr,
+      header: script.metadataStr,
       grant: script.metadata.grant || [],
       connects: script.metadata.connect || [],
     };
@@ -134,9 +133,9 @@ export default class GMApi {
       scriptWillUpdate: true,
       scriptHandler: "ScriptCat",
       scriptUpdateURL: script.downloadUrl,
-      scriptMetaStr: metadataStr,
-      userConfig: parseUserConfig(userConfigStr),
-      userConfigStr,
+      scriptMetaStr: script.metadataStr,
+      userConfig: parseUserConfig(script.userConfigStr),
+      userConfigStr: script.userConfigStr,
       // scriptSource: script.sourceCode,
       version: ExtVersion,
       script: {
@@ -154,7 +153,7 @@ export default class GMApi {
   @GMContext.API()
   public GM_getValue(key: string, defaultValue?: any) {
     const ret = this.scriptRes.value[key];
-    if (ret) {
+    if (ret !== undefined) {
       return ret;
     }
     return defaultValue;

src/app/service/service_worker/runtime.ts

@@ -27,6 +27,7 @@ import { SystemConfig } from "@App/pkg/config/config";
 import { ResourceService } from "./resource";
 import { LocalStorageDAO } from "@App/app/repo/localStorage";
 import Logger from "@App/app/logger/logger";
+import { getMetadataStr, getUserConfigStr } from "@App/pkg/utils/script";
 
 // 为了优化性能，存储到缓存时删除了code、value与resource
 export interface ScriptMatchInfo extends ScriptRunResouce {
@@ -35,6 +36,11 @@ export interface ScriptMatchInfo extends ScriptRunResouce {
   customizeExcludeMatches: string[];
 }
 
+export interface PageLoadScript extends ScriptMatchInfo {
+  metadataStr: string; // 脚本元数据字符串
+  userConfigStr: string; // 用户配置字符串
+}
+
 export interface EmitEventRequest {
   uuid: string;
   event: string;
@@ -346,10 +352,9 @@ export class RuntimeService {
           return arr;
         }
       }
-      // 获取value
-      arr.push(scriptRes);
+      arr.push(scriptRes as PageLoadScript);
       return arr;
-    }, [] as ScriptMatchInfo[]);
+    }, [] as PageLoadScript[]);
 
     await Promise.all([
       // 加载value
@@ -362,6 +367,16 @@ export class RuntimeService {
         const resource = await this.resource.getScriptResources(script);
         script.resource = resource;
       }),
+      // 加载code相关的信息
+      ...enableScript.map(async (script) => {
+        const code = await this.scriptDAO.scriptCodeDAO.get(script.uuid);
+        if (code) {
+          const metadataStr = getMetadataStr(code.code) || "";
+          const userConfigStr = getUserConfigStr(code.code) || "";
+          script.metadataStr = metadataStr;
+          script.userConfigStr = userConfigStr;
+        }
+      }),
     ]);
 
     this.mq.emit("pageLoad", {
@@ -479,6 +494,7 @@ export class RuntimeService {
       scriptMatch[key] = val;
       // 优化性能，将不需要的信息去掉
       // 而且可能会超过缓存的存储限制
+      // @ts-ignore
       scriptMatch[key].code = "";
       scriptMatch[key].value = {};
       scriptMatch[key].resource = {};

src/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "__MSG_scriptcat__",
-  "version": "0.17.0.1200",
+  "version": "0.17.0.1300",
   "author": "CodFrm",
   "description": "__MSG_scriptcat_description__",
   "options_ui": {