调整

Author: cyfung1031

src/app/service/content/gm_api/gm_api.ts

@@ -1430,8 +1430,8 @@ export default class GMApi extends GM_Base {
           con.disconnect();
         };
         con.onDisconnect(onDisconnected);
-        con.onMessage((data) => {
-          switch (data.action) {
+        con.onMessage((msg) => {
+          switch (msg.action) {
             case "start":
               onStart(con);
               break;

src/app/service/service_worker/gm_api/gm_api.ts

@@ -2,15 +2,15 @@ import LoggerCore from "@App/app/logger/core";
 import Logger from "@App/app/logger/logger";
 import { ScriptDAO } from "@App/app/repo/scripts";
 import { type IGetSender, type Group, GetSenderType } from "@Packages/message/server";
-import type { ExtMessageSender, MessageSend, TMessageCommAction } from "@Packages/message/types";
+import type { ExtMessageSender, MessageConnect, MessageSend, TMessageCommAction } from "@Packages/message/types";
 import { connect, sendMessage } from "@Packages/message/client";
 import type { IMessageQueue } from "@Packages/message/message_queue";
 import { type ValueService } from "@App/app/service/service_worker/value";
 import type { ConfirmParam } from "../permission_verify";
 import PermissionVerify, { PermissionVerifyApiGet } from "../permission_verify";
 import { cacheInstance } from "@App/app/cache";
 import { type RuntimeService } from "../runtime";
-import { getIcon, isFirefox, getCurrentTab, openInCurrentTab, cleanFileName, makeBlobURL } from "@App/pkg/utils/utils";
+import { getIcon, isFirefox, getCurrentTab, openInCurrentTab, cleanFileName, makeBlobURL, Deferred } from "@App/pkg/utils/utils";
 import { deferred } from "@App/pkg/utils/utils";
 import { type SystemConfig } from "@App/pkg/config/config";
 import i18next, { i18nName } from "@App/locales/locales";
@@ -1316,31 +1316,34 @@ export default class GMApi {
     if (!sender.isType(GetSenderType.CONNECT)) {
       throw new Error("GM_download ERROR: sender is not MessageConnect");
     }
-    const msgConn = sender.getConnect();
+    let msgConn: MessageConnect | undefined | null = sender.getConnect();
     if (!msgConn) {
       throw new Error("GM_download ERROR: msgConn is undefined");
     }
     let isConnDisconnected = false;
-    const d = deferred<boolean>();
+    let d: Deferred<boolean> | null = deferred<boolean>();
     let done: boolean = false;
     const onDisconnected = () => {
       if (isConnDisconnected) return;
       isConnDisconnected = true;
-      d.resolve(done);
+      d!.resolve(done);
+      msgConn = null; // release for GC
+      d = null; // release for GC
     };
     msgConn.onDisconnect(onDisconnected);
-    msgConn.onMessage((data) => {
-      if (data.action === "done") {
+    msgConn.onMessage((msg) => {
+      if (msg.action === "done") {
         done = true;
-        msgConn.disconnect();
+        msgConn?.disconnect();
         onDisconnected(); // in case .disconnect() not working
       }
     });
     stackAsyncTask(`${lockKey}`, async () => {
-      msgConn.sendMessage({
+      if (isConnDisconnected) return;
+      msgConn!.sendMessage({
         action: "start",
       });
-      return d.promise;
+      return d!.promise;
     });
   }