simplify ExtensionLoader

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

src/extensions/extension-loader.ts

@@ -23,8 +23,44 @@ export class ExtensionLoader {
   @observable isLoaded = false;
   whenLoaded = when(() => this.isLoaded);
 
-  constructor() {
+  @computed get userExtensions(): Map<LensExtensionId, InstalledExtension> {
+    const extensions = this.extensions.toJS();
+    extensions.forEach((ext, extId) => {
+      if (ext.isBundled) {
+        extensions.delete(extId);
+      }
+    })
+    return extensions;
+  }
+
+  @action
+  async init(extensions?: Map<LensExtensionId, InstalledExtension>) {
+    if (extensions) {
+      this.extensions.replace(extensions);
+    }
     if (ipcRenderer) {
+      this.initRenderer()
+    } else {
+      this.initMain()
+    }
+    extensionsStore.manageState(this);
+  }
+
+  protected async initMain() {
+    this.isLoaded = true;
+    this.loadOnMain();
+    this.broadcastExtensions();
+
+    reaction(() => this.extensions.toJS(), () => {
+      this.broadcastExtensions()
+    })
+
+    handleRequest(this.requestExtensionsChannel, () => {
+      return Array.from(this.toJSON())
+    })
+  }
+
+  protected async initRenderer() {
     const extensionListHandler = ( extensions: [LensExtensionId, InstalledExtension][]) => {
       this.isLoaded = true;
       extensions.forEach(([extId, ext]) => {
@@ -37,33 +73,6 @@ export class ExtensionLoader {
     subscribeToBroadcast(this.requestExtensionsChannel, (event, extensions: [LensExtensionId, InstalledExtension][]) => {
       extensionListHandler(extensions)
     });
-    } else {
-      reaction(() => this.extensions.toJS(), () => {
-        this.broadcastExtensions()
-      })
-      handleRequest(this.requestExtensionsChannel, () => {
-        return Array.from(this.toJSON())
-      })
-    }
-    extensionsStore.manageState(this);
-  }
-
-  @computed get userExtensions(): Map<LensExtensionId, InstalledExtension> {
-    const extensions = this.extensions.toJS();
-    extensions.forEach((ext, extId) => {
-      if (ext.isBundled) {
-        extensions.delete(extId);
-      }
-    })
-    return extensions;
-  }
-
-  @action
-  async init(extensions: Map<LensExtensionId, InstalledExtension>) {
-    this.extensions.replace(extensions);
-    this.isLoaded = true;
-    this.loadOnMain();
-    this.broadcastExtensions();
   }
 
   loadOnMain() {

src/renderer/bootstrap.tsx

@@ -14,6 +14,7 @@ import { clusterStore } from "../common/cluster-store";
 import { i18nStore } from "./i18n";
 import { themeStore } from "./theme.store";
 import { extensionsStore } from "../extensions/extensions-store";
+import { extensionLoader } from "../extensions/extension-loader";
 
 type AppComponent = React.ComponentType & {
   init?(): Promise<void>;
@@ -30,6 +31,8 @@ export async function bootstrap(App: AppComponent) {
   const rootElem = document.getElementById("app")
   rootElem.classList.toggle("is-mac", isMac);
 
+  extensionLoader.init()
+
   // preload common stores
   await Promise.all([
     userStore.load(),