destroy disposable windows

src/main/server.ts

@@ -188,6 +188,10 @@ export class Server {
                 },
               );
               break;
+            case CODE.WEBSOCKET_VANISHED:
+              logger.info('server', 'Closing open disposable windows', {origin: (error as any).origin});
+              windowsController.destroyDisposableWindows((error as any).origin);
+              break;
             case CODE.PROVIDER_CRYPTO_NOT_FOUND:
               windowsController.showWarningWindow(
                 {
@@ -224,7 +228,7 @@ export class Server {
             const keyPinWindowResult = await windowsController.showKeyPinWindow({
               ...params,
               accept: false,
-            });
+            }, params.origin);
 
             params.resolve(keyPinWindowResult.accept);
 
@@ -235,7 +239,7 @@ export class Server {
             const p11PinWindowResult = await windowsController.showP11PinWindow({
               ...params,
               pin: '',
-            });
+            }, params.origin);
 
             if (p11PinWindowResult.pin) {
               params.resolve(p11PinWindowResult.pin);

src/main/tray/development_template.ts

@@ -115,6 +115,7 @@ export const developmentTemplate = (): MenuItemConstructorOptions[] => ([
               origin: 'https://TEST.com/',
               accept: true,
             },
+            'test'
           );
         },
       },
@@ -126,6 +127,7 @@ export const developmentTemplate = (): MenuItemConstructorOptions[] => ([
               pin: '',
               origin: 'https://TEST.com/',
             },
+            'test'
           );
         },
       },

src/main/windows/browser_window.ts

@@ -146,7 +146,11 @@ export class BrowserWindow {
   }
 
   public getParams() {
-    return this.window.params || {};
+    try {
+      return this.window.params || {};
+    } catch {
+      return {};
+    }
   }
 
   public focus() {

src/main/windows/windows_controller.ts

@@ -45,11 +45,18 @@ interface IWarningWindowParams {
 
 class WindowsController {
   windows: Assoc<BrowserWindow> = {};
+  private disposableWindowsBySocketId: Assoc<BrowserWindow[]> = {};
 
   static getScreenSize() {
     return screen.getPrimaryDisplay().bounds;
   }
 
+  destroyDisposableWindows(socketId: string) {
+    const arr = [...this.disposableWindowsBySocketId[socketId] || []];
+    this.disposableWindowsBySocketId[socketId] = [];
+    arr.forEach(w => w.window.destroy());
+  }
+
   showPreferencesWindow(defaultTab?: ('about' | 'updates' | 'settings')) {
     return new Promise<void>((resolve) => {
       const params = {
@@ -89,7 +96,7 @@ class WindowsController {
   }
 
   // eslint-disable-next-line class-methods-use-this
-  showP11PinWindow(params: IP11PinWindowParams): Promise<IP11PinWindowParams> {
+  showP11PinWindow(params: IP11PinWindowParams, socketId: string): Promise<IP11PinWindowParams> {
     return new Promise((resolve) => {
       const browserWindow = new BrowserWindow({
         params: {
@@ -102,14 +109,23 @@ class WindowsController {
         },
         title: params.label || l10n.get('p11-pin'),
         onClosed: () => {
+          this.disposableWindowsBySocketId[socketId] = this.disposableWindowsBySocketId[socketId].filter(w => {
+            try {
+              return w.window.id !== browserWindow.window.id;
+            } catch {
+              return false;
+            }
+          });
           resolve(browserWindow.getParams() as IP11PinWindowParams);
         },
       });
+      this.disposableWindowsBySocketId[socketId] = this.disposableWindowsBySocketId[socketId] || [];
+      this.disposableWindowsBySocketId[socketId].push(browserWindow);
     });
   }
 
   // eslint-disable-next-line class-methods-use-this
-  showKeyPinWindow(params: IKeyPinWindowParams): Promise<IKeyPinWindowParams> {
+  showKeyPinWindow(params: IKeyPinWindowParams, socketId: string): Promise<IKeyPinWindowParams> {
     return new Promise((resolve) => {
       const { width, height } = WindowsController.getScreenSize();
 
@@ -128,9 +144,18 @@ class WindowsController {
           y: height - windowSizes.default.height,
         },
         onClosed: () => {
+          this.disposableWindowsBySocketId[socketId] = this.disposableWindowsBySocketId[socketId].filter(w => {
+            try {
+              return w.window.id !== browserWindow.window.id;
+            } catch {
+              return false;
+            }
+          });
           resolve(browserWindow.getParams() as IKeyPinWindowParams);
         },
       });
+      this.disposableWindowsBySocketId[socketId] = this.disposableWindowsBySocketId[socketId] || [];
+      this.disposableWindowsBySocketId[socketId].push(browserWindow);
     });
   }