tracker / user-store refactoring, part 1

Signed-off-by: Roman <ixrock@gmail.com>

src/main/index.ts

@@ -18,7 +18,6 @@ import initMenu from "./menu"
 import * as proxy from "./proxy"
 import { WindowManager } from "./window-manager";
 import { clusterStore } from "../common/cluster-store"
-import { tracker } from "./tracker"
 import { ClusterManager } from "./cluster-manager";
 import AppUpdater from "./app-updater"
 import { shellSync } from "./shell-sync"
@@ -26,6 +25,7 @@ import { getFreePort } from "./port"
 import { mangleProxyEnv } from "./proxy-env"
 import { findMainWebContents } from "./webcontents"
 import { registerStaticProtocol } from "../common/register-static";
+import { tracker } from "../common/tracker";
 
 mangleProxyEnv()
 if (app.commandLine.getSwitchValue("proxy-server") !== "") {

src/main/kubectl.ts

@@ -285,7 +285,7 @@ export class Kubectl {
   }
 
   protected getDownloadMirror() {
-    const mirror = packageMirrors.get(userStore.getPreferences().downloadMirror)
+    const mirror = packageMirrors.get(userStore.preferences.downloadMirror)
     if (mirror) {
       return mirror
     }

src/main/kubectl_spec.ts

@@ -1,19 +1,7 @@
 import packageInfo from "../../package.json"
 import { bundledKubectl, Kubectl } from "../../src/main/kubectl";
-import { UserStore } from "../common/user-store";
 
-jest.mock("../common/user-store", () => {
-  const userStoreMock: Partial<UserStore> = {
-    getPreferences() {
-      return {
-        downloadMirror: "default"
-      }
-    }
-  }
-  return {
-    userStore: userStoreMock,
-  }
-})
+jest.mock("../common/user-store");
 
 describe("kubectlVersion", () => {
   it("returns bundled version if exactly same version used", async () => {

src/main/node-shell-session.ts

@@ -3,10 +3,10 @@ import * as pty from "node-pty"
 import { ShellSession } from "./shell-session";
 import { v4 as uuid } from "uuid"
 import * as k8s from "@kubernetes/client-node"
+import { KubeConfig } from "@kubernetes/client-node"
+import { Cluster } from "./cluster"
 import logger from "./logger";
-import { KubeConfig, V1Pod } from "@kubernetes/client-node";
-import { tracker } from "./tracker"
-import { Cluster, ClusterPreferences } from "./cluster"
+import { tracker } from "../common/tracker";
 
 export class NodeShellSession extends ShellSession {
   protected nodeName: string;
@@ -107,7 +107,7 @@ export class NodeShellSession extends ShellSession {
       const watch = new k8s.Watch(kc);
 
       const req = await watch.watch(`/api/v1/namespaces/kube-system/pods`, {},
-      // callback is called for each received object.
+        // callback is called for each received object.
         (_type, obj) => {
           if (obj.metadata.name == podId && obj.status.phase === "Running") {
             resolve(true)
@@ -119,9 +119,13 @@ export class NodeShellSession extends ShellSession {
           reject(false)
         }
       );
-      setTimeout(() => { req.abort(); reject(false); }, 120 * 1000);
+      setTimeout(() => {
+        req.abort();
+        reject(false);
+      }, 120 * 1000);
     })
   }
+
   protected deleteNodeShellPod() {
     const kc = this.getKubeConfig();
     const k8sApi = kc.makeApiClient(k8s.CoreV1Api);
@@ -130,12 +134,11 @@ export class NodeShellSession extends ShellSession {
 }
 
 export async function open(socket: WebSocket, pathToKubeconfig: string, cluster: Cluster, nodeName?: string): Promise<ShellSession> {
-  return new Promise(async(resolve, reject) => {
+  return new Promise(async (resolve, reject) => {
     let shell = null
     if (nodeName) {
       shell = new NodeShellSession(socket, pathToKubeconfig, cluster, nodeName)
-    }
-    else {
+    } else {
       shell = new ShellSession(socket, pathToKubeconfig, cluster)
     }
     shell.open()

src/main/resource-applier.ts

@@ -5,7 +5,7 @@ import path from "path";
 import * as tempy from "tempy";
 import logger from "./logger"
 import { Cluster } from "./cluster";
-import { tracker } from "./tracker";
+import { tracker } from "../common/tracker";
 
 type KubeObject = {
   status: {};

src/main/routes/config.ts

@@ -94,7 +94,7 @@ class ConfigRoute extends LensApi {
     const data: IConfigRoutePayload = {
       clusterName: cluster.contextName,
       lensVersion: app.getVersion(),
-      lensTheme: `kontena-${userStore.getPreferences().colorTheme}`,
+      lensTheme: `kontena-${userStore.preferences.colorTheme}`,
       kubeVersion: cluster.version,
       chartsEnabled: true,
       isClusterAdmin: cluster.isAdmin,

src/main/shell-session.ts

@@ -5,10 +5,10 @@ import path from "path"
 import shellEnv from "shell-env"
 import { app } from "electron"
 import { Kubectl } from "./kubectl"
-import { tracker } from "./tracker"
 import { Cluster, ClusterPreferences } from "./cluster"
 import { helmCli } from "./helm-cli"
 import { isWindows } from "../common/vars";
+import { tracker } from "../common/tracker";
 
 export class ShellSession extends EventEmitter {
   static shellEnvs: Map<string, any> = new Map()

src/main/tracker.ts

@@ -1,4 +0,0 @@
-import { Tracker } from "../common/tracker"
-import { app, remote } from "electron"
-
-export const tracker = new Tracker(app || remote.app);

src/main/window-manager.ts

@@ -1,8 +1,8 @@
 import { BrowserWindow, shell } from "electron"
 import { PromiseIpc } from "electron-promise-ipc"
 import windowStateKeeper from "electron-window-state"
-import { tracker } from "./tracker";
 import { getStaticUrl } from "../common/register-static";
+import { tracker } from "../common/tracker";
 
 export class WindowManager {
   public mainWindow: BrowserWindow = null;