🐛 修复定时脚本计时器停止错误 #147 #149

Author: CodFrm

src/runtime/content/gm_api.ts

@@ -1,5 +1,6 @@
 /* eslint-disable camelcase */
 /* eslint-disable max-classes-per-file */
+import { ExtVersion } from "@App/app/const";
 import LoggerCore from "@App/app/logger/core";
 import { Channel, ChannelHandler } from "@App/app/message/channel";
 import MessageContent from "@App/app/message/content";
@@ -134,16 +135,18 @@ export default class GMApi {
       icon: (script.metadata.icon && script.metadata.icon[0]) || null,
       icon64: (script.metadata.icon64 && script.metadata.icon64[0]) || null,
       header: metadataStr,
+      grant: script.metadata.grant || [],
     };
+
     return {
       // downloadMode
       // isIncognito
-      scriptWillUpdate: false,
+      scriptWillUpdate: true,
       scriptHandler: "ScriptCat",
-      scriptUpdateURL: script.checkUpdateUrl,
+      scriptUpdateURL: script.downloadUrl,
       scriptMetaStr: metadataStr,
-      scriptSource: script.sourceCode,
-      version: script.metadata.version && script.metadata.version[0],
+      // scriptSource: script.sourceCode,
+      version: ExtVersion,
       script: {
         // TODO: 更多完整的信息(为了兼容Tampermonkey,后续待定)
         name: script.name,

src/runtime/content/sandbox.ts

@@ -17,7 +17,7 @@ type SandboxEvent = "enable" | "disable" | "start" | "stop";
 
 type Handler = (data: any) => Promise<any>;
 
-// 沙盒运行环境
+// 沙盒运行环境, 后台脚本与定时脚本的运行环境
 @IoC.Singleton(MessageSandbox)
 export default class SandboxRuntime {
   message: MessageSandbox;
@@ -76,6 +76,7 @@ export default class SandboxRuntime {
     switch (script.type) {
       case SCRIPT_TYPE_CRONTAB:
         // 定时脚本
+        this.stopCronJob(script.id);
         return this.crontabScript(script);
       case SCRIPT_TYPE_BACKGROUND:
         // 后台脚本, 直接执行脚本
@@ -86,23 +87,27 @@ export default class SandboxRuntime {
   }
 
   disable(id: number): Promise<boolean> {
-    const exec = this.execScripts.get(id);
-    if (!exec) {
-      return Promise.resolve(false);
-    }
     // 停止脚本运行,主要是停止定时器
     // 后续考虑停止正在运行的脚本的方法
     // 现期对于正在运行的脚本仅仅是在background中判断是否运行
     // 未运行的脚本不处理GMApi的请求
-    this.execStop(exec);
+    this.stopCronJob(id);
+    const exec = this.execScripts.get(id);
+    if (!exec) {
+      return Promise.resolve(false);
+    }
+    return Promise.resolve(true);
+  }
+
+  // 停止计时器
+  stopCronJob(id: number) {
     const list = this.cronJob.get(id);
     if (list) {
       list.forEach((val) => {
         val.stop();
       });
       this.cronJob.delete(id);
     }
-    return Promise.resolve(true);
   }
 
   // 执行脚本