fix inflight upload jobs persisted status incorrect

Author: lihsai0

src/main/index.js

@@ -260,7 +260,9 @@ ipcMain.on("UploaderManager", (event, message) => {
     });
 
     uploaderProcess.on("message", (message) => {
-      event.sender.send("UploaderManager-reply", message);
+      if (win && !win.isDestroyed()) {
+        event.sender.send("UploaderManager-reply", message);
+      }
       switch (message.action) {
         case UploadAction.UpdateUiData: {
           uploadRunning = message.data.running;
@@ -666,7 +668,11 @@ app.on("window-all-closed", () => {
   // On OS X it is common for applications and their menu bar
   // to stay active until the user quits explicitly with Cmd + Q
   //if (process.platform !== 'darwin') {
-  app.quit();
+
+  // resolve inflight jobs persisted status not correct
+  setTimeout(() => {
+    app.quit();
+  }, 3000);
   //}
 });
 

src/main/uploader/index.ts

@@ -111,8 +111,44 @@ process.on("message", (message: UploadMessage) => {
     }
 });
 
+let isCleanup = false;
+function handleExit() {
+    if (isCleanup) {
+        return Promise.resolve();
+    }
+
+    isCleanup = true;
+
+    uploadManager.stopAllJobs({
+        matchStatus: [Status.Waiting],
+    });
+
+    return new Promise<void>((resolve, reject) => {
+        try {
+            // resolve inflight jobs persisted status not correct
+            setTimeout(() => {
+                uploadManager.stopAllJobs({
+                    matchStatus: [Status.Running],
+                });
+                uploadManager.persistJobs(true);
+                resolve();
+            }, 2000);
+        } catch {
+            reject()
+        }
+    });
+}
+
+
 process.on("exit", () => {
-    uploadManager.persistJobs(true);
+    handleExit()
+});
+
+process.on('SIGTERM', () => {
+    handleExit()
+        .then(() => {
+            process.exit(0);
+        });
 });
 
 function handleJobDone(jobId: string, job?: UploadJob) {

src/main/uploader/upload-manager.ts

@@ -425,7 +425,7 @@ export default class UploadManager {
                     },
                 );
 
-                if (job.status === Status.Running) {
+                if ([Status.Waiting, Status.Running].includes(job.status)) {
                     job.stop();
                 }
 
@@ -481,11 +481,20 @@ export default class UploadManager {
         this.scheduleJobs();
     }
 
-    public stopAllJobs(): void {
+    public stopAllJobs({
+        matchStatus,
+    }: {
+        matchStatus: Status[],
+    } = {
+        matchStatus: [],
+    }): void {
         this.jobIds
             .map(id => this.jobs.get(id))
             .forEach(job => {
-                if (!job) {
+                if (!job || ![Status.Running, Status.Waiting].includes(job.status)) {
+                    return;
+                }
+                if (!matchStatus.includes(job.status)){
                     return;
                 }
                 job.stop();