From 57bc6f9390a33400730eb7c261cf7c23c5f3532a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= <yz@ggnb.top>
Date: Mon, 26 Feb 2024 15:31:08 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=E8=AE=A2?=
 =?UTF-8?q?=E9=98=85=E8=84=9A=E6=9C=AC=E9=87=8D=E5=A4=8D=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20#257?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yaml               | 2 +-
 .github/workflows/packageRelease.yml       | 2 +-
 .github/workflows/test.yaml                | 2 +-
 src/app/service/script/manager.ts          | 4 ++--
 src/app/service/subscribe/manager.ts       | 6 +++++-
 src/pages/options/routes/SubscribeList.tsx | 2 +-
 src/pkg/utils/script.ts                    | 1 +
 7 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a77cf2d1..442bee9e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -16,7 +16,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
           cache: 'npm'
 
       - name: Package with Node
diff --git a/.github/workflows/packageRelease.yml b/.github/workflows/packageRelease.yml
index d7f68487..e8897576 100644
--- a/.github/workflows/packageRelease.yml
+++ b/.github/workflows/packageRelease.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
           cache: 'npm'
 
       - name: Package with Node
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index cd6864e8..81ccbbde 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -18,7 +18,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
           cache: 'npm'
 
       - name: Unit Test
diff --git a/src/app/service/script/manager.ts b/src/app/service/script/manager.ts
index 89c0a438..d84f9bbd 100644
--- a/src/app/service/script/manager.ts
+++ b/src/app/service/script/manager.ts
@@ -232,10 +232,10 @@ export class ScriptManager extends Manager {
     source: InstallSource,
     subscribeUrl?: string
   ) {
-    const info = await fetchScriptInfo(url, "system", false, uuidv4());
+    const info = await fetchScriptInfo(url, source, false, uuidv4());
     const prepareScript = await prepareScriptByCode(info.code, url, info.uuid);
     prepareScript.script.subscribeUrl = subscribeUrl;
-    await this.event.upsertHandler(prepareScript.script, "system");
+    await this.event.upsertHandler(prepareScript.script, source);
     return Promise.resolve(prepareScript.script);
   }
 }
diff --git a/src/app/service/subscribe/manager.ts b/src/app/service/subscribe/manager.ts
index 92675fb7..98ac3551 100644
--- a/src/app/service/subscribe/manager.ts
+++ b/src/app/service/subscribe/manager.ts
@@ -131,7 +131,7 @@ export default class SubscribeManager extends Manager {
       subscribeId: subscribe.id,
       name: subscribe.name,
     });
-    this.subscribeDAO.update(id, { checktime: new Date().getTime() });
+    await this.subscribeDAO.update(id, { checktime: new Date().getTime() });
     try {
       const info = await fetchScriptInfo(
         subscribe.url,
@@ -255,12 +255,16 @@ export default class SubscribeManager extends Manager {
     });
 
     await Promise.allSettled(result);
+
+    await this.subscribeDAO.update(subscribe.id, subscribe);
+
     InfoNotification(
       "订阅更新",
       `安装了:${notification[0].join(",")}\n删除了:${notification[1].join(
         "\n"
       )}`
     );
+
     logger.info("subscribe update", {
       install: notification[0],
       update: notification[1],
diff --git a/src/pages/options/routes/SubscribeList.tsx b/src/pages/options/routes/SubscribeList.tsx
index 4a33502b..20ba7a69 100644
--- a/src/pages/options/routes/SubscribeList.tsx
+++ b/src/pages/options/routes/SubscribeList.tsx
@@ -227,7 +227,7 @@ function SubscribeList() {
             onClick={() => {
               Message.info({
                 id: "checkupdate",
-                content: t("checking_update"),
+                content: t("checking_for_updates"),
               });
               subscribeCtrl
                 .checkUpdate(subscribe.id)
diff --git a/src/pkg/utils/script.ts b/src/pkg/utils/script.ts
index 1ecaacb1..40a299ff 100644
--- a/src/pkg/utils/script.ts
+++ b/src/pkg/utils/script.ts
@@ -165,6 +165,7 @@ export function copyScript(script: Script, old: Script): Script {
 export function copySubscribe(sub: Subscribe, old: Subscribe): Subscribe {
   const ret = sub;
   ret.id = old.id;
+  ret.scripts = old.scripts;
   ret.createtime = old.createtime;
   ret.status = old.status;
   return ret;