Upgrade to Electron 14.2.4 (#4625)

Co-authored-by: Sebastian Malton <sebastian@malton.name>
Co-authored-by: Jim Ehrismann <jehrismann@mirantis.com>

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

@@ -8,8 +8,7 @@ import { Console } from "console";
 import { stdout, stderr } from "process";
 import extensionLoaderInjectable from "../extension-loader/extension-loader.injectable";
 import { runInAction } from "mobx";
-import updateExtensionsStateInjectable
-  from "../extension-loader/update-extensions-state/update-extensions-state.injectable";
+import updateExtensionsStateInjectable from "../extension-loader/update-extensions-state/update-extensions-state.injectable";
 import { getDisForUnitTesting } from "../../test-utils/get-dis-for-unit-testing";
 import mockFs from "mock-fs";
 
@@ -24,7 +23,7 @@ jest.mock(
   () => ({
     ipcRenderer: {
       invoke: jest.fn(async (channel: string) => {
-        if (channel === "extensions:main") {
+        if (channel === "extension-loader:main:state") {
           return [
             [
               manifestPath,
@@ -61,7 +60,7 @@ jest.mock(
       }),
       on: jest.fn(
         (channel: string, listener: (event: any, ...args: any[]) => void) => {
-          if (channel === "extensions:main") {
+          if (channel === "extension-loader:main:state") {
             // First initialize with extensions 1 and 2
             // and then broadcast event to remove extension 2 and add extension number 3
             setTimeout(() => {

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

@@ -10,12 +10,7 @@ import fse from "fs-extra";
 import { makeObservable, observable, reaction, when } from "mobx";
 import os from "os";
 import path from "path";
-import {
-  broadcastMessage,
-  ipcMainHandle,
-  ipcRendererOn,
-  requestMain,
-} from "../../common/ipc";
+import { broadcastMessage, ipcMainHandle, ipcRendererOn } from "../../common/ipc";
 import { toJS } from "../../common/utils";
 import logger from "../../main/logger";
 import type { ExtensionsStore } from "../extensions-store/extensions-store";
@@ -24,6 +19,8 @@ import type { LensExtensionId, LensExtensionManifest } from "../lens-extension";
 import { isProduction } from "../../common/vars";
 import type { ExtensionInstallationStateStore } from "../extension-installation-state-store/extension-installation-state-store";
 import type { PackageJson } from "type-fest";
+import { extensionDiscoveryStateChannel } from "../../common/ipc/extension-handling";
+import { requestInitialExtensionDiscovery } from "../../renderer/ipc";
 
 interface Dependencies {
   extensionLoader: ExtensionLoader;
@@ -96,9 +93,6 @@ export class ExtensionDiscovery {
     return when(() => this.isLoaded);
   }
 
-  // IPC channel to broadcast changes to extension-discovery from main
-  protected static readonly extensionDiscoveryChannel = "extension-discovery:main";
-
   public events = new EventEmitter();
 
   constructor(protected dependencies : Dependencies) {
@@ -141,14 +135,14 @@ export class ExtensionDiscovery {
       this.isLoaded = isLoaded;
     };
 
-    requestMain(ExtensionDiscovery.extensionDiscoveryChannel).then(onMessage);
-    ipcRendererOn(ExtensionDiscovery.extensionDiscoveryChannel, (_event, message: ExtensionDiscoveryChannelMessage) => {
+    requestInitialExtensionDiscovery().then(onMessage);
+    ipcRendererOn(extensionDiscoveryStateChannel, (_event, message: ExtensionDiscoveryChannelMessage) => {
       onMessage(message);
     });
   }
 
   async initMain(): Promise<void> {
-    ipcMainHandle(ExtensionDiscovery.extensionDiscoveryChannel, () => this.toJSON());
+    ipcMainHandle(extensionDiscoveryStateChannel, () => this.toJSON());
 
     reaction(() => this.toJSON(), () => {
       this.broadcast();
@@ -492,6 +486,6 @@ export class ExtensionDiscovery {
   }
 
   broadcast(): void {
-    broadcastMessage(ExtensionDiscovery.extensionDiscoveryChannel, this.toJSON());
+    broadcastMessage(extensionDiscoveryStateChannel, this.toJSON());
   }
 }

src/extensions/extension-loader/extension-loader.ts

@@ -8,7 +8,7 @@ import { EventEmitter } from "events";
 import { isEqual } from "lodash";
 import { action, computed, makeObservable, observable, observe, reaction, when } from "mobx";
 import path from "path";
-import { broadcastMessage, ipcMainOn, ipcRendererOn, requestMain, ipcMainHandle } from "../../common/ipc";
+import { broadcastMessage, ipcMainOn, ipcRendererOn, ipcMainHandle } from "../../common/ipc";
 import { Disposer, toJS } from "../../common/utils";
 import logger from "../../main/logger";
 import type { KubernetesCluster } from "../common-api/catalog";
@@ -17,6 +17,8 @@ import type { LensExtension, LensExtensionConstructor, LensExtensionId } from ".
 import type { LensRendererExtension } from "../lens-renderer-extension";
 import * as registries from "../registries";
 import type { LensExtensionState } from "../extensions-store/extensions-store";
+import { extensionLoaderFromMainChannel, extensionLoaderFromRendererChannel } from "../../common/ipc/extension-handling";
+import { requestExtensionLoaderInitialState } from "../../renderer/ipc";
 
 const logModule = "[EXTENSIONS-LOADER]";
 
@@ -49,12 +51,6 @@ export class ExtensionLoader {
    */
   protected instancesByName = observable.map<string, LensExtension>();
 
-  // IPC channel to broadcast changes to extensions from main
-  protected static readonly extensionsMainChannel = "extensions:main";
-
-  // IPC channel to broadcast changes to extensions from renderer
-  protected static readonly extensionsRendererChannel = "extensions:renderer";
-
   // emits event "remove" of type LensExtension when the extension is removed
   private events = new EventEmitter();
 
@@ -196,11 +192,11 @@ export class ExtensionLoader {
     this.isLoaded = true;
     this.loadOnMain();
 
-    ipcMainHandle(ExtensionLoader.extensionsMainChannel, () => {
+    ipcMainHandle(extensionLoaderFromMainChannel, () => {
       return Array.from(this.toJSON());
     });
 
-    ipcMainOn(ExtensionLoader.extensionsRendererChannel, (event, extensions: [LensExtensionId, InstalledExtension][]) => {
+    ipcMainOn(extensionLoaderFromRendererChannel, (event, extensions: [LensExtensionId, InstalledExtension][]) => {
       this.syncExtensions(extensions);
     });
   }
@@ -220,16 +216,16 @@ export class ExtensionLoader {
       });
     };
 
-    requestMain(ExtensionLoader.extensionsMainChannel).then(extensionListHandler);
-    ipcRendererOn(ExtensionLoader.extensionsMainChannel, (event, extensions: [LensExtensionId, InstalledExtension][]) => {
+    requestExtensionLoaderInitialState().then(extensionListHandler);
+    ipcRendererOn(extensionLoaderFromMainChannel, (event, extensions: [LensExtensionId, InstalledExtension][]) => {
       extensionListHandler(extensions);
     });
   }
 
   broadcastExtensions() {
     const channel = ipcRenderer
-      ? ExtensionLoader.extensionsRendererChannel
-      : ExtensionLoader.extensionsMainChannel;
+      ? extensionLoaderFromRendererChannel
+      : extensionLoaderFromMainChannel;
 
     broadcastMessage(channel, Array.from(this.extensions));
   }