Fix crash when calling .destroy() on a BrowserWindow

jsonnull · Dec 7, 2024 · 6bf4183 · 6bf4183
1 parent bf2c1a4
commit 6bf4183
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/.changeset/giant-pandas-approve.md b/.changeset/giant-pandas-approve.md
@@ -0,0 +1,5 @@
+---
+'electron-trpc': patch
+---
+
+Fix a crash when calling `.destroy()` on a BrowserWindow.
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,23 +83,24 @@ class IPCHandler<TRouter extends AnyRouter> {
   }
 
   #attachSubscriptionCleanupHandlers(win: BrowserWindow) {
+    const webContentsId = win.webContents.id;
     win.webContents.on('did-start-navigation', ({ isSameDocument, frame }) => {
       // Check if it's a hard navigation
       if (!isSameDocument) {
         debug(
           'Handling hard navigation event',
-          `webContentsId: ${win.webContents.id}`,
+          `webContentsId: ${webContentsId}`,
           `frameRoutingId: ${frame.routingId}`
         );
         this.#cleanUpSubscriptions({
-          webContentsId: win.webContents.id,
+          webContentsId: webContentsId,
           frameRoutingId: frame.routingId,
         });
       }
     });
     win.webContents.on('destroyed', () => {
       debug('Handling webContents `destroyed` event');
-      this.detachWindow(win);
+      this.detachWindow(win, webContentsId);
     });
   }
 }