Revert "refactor: delegate quit to main renderer (#191)" (#198)

This reverts commit 9bcc991.

Author: nsrCodes

package.json

@@ -15,7 +15,7 @@
     "deploy": "npm run build && electron-builder build --publish always",
     "postinstall": "ts-node .erb/scripts/check-native-dep.js && electron-builder install-app-deps && cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.dev.dll.ts",
     "start": "ts-node ./.erb/scripts/check-port-in-use.js && npm run start:renderer",
-    "start:main": "cross-env NODE_ENV=development electron --inspect=9229 -r ts-node/register/transpile-only ./src/main/main.ts --trace-warnings",
+    "start:main": "cross-env NODE_ENV=development electron -r ts-node/register/transpile-only ./src/main/main.ts --trace-warnings",
     "start:renderer": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./.erb/configs/webpack.config.renderer.dev.ts",
     "test": "jest",
     "debug-prod-build": "cross-env DEBUG_PROD=true && npm run build",

src/lib/autoupdate/index.js

@@ -93,7 +93,7 @@ class AutoUpdate {
     ipcMain.handle("quit-and-install", () => {
       log.info("recieved quit and install")
       global.quitAndInstall = true;
-      const res = autoUpdater.quitAndInstall();
+      let res = autoUpdater.quitAndInstall();
       log.info("finished quit and install", res)
     });
   };

src/main/actions/cleanup.js

@@ -1,29 +1,21 @@
 const { app, ipcMain } = require("electron");
 
-const cleanup = () => {
-  if(global.backgroundProcessStarted) {
-    if (global.backgroundWindow) {
-      global.backgroundWindow.webContents.send("shutdown");
-    } else {
-      // No backgroundWindow. Quit directly without cleanup
+export const cleanupAndQuit = () => {
+  cleanup();
+
+  if (global.backgroundWindow) {
+    ipcMain.on("shutdown-success", () => {
+      console.log("shudown sucess");
       app.quit();
-    }
+    });
+  }
+};
+
+const cleanup = () => {
+  if (global.backgroundWindow) {
+    global.backgroundWindow.webContents.send("shutdown");
   } else {
+    // No backgroundWindow. Quit directly without cleanup
     app.quit();
   }
 };
-
-
-export const getReadyToQuitApp = async  () => {
-  return new Promise((resolve) => {
-    cleanup();
-  
-    if (global.backgroundWindow) {
-      ipcMain.once("shutdown-success", () => {
-        console.log("shudown sucess");
-        global.backgroundWindow?.close();
-        resolve()
-      });
-    }
-  })
-};

src/main/actions/logNetworkRequest.js

@@ -1,3 +1,17 @@
+/**
+ * @param {Array} array into which element will be pushed
+ * @param {number} required max length of array
+ * @param {*} element to push
+ */
+const addToLog = (array, limit, element) => {
+  const arrayToModify = [...array];
+  if (arrayToModify.length >= limit) {
+    arrayToModify.shift();
+  }
+  arrayToModify.push(element);
+  return arrayToModify;
+};
+
 const logNetworkRequest = (event, message, webAppWindow) => {
   const newLog = message;
   if (webAppWindow) {

src/main/actions/logNetworkRequestV2.js

@@ -1,6 +1,20 @@
+/**
+ * @param {Array} array into which element will be pushed
+ * @param {number} required max length of array
+ * @param {*} element to push
+ */
+const addToLog = (array, limit, element) => {
+  const arrayToModify = [...array];
+  if (arrayToModify.length >= limit) {
+    arrayToModify.shift();
+  }
+  arrayToModify.push(element);
+  return arrayToModify;
+};
+
 const logNetworkRequestV2 = (event, message, webAppWindow) => {
   const newLog = message;
-  if (webAppWindow && !webAppWindow.isDestroyed()) {
+  if (webAppWindow) {
     webAppWindow.send("log-network-request-v2", newLog);
   }
 };

src/main/actions/startBackgroundProcess.js

@@ -79,6 +79,14 @@ const startBackgroundProcess = async () => {
       resolve(true);
     });
 
+    backgroundWindow.on("close", (event) => {
+      if (global.isQuitActionConfirmed) {
+        console.log("BG quitting");
+        return;
+      }
+
+      event.preventDefault();
+    });
   });
 };
 

src/main/events.js

@@ -68,9 +68,6 @@ function removeFileFromAccessRecords(filePath) {
 
 // These events do not require the browser window
 export const registerMainProcessEvents = () => {
-  ipcMain.on("background-process-started", () => {
-    global.backgroundProcessStarted = true;
-  });
   ipcMain.handle("start-background-process", startBackgroundProcess);
   /** Main Process State Management */
   ipcMain.handle("get-state", getState);
@@ -111,32 +108,32 @@ export const registerMainProcessEventsForWebAppWindow = (webAppWindow) => {
 
   // Open handle for async source detection
   ipcMain.handle("app-detected", async (event, payload) => {
-    webAppWindow?.send("app-detected", payload);
+    webAppWindow.send("app-detected", payload);
   });
 
   ipcMain.handle("browser-connected", async (event, payload) => {
-    webAppWindow?.send("browser-connected", payload);
+    webAppWindow.send("browser-connected", payload);
   });
 
   ipcMain.handle("browser-disconnected", async (event, payload) => {
-    webAppWindow?.send("browser-disconnected", payload);
+    webAppWindow.send("browser-disconnected", payload);
   });
 
   // Open handle for async browser close
   ipcMain.handle("browser-closed", async (event, payload) => {
-    webAppWindow?.send("browser-closed", payload);
+    webAppWindow.send("browser-closed", payload);
   });
 
   // Open handle for async browser close
   ipcMain.handle("proxy-restarted", async (event, payload) => {
     createOrUpdateAxiosInstance(payload);
-    webAppWindow?.send("proxy-restarted", payload);
+    webAppWindow.send("proxy-restarted", payload);
   });
 
   // hacky implementation for syncing addition and deletion
   const resendAllNetworkLogs = async () => {
     const res = await getAllNetworkSessions();
-    webAppWindow?.send("network-sessions-updated", res);
+    webAppWindow.send("network-sessions-updated", res);
   };
 
   ipcMain.handle("get-all-network-sessions", async () => {
@@ -259,7 +256,7 @@ export const registerMainProcessEventsForWebAppWindow = (webAppWindow) => {
   });
 
   ipcMain.handle("helper-server-hit", () => {
-    webAppWindow?.send("helper-server-hit");
+    webAppWindow.send("helper-server-hit");
   });
 };
 

src/main/main.ts

@@ -12,7 +12,7 @@
 import "core-js/stable";
 import "regenerator-runtime/runtime";
 import path from "path";
-import { app, BrowserWindow, shell, dialog, Tray, Menu, clipboard, ipcMain } from "electron";
+import { app, BrowserWindow, shell, dialog, Tray, Menu, clipboard } from "electron";
 import log from "electron-log";
 import MenuBuilder from "./menu";
 import {
@@ -24,7 +24,9 @@ import {
 /** Storage - State */
 import "./actions/initGlobalState";
 import AutoUpdate from "../lib/autoupdate";
-import { getReadyToQuitApp } from "./actions/cleanup";
+import { cleanupAndQuit } from "./actions/cleanup";
+import { trackEventViaWebApp } from "./actions/events";
+import EVENTS from "./actions/events/constants";
 import fs from "fs";
 import logger from "../utils/logger";
 import { setupIPCForwardingToWebApp } from "./actions/setupIPCForwarding";
@@ -83,7 +85,7 @@ export default function createTrayMenu(ip?: string, port?: number) {
     {
       label: "Show Requestly",
       click: () => {
-        if(webAppWindow && !webAppWindow.isDestroyed()) {
+        if(webAppWindow) {
           if(webAppWindow.isMinimized()) {
             webAppWindow.restore()
           }
@@ -149,7 +151,7 @@ export default function createTrayMenu(ip?: string, port?: number) {
     {
       label: "Quit",
       click: () => {
-        webAppWindow?.close();
+        app.quit();
       },
     },
   ]
@@ -168,7 +170,7 @@ export default function createTrayMenu(ip?: string, port?: number) {
   tray.setContextMenu(trayMenu);
 }
 
-let closingAccepted = false
+
 const createWindow = async () => {
   if (isDevelopment) {
     await installExtensions();
@@ -256,19 +258,63 @@ const createWindow = async () => {
     }
   });
 
-  webAppWindow.on('close', async (event) => {
-    if(!closingAccepted) {
-      event.preventDefault();
-      webAppWindow?.webContents.send("initiate-app-close")
+  // webAppWindow.on('closed', () => {
+  //   webAppWindow = null;
+  // });
+
+  webAppWindow.on("close", (e) => {
+    // Check if user has already asked to Quit app from here or somewhere else
+    // @ts-expect-error
+    if (global.isQuitActionConfirmed) {
+      saveCookies();
+      app.quit();
+      return;
     }
-  })
 
-  webAppWindow.on('closed', async () => {
-    saveCookies();
-    await getReadyToQuitApp();
-    webAppWindow = null;
-    return;
-  })
+    if (webAppWindow) {
+      let message =
+        "Do you really want to quit? This would also stop the proxy server.";
+
+      // @ts-expect-error
+      if (global.quitAndInstall) {
+        message = "Confirm to restart & install update";
+        // @ts-expect-error
+        global.quitAndInstall = false;
+      }
+
+      const choice = dialog.showMessageBoxSync(webAppWindow, {
+        type: "question",
+        buttons: ["Yes, quit Requestly", "Minimize instead", "Cancel"],
+        title: "Quit Requestly",
+        message: message,
+      });
+
+      switch (choice) {
+        // If Quit is clicked
+        case 0:
+          // Set flag to check next iteration
+          trackEventViaWebApp(webAppWindow, EVENTS.QUIT_APP)
+          // @ts-expect-error
+          global.isQuitActionConfirmed = true;
+          // Calling app.quit() would again invoke this function
+          e.preventDefault();
+          cleanupAndQuit();
+          break;
+        // If Minimize is clicked
+        case 1:
+          webAppWindow.minimize();
+          e.preventDefault();
+          break;
+        // If cancel is clicked
+        case 2:
+          e.preventDefault();
+          break;
+        default:
+          break;
+      }
+    }
+  });
+
   const enableBGWindowDebug = () => {
     // Show bg window and toggle the devtools
     try {
@@ -322,7 +368,7 @@ function handleCustomProtocolURL(urlString: string) {
 
 // custom protocol (requestly) handler
 app.on("open-url", (_event, rqUrl) => {
-  if(webAppWindow && !webAppWindow.isDestroyed()) {
+  if(webAppWindow) {
     handleCustomProtocolURL(rqUrl)
   } else {
     onWebAppReadyHandlers.push(() => handleCustomProtocolURL(rqUrl))
@@ -355,7 +401,7 @@ async function handleFileOpen(filePath: string, webAppWindow?: BrowserWindow) {
 
 app.on('open-file', async (event, filePath) => {
   event.preventDefault();
-  if(webAppWindow && !webAppWindow.isDestroyed()) {
+  if(webAppWindow) {
     handleFileOpen(filePath, webAppWindow);
   } else {
     logger.log("webAppWindow not ready")
@@ -438,24 +484,3 @@ app
   .catch((err) => {
     console.log(err);
   });
-
-ipcMain.handle("quit-app", (_event) => {
-  closingAccepted = true
-  webAppWindow?.close();
-})
-
-app.on("before-quit", () => {
-  // cleanup when quitting has been finalised
-  ipcMain.removeAllListeners();
-  webAppWindow?.removeAllListeners();
-  // @ts-expect-error BrowserWindow types are not being enforced for this variable
-  backgroundWindow?.removeAllListeners();
-
-  ipcMain.removeAllListeners();
-  process.on('uncaughtException', (err) => {
-    logger.error('Unhandled Exception while quitting:', err);
-  });
-  process.on('unhandledRejection', (err) => {
-    logger.error('Unhandled Rejection while quitting:', err);
-  });
-})

src/main/menu.ts

@@ -1,4 +1,5 @@
 import {
+  app,
   Menu,
   shell,
   BrowserWindow,
@@ -12,7 +13,6 @@ interface DarwinMenuItemConstructorOptions extends MenuItemConstructorOptions {
 
 export default class MenuBuilder {
   mainWindow: BrowserWindow;
-
   enableBGWindowDebug: Function;
 
   constructor(mainWindow: BrowserWindow, enableBGWindowDebug: Function) {
@@ -79,7 +79,10 @@ export default class MenuBuilder {
           label: "Quit",
           accelerator: "Command+Q",
           click: () => {
-            return this.mainWindow?.close();
+            if (this.mainWindow) {
+              return this.mainWindow.close();
+            }
+            app.quit();
           },
         },
       ],
@@ -286,7 +289,10 @@ export default class MenuBuilder {
             label: "&Close",
             accelerator: "Ctrl+W",
             click: () => {
-              return this.mainWindow?.close();
+              if (this.mainWindow) {
+                return this.mainWindow.close();
+              }
+              app.quit();
             },
           },
         ],