🐛 修复脚本同步删除问题 #1158

Author: CodFrm

src/app/service/queue.ts

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

src/app/service/service_worker/script.ts

@@ -413,7 +413,7 @@ export class ScriptService {
       });
   }
 
-  async deleteScript(uuid: string) {
+  async deleteScript(uuid: string, deleteBy?: InstallSource) {
     let logger = this.logger.with({ uuid });
     const script = await this.scriptDAO.get(uuid);
     if (!script) {
@@ -428,7 +428,7 @@ export class ScriptService {
         await this.scriptCodeDAO.delete(uuid);
         await this.compiledResourceDAO.delete(uuid);
         logger.info("delete success");
-        const data = [{ uuid, storageName, type: script.type }] as TDeleteScript[];
+        const data = [{ uuid, storageName, type: script.type, deleteBy }] as TDeleteScript[];
         this.mq.publish("deleteScripts", data);
         return true;
       })

src/app/service/service_worker/synchronize.ts

@@ -382,9 +382,12 @@ export class SynchronizeService {
     // 对比脚本列表和文件列表,进行同步
     const result: Promise<void>[] = [];
     const updateScript: Map<string, boolean> = new Map();
+    // 需要是同步操作，后续上传剩下的脚本
+    // 最后使用 Promise.allSettled 进行等待
     uuidMap.forEach((file, uuid) => {
       const script = scriptMap.get(uuid);
       if (script) {
+        scriptMap.delete(uuid);
         // 脚本存在但是文件不存在,则读取.meta.json内容判断是否需要删除脚本
         if (!file.script) {
           result.push(
@@ -394,26 +397,23 @@ export class SynchronizeService {
               const metaJson = (await meta.read("string")) as string;
               const metaObj = JSON.parse(metaJson) as SyncMeta;
               if (metaObj.isDeleted) {
-                if (script) {
-                  this.script.deleteScript(script.uuid);
-                  InfoNotification(
-                    i18n.t("notification.script_sync_delete"),
-                    i18n.t("notification.script_sync_delete_desc", { scriptName: i18nName(script) })
-                  );
-                }
-                scriptMap.delete(uuid);
+                // 删除脚本
+                this.script.deleteScript(script.uuid, "sync");
+                InfoNotification(
+                  i18n.t("notification.script_sync_delete"),
+                  i18n.t("notification.script_sync_delete_desc", { scriptName: i18nName(script) })
+                );
               } else {
-                // 否则认为是一个无效的.meta文件,进行删除
+                // 否则认为是一个无效的.meta文件，进行删除，并进行同步
                 await fs.delete(file.meta!.name);
+                result.push(this.pushScript(fs, script));
               }
             })()
           );
           return;
         }
         // 过滤掉无变动的文件
         if (fileDigestMap[file.script!.name] === file.script!.digest) {
-          // 删除了之后,剩下的就是需要上传的脚本了
-          scriptMap.delete(uuid);
           return;
         }
         const updatetime = script.updatetime || script.createtime;
@@ -427,10 +427,9 @@ export class SynchronizeService {
           updateScript.set(uuid, true);
           result.push(this.pullScript(fs, file as SyncFiles, cloudStatus[uuid], script));
         }
-        scriptMap.delete(uuid);
         return;
       }
-      // 如果脚本不存在,且文件存在,则安装脚本
+      // 如果脚本不存在，但文件存在，则安装脚本
       if (file.script) {
         if (!file.meta) {
           // 如果.meta文件不存在，则删除脚本文件，并跳过
@@ -679,7 +678,10 @@ export class SynchronizeService {
     const config = await this.systemConfig.getCloudSync();
     if (config.enable) {
       this.buildFileSystem(config).then(async (fs) => {
-        for (const { uuid } of data) {
+        for (const { uuid, deleteBy } of data) {
+          if (deleteBy === "sync") {
+            continue;
+          }
           await this.deleteCloudScript(fs, uuid, config.syncDelete);
         }
       });