Stop using remote to obtain app.getPath()

- Initialize entire map in bootstrap()

- Updated unit tests

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

__mocks__/electron.ts

@@ -26,11 +26,6 @@ export default {
     getLocale: jest.fn().mockRejectedValue("en"),
     getPath: jest.fn(() => "tmp"),
   },
-  remote: {
-    app: {
-      getPath: jest.fn()
-    }
-  },
   dialog: jest.fn(),
   ipcRenderer: {
     on: jest.fn()

integration/helpers/utils.ts

@@ -26,7 +26,7 @@ import * as uuid from "uuid";
 import { ElectronApplication, Frame, Page, _electron as electron } from "playwright";
 import { noop } from "lodash";
 
-export const AppPaths: Partial<Record<NodeJS.Platform, string>> = {
+export const appPaths: Partial<Record<NodeJS.Platform, string>> = {
   "win32": "./dist/win-unpacked/OpenLens.exe",
   "linux": "./dist/linux-unpacked/open-lens",
   "darwin": "./dist/mac/OpenLens.app/Contents/MacOS/OpenLens",
@@ -65,7 +65,7 @@ export async function start() {
 
   const app = await electron.launch({
     args: ["--integration-testing"], // this argument turns off the blocking of quit
-    executablePath: AppPaths[process.platform],
+    executablePath: appPaths[process.platform],
     bypassCSP: true,
     env: {
       CICD,

src/common/__tests__/cluster-store.test.ts

@@ -30,6 +30,7 @@ import { Console } from "console";
 import { stdout, stderr } from "process";
 import type { ClusterId } from "../cluster-types";
 import { getCustomKubeConfigPath } from "../utils";
+import { AppPaths } from "../app-paths";
 
 console = new Console(stdout, stderr);
 
@@ -85,6 +86,8 @@ jest.mock("electron", () => {
   };
 });
 
+AppPaths.init();
+
 describe("empty config", () => {
   beforeEach(async () => {
     ClusterStore.getInstance(false)?.unregisterIpcListener();

src/common/__tests__/hotbar-store.test.ts

@@ -22,6 +22,7 @@
 import { anyObject } from "jest-mock-extended";
 import mockFs from "mock-fs";
 import logger from "../../main/logger";
+import { AppPaths } from "../app-paths";
 import { ClusterStore } from "../cluster-store";
 import { HotbarStore } from "../hotbar-store";
 
@@ -123,10 +124,15 @@ jest.mock("electron", () => {
       getPath: () => "tmp",
       getLocale: () => "en",
       setLoginItemSettings: (): void => void 0,
-    }
+    },
+    ipcMain: {
+      on: jest.fn(),
+    },
   };
 });
 
+AppPaths.init();
+
 describe("HotbarStore", () => {
   beforeEach(() => {
     mockFs({

src/common/__tests__/user-store.test.ts

@@ -28,7 +28,10 @@ jest.mock("electron", () => {
       getPath: () => "tmp",
       getLocale: () => "en",
       setLoginItemSettings: (): void => void 0,
-    }
+    },
+    ipcMain: {
+      on: jest.fn(),
+    },
   };
 });
 
@@ -39,8 +42,10 @@ import electron from "electron";
 import { stdout, stderr } from "process";
 import { ThemeStore } from "../../renderer/theme.store";
 import type { ClusterStoreModel } from "../cluster-store";
+import { AppPaths } from "../app-paths";
 
 console = new Console(stdout, stderr);
+AppPaths.init();
 
 describe("user store tests", () => {
   describe("for an empty config", () => {

src/common/app-paths.ts

@@ -0,0 +1,114 @@
+/**
+ * Copyright (c) 2021 OpenLens Authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+import { app, ipcMain, ipcRenderer } from "electron";
+import { observable, when } from "mobx";
+import logger from "./logger";
+import { fromEntries, toJS } from "./utils";
+import { isWindows } from "./vars";
+
+export type PathName = Parameters<typeof app["getPath"]>[0];
+
+const pathNames: PathName[] = [
+  "home",
+  "appData",
+  "userData",
+  "cache",
+  "temp",
+  "exe",
+  "module",
+  "desktop",
+  "documents",
+  "downloads",
+  "music",
+  "pictures",
+  "videos",
+  "logs",
+  "crashDumps",
+];
+
+if (isWindows) {
+  pathNames.push("recent");
+}
+
+export class AppPaths {
+  private static paths = observable.box<Record<PathName, string> | undefined>();
+  private static readonly ipcChannel = "get-app-paths";
+
+  /**
+   * Inititalizes the local copy of the paths from electron
+   */
+  static init(): void {
+    logger.info(`[APP-PATHS]: initializing`);
+
+    if (AppPaths.paths.get()) {
+      logger.error("[APP-PATHS]: init called more than once");
+
+      return;
+    }
+
+    if (ipcMain) {
+      AppPaths.initMain();
+    } else {
+      AppPaths.initRenderer();
+    }
+  }
+
+  private static initMain(): void {
+    AppPaths.paths.set(fromEntries(
+      pathNames.map(pathName => [pathName, app.getPath(pathName)])
+    ));
+    ipcMain.on(AppPaths.ipcChannel, (event) => event.returnValue = toJS(AppPaths.paths.get()));
+  }
+
+  private static initRenderer(): void {
+    const paths = ipcRenderer.sendSync(AppPaths.ipcChannel);
+
+    if (!paths || typeof paths !== "object") {
+      throw Object.assign(new Error("[APP-PATHS]: ipc channel returned unexpected data"), { data: paths });
+    }
+
+    AppPaths.paths.set(paths);
+  }
+
+  /**
+   * An alternative to `app.getPath()` for use in renderer and common.
+   * This function throws if called before initialization.
+   * @param name The name of the path field
+   */
+  static get(name: PathName): string {
+    if (!AppPaths.paths.get()) {
+      throw new Error("AppPaths.init() has not been called");
+    }
+
+    return AppPaths.paths.get()[name];
+  }
+
+  /**
+   * An async version of `AppPaths.get()` which waits for `AppPaths.init()` to
+   * be called before returning
+   */
+  static async getAsync(name: PathName): Promise<string> {
+    await when(() => Boolean(AppPaths.paths.get()));
+
+    return AppPaths.paths.get()[name];
+  }
+}

src/common/base-store.ts

@@ -30,7 +30,7 @@ import { broadcastMessage, ipcMainOn, ipcRendererOn } from "./ipc";
 import isEqual from "lodash/isEqual";
 import { isTestEnv } from "./vars";
 import { kebabCase } from "lodash";
-import { getPath } from "./utils/getPath";
+import { AppPaths } from "./app-paths";
 
 export interface BaseStoreParams<T> extends ConfOptions<T> {
   syncOptions?: IReactionOptions;
@@ -93,7 +93,7 @@ export abstract class BaseStore<T> extends Singleton {
   }
 
   protected cwd() {
-    return getPath("userData");
+    return AppPaths.get("userData");
   }
 
   protected async saveToFile(model: T) {

src/common/logger.ts

@@ -19,13 +19,12 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { ipcMain } from "electron";
+import { app, ipcMain } from "electron";
 import winston, { format } from "winston";
 import type Transport from "winston-transport";
 import { consoleFormat } from "winston-console-format";
 import { isDebugging, isTestEnv } from "./vars";
 import BrowserConsole from "winston-transport-browserconsole";
-import { getPath } from "./utils/getPath";
 
 const logLevel = process.env.LOG_LEVEL
   ? process.env.LOG_LEVEL
@@ -66,7 +65,11 @@ if (ipcMain) {
         handleExceptions: false,
         level: logLevel,
         filename: "lens.log",
-        dirname: getPath("logs"),
+        /**
+         * SAFTEY: the `ipcMain` check above should mean that this is only
+         * called in the main process
+         */
+        dirname: app.getPath("logs"),
         maxsize: 16 * 1024,
         maxFiles: 16,
         tailable: true,

src/common/user-store/user-store.ts

@@ -33,7 +33,7 @@ import { ObservableToggleSet, toJS } from "../../renderer/utils";
 import { DESCRIPTORS, KubeconfigSyncValue, UserPreferencesModel, EditorConfiguration } from "./preferences-helpers";
 import logger from "../../main/logger";
 import type { monaco } from "react-monaco-editor";
-import { getPath } from "../utils/getPath";
+import { AppPaths } from "../app-paths";
 
 export interface UserStoreModel {
   lastSeenAppVersion: string;
@@ -257,5 +257,5 @@ export class UserStore extends BaseStore<UserStoreModel> /* implements UserStore
  * @returns string
  */
 export function getDefaultKubectlDownloadPath(): string {
-  return path.join(getPath("userData"), "binaries");
+  return path.join(AppPaths.get("userData"), "binaries");
 }

src/common/utils/cluster-id-url-parsing.ts

@@ -46,6 +46,11 @@ export function getClusterFrameUrl(clusterId: ClusterId) {
  * Get the result of `getClusterIdFromHost` from the current `location.host`
  */
 export function getHostedClusterId(): ClusterId | undefined {
+  // catch being called in main
+  if (typeof location === "undefined") {
+    return undefined;
+  }
+
   return getClusterIdFromHost(location.host);
 }
 

src/common/utils/index.ts

@@ -32,19 +32,21 @@ export * from "./base64";
 export * from "./camelCase";
 export * from "./cloneJson";
 export * from "./cluster-id-url-parsing";
+export * from "./convertCpu";
+export * from "./convertMemory";
 export * from "./debouncePromise";
 export * from "./defineGlobal";
 export * from "./delay";
 export * from "./disposer";
 export * from "./downloadFile";
-export * from "./formatDuration";
 export * from "./escapeRegExp";
 export * from "./extended-map";
-export * from "./getPath";
+export * from "./formatDuration";
 export * from "./getRandId";
 export * from "./hash-set";
 export * from "./local-kubeconfig";
 export * from "./n-fircate";
+export * from "./objects";
 export * from "./openExternal";
 export * from "./paths";
 export * from "./reject-promise";
@@ -56,8 +58,6 @@ export * from "./toggle-set";
 export * from "./toJS";
 export * from "./type-narrowing";
 export * from "./types";
-export * from "./convertMemory";
-export * from "./convertCpu";
 
 import * as iter from "./iter";
 import * as array from "./array";

src/common/utils/local-kubeconfig.ts

@@ -21,11 +21,11 @@
 
 import path from "path";
 import * as uuid from "uuid";
+import { AppPaths } from "../app-paths";
 import type { ClusterId } from "../cluster-types";
-import { getPath } from "./getPath";
 
 export function storedKubeConfigFolder(): string {
-  return path.resolve(getPath("userData"), "kubeconfigs");
+  return path.resolve(AppPaths.get("userData"), "kubeconfigs");
 }
 
 export function getCustomKubeConfigPath(clusterId: ClusterId = uuid.v4()): string {

src/common/utils/objects.ts

@@ -19,19 +19,10 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { app, ipcMain } from "electron";
-
-const remote = ipcMain ? null : require("@electron/remote");
-
 /**
- * calls getPath either on app or on the remote's app
- *
- * @deprecated Use a different method for accessing the getPath function
+ * A better typed version of `Object.fromEntries` where the keys are known to
+ * be a specific subset
  */
-export function getPath(name: Parameters<typeof app["getPath"]>[0]): string {
-  if (app) {
-    return app.getPath(name);
-  }
-
-  return remote.app.getPath(name);
+export function fromEntries<T, Key extends string>(entries: Iterable<readonly [Key, T]>): { [k in Key]: T } {
+  return Object.fromEntries(entries) as { [k in Key]: T };
 }

src/extensions/__tests__/extension-discovery.test.ts

@@ -26,6 +26,7 @@ import path from "path";
 import { ExtensionDiscovery } from "../extension-discovery";
 import os from "os";
 import { Console } from "console";
+import { AppPaths } from "../../common/app-paths";
 
 jest.setTimeout(60_000);
 
@@ -44,11 +45,16 @@ jest.mock("electron", () => ({
     getPath: () => "tmp",
     setLoginItemSettings: jest.fn(),
   },
+  ipcMain: {
+    on: jest.fn(),
+  },
 }));
 
 console = new Console(process.stdout, process.stderr); // fix mockFS
 const mockedWatch = watch as jest.MockedFunction<typeof watch>;
 
+AppPaths.init();
+
 describe("ExtensionDiscovery", () => {
   beforeEach(() => {
     ExtensionDiscovery.resetInstance();

src/extensions/extension-loader.ts

@@ -24,9 +24,10 @@ import { EventEmitter } from "events";
 import { isEqual } from "lodash";
 import { action, computed, makeObservable, observable, observe, reaction, when } from "mobx";
 import path from "path";
+import { AppPaths } from "../common/app-paths";
 import { ClusterStore } from "../common/cluster-store";
 import { broadcastMessage, ipcMainOn, ipcRendererOn, requestMain, ipcMainHandle } from "../common/ipc";
-import { Disposer, getHostedClusterId, Singleton, toJS, getPath } from "../common/utils";
+import { Disposer, getHostedClusterId, Singleton, toJS } from "../common/utils";
 import logger from "../main/logger";
 import type { InstalledExtension } from "./extension-discovery";
 import { ExtensionsStore } from "./extensions-store";
@@ -36,7 +37,7 @@ import type { LensRendererExtension } from "./lens-renderer-extension";
 import * as registries from "./registries";
 
 export function extensionPackagesRoot() {
-  return path.join(getPath("userData"));
+  return path.join(AppPaths.get("userData"));
 }
 
 const logModule = "[EXTENSIONS-LOADER]";

src/extensions/registries/__tests__/page-registry.test.ts

@@ -28,6 +28,7 @@ import { stdout, stderr } from "process";
 import { ThemeStore } from "../../../renderer/theme.store";
 import { TerminalStore } from "../../renderer-api/components";
 import { UserStore } from "../../../common/user-store";
+import { AppPaths } from "../../../common/app-paths";
 
 jest.mock("react-monaco-editor", () => null);
 
@@ -35,8 +36,13 @@ jest.mock("electron", () => ({
   app: {
     getPath: () => "tmp",
   },
+  ipcMain: {
+    on: jest.fn(),
+  },
 }));
 
+AppPaths.init();
+
 console = new Console(stdout, stderr);
 
 let ext: LensExtension = null;

src/main/__test__/context-handler.test.ts

@@ -23,12 +23,16 @@ import { UserStore } from "../../common/user-store";
 import { ContextHandler } from "../context-handler";
 import { PrometheusProvider, PrometheusProviderRegistry, PrometheusService } from "../prometheus";
 import mockFs from "mock-fs";
+import { AppPaths } from "../../common/app-paths";
 
 jest.mock("electron", () => ({
   app: {
     getPath: () => "tmp",
     setLoginItemSettings: jest.fn(),
   },
+  ipcMain: {
+    on: jest.fn(),
+  },
 }));
 
 enum ServiceResult {
@@ -76,6 +80,8 @@ function getHandler() {
   }) as any);
 }
 
+AppPaths.init();
+
 describe("ContextHandler", () => {
   beforeEach(() => {
     mockFs({

src/main/__test__/kube-auth-proxy.test.ts

@@ -19,15 +19,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-const logger = {
-  silly: jest.fn(),
-  debug: jest.fn(),
-  log: jest.fn(),
-  info: jest.fn(),
-  error: jest.fn(),
-  crit: jest.fn(),
-};
-
 jest.mock("winston", () => ({
   format: {
     colorize: jest.fn(),
@@ -35,9 +26,18 @@ jest.mock("winston", () => ({
     simple: jest.fn(),
     label: jest.fn(),
     timestamp: jest.fn(),
-    printf: jest.fn()
+    printf: jest.fn(),
+    padLevels: jest.fn(),
+    ms: jest.fn(),
   },
-  createLogger: jest.fn().mockReturnValue(logger),
+  createLogger: jest.fn().mockReturnValue({
+    silly: jest.fn(),
+    debug: jest.fn(),
+    log: jest.fn(),
+    info: jest.fn(),
+    error: jest.fn(),
+    crit: jest.fn(),
+  }),
   transports: {
     Console: jest.fn(),
     File: jest.fn(),
@@ -54,7 +54,6 @@ jest.mock("electron", () => ({
 jest.mock("../../common/ipc");
 jest.mock("child_process");
 jest.mock("tcp-port-used");
-//jest.mock("../utils/get-port");
 
 import { Cluster } from "../cluster";
 import { KubeAuthProxy } from "../kube-auth-proxy";
@@ -68,6 +67,7 @@ import { UserStore } from "../../common/user-store";
 import { Console } from "console";
 import { stdout, stderr } from "process";
 import mockFs from "mock-fs";
+import { AppPaths } from "../../common/app-paths";
 
 console = new Console(stdout, stderr);
 
@@ -75,6 +75,22 @@ const mockBroadcastIpc = broadcastMessage as jest.MockedFunction<typeof broadcas
 const mockSpawn = spawn as jest.MockedFunction<typeof spawn>;
 const mockWaitUntilUsed = waitUntilUsed as jest.MockedFunction<typeof waitUntilUsed>;
 
+jest.mock("electron", () => {
+  return {
+    app: {
+      getVersion: () => "99.99.99",
+      getPath: () => "tmp",
+      getLocale: () => "en",
+      setLoginItemSettings: (): void => void 0,
+    },
+    ipcMain: {
+      on: jest.fn(),
+    },
+  };
+});
+
+AppPaths.init();
+
 describe("kube auth proxy tests", () => {
   beforeEach(() => {
     jest.clearAllMocks();

src/main/__test__/router.test.ts

@@ -19,8 +19,21 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+import { AppPaths } from "../../common/app-paths";
 import { Router } from "../router";
 
+jest.mock("electron", () => ({
+  app: {
+    getPath: () => "tmp",
+    setLoginItemSettings: jest.fn(),
+  },
+  ipcMain: {
+    on: jest.fn(),
+  },
+}));
+
+AppPaths.init();
+
 describe("Router", () => {
   it("blocks path traversal attacks", async () => {
     const response: any = {

src/main/catalog-sources/__test__/kubeconfig-sync.test.ts

@@ -28,13 +28,19 @@ import mockFs from "mock-fs";
 import fs from "fs";
 import { ClusterStore } from "../../../common/cluster-store";
 import { ClusterManager } from "../../cluster-manager";
+import { AppPaths } from "../../../common/app-paths";
 
 jest.mock("electron", () => ({
   app: {
     getPath: () => "/foo",
   },
+  ipcMain: {
+    on: jest.fn(),
+  },
 }));
 
+AppPaths.init();
+
 describe("kubeconfig-sync.source tests", () => {
   beforeEach(() => {
     mockFs();

src/main/extension-filesystem.ts

@@ -27,7 +27,7 @@ import path from "path";
 import { BaseStore } from "../common/base-store";
 import type { LensExtensionId } from "../extensions/lens-extension";
 import { toJS } from "../common/utils";
-import { getPath } from "../common/utils/getPath";
+import { app } from "electron";
 
 interface FSProvisionModel {
   extensions: Record<string, string>; // extension names to paths
@@ -55,7 +55,7 @@ export class FilesystemProvisionerStore extends BaseStore<FSProvisionModel> {
     if (!this.registeredExtensions.has(extensionName)) {
       const salt = randomBytes(32).toString("hex");
       const hashedName = SHA256(`${extensionName}/${salt}`).toString();
-      const dirPath = path.resolve(getPath("userData"), "extension_data", hashedName);
+      const dirPath = path.resolve(app.getPath("userData"), "extension_data", hashedName);
 
       this.registeredExtensions.set(extensionName, dirPath);
     }

src/main/index.ts

@@ -65,6 +65,7 @@ import { initMenu } from "./menu";
 import { initTray } from "./tray";
 import * as path from "path";
 import { kubeApiRequest, shellApiRequest } from "./proxy-functions";
+import { AppPaths } from "../common/app-paths";
 
 const onCloseCleanup = disposer();
 const onQuitCleanup = disposer();
@@ -89,6 +90,8 @@ if (process.env.CICD) {
   app.setPath("userData", workingDir);
 }
 
+AppPaths.init();
+
 if (process.env.LENS_DISABLE_GPU) {
   app.disableHardwareAcceleration();
 }

src/main/kubectl.ts

@@ -31,8 +31,8 @@ import { customRequest } from "../common/request";
 import { getBundledKubectlVersion } from "../common/utils/app-version";
 import { isDevelopment, isWindows, isTestEnv } from "../common/vars";
 import { SemVer } from "semver";
-import { getPath } from "../common/utils/getPath";
 import { defaultPackageMirror, packageMirrors } from "../common/user-store/preferences-helpers";
+import { app } from "electron";
 
 const bundledVersion = getBundledKubectlVersion();
 const kubectlMap: Map<string, string> = new Map([
@@ -81,7 +81,7 @@ export class Kubectl {
   protected dirname: string;
 
   static get kubectlDir() {
-    return path.join(getPath("userData"), "binaries", "kubectl");
+    return path.join(app.getPath("userData"), "binaries", "kubectl");
   }
 
   public static readonly bundledKubectlVersion: string = bundledVersion;

src/main/protocol-handler/__test__/router.test.ts

@@ -29,6 +29,7 @@ import { ExtensionLoader } from "../../../extensions/extension-loader";
 import { ExtensionsStore } from "../../../extensions/extensions-store";
 import { LensProtocolRouterMain } from "../router";
 import mockFs from "mock-fs";
+import { AppPaths } from "../../../common/app-paths";
 
 jest.mock("../../../common/ipc");
 
@@ -37,8 +38,13 @@ jest.mock("electron", () => ({
     getPath: () => "tmp",
     setLoginItemSettings: jest.fn(),
   },
+  ipcMain: {
+    on: jest.fn(),
+  },
 }));
 
+AppPaths.init();
+
 function throwIfDefined(val: any): void {
   if (val != null) {
     throw val;

src/renderer/bootstrap.tsx

@@ -36,8 +36,6 @@ import { ClusterStore } from "../common/cluster-store";
 import { UserStore } from "../common/user-store";
 import { ExtensionDiscovery } from "../extensions/extension-discovery";
 import { ExtensionLoader } from "../extensions/extension-loader";
-import { App } from "./components/app";
-import { LensApp } from "./lens-app";
 import { HelmRepoManager } from "../main/helm/helm-repo-manager";
 import { ExtensionInstallationStateStore } from "./components/+extensions/extension-install.store";
 import { DefaultProps } from "./mui-base-theme";
@@ -51,6 +49,7 @@ import { ThemeStore } from "./theme.store";
 import { SentryInit } from "../common/sentry";
 import { TerminalStore } from "./components/dock/terminal.store";
 import cloudsMidnight from "./monaco-themes/Clouds Midnight.json";
+import { AppPaths } from "../common/app-paths";
 
 configurePackages();
 
@@ -69,7 +68,8 @@ type AppComponent = React.ComponentType & {
   init?(rootElem: HTMLElement): Promise<void>;
 };
 
-export async function bootstrap(App: AppComponent) {
+export async function bootstrap(comp: () => Promise<AppComponent>) {
+  AppPaths.init();
   const rootElem = document.getElementById("app");
 
   await attachChromeDebugger();
@@ -124,9 +124,10 @@ export async function bootstrap(App: AppComponent) {
   cs.registerIpcListener();
 
   // init app's dependencies if any
-  if (App.init) {
-    await App.init(rootElem);
-  }
+  const App = await comp();
+
+  await App.init(rootElem);
+
   render(<>
     {isMac && <div id="draggable-top" />}
     {DefaultProps(App)}
@@ -134,7 +135,11 @@ export async function bootstrap(App: AppComponent) {
 }
 
 // run
-bootstrap(process.isMainFrame ? LensApp : App);
+bootstrap(
+  async () => process.isMainFrame
+    ? (await import("./lens-app")).LensApp
+    : (await import("./components/app")).App
+);
 
 
 /**

src/renderer/components/+catalog/catalog.tsx

@@ -37,7 +37,7 @@ import { CatalogAddButton } from "./catalog-add-button";
 import type { RouteComponentProps } from "react-router";
 import { Notifications } from "../notifications";
 import { MainLayout } from "../layout/main-layout";
-import { createAppStorage, cssNames, prevDefault } from "../../utils";
+import { createStorage, cssNames, prevDefault } from "../../utils";
 import { makeCss } from "../../../common/utils/makeCss";
 import { CatalogEntityDetails } from "./catalog-entity-details";
 import { browseCatalogTab, catalogURL, CatalogViewRouteParam } from "../../../common/routes";
@@ -47,7 +47,7 @@ import { RenderDelay } from "../render-delay/render-delay";
 import { Icon } from "../icon";
 import { HotbarToggleMenuItem } from "./hotbar-toggle-menu-item";
 
-export const previousActiveTab = createAppStorage("catalog-previous-active-tab", browseCatalogTab);
+export const previousActiveTab = createStorage("catalog-previous-active-tab", browseCatalogTab);
 
 enum sortBy {
   name = "name",
@@ -74,7 +74,7 @@ export class Catalog extends React.Component<Props> {
     this.catalogEntityStore = props.catalogEntityStore;
   }
   static defaultProps = {
-    catalogEntityStore: new CatalogEntityStore(),       
+    catalogEntityStore: new CatalogEntityStore(),
   };
 
   get routeActiveTab(): string {

src/renderer/components/+extensions/__tests__/extensions.test.tsx

@@ -31,6 +31,7 @@ import { ExtensionInstallationStateStore } from "../extension-install.store";
 import { Extensions } from "../extensions";
 import mockFs from "mock-fs";
 import { mockWindow } from "../../../../../__mocks__/windowMock";
+import { AppPaths } from "../../../../common/app-paths";
 
 mockWindow();
 
@@ -38,23 +39,35 @@ jest.setTimeout(30000);
 jest.mock("fs-extra");
 jest.mock("../../notifications");
 
-jest.mock("../../../../common/utils", () => ({
-  ...jest.requireActual<any>("../../../../common/utils"),
-  downloadFile: jest.fn(() => ({
-    promise: Promise.resolve()
+jest.mock("../../../../common/utils/downloadFile", () => ({
+  downloadFile: jest.fn(({ url }) => ({
+    promise: Promise.resolve(),
+    url,
+    cancel: () => {},
+  })),
+  downloadJson: jest.fn(({ url }) => ({
+    promise: Promise.resolve({}),
+    url,
+    cancel: () => { },
   })),
-  extractTar: jest.fn(() => Promise.resolve())
 }));
 
+jest.mock("../../../../common/utils/tar");
+
 jest.mock("electron", () => ({
   app: {
     getVersion: () => "99.99.99",
     getPath: () => "tmp",
     getLocale: () => "en",
     setLoginItemSettings: (): void => void 0,
-  }
+  },
+  ipcMain: {
+    on: jest.fn(),
+  },
 }));
 
+AppPaths.init();
+
 describe("Extensions", () => {
   beforeEach(async () => {
     mockFs({

src/renderer/components/+extensions/extensions.tsx

@@ -47,7 +47,7 @@ import { Notice } from "./notice";
 import { SettingLayout } from "../layout/setting-layout";
 import { docsUrl } from "../../../common/vars";
 import { dialog } from "../../remote-helpers";
-import { getPath } from "../../../common/utils/getPath";
+import { AppPaths } from "../../../common/app-paths";
 
 function getMessageFromError(error: any): string {
   if (!error || typeof error !== "object") {
@@ -469,7 +469,7 @@ const supportedFormats = ["tar", "tgz"];
 
 async function installFromSelectFileDialog() {
   const { canceled, filePaths } = await dialog.showOpenDialog({
-    defaultPath: getPath("downloads"),
+    defaultPath: AppPaths.get("downloads"),
     properties: ["openFile", "multiSelections"],
     message: `Select extensions to install (formats: ${supportedFormats.join(", ")}), `,
     buttonLabel: "Use configuration",

src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx

@@ -27,13 +27,19 @@ import selectEvent from "react-select-event";
 
 import { Cluster } from "../../../../main/cluster";
 import { DeleteClusterDialog } from "../delete-cluster-dialog";
+import { AppPaths } from "../../../../common/app-paths";
 
 jest.mock("electron", () => ({
   app: {
     getPath: () => "tmp",
   },
+  ipcMain: {
+    on: jest.fn(),
+  },
 }));
 
+AppPaths.init();
+
 const kubeconfig = `
 apiVersion: v1
 clusters:

src/renderer/components/dock/__test__/dock-tabs.test.tsx

@@ -30,6 +30,7 @@ import { noop } from "../../../utils";
 import { ThemeStore } from "../../../theme.store";
 import { TerminalStore } from "../terminal.store";
 import { UserStore } from "../../../../common/user-store";
+import { AppPaths } from "../../../../common/app-paths";
 
 jest.mock("react-monaco-editor", () => ({
   monaco: {
@@ -43,8 +44,13 @@ jest.mock("electron", () => ({
   app: {
     getPath: () => "tmp",
   },
+  ipcMain: {
+    on: jest.fn(),
+  },
 }));
 
+AppPaths.init();
+
 const initialTabs: DockTab[] = [
   { id: "terminal", kind: TabKind.TERMINAL, title: "Terminal", pinned: false, },
   { id: "create", kind: TabKind.CREATE_RESOURCE, title: "Create resource", pinned: false, },

src/renderer/components/dock/__test__/log-resource-selector.test.tsx

@@ -31,6 +31,7 @@ import { dockerPod, deploymentPod1 } from "./pod.mock";
 import { ThemeStore } from "../../../theme.store";
 import { UserStore } from "../../../../common/user-store";
 import mockFs from "mock-fs";
+import { AppPaths } from "../../../../common/app-paths";
 
 jest.mock("react-monaco-editor", () => null);
 
@@ -38,8 +39,13 @@ jest.mock("electron", () => ({
   app: {
     getPath: () => "tmp",
   },
+  ipcMain: {
+    on: jest.fn(),
+  },
 }));
 
+AppPaths.init();
+
 const getComponent = (tabData: LogTabData) => {
   return (
     <LogResourceSelector

src/renderer/components/dock/__test__/log-tab.store.test.ts

@@ -28,6 +28,7 @@ import { logTabStore } from "../log-tab.store";
 import { deploymentPod1, deploymentPod2, deploymentPod3, dockerPod } from "./pod.mock";
 import fse from "fs-extra";
 import { mockWindow } from "../../../../../__mocks__/windowMock";
+import { AppPaths } from "../../../../common/app-paths";
 
 mockWindow();
 
@@ -37,8 +38,13 @@ jest.mock("electron", () => ({
   app: {
     getPath: () => "tmp",
   },
+  ipcMain: {
+    on: jest.fn(),
+  },
 }));
 
+AppPaths.init();
+
 podsStore.items.push(new Pod(dockerPod));
 podsStore.items.push(new Pod(deploymentPod1));
 podsStore.items.push(new Pod(deploymentPod2));

src/renderer/components/hotbar/__tests__/hotbar-remove-command.test.tsx

@@ -27,14 +27,20 @@ import { ThemeStore } from "../../../theme.store";
 import { UserStore } from "../../../../common/user-store";
 import { Notifications } from "../../notifications";
 import mockFs from "mock-fs";
+import { AppPaths } from "../../../../common/app-paths";
 
 jest.mock("electron", () => ({
   app: {
     getPath: () => "tmp",
     setLoginItemSettings: jest.fn(),
   },
+  ipcMain: {
+    on: jest.fn(),
+  },
 }));
 
+AppPaths.init();
+
 const mockHotbars: {[id: string]: any} = {
   "1": {
     id: "1",

src/renderer/utils/createStorage.ts

@@ -26,7 +26,6 @@ import { comparer, observable, reaction, toJS, when } from "mobx";
 import fse from "fs-extra";
 import { StorageHelper } from "./storageHelper";
 import logger from "../../main/logger";
-import { getHostedClusterId, getPath } from "../../common/utils";
 import { isTestEnv } from "../../common/vars";
 
 const storage = observable({
@@ -37,36 +36,29 @@ const storage = observable({
 
 /**
  * Creates a helper for saving data under the "key" intended for window.localStorage
- * @param key
- * @param defaultValue
+ * @param key The descriptor of the data
+ * @param defaultValue The default value of the data, must be JSON serializable
  */
 export function createStorage<T>(key: string, defaultValue: T) {
-  return createAppStorage(key, defaultValue, getHostedClusterId());
-}
-
-export function createAppStorage<T>(key: string, defaultValue: T, clusterId?: string | undefined) {
   const { logPrefix } = StorageHelper;
-  const folder = path.resolve(getPath("userData"), "lens-local-storage");
-  const fileName = `${clusterId ?? "app"}.json`;
-  const filePath = path.resolve(folder, fileName);
 
   if (!storage.initialized) {
+    storage.initialized = true;
     init(); // called once per cluster-view
   }
 
-  function init() {
-    storage.initialized = true;
+  async function init() {
+    const filePath = await StorageHelper.getLocalStoragePath();
 
-    // read previously saved state (if any)
-    fse.readJson(filePath)
-      .then(data => storage.data = data)
-      .catch(() => null) // ignore empty / non-existing / invalid json files
-      .finally(() => {
-        if (!isTestEnv) {
-          logger.info(`${logPrefix} loading finished for ${filePath}`);
-        }
-        storage.loaded = true;
-      });
+    try {
+      storage.data = await fse.readJson(filePath);
+    } catch {} finally {
+      if (!isTestEnv) {
+        logger.info(`${logPrefix} loading finished for ${filePath}`);
+      }
+
+      storage.loaded = true;
+    }
 
     // bind auto-saving data changes to %storage-file.json
     reaction(() => toJS(storage.data), saveFile, {
@@ -78,7 +70,7 @@ export function createAppStorage<T>(key: string, defaultValue: T, clusterId?: st
       logger.info(`${logPrefix} saving ${filePath}`);
 
       try {
-        await fse.ensureDir(folder, { mode: 0o755 });
+        await fse.ensureDir(path.dirname(filePath), { mode: 0o755 });
         await fse.writeJson(filePath, state, { spaces: 2 });
       } catch (error) {
         logger.error(`${logPrefix} saving failed: ${error}`, {

src/renderer/utils/storageHelper.ts

@@ -24,6 +24,9 @@ import { action, comparer, makeObservable, observable, toJS, when, } from "mobx"
 import produce, { Draft, isDraft } from "immer";
 import { isEqual, isPlainObject } from "lodash";
 import logger from "../../main/logger";
+import { getHostedClusterId } from "../../common/utils";
+import path from "path";
+import { AppPaths } from "../../common/app-paths";
 
 export interface StorageAdapter<T> {
   [metadata: string]: any;
@@ -40,6 +43,10 @@ export interface StorageHelperOptions<T> {
 }
 
 export class StorageHelper<T> {
+  static async getLocalStoragePath() {
+    return path.resolve(await AppPaths.getAsync("userData"), "lens-local-storage", `${getHostedClusterId() || "app"}.json`);
+  }
+
   static logPrefix = "[StorageHelper]:";
   readonly storage: StorageAdapter<T>;