various configs refactoring/fixes, building project optimizations

src/main/cluster-manager.ts

@@ -11,7 +11,7 @@ import path from "path"
 import { promises } from "fs"
 import  { ensureDir } from "fs-extra"
 import filenamify from "filenamify"
-import { v4 as uuid } from "uuid"
+import uuid from "uuid"
 
 export type FeatureInstallRequest = {
   name: string;
@@ -92,7 +92,7 @@ export class ClusterManager {
         configs.forEach(c => {
           k8s.validateConfig(c)
           const cluster = new Cluster({
-            id: uuid(),
+            id: uuid.v4(),
             port: this.port,
             kubeConfig: k8s.dumpConfigYaml(c),
             preferences: clusterData.preferences,
@@ -115,15 +115,15 @@ export class ClusterManager {
       logger.debug(`IPC: addCluster`)
       const cluster = await this.addNewCluster(clusterData)
       return {
-        addedCluster: this.clusterResponse(cluster),
-        allClusters: Array.from(this.getClusters()).map((cluster: Cluster) => this.clusterResponse(cluster))
+        addedCluster: cluster.toClusterInfo(),
+        allClusters: Array.from(this.getClusters()).map((cluster: Cluster) => cluster.toClusterInfo())
       }
     });
 
     this.promiseIpc.on("getClusters", async (workspaceId: string) => {
       logger.debug(`IPC: getClusters, workspace ${workspaceId}`)
       const workspaceClusters = Array.from(this.getClusters()).filter((cluster) => cluster.workspace === workspaceId)
-      return workspaceClusters.map((cluster: Cluster) => this.clusterResponse(cluster))
+      return workspaceClusters.map((cluster: Cluster) => cluster.toClusterInfo())
     });
 
     this.promiseIpc.on("getCluster", async (id: string) => {
@@ -131,7 +131,7 @@ export class ClusterManager {
       const cluster = this.getCluster(id)
       if (cluster) {
         await cluster.refreshCluster()
-        return this.clusterResponse(cluster)
+        return cluster.toClusterInfo()
       } else {
         return null
       }
@@ -179,7 +179,7 @@ export class ClusterManager {
         if(!cluster.preferences) cluster.preferences = {};
         cluster.preferences.icon = clusterIcon
         clusterStore.storeCluster(cluster);
-        return {success: true, cluster: this.clusterResponse(cluster), message: ""}
+        return {success: true, cluster: cluster.toClusterInfo(), message: ""}
       } catch(error) {
         return {success: false, message: error}
       }
@@ -191,7 +191,7 @@ export class ClusterManager {
       if (cluster && cluster.preferences) {
         cluster.preferences.icon = null;
         clusterStore.storeCluster(cluster)
-        return {success: true, cluster: this.clusterResponse(cluster), message: ""}
+        return {success: true, cluster: cluster.toClusterInfo(), message: ""}
       } else {
         return {success: false, message: "Cluster not found"}
       }
@@ -200,7 +200,7 @@ export class ClusterManager {
     this.promiseIpc.on("refreshCluster", async (clusterId: string) => {
       const cluster = this.clusters.get(clusterId)
       await cluster.refreshCluster()
-      return this.clusterResponse(cluster)
+      return cluster.toClusterInfo()
     });
 
     this.promiseIpc.on("stopCluster", (clusterId: string) => {
@@ -215,7 +215,7 @@ export class ClusterManager {
 
     this.promiseIpc.on("removeCluster", (ctx: string) => {
       logger.debug(`IPC: removeCluster: ${ctx}`)
-      return this.removeCluster(ctx).map((cluster: Cluster) => this.clusterResponse(cluster))
+      return this.removeCluster(ctx).map((cluster: Cluster) => cluster.toClusterInfo())
     });
 
     this.promiseIpc.on("clusterStored", (clusterId: string) => {
@@ -272,11 +272,6 @@ export class ClusterManager {
     return cluster;
   }
 
-  // TODO: remove this
-  protected clusterResponse(cluster: Cluster) {
-    return cluster.toClusterInfo()
-  }
-
   protected async uploadClusterIcon(cluster: Cluster, fileName: string, src: string): Promise<string> {
     await ensureDir(ClusterManager.clusterIconDir)
     fileName = filenamify(cluster.contextName + "-" + fileName)

src/main/cluster.ts

@@ -179,16 +179,14 @@ export class Cluster implements ClusterInfo {
     }
   }
 
-  protected async k8sRequest(path: string, opts?: request.RequestPromiseOptions) {
-    const options = Object.assign({
-      json: true, timeout: 10000
-    }, (opts || {}))
-    if (!options.headers) {
-      options.headers = {}
-    }
-    options.headers.host = `${this.id}.localhost:${this.port}`
-
-    return request(`http://127.0.0.1:${this.port}/api-kube${path}`, options)
+  protected async k8sRequest(path: string, opts: request.RequestPromiseOptions = {}) {
+    const url = `http://127.0.0.1:${this.port}/api-kube${path}`; // fixme: remove hardcoded api prefix
+    opts.json = true;
+    opts.timeout = 10000;
+    opts.headers = Object.assign({}, opts.headers, {
+      host: `${this.id}.localhost:${this.port}`,
+    });
+    return request(url, opts);
   }
 
   protected async getConnectionStatus() {
@@ -300,9 +298,7 @@ export class Cluster implements ClusterInfo {
             if (k8s.podHasIssues(pod)) {
               uniqEventSources.add(w.involvedObject.uid);
             }
-            continue; // TODO: refactor
-          } catch (error) {
-            continue;
+          } catch (err) {
           }
         }
         else {

src/main/index_backup.ts

@@ -132,3 +132,8 @@ app.on("will-quit", async (event) => {
   if (clusterManager) clusterManager.stop()
   app.exit(0);
 })
+
+// auto-restart app in dev-mode
+if (isDevelopment) {
+  require('electron-reloader')(module);
+}

src/main/logger.ts

@@ -1,10 +1,11 @@
-import * as winston from "winston"
+import winston from "winston"
+import { isDebugging } from "../common/vars";
 
 const options = {
   colorize: true,
   handleExceptions: false,
   json: false,
-  level: process.env.DEBUG === "true" ? "debug" : "info",
+  level: isDebugging ? "debug" : "info",
 }
 
 const logger = winston.createLogger({

src/main/menu.ts

@@ -1,5 +1,5 @@
 import { app, BrowserWindow, dialog, Menu, MenuItem, MenuItemConstructorOptions, shell, webContents } from "electron"
-import { isDevelopment, isMac, isWindows } from "../common/vars";
+import { isDevelopment, isMac, issuesTrackerUrl, isWindows, slackUrl } from "../common/vars";
 
 // todo: refactor + split menu sections to separated files, e.g. menus/file.menu.ts
 
@@ -183,13 +183,13 @@ export default function initMenu(opts: MenuOptions, promiseIpc: any) {
       {
         label: 'Community Slack',
         click: async () => {
-          shell.openExternal('https://join.slack.com/t/k8slens/shared_invite/enQtOTc5NjAyNjYyOTk4LWU1NDQ0ZGFkOWJkNTRhYTc2YjVmZDdkM2FkNGM5MjhiYTRhMDU2NDQ1MzIyMDA4ZGZlNmExOTc0N2JmY2M3ZGI');
+          shell.openExternal(slackUrl);
         },
       },
       {
         label: 'Report an Issue',
         click: async () => {
-          shell.openExternal('https://github.com/lensapp/lens/issues');
+          shell.openExternal(issuesTrackerUrl);
         },
       },
       {