Fix crash when calling .destroy() on a BrowserWindow

jsonnull · May 28, 2024 · 7cf07e2 · 7cf07e2
1 parent cfdb2e5
commit 7cf07e2
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/packages/electron-trpc/src/main/createIPCHandler.ts b/packages/electron-trpc/src/main/createIPCHandler.ts
@@ -55,11 +55,15 @@ class IPCHandler<TRouter extends AnyRouter> {
     this.#attachSubscriptionCleanupHandlers(win);
   }
 
-  detachWindow(win: BrowserWindow) {
+  detachWindow(win: BrowserWindow, webContentsId?: number) {
     debug('Detaching window', win.id);
 
+    if (win.isDestroyed() && webContentsId === undefined) {
+      throw new Error('webContentsId is required when calling detachWindow on a destroyed window');
+    }
+
     this.#windows = this.#windows.filter((w) => w !== win);
-    this.#cleanUpSubscriptions({ webContentsId: win.webContents.id });
+    this.#cleanUpSubscriptions({ webContentsId: webContentsId ?? win.webContents.id });
   }
 
   #cleanUpSubscriptions({
@@ -79,6 +83,7 @@ class IPCHandler<TRouter extends AnyRouter> {
   }
 
   #attachSubscriptionCleanupHandlers(win: BrowserWindow) {
+    const webContentsId = win.webContents.id;
     win.webContents.on('did-start-navigation', ({ frame }) => {
       debug(
         'Handling webContents `did-start-navigation` event',
@@ -92,7 +97,7 @@ class IPCHandler<TRouter extends AnyRouter> {
     });
     win.webContents.on('destroyed', () => {
       debug('Handling webContents `destroyed` event');
-      this.detachWindow(win);
+      this.detachWindow(win, webContentsId);
     });
   }
 }