chore: Rename exitApp to forceAppExit

Signed-off-by: Sebastian Malton <sebastian@malton.name>

packages/core/src/main/electron-app/features/force-app-exit.injectable.ts

@@ -5,8 +5,8 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import electronAppInjectable from "../electron-app.injectable";
 
-const exitAppInjectable = getInjectable({
-  id: "exit-app",
+const forceAppExitInjectable = getInjectable({
+  id: "force-app-exit",
 
   instantiate: (di) => () => {
     const app = di.inject(electronAppInjectable);
@@ -15,4 +15,4 @@ const exitAppInjectable = getInjectable({
   },
 });
 
-export default exitAppInjectable;
+export default forceAppExitInjectable;

packages/core/src/main/electron-app/runnables/enforce-single-application-instance.injectable.ts

@@ -5,7 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { beforeElectronIsReadyInjectionToken } from "@k8slens/application-for-electron-main";
 import requestSingleInstanceLockInjectable from "../features/request-single-instance-lock.injectable";
-import exitAppInjectable from "../features/exit-app.injectable";
+import forceAppExitInjectable from "../features/force-app-exit.injectable";
 
 const enforceSingleApplicationInstanceInjectable = getInjectable({
   id: "enforce-single-application-instance",
@@ -13,10 +13,10 @@ const enforceSingleApplicationInstanceInjectable = getInjectable({
   instantiate: (di) => ({
     run: () => {
       const requestSingleInstanceLock = di.inject(requestSingleInstanceLockInjectable);
-      const exitApp = di.inject(exitAppInjectable);
+      const forceAppExit = di.inject(forceAppExitInjectable);
 
       if (!requestSingleInstanceLock()) {
-        exitApp();
+        forceAppExit();
       }
 
       return undefined;

packages/core/src/main/electron-app/runnables/setup-device-shutdown.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import powerMonitorInjectable from "../features/power-monitor.injectable";
-import exitAppInjectable from "../features/exit-app.injectable";
+import forceAppExitInjectable from "../features/force-app-exit.injectable";
 import { onLoadOfApplicationInjectionToken } from "@k8slens/application";
 
 const setupDeviceShutdownInjectable = getInjectable({
@@ -13,9 +13,9 @@ const setupDeviceShutdownInjectable = getInjectable({
   instantiate: (di) => ({
     run: () => {
       const powerMonitor = di.inject(powerMonitorInjectable);
-      const exitApp = di.inject(exitAppInjectable);
+      const forceAppExit = di.inject(forceAppExitInjectable);
 
-      powerMonitor.on("shutdown", exitApp);
+      powerMonitor.on("shutdown", forceAppExit);
     },
   }),
 

packages/core/src/main/start-main-application/runnables/setup-lens-proxy.injectable.ts

@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import exitAppInjectable from "../../electron-app/features/exit-app.injectable";
+import forceAppExitInjectable from "../../electron-app/features/force-app-exit.injectable";
 import lensProxyInjectable from "../../lens-proxy/lens-proxy.injectable";
 import loggerInjectable from "../../../common/logger.injectable";
 import lensProxyPortInjectable from "../../lens-proxy/lens-proxy-port.injectable";
@@ -22,7 +22,7 @@ const setupLensProxyInjectable = getInjectable({
   instantiate: (di) => ({
     run: async () => {
       const lensProxy = di.inject(lensProxyInjectable);
-      const exitApp = di.inject(exitAppInjectable);
+      const forceAppExit = di.inject(forceAppExitInjectable);
       const logger = di.inject(loggerInjectable);
       const lensProxyPort = di.inject(lensProxyPortInjectable);
       const isWindows = di.inject(isWindowsInjectable);
@@ -37,7 +37,7 @@ const setupLensProxyInjectable = getInjectable({
       } catch (error: any) {
         showErrorPopup("Lens Error", `Could not start proxy: ${error?.message || "unknown error"}`);
 
-        return exitApp();
+        return forceAppExit();
       }
 
       // test proxy connection
@@ -54,7 +54,7 @@ const setupLensProxyInjectable = getInjectable({
         if (buildVersion.get() !== versionFromProxy) {
           logger.error("Proxy server responded with invalid response");
 
-          return exitApp();
+          return forceAppExit();
         }
 
         logger.info("⚡ LensProxy connection OK");
@@ -73,7 +73,7 @@ const setupLensProxyInjectable = getInjectable({
 
         showErrorPopup("Lens Proxy Error", message.join("\n\n"));
 
-        return exitApp();
+        return forceAppExit();
       }
     },
     runAfter: initializeBuildVersionInjectable,

packages/core/src/main/stop-services-and-exit-app.injectable.ts

@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import exitAppInjectable from "./electron-app/features/exit-app.injectable";
+import forceAppExitInjectable from "./electron-app/features/force-app-exit.injectable";
 import clusterManagerInjectable from "./cluster/manager.injectable";
 import loggerInjectable from "../common/logger.injectable";
 import closeAllWindowsInjectable from "./start-main-application/lens-window/hide-all-windows/close-all-windows.injectable";
@@ -14,7 +14,7 @@ const stopServicesAndExitAppInjectable = getInjectable({
   id: "stop-services-and-exit-app",
 
   instantiate: (di) => {
-    const exitApp = di.inject(exitAppInjectable);
+    const forceAppExit = di.inject(forceAppExitInjectable);
     const clusterManager = di.inject(clusterManagerInjectable);
     const logger = di.inject(loggerInjectable);
     const closeAllWindows = di.inject(closeAllWindowsInjectable);
@@ -27,7 +27,7 @@ const stopServicesAndExitAppInjectable = getInjectable({
       clusterManager.stop();
       await stopAllExtensions();
       logger.info("SERVICE:QUIT");
-      setTimeout(exitApp, 1000);
+      setTimeout(forceAppExit, 1000);
     };
   },
 });