fix(main-app): send ipc crash (#1242)

netless-io · Dec 24, 2021 · 22bcc47 · 22bcc47
1 parent 459f538
commit 22bcc47
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 8 deletions.
diff --git a/desktop/main-app/src/utils/ipc-actions.ts b/desktop/main-app/src/utils/ipc-actions.ts
@@ -166,7 +166,7 @@ export const injectionWindowIPCAction = (customWindow: CustomWindow): void => {
                 .getWin(args.browserWindowID);
 
             if (realCustomWindow) {
-                windowActionAsync(customWindow)[args.actions](args.args);
+                windowActionAsync(realCustomWindow)[args.actions](args.args);
             }
         },
     );

diff --git a/desktop/main-app/src/utils/window-event.ts b/desktop/main-app/src/utils/window-event.ts
@@ -16,6 +16,10 @@ export const windowHookClose = (customWindow: CustomWindow): void => {
     });
 };
 
+export const windowHookClosed = (customWindow: CustomWindow, cb: Function): void => {
+    customWindow.window.on("closed", cb);
+};
+
 export const windowReadyToShow = (customWindow: CustomWindow): void => {
     customWindow.window.on("ready-to-show", () => {
         if (customWindow.options.isPortal) {

diff --git a/desktop/main-app/src/window-manager/abstract.ts b/desktop/main-app/src/window-manager/abstract.ts
@@ -1,6 +1,11 @@
 import { constants } from "flat-types";
 import { BrowserWindow, BrowserWindowConstructorOptions } from "electron";
-import { windowHookClose, windowOpenDevTools, windowReadyToShow } from "../utils/window-event";
+import {
+    windowHookClose,
+    windowHookClosed,
+    windowOpenDevTools,
+    windowReadyToShow,
+} from "../utils/window-event";
 import {
     defaultBrowserWindowOptions,
     defaultWindowOptions,
@@ -17,16 +22,28 @@ export abstract class AbstractWindow<MULTI_INSTANCE extends boolean> {
         public readonly name: constants.WindowsName,
     ) {}
 
-    public remove(id: number): void {
-        const win = this.getWin(id);
+    public remove(id: number | CustomWindow): void {
+        const win = typeof id === "number" ? this.getWin(id) : id;
 
         if (win === null) {
             return;
         }
 
         AbstractWindow.closeWindow(win);
 
-        this.wins = this.isMultiInstance ? this.wins.filter(win => win.window.id !== id) : [];
+        if (this.isMultiInstance) {
+            this.wins = this.wins.filter(({ window }) => {
+                if (window.isDestroyed()) {
+                    return false;
+                }
+
+                return window.id !== id;
+            });
+
+            return;
+        }
+
+        this.wins = [];
     }
 
     protected createWindow(
@@ -62,6 +79,10 @@ export abstract class AbstractWindow<MULTI_INSTANCE extends boolean> {
         windowOpenDevTools(win);
 
         windowHookClose(win);
+        windowHookClosed(win, () => {
+            // sync this.wins
+            this.remove(win);
+        });
 
         windowReadyToShow(win);
 
@@ -77,14 +98,14 @@ export abstract class AbstractWindow<MULTI_INSTANCE extends boolean> {
         if (this.isMultiInstance) {
             const id = ids[0];
             for (const win of this.wins) {
-                if (win.window.id === id) {
+                if (!win.window.isDestroyed() && win.window.id === id) {
                     return win;
                 }
             }
             return null;
         }
 
-        return this.wins[0] || null;
+        return this.wins[0].window.isDestroyed() ? null : this.wins[0];
     }
 
     public isEmpty(): boolean {

diff --git a/desktop/main-app/src/window-manager/window-manager.ts b/desktop/main-app/src/window-manager/window-manager.ts
@@ -25,7 +25,7 @@ export class WindowManager<
     }
 
     public remove(customWindow: CustomWindow): void {
-        this.wins[customWindow.options.name].remove(customWindow.window.id);
+        this.wins[customWindow.options.name].remove(customWindow);
     }
 
     private interceptPortalNewWindow(customWindow: CustomWindow): void {