♻️ 增强后台脚本任务检查，减少错误 #714

Author: CodFrm

src/app/repo/repo.ts

@@ -128,13 +128,12 @@ function deleteStorage(key: string) {
   });
 }
 function deletesStorage(keys: string[]) {
-  return new Promise<void>((resolve, reject) => {
+  return new Promise<void>((resolve) => {
     chrome.storage.local.remove(keys, () => {
       const lastError = chrome.runtime.lastError;
       if (lastError) {
         console.error("chrome.runtime.lastError in chrome.storage.local.remove:", lastError);
         // 无视storage API错误，继续执行
-        reject();
       }
       resolve();
     });

src/app/service/offscreen/script.ts

@@ -4,7 +4,12 @@ import { type MessageQueue } from "@Packages/message/message_queue";
 import { type WindowMessage } from "@Packages/message/window_message";
 import { ResourceClient, ScriptClient, ValueClient } from "../service_worker/client";
 import type { ScriptRunResource } from "@App/app/repo/scripts";
-import { SCRIPT_STATUS_ENABLE, SCRIPT_TYPE_NORMAL } from "@App/app/repo/scripts";
+import {
+  SCRIPT_STATUS_ENABLE,
+  SCRIPT_TYPE_BACKGROUND,
+  SCRIPT_TYPE_CRONTAB,
+  SCRIPT_TYPE_NORMAL,
+} from "@App/app/repo/scripts";
 import { disableScript, enableScript, runScript, stopScript } from "../sandbox/client";
 import { type Group } from "@Packages/message/server";
 import type { MessageSend } from "@Packages/message/types";
@@ -65,8 +70,11 @@ export class ScriptService {
       }
     });
     this.messageQueue.subscribe<TDeleteScript[]>("deleteScripts", async (data) => {
-      for (const { uuid } of data) {
-        await disableScript(this.windowMessage, uuid);
+      for (const { uuid, type } of data) {
+        // 只发送后台脚本和定时脚本
+        if (type === SCRIPT_TYPE_BACKGROUND || type === SCRIPT_TYPE_CRONTAB) {
+          await disableScript(this.windowMessage, uuid);
+        }
       }
     });
 

src/app/service/queue.ts

@@ -15,7 +15,7 @@ export type TInstallScriptParams = {
 
 export type TInstallScript = { script: TInstallScriptParams; update: boolean; upsertBy?: InstallSource };
 
-export type TDeleteScript = { uuid: string; storageName: string };
+export type TDeleteScript = { uuid: string; storageName: string; type: SCRIPT_TYPE };
 
 export type TSortedScript = { uuid: string; sort: number };
 

src/app/service/sandbox/runtime.ts

@@ -102,16 +102,21 @@ export class Runtime {
     }
   }
 
-  disableScript(uuid: string) {
+  async disableScript(uuid: string) {
     // 关闭脚本
     // 停止定时任务
-    this.stopCronJob(uuid);
+    // 检查是否有定时器
+    if (this.cronJob.has(uuid)) {
+      this.stopCronJob(uuid);
+    }
     // 移除重试队列
     this.removeRetryList(uuid);
-    // 发送运行状态变更
-    proxyUpdateRunStatus(this.windowMessage, { uuid, runStatus: SCRIPT_RUN_STATUS_COMPLETE });
+    if (!this.execScripts.has(uuid)) {
+      // 没有在运行
+      return false;
+    }
     // 停止脚本运行
-    return this.stopScript(uuid);
+    return await this.stopScript(uuid);
   }
 
   // 执行脚本

src/app/service/service_worker/script.ts

@@ -284,7 +284,7 @@ export class ScriptService {
       .then(async () => {
         await this.scriptCodeDAO.delete(uuid);
         logger.info("delete success");
-        const data = [{ uuid, storageName }];
+        const data = [{ uuid, storageName, type: script.type }];
         this.mq.publish<TDeleteScript[]>("deleteScripts", data);
         return true;
       })
@@ -296,28 +296,20 @@ export class ScriptService {
 
   async deleteScripts(uuids: string[]) {
     const logger = this.logger.with({ uuids });
-    const scripts = await this.scriptDAO.gets(uuids);
-    const uuids2: string[] = [];
-    const storageNames: string[] = [];
-    for (let i = 0, l = uuids.length; i < l; i++) {
-      const script = scripts[i];
-      if (script && script.uuid && script.uuid === uuids[i]) {
-        uuids2.push(script.uuid);
-        storageNames.push(getStorageName(script));
-      }
-    }
-    if (!uuids2.length) {
+    const scripts = (await this.scriptDAO.gets(uuids)).filter((s) => !!s);
+    if (!scripts.length) {
       logger.error("scripts not found");
       throw new Error("scripts not found");
     }
     return this.scriptDAO
-      .deletes(uuids2)
+      .deletes(uuids)
       .then(async () => {
-        await this.scriptCodeDAO.deletes(uuids2);
+        await this.scriptCodeDAO.deletes(uuids);
         logger.info("delete success");
-        const data = uuids2.map((uuid, i) => ({
-          uuid,
-          storageName: storageNames[i],
+        const data = scripts.map((script) => ({
+          uuid: script.uuid,
+          storageName: getStorageName(script),
+          type: script.type,
         }));
         this.mq.publish<TDeleteScript[]>("deleteScripts", data);
         return true;