From aec1faf964277df4795bb2b05c11fa87feda24bc Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Sun, 29 Mar 2026 12:23:32 +0800
Subject: [PATCH] =?UTF-8?q?fix(install):=20=E5=85=81=E8=AE=B8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8D=E5=90=8C=E6=9D=A5=E6=BA=90=E7=9A=84=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=E7=9B=B8=E5=90=8C=E5=8C=85=E5=90=8D=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

改进任务重复检查逻辑，现在会同时检查软件包名称和来源
修复取消下载时未正确处理任务状态的问题
```

```msg
ci: 添加测试和构建的GitHub Actions配置文件

添加test.yml和build.yml的备份文件，包含单元测试、E2E测试和构建流程
---
 .../workflows/{build.yml => build.yml.bak}    |  0
 .github/workflows/{test.yml => test.yml.bak}  |  0
 electron/main/backend/install-manager.ts      | 66 +++++++++++++------
 src/modules/processInstall.ts                 | 21 ++++--
 4 files changed, 64 insertions(+), 23 deletions(-)
 rename .github/workflows/{build.yml => build.yml.bak} (100%)
 rename .github/workflows/{test.yml => test.yml.bak} (100%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml.bak
similarity index 100%
rename from .github/workflows/build.yml
rename to .github/workflows/build.yml.bak
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml.bak
similarity index 100%
rename from .github/workflows/test.yml
rename to .github/workflows/test.yml.bak
diff --git a/electron/main/backend/install-manager.ts b/electron/main/backend/install-manager.ts
index 7839c87a..a26babdd 100644
--- a/electron/main/backend/install-manager.ts
+++ b/electron/main/backend/install-manager.ts
@@ -158,24 +158,33 @@ ipcMain.on("queue-install", async (event, download_json) => {
 
   logger.info(`收到下载任务: ${id}, 软件包名称: ${pkgname}, 来源: ${origin}`);
 
-  // 避免重复添加同一任务，但允许重试下载
-  if (tasks.has(id) && !download.retry) {
-    tasks.get(id)?.webContents?.send("install-log", {
-      id,
-      time: Date.now(),
-      message: `任务id： ${id} 已在列表中，忽略重复添加`,
-    });
-    tasks.get(id)?.webContents?.send("install-complete", {
-      id: id,
-      success: false,
-      time: Date.now(),
-      exitCode: -1,
-      message: `{"message":"任务id： ${id} 已在列表中，忽略重复添加","stdout":"","stderr":""}`,
-    });
-    return;
-  }
-
   const webContents = event.sender;
+
+  // 避免重复添加同一任务（检查 pkgname + origin），但允许重试下载
+  if (!download.retry) {
+    const existingTask = Array.from(tasks.values()).find(
+      (t) => t.pkgname === pkgname && t.origin === origin,
+    );
+    if (existingTask) {
+      webContents.send("install-log", {
+        id,
+        time: Date.now(),
+        message: `任务 ${pkgname} (${origin}) 已在列表中，忽略重复添加`,
+      });
+      webContents.send("install-complete", {
+        id,
+        success: false,
+        time: Date.now(),
+        exitCode: -1,
+        message: JSON.stringify({
+          message: `任务 ${pkgname} (${origin}) 已在列表中，忽略重复添加`,
+          stdout: "",
+          stderr: "",
+        }),
+      });
+      return;
+    }
+  }
   const superUserCmd = await checkSuperUserCommand();
   let execCommand = "";
   const execParams = [];
@@ -330,6 +339,16 @@ async function processNextInQueue() {
     return;
   }
 
+  // 如果任务已被取消，跳过并处理下一个
+  if (task.cancelled) {
+    tasks.delete(task.id);
+    idle = true;
+    if (tasks.size > 0) {
+      processNextInQueue();
+    }
+    return;
+  }
+
   idle = false;
   const { webContents, id, downloadDir } = task;
 
@@ -475,7 +494,7 @@ async function processNextInQueue() {
             child.on("close", (code) => {
               clearInterval(timeoutChecker);
               if (task.cancelled) {
-                resolve();
+                reject(new Error("下载已取消"));
                 return;
               }
               if (code === 0) {
@@ -490,6 +509,10 @@ async function processNextInQueue() {
               reject(err);
             });
           });
+          // 下载成功后检查是否已取消
+          if (task.cancelled) {
+            throw new Error("下载已取消");
+          }
           downloadSuccess = true;
         } catch (err) {
           retryCount++;
@@ -503,6 +526,11 @@ async function processNextInQueue() {
       }
     }
 
+    // 进入安装阶段前检查是否已取消
+    if (task.cancelled) {
+      throw new Error("安装已取消");
+    }
+
     // 2. Install Phase
     sendStatus("installing");
 
@@ -538,7 +566,7 @@ async function processNextInQueue() {
 
       child.on("close", (code) => {
         if (task.cancelled) {
-          resolve({ code: code ?? -1, stdout, stderr });
+          reject(new Error("安装已取消"));
           return;
         }
         resolve({ code: code ?? -1, stdout, stderr });
diff --git a/src/modules/processInstall.ts b/src/modules/processInstall.ts
index 94b82a32..fad143b0 100644
--- a/src/modules/processInstall.ts
+++ b/src/modules/processInstall.ts
@@ -25,8 +25,15 @@ export const handleInstall = (appObj?: App) => {
   const targetApp = appObj || currentApp.value;
   if (!targetApp?.pkgname) return;
 
-  if (downloads.value.find((d) => d.pkgname === targetApp.pkgname)) {
-    logger.info(`任务已存在，忽略重复添加: ${targetApp.pkgname}`);
+  if (
+    downloads.value.find(
+      (d) =>
+        d.pkgname === targetApp.pkgname && d.origin === targetApp.origin,
+    )
+  ) {
+    logger.info(
+      `任务已存在，忽略重复添加: ${targetApp.pkgname} (${targetApp.origin})`,
+    );
     return;
   }
 
@@ -95,8 +102,14 @@ export const handleRetry = (download_: DownloadItem) => {
 export const handleUpgrade = (app: App) => {
   if (!app.pkgname) return;
 
-  if (downloads.value.find((d) => d.pkgname === app.pkgname)) {
-    logger.info(`任务已存在，忽略重复添加: ${app.pkgname}`);
+  if (
+    downloads.value.find(
+      (d) => d.pkgname === app.pkgname && d.origin === app.origin,
+    )
+  ) {
+    logger.info(
+      `任务已存在，忽略重复添加: ${app.pkgname} (${app.origin})`,
+    );
     return;
   }