Switch to using messaging and startable stoppable from NPM package (#7368)

* Add custom jest resolver to fix requiring "uuid" module Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Update dependencies Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Introduce test utils for rendering and running with thrown mobx reactions Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Extract startable-stoppable to NPM package Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Extract messaging to NPM package Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Switch to using startable-stoppable from NPM package Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Switch to using messaging from the Feature Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Remove old implementation of messaging Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Make setupping app paths happen earlier in renderer Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Fix typo Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Add kludge to make testing-library work properly from test-utils package Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Fix code style Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Add lint:fix -root script Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Fix unrelated failing unit tests Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Turn of no-floating-promises from typescript linting for being broken Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Make linting not happen for dist -directories Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Make linting failures appear as failure Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Stop running prettier twice It already gets ran as eslint-plugin. Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Make CI run unit tests for all packages by consolidating name of NPM script Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Add missing unit tests for coverage Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Skip coverage for test utils Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Remove check for coverage in packages which are not ready for it Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Stop collecting coverage from index.ts files them being indirections to the implementation Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Implement sending message to channel in main Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Add missing feature dependencies Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Add dummy implementations for requesting in main from renderer Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Re-enable communicating from main to cluster frames Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Ignore trivial files from coverage Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Update package-lock Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Extract message-bridge to separate NPM package to prevent dev dependencies being in the production bundle Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Extract computed channel to own NPM package for clear dependencies Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Consolidate electron related stuff to a directory Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Add missing publish configurations Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Ignore test implementation from coverage being not interesting Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> --------- Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
2025-05-20 05:10:56 +00:00 · 2023-03-21 11:38:43 +02:00
1 parent df49ff9b96
commit 0f1f030a06
@@ -4,11 +4,12 @@
 */
 import { appPathsChannel } from "../../common/app-paths/app-paths-channel";
 import appPathsInjectable from "../../common/app-paths/app-paths.injectable";
-import { getRequestChannelListenerInjectable } from "../utils/channel/channel-listeners/listener-tokens";
+import { getRequestChannelListenerInjectable } from "@k8slens/messaging";

 const appPathsRequestChannelListenerInjectable = getRequestChannelListenerInjectable({
+  id: "app-paths-request-channel-listener",
  channel: appPathsChannel,
-  handler: (di) => {
+  getHandler: (di) => {
    const appPaths = di.inject(appPathsInjectable);

    return () => appPaths;
@@ -3,12 +3,13 @@
 * Licensed under MIT License. See LICENSE in root directory for more information.
 */
 import { buildVersionChannel } from "../../common/vars/build-semantic-version.injectable";
-import { getRequestChannelListenerInjectable } from "../utils/channel/channel-listeners/listener-tokens";
+import { getRequestChannelListenerInjectable } from "@k8slens/messaging";
 import buildVersionInjectable from "../vars/build-version/build-version.injectable";

 const buildVersionChannelListenerInjectable = getRequestChannelListenerInjectable({
+  id: "build-version-channel-listener",
  channel: buildVersionChannel,
-  handler: (di) => {
+  getHandler: (di) => {
    const buildVersion = di.inject(buildVersionInjectable);

    return () => buildVersion.get();
@@ -7,7 +7,7 @@ import { reaction } from "mobx";
 import ipcMainInjectionToken from "../../common/ipc/ipc-main-injection-token";
 import { catalogInitChannel } from "../../common/ipc/catalog";
 import { disposer } from "@k8slens/utilities";
-import { getStartableStoppable } from "../../common/utils/get-startable-stoppable";
+import { getStartableStoppable } from "@k8slens/startable-stoppable";
 import catalogEntityRegistryInjectable from "../catalog/entity-registry.injectable";
 import catalogSyncBroadcasterInjectable from "./broadcaster.injectable";
 import { toJS } from "../../common/utils";
@@ -3,13 +3,13 @@
 * Licensed under MIT License. See LICENSE in root directory for more information.
 */
 import { clusterVisibilityChannel } from "../../common/cluster/visibility-channel";
-import { getMessageChannelListenerInjectable } from "../../common/utils/channel/message-channel-listener-injection-token";
+import { getMessageChannelListenerInjectable } from "@k8slens/messaging";
 import visibleClusterInjectable from "./visible-cluster.injectable";

 const clusterVisibilityHandlerInjectable = getMessageChannelListenerInjectable({
  channel: clusterVisibilityChannel,
  id: "base",
-  handler: (di) => {
+  getHandler: (di) => {
    const visibleCluster = di.inject(visibleClusterInjectable);

    return (clusterId) => visibleCluster.set(clusterId);
@@ -3,7 +3,7 @@
 * Licensed under MIT License. See LICENSE in root directory for more information.
 */
 import { getInjectable } from "@ogre-tools/injectable";
-import { getStartableStoppable } from "../../../common/utils/get-startable-stoppable";
+import { getStartableStoppable } from "@k8slens/startable-stoppable";
 import operatingSystemThemeStateInjectable from "../../theme/operating-system-theme-state.injectable";
 import nativeThemeInjectable from "./native-theme.injectable";
 import getElectronThemeInjectable from "./get-electron-theme.injectable";
@@ -29,6 +29,8 @@ import {
  setLegacyGlobalDiForExtensionApi,
 } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
 import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx";
+import { registerFeature } from "@k8slens/feature-core";
+import { messagingFeature, testUtils as messagingTestUtils } from "@k8slens/messaging";

 export function getDiForUnitTesting() {
  const di = createContainer("main");
@@ -36,6 +38,11 @@ export function getDiForUnitTesting() {
  registerMobX(di);
  setLegacyGlobalDiForExtensionApi(di, "main");

+  runInAction(() => {
+    registerFeature(di, messagingFeature, messagingTestUtils.messagingFeatureForUnitTesting);
+
+  });
+
  di.preventSideEffects();

  runInAction(() => {
@@ -3,12 +3,14 @@
 * Licensed under MIT License. See LICENSE in root directory for more information.
 */
 import { addHelmRepositoryChannel } from "../../../../common/helm/add-helm-repository-channel";
-import { getRequestChannelListenerInjectable } from "../../../utils/channel/channel-listeners/listener-tokens";
+import { getRequestChannelListenerInjectable } from "@k8slens/messaging";
 import addHelmRepositoryInjectable from "./add-helm-repository.injectable";

-const addHelmRepositoryChannelListenerInjectable = getRequestChannelListenerInjectable({
-  channel: addHelmRepositoryChannel,
-  handler: (di) => di.inject(addHelmRepositoryInjectable),
-});
+const addHelmRepositoryChannelListenerInjectable =
+  getRequestChannelListenerInjectable({
+    id: "add-helm-repository-channel-listener",
+    channel: addHelmRepositoryChannel,
+    getHandler: (di) => di.inject(addHelmRepositoryInjectable),
+  });

 export default addHelmRepositoryChannelListenerInjectable;
@@ -5,17 +5,16 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import execHelmInjectable from "../../exec-helm/exec-helm.injectable";
 import loggerInjectable from "../../../../common/logger.injectable";
-import type { AddHelmRepositoryChannel } from "../../../../common/helm/add-helm-repository-channel";
-import type { RequestChannelHandler } from "../../../utils/channel/channel-listeners/listener-tokens";
+import type { HelmRepo } from "../../../../common/helm/helm-repo";

 const addHelmRepositoryInjectable = getInjectable({
  id: "add-helm-repository",

-  instantiate: (di): RequestChannelHandler<AddHelmRepositoryChannel> => {
+  instantiate: (di) => {
    const execHelm = di.inject(execHelmInjectable);
    const logger = di.inject(loggerInjectable);

-    return async (repo) => {
+    return async (repo: HelmRepo) => {
      const {
        name,
        url,
@@ -59,12 +58,12 @@ const addHelmRepositoryInjectable = getInjectable({

      if (result.callWasSuccessful) {
        return {
-          callWasSuccessful: true,
+          callWasSuccessful: true as const,
        };
      }

      return {
-        callWasSuccessful: false,
+        callWasSuccessful: false as const,
        error: result.error.stderr || result.error.message,
      };
    };
@@ -3,12 +3,13 @@
 * Licensed under MIT License. See LICENSE in root directory for more information.
 */
 import { getActiveHelmRepositoriesChannel } from "../../../../common/helm/get-active-helm-repositories-channel";
-import { getRequestChannelListenerInjectable } from "../../../utils/channel/channel-listeners/listener-tokens";
+import { getRequestChannelListenerInjectable } from "@k8slens/messaging";
 import getActiveHelmRepositoriesInjectable from "./get-active-helm-repositories.injectable";

 const getActiveHelmRepositoriesChannelListenerInjectable = getRequestChannelListenerInjectable({
+  id: "get-active-helm-repositories-channel-listener",
  channel: getActiveHelmRepositoriesChannel,
-  handler: (di) => di.inject(getActiveHelmRepositoriesInjectable),
+  getHandler: (di) => di.inject(getActiveHelmRepositoriesInjectable),
 });

 export default getActiveHelmRepositoriesChannelListenerInjectable;
@@ -4,11 +4,12 @@
 */
 import removeHelmRepositoryInjectable from "./remove-helm-repository.injectable";
 import { removeHelmRepositoryChannel } from "../../../../common/helm/remove-helm-repository-channel";
-import { getRequestChannelListenerInjectable } from "../../../utils/channel/channel-listeners/listener-tokens";
+import { getRequestChannelListenerInjectable } from "@k8slens/messaging";

 const removeHelmRepositoryChannelListenerInjectable = getRequestChannelListenerInjectable({
+  id: "remove-helm-repository-channel-listener",
  channel: removeHelmRepositoryChannel,
-  handler: (di) => di.inject(removeHelmRepositoryInjectable),
+  getHandler: (di) => di.inject(removeHelmRepositoryInjectable),
 });

 export default removeHelmRepositoryChannelListenerInjectable;
@@ -5,7 +5,7 @@

 import { getInjectable } from "@ogre-tools/injectable";
 import showApplicationWindowInjectable from "../start-main-application/lens-window/show-application-window.injectable";
-import type { RequestChannelHandler } from "../utils/channel/channel-listeners/listener-tokens";
+import type { RequestChannelHandler } from "@k8slens/messaging";
 import type { openPathPickingDialogChannel } from "../../features/path-picking-dialog/common/channel";
 import showOpenDialogInjectable from "../electron-app/features/show-open-dialog.injectable";

@@ -6,11 +6,12 @@ import emitAppEventInjectable from "../../common/app-event-bus/emit-event.inject
 import getClusterByIdInjectable from "../../common/cluster-store/get-by-id.injectable";
 import { kubectlApplyAllChannel } from "../../common/kube-helpers/channels";
 import resourceApplierInjectable from "../resource-applier/create-resource-applier.injectable";
-import { getRequestChannelListenerInjectable } from "../utils/channel/channel-listeners/listener-tokens";
+import { getRequestChannelListenerInjectable } from "@k8slens/messaging";

 const kubectlApplyAllChannelHandlerInjectable = getRequestChannelListenerInjectable({
+  id: "kubectl-apply-all-channel-handler-listener",
  channel: kubectlApplyAllChannel,
-  handler: (di) => {
+  getHandler: (di) => {
    const getClusterById = di.inject(getClusterByIdInjectable);
    const emitAppEvent = di.inject(emitAppEventInjectable);

@@ -6,11 +6,12 @@ import emitAppEventInjectable from "../../common/app-event-bus/emit-event.inject
 import getClusterByIdInjectable from "../../common/cluster-store/get-by-id.injectable";
 import { kubectlDeleteAllChannel } from "../../common/kube-helpers/channels";
 import resourceApplierInjectable from "../resource-applier/create-resource-applier.injectable";
-import { getRequestChannelListenerInjectable } from "../utils/channel/channel-listeners/listener-tokens";
+import { getRequestChannelListenerInjectable } from "@k8slens/messaging";

 const kubectlDeleteAllChannelHandlerInjectable = getRequestChannelListenerInjectable({
+  id: "kubectl-delete-all-channel-handler-listener",
  channel: kubectlDeleteAllChannel,
-  handler: (di) => {
+  getHandler: (di) => {
    const emitAppEvent = di.inject(emitAppEventInjectable);
    const getClusterById = di.inject(getClusterByIdInjectable);

@@ -3,12 +3,13 @@
 * Licensed under MIT License. See LICENSE in root directory for more information.
 */
 import { lensProxyCertificateChannel } from "../../common/certificate/lens-proxy-certificate-channel";
-import { getRequestChannelListenerInjectable } from "../utils/channel/channel-listeners/listener-tokens";
+import { getRequestChannelListenerInjectable } from "@k8slens/messaging";
 import lensProxyCertificateInjectable from "../../common/certificate/lens-proxy-certificate.injectable";

 const lensProxyCertificateRequestHandlerInjectable = getRequestChannelListenerInjectable({
+  id: "lens-proxy-certificate-request-handler-listener",
  channel: lensProxyCertificateChannel,
-  handler: (di) => {
+  getHandler: (di) => {
    const lensProxyCertificate = di.inject(lensProxyCertificateInjectable).get();

    return () => ({
@@ -3,17 +3,17 @@
 * Licensed under MIT License. See LICENSE in root directory for more information.
 */
 import { currentClusterMessageChannel } from "../../../../common/cluster/current-cluster-channel";
-import { getMessageChannelListenerInjectable } from "../../../../common/utils/channel/message-channel-listener-injection-token";
+import { getMessageChannelListenerInjectable } from "@k8slens/messaging";
 import currentClusterFrameClusterIdStateInjectable from "./current-cluster-frame-cluster-id-state.injectable";

-const currentVisibileClusterListenerInjectable = getMessageChannelListenerInjectable({
-  id: "current-visibile-cluster",
+const currentVisibleClusterListenerInjectable = getMessageChannelListenerInjectable({
+  id: "current-visible-cluster",
  channel: currentClusterMessageChannel,
-  handler: (di) => {
+  getHandler: (di) => {
    const currentClusterFrameState = di.inject(currentClusterFrameClusterIdStateInjectable);

    return clusterId => currentClusterFrameState.set(clusterId);
  },
 });

-export default currentVisibileClusterListenerInjectable;
+export default currentVisibleClusterListenerInjectable;
@@ -2,7 +2,7 @@
 * Copyright (c) OpenLens Authors. All rights reserved.
 * Licensed under MIT License. See LICENSE in root directory for more information.
 */
-import { getMessageChannelListenerInjectable } from "../../../../common/utils/channel/message-channel-listener-injection-token";
+import { getMessageChannelListenerInjectable } from "@k8slens/messaging";
 import { rootFrameHasRenderedChannel } from "../../../../common/root-frame/root-frame-rendered-channel";
 import { runManyFor } from "@k8slens/run-many";
 import { afterRootFrameIsReadyInjectionToken } from "../../runnable-tokens/phases";
@@ -10,7 +10,7 @@ import { afterRootFrameIsReadyInjectionToken } from "../../runnable-tokens/phase
 const rootFrameRenderedChannelListenerInjectable = getMessageChannelListenerInjectable({
  id: "action",
  channel: rootFrameHasRenderedChannel,
-  handler: (di) => {
+  getHandler: (di) => {
    const runMany = runManyFor(di);

    return runMany(afterRootFrameIsReadyInjectionToken);
@@ -4,7 +4,7 @@
 */
 import { getInjectable } from "@ogre-tools/injectable";
 import { reaction } from "mobx";
-import { getStartableStoppable } from "../../../common/utils/get-startable-stoppable";
+import { getStartableStoppable } from "@k8slens/startable-stoppable";
 import electronTrayInjectable from "../electron-tray/electron-tray.injectable";
 import trayIconInjectable from "./tray-icon.injectable";

@@ -3,7 +3,7 @@
 * Licensed under MIT License. See LICENSE in root directory for more information.
 */
 import { getInjectable } from "@ogre-tools/injectable";
-import { getStartableStoppable } from "../../../common/utils/get-startable-stoppable";
+import { getStartableStoppable } from "@k8slens/startable-stoppable";
 import { reaction } from "mobx";
 import type { MinimalTrayMenuItem } from "../electron-tray/electron-tray.injectable";
 import electronTrayInjectable from "../electron-tray/electron-tray.injectable";
@@ -1,32 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { IpcMainEvent } from "electron";
-import { enlistMessageChannelListenerInjectionToken } from "../../../../common/utils/channel/enlist-message-channel-listener-injection-token";
-import ipcMainInjectionToken from "../../../../common/ipc/ipc-main-injection-token";
-
-const enlistMessageChannelListenerInjectable = getInjectable({
-  id: "enlist-message-channel-listener-for-main",
-
-  instantiate: (di) => {
-    const ipcMain = di.inject(ipcMainInjectionToken);
-
-    return ({ channel, handler }) => {
-      const nativeOnCallback = (_: IpcMainEvent, message: unknown) => {
-        handler(message);
-      };
-
-      ipcMain.on(channel.id, nativeOnCallback);
-
-      return () => {
-        ipcMain.off(channel.id, nativeOnCallback);
-      };
-    };
-  },
-
-  injectionToken: enlistMessageChannelListenerInjectionToken,
-});
-
-export default enlistMessageChannelListenerInjectable;
@@ -1,97 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getDiForUnitTesting } from "../../../getDiForUnitTesting";
-import ipcMainInjectable from "../ipc-main/ipc-main.injectable";
-import type { EnlistMessageChannelListener } from "../../../../common/utils/channel/enlist-message-channel-listener-injection-token";
-import { enlistMessageChannelListenerInjectionToken } from "../../../../common/utils/channel/enlist-message-channel-listener-injection-token";
-import type { IpcMain, IpcMainEvent } from "electron";
-
-describe("enlist message channel listener in main", () => {
-  let enlistMessageChannelListener: EnlistMessageChannelListener;
-  let ipcMainStub: IpcMain;
-  let onMock: jest.Mock;
-  let offMock: jest.Mock;
-
-  beforeEach(() => {
-    const di = getDiForUnitTesting();
-
-    onMock = jest.fn();
-    offMock = jest.fn();
-
-    ipcMainStub = {
-      on: onMock,
-      off: offMock,
-    } as unknown as IpcMain;
-
-    di.override(ipcMainInjectable, () => ipcMainStub);
-
-    enlistMessageChannelListener = di.inject(
-      enlistMessageChannelListenerInjectionToken,
-    );
-  });
-
-  describe("when called", () => {
-    let handlerMock: jest.Mock;
-    let disposer: () => void;
-
-    beforeEach(() => {
-      handlerMock = jest.fn();
-
-      disposer = enlistMessageChannelListener({
-        channel: { id: "some-channel-id" },
-        handler: handlerMock,
-      });
-    });
-
-    it("does not call handler yet", () => {
-      expect(handlerMock).not.toHaveBeenCalled();
-    });
-
-    it("registers the listener", () => {
-      expect(onMock).toHaveBeenCalledWith(
-        "some-channel-id",
-        expect.any(Function),
-      );
-    });
-
-    it("does not de-register the listener yet", () => {
-      expect(offMock).not.toHaveBeenCalled();
-    });
-
-    describe("when message arrives", () => {
-      beforeEach(() => {
-        onMock.mock.calls[0][1]({} as IpcMainEvent, "some-message");
-      });
-
-      it("calls the handler with the message", () => {
-        expect(handlerMock).toHaveBeenCalledWith("some-message");
-      });
-
-      it("when disposing the listener, de-registers the listener", () => {
-        disposer();
-
-        expect(offMock).toHaveBeenCalledWith("some-channel-id", expect.any(Function));
-      });
-    });
-
-    it("given number as message, when message arrives, calls the handler with the message", () => {
-      onMock.mock.calls[0][1]({} as IpcMainEvent, 42);
-
-      expect(handlerMock).toHaveBeenCalledWith(42);
-    });
-
-    it("given boolean as message, when message arrives, calls the handler with the message", () => {
-      onMock.mock.calls[0][1]({} as IpcMainEvent, true);
-
-      expect(handlerMock).toHaveBeenCalledWith(true);
-    });
-
-    it("given object as message, when message arrives, calls the handler with the message", () => {
-      onMock.mock.calls[0][1]({} as IpcMainEvent, { some: "object" });
-
-      expect(handlerMock).toHaveBeenCalledWith({ some: "object" });
-    });
-  });
-});
@@ -1,32 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { IpcMainInvokeEvent } from "electron";
-import type { Disposer } from "@k8slens/utilities";
-import type { RequestChannel } from "../../../../common/utils/channel/request-channel-listener-injection-token";
-import type { RequestChannelListener } from "./listener-tokens";
-import ipcMainInjectionToken from "../../../../common/ipc/ipc-main-injection-token";
-
-export type EnlistRequestChannelListener = <TChannel extends RequestChannel<unknown, unknown>>(listener: RequestChannelListener<TChannel>) => Disposer;
-
-const enlistRequestChannelListenerInjectable = getInjectable({
-  id: "enlist-request-channel-listener-for-main",
-
-  instantiate: (di): EnlistRequestChannelListener => {
-    const ipcMain = di.inject(ipcMainInjectionToken);
-
-    return ({ channel, handler }) => {
-      const nativeHandleCallback = (_: IpcMainInvokeEvent, request: unknown) => handler(request);
-
-      ipcMain.handle(channel.id, nativeHandleCallback);
-
-      return () => {
-        ipcMain.off(channel.id, nativeHandleCallback);
-      };
-    };
-  },
-});
-
-export default enlistRequestChannelListenerInjectable;
@@ -1,153 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getDiForUnitTesting } from "../../../getDiForUnitTesting";
-import ipcMainInjectable from "../ipc-main/ipc-main.injectable";
-import type { IpcMain, IpcMainInvokeEvent } from "electron";
-import { getPromiseStatus } from "@k8slens/test-utils";
-import type { AsyncFnMock } from "@async-fn/jest";
-import asyncFn from "@async-fn/jest";
-import type { RequestChannel } from "../../../../common/utils/channel/request-channel-listener-injection-token";
-import type { EnlistRequestChannelListener } from "./enlist-request-channel-listener.injectable";
-import enlistRequestChannelListenerInjectable from "./enlist-request-channel-listener.injectable";
-import type { RequestChannelHandler } from "./listener-tokens";
-
-type TestRequestChannel = RequestChannel<unknown, unknown>;
-
-const testRequestChannel: TestRequestChannel = {
-  id: "some-channel-id",
-};
-
-describe("enlist request channel listener in main", () => {
-  let enlistRequestChannelListener: EnlistRequestChannelListener;
-  let ipcMainStub: IpcMain;
-  let handleMock: jest.Mock;
-  let offMock: jest.Mock;
-
-  beforeEach(() => {
-    const di = getDiForUnitTesting();
-
-    handleMock = jest.fn();
-    offMock = jest.fn();
-
-    ipcMainStub = {
-      handle: handleMock,
-      off: offMock,
-    } as unknown as IpcMain;
-
-    di.override(ipcMainInjectable, () => ipcMainStub);
-
-    enlistRequestChannelListener = di.inject(enlistRequestChannelListenerInjectable);
-  });
-
-  describe("when called", () => {
-    let handlerMock: AsyncFnMock<RequestChannelHandler<TestRequestChannel>>;
-    let disposer: () => void;
-
-    beforeEach(() => {
-      handlerMock = asyncFn();
-
-      disposer = enlistRequestChannelListener({
-        channel: testRequestChannel,
-        handler: handlerMock,
-      });
-    });
-
-    it("does not call handler yet", () => {
-      expect(handlerMock).not.toHaveBeenCalled();
-    });
-
-    it("registers the listener", () => {
-      expect(handleMock).toHaveBeenCalledWith(
-        "some-channel-id",
-        expect.any(Function),
-      );
-    });
-
-    it("does not de-register the listener yet", () => {
-      expect(offMock).not.toHaveBeenCalled();
-    });
-
-    describe("when request arrives", () => {
-      let actualPromise: Promise<any>;
-
-      beforeEach(() => {
-        actualPromise = handleMock.mock.calls[0][1](
-          {} as IpcMainInvokeEvent,
-          "some-request",
-        );
-      });
-
-      it("calls the handler with the request", () => {
-        expect(handlerMock).toHaveBeenCalledWith("some-request");
-      });
-
-      it("does not resolve yet", async () => {
-        const promiseStatus = await getPromiseStatus(actualPromise);
-
-        expect(promiseStatus.fulfilled).toBe(false);
-      });
-
-      describe("when handler resolves with response, listener resolves with the response", () => {
-        beforeEach(async () => {
-          await handlerMock.resolve("some-response");
-        });
-
-        it("resolves with the response", async () => {
-          const actual = await actualPromise;
-
-          expect(actual).toBe("some-response");
-        });
-
-        it("when disposing the listener, de-registers the listener", () => {
-          disposer();
-
-          expect(offMock).toHaveBeenCalledWith("some-channel-id", expect.any(Function));
-        });
-      });
-
-      it("given number as response, when handler resolves with response, listener resolves with stringified response", async () => {
-        await handlerMock.resolve(42);
-
-        const actual = await actualPromise;
-
-        expect(actual).toBe(42);
-      });
-
-      it("given boolean as response, when handler resolves with response, listener resolves with stringified response", async () => {
-        await handlerMock.resolve(true);
-
-        const actual = await actualPromise;
-
-        expect(actual).toBe(true);
-      });
-
-      it("given object as response, when handler resolves with response, listener resolves with response", async () => {
-        await handlerMock.resolve({ some: "object" });
-
-        const actual = await actualPromise;
-
-        expect(actual).toEqual({ some: "object" });
-      });
-    });
-
-    it("given number as request, when request arrives, calls the handler with the request", () => {
-      handleMock.mock.calls[0][1]({} as IpcMainInvokeEvent, 42);
-
-      expect(handlerMock).toHaveBeenCalledWith(42);
-    });
-
-    it("given boolean as request, when request arrives, calls the handler with the request", () => {
-      handleMock.mock.calls[0][1]({} as IpcMainInvokeEvent, true);
-
-      expect(handlerMock).toHaveBeenCalledWith(true);
-    });
-
-    it("given object as request, when request arrives, calls the handler with the request", () => {
-      handleMock.mock.calls[0][1]({} as IpcMainInvokeEvent, { some: "object" });
-
-      expect(handlerMock).toHaveBeenCalledWith({ some: "object" });
-    });
-  });
-});
@@ -1,46 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import type { DiContainerForInjection } from "@ogre-tools/injectable";
-import { getInjectable, getInjectionToken } from "@ogre-tools/injectable";
-import type { RequestChannel } from "../../../../common/utils/channel/request-channel-listener-injection-token";
-
-export type RequestChannelHandler<Channel> = Channel extends RequestChannel<infer Request, infer Response>
-  ? (req: Request) => Promise<Response> | Response
-  : never;
-
-export interface RequestChannelListener<Channel> {
-  channel: Channel;
-  handler: RequestChannelHandler<Channel>;
-}
-
-
-export const requestChannelListenerInjectionToken = getInjectionToken<RequestChannelListener<RequestChannel<unknown, unknown>>>( {
-  id: "request-channel-listener",
-});
-
-export interface GetRequestChannelListenerInjectableInfo<
-  Channel extends RequestChannel<Request, Response>,
-  Request,
-  Response,
-> {
-  channel: Channel;
-  handler: (di: DiContainerForInjection) => RequestChannelHandler<Channel>;
-}
-
-export function getRequestChannelListenerInjectable<
-  Channel extends RequestChannel<Request, Response>,
-  Request,
-  Response,
->(info: GetRequestChannelListenerInjectableInfo<Channel, Request, Response>) {
-  return getInjectable({
-    id: `${info.channel.id}-listener`,
-    instantiate: (di) => ({
-      channel: info.channel,
-      handler: info.handler(di),
-    }),
-    injectionToken: requestChannelListenerInjectionToken,
-  });
-}
@@ -1,34 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { disposer } from "@k8slens/utilities";
-import type { RequestChannel } from "../../../../common/utils/channel/request-channel-listener-injection-token";
-import { getStartableStoppable } from "../../../../common/utils/get-startable-stoppable";
-import enlistRequestChannelListenerInjectable from "./enlist-request-channel-listener.injectable";
-import { requestChannelListenerInjectionToken } from "./listener-tokens";
-
-const listeningOnRequestChannelsInjectable = getInjectable({
-  id: "listening-on-request-channels",
-  instantiate: (di) => {
-    const enlistRequestChannelListener = di.inject(enlistRequestChannelListenerInjectable);
-    const requestChannelListeners = di.injectMany(requestChannelListenerInjectionToken);
-
-    return getStartableStoppable("listening-on-request-channels", () => {
-      const seenChannels = new Set<RequestChannel<unknown, unknown>>();
-
-      for (const listener of requestChannelListeners) {
-        if (seenChannels.has(listener.channel)) {
-          throw new Error(`Tried to register a multiple channel handlers for "${listener.channel.id}", only one handler is supported for a request channel.`);
-        }
-
-        seenChannels.add(listener.channel);
-      }
-
-      return disposer(requestChannelListeners.map(enlistRequestChannelListener));
-    });
-  },
-});
-
-export default listeningOnRequestChannelsInjectable;
@@ -1,26 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import { onLoadOfApplicationInjectionToken } from "@k8slens/application";
-import listeningOnMessageChannelsInjectable from "../../../../common/utils/channel/listening-on-message-channels.injectable";
-import listeningOnRequestChannelsInjectable from "./listening-on-request-channels.injectable";
-
-const startListeningOnChannelsInjectable = getInjectable({
-  id: "start-listening-on-channels-main",
-
-  instantiate: (di) => ({
-    run: () => {
-      const listeningOnMessageChannels = di.inject(listeningOnMessageChannelsInjectable);
-      const listeningOnRequestChannels = di.inject(listeningOnRequestChannelsInjectable);
-
-      listeningOnMessageChannels.start();
-      listeningOnRequestChannels.start();
-    },
-  }),
-
-  injectionToken: onLoadOfApplicationInjectionToken,
-});
-
-export default startListeningOnChannelsInjectable;
@@ -1,32 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getInjectable } from "@ogre-tools/injectable";
-import type { SendMessageToChannel } from "../../../common/utils/channel/message-to-channel-injection-token";
-import { sendMessageToChannelInjectionToken } from "../../../common/utils/channel/message-to-channel-injection-token";
-import getVisibleWindowsInjectable from "../../start-main-application/lens-window/get-visible-windows.injectable";
-import clusterFramesInjectable from "../../../common/cluster-frames.injectable";
-
-const messageToChannelInjectable = getInjectable({
-  id: "message-to-channel",
-
-  instantiate: (di) => {
-    const getVisibleWindows = di.inject(getVisibleWindowsInjectable);
-    const clusterFrames = di.inject(clusterFramesInjectable);
-
-    return ((channel, data) => {
-      for (const window of getVisibleWindows()) {
-        window.send({ channel: channel.id, data });
-
-        clusterFrames.forEach(frameInfo => {
-          window.send({ channel: channel.id, data, frameInfo });
-        });
-      }
-    }) as SendMessageToChannel;
-  },
-
-  injectionToken: sendMessageToChannelInjectionToken,
-});
-
-export default messageToChannelInjectable;
@@ -1,115 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getDiForUnitTesting } from "../../getDiForUnitTesting";
-import getVisibleWindowsInjectable from "../../start-main-application/lens-window/get-visible-windows.injectable";
-import clusterFramesInjectable from "../../../common/cluster-frames.injectable";
-import type { MessageChannel } from "../../../common/utils/channel/message-channel-listener-injection-token";
-import { sendMessageToChannelInjectionToken } from "../../../common/utils/channel/message-to-channel-injection-token";
-import type { DiContainer } from "@ogre-tools/injectable";
-import type { ClusterFrameInfo } from "../../../common/cluster-frames.injectable";
-
-describe("message-to-channel", () => {
-  let di: DiContainer;
-  let sendToWindowMock: jest.Mock;
-
-  beforeEach(() => {
-    di = getDiForUnitTesting();
-
-    sendToWindowMock = jest.fn();
-
-    di.override(getVisibleWindowsInjectable, () => () => [
-      {
-        id: "some-window",
-        send: sendToWindowMock,
-        show: () => {},
-        reload: () => {},
-        isStarting: false,
-        start: async () => {},
-        close: () => {},
-        isVisible: true,
-      },
-
-      {
-        id: "some-other-window",
-        send: sendToWindowMock,
-        show: () => {},
-        reload: () => {},
-        isStarting: false,
-        start: async () => {},
-        close: () => {},
-        isVisible: true,
-      },
-    ]);
-
-    di.override(
-      clusterFramesInjectable,
-      () =>
-        new Map<string, ClusterFrameInfo>([
-          [
-            "some-cluster-id",
-            { frameId: 42, processId: 84 },
-          ],
-          [
-            "some-other-cluster-id",
-            { frameId: 126, processId: 168 },
-          ],
-        ]),
-    );
-  });
-
-  describe("when sending message", () => {
-    beforeEach(() => {
-      const sendMessageToChannel = di.inject(
-        sendMessageToChannelInjectionToken,
-      );
-
-      sendMessageToChannel(someChannel, 42);
-    });
-
-    it("sends to each window and cluster frames", () => {
-      expect(sendToWindowMock.mock.calls).toEqual([
-        [{ channel: "some-channel-id", data: 42 }],
-
-        [
-          {
-            channel: "some-channel-id",
-            data: 42,
-            frameInfo: { frameId: 42, processId: 84 },
-          },
-        ],
-
-        [
-          {
-            channel: "some-channel-id",
-            data: 42,
-            frameInfo: { frameId: 126, processId: 168 },
-          },
-        ],
-
-        [{ channel: "some-channel-id", data: 42 }],
-
-        [
-          {
-            channel: "some-channel-id",
-            data: 42,
-            frameInfo: { frameId: 42, processId: 84 },
-          },
-        ],
-
-        [
-          {
-            channel: "some-channel-id",
-            data: 42,
-            frameInfo: { frameId: 126, processId: 168 },
-          },
-        ],
-      ]);
-    });
-  });
-});
-
-const someChannel: MessageChannel<number> = {
-  id: "some-channel-id",
-};
@@ -3,12 +3,13 @@
 * Licensed under MIT License. See LICENSE in root directory for more information.
 */
 import { resolveSystemProxyChannel } from "../../../common/utils/resolve-system-proxy/resolve-system-proxy-channel";
-import { getRequestChannelListenerInjectable } from "../channel/channel-listeners/listener-tokens";
+import { getRequestChannelListenerInjectable } from "@k8slens/messaging";
 import resolveSystemProxyInjectable from "./resolve-system-proxy.injectable";

 const resolveSystemProxyChannelResponderInjectable = getRequestChannelListenerInjectable({
+  id: "resolve-system-proxy-channel-responder-listener",
  channel: resolveSystemProxyChannel,
-  handler: (di) => di.inject(resolveSystemProxyInjectable),
+  getHandler: (di) => di.inject(resolveSystemProxyInjectable),
 });

 export default resolveSystemProxyChannelResponderInjectable;
@@ -4,11 +4,12 @@
 */
 import { syncBoxInitialValueChannel } from "../../../common/utils/sync-box/channels";
 import { syncBoxInjectionToken } from "../../../common/utils/sync-box/sync-box-injection-token";
-import { getRequestChannelListenerInjectable } from "../channel/channel-listeners/listener-tokens";
+import { getRequestChannelListenerInjectable } from "@k8slens/messaging";

 const syncBoxInitialValueChannelListenerInjectable = getRequestChannelListenerInjectable({
+  id: "sync-box-initial-value-channel-listener",
  channel: syncBoxInitialValueChannel,
-  handler: (di) => {
+  getHandler: (di) => {
    const syncBoxes = di.injectMany(syncBoxInjectionToken);

    return () => syncBoxes.map((box) => ({