Switch to using messaging from the Feature

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

packages/core/src/common/app-paths/app-paths-channel.ts

@@ -3,11 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import type { AppPaths } from "./app-path-injection-token";
-import type { RequestChannel } from "../utils/channel/request-channel-listener-injection-token";
+import { getRequestChannel } from "@k8slens/messaging";
 
-export type AppPathsChannel = RequestChannel<void, AppPaths>;
-
-export const appPathsChannel: AppPathsChannel = {
-  id: "app-paths",
-};
+export const appPathsChannel = getRequestChannel<void, AppPaths>('app-paths')
 

packages/core/src/common/base-store/base-store.ts

@@ -15,7 +15,7 @@ import type { GetConfigurationFileModel } from "../get-configuration-file-model/
 import type { Logger } from "../logger";
 import type { PersistStateToConfig } from "./save-to-file";
 import type { GetBasenameOfPath } from "../path/get-basename.injectable";
-import type { EnlistMessageChannelListener } from "../utils/channel/enlist-message-channel-listener-injection-token";
+import type { EnlistMessageChannelListener } from "@k8slens/messaging";
 import { toJS } from "../utils";
 
 export interface BaseStoreParams<T> extends Omit<ConfOptions<T>, "migrations"> {
@@ -108,6 +108,7 @@ export abstract class BaseStore<T extends object> {
           this.params.syncOptions,
         ),
         this.dependencies.enlistMessageChannelListener({
+          id: this.displayName,
           channel: {
             id: `${this.dependencies.ipcChannelPrefixes.local}:${config.path}`,
           },

packages/core/src/common/certificate/lens-proxy-certificate-channel.ts

@@ -4,6 +4,6 @@
  */
 
 import type { SelfSignedCert } from "selfsigned";
-import { getRequestChannel } from "../utils/channel/get-request-channel";
+import { getRequestChannel } from "@k8slens/messaging";
 
 export const lensProxyCertificateChannel = getRequestChannel<void, SelfSignedCert>("request-lens-proxy-certificate");

packages/core/src/common/cluster-store/cluster-store.injectable.ts

@@ -16,7 +16,7 @@ import { baseStoreIpcChannelPrefixesInjectionToken } from "../base-store/channel
 import { shouldBaseStoreDisableSyncInIpcListenerInjectionToken } from "../base-store/disable-sync";
 import { persistStateToConfigInjectionToken } from "../base-store/save-to-file";
 import getBasenameOfPathInjectable from "../path/get-basename.injectable";
-import { enlistMessageChannelListenerInjectionToken } from "../utils/channel/enlist-message-channel-listener-injection-token";
+import { enlistMessageChannelListenerInjectionToken } from "@k8slens/messaging";
 
 const clusterStoreInjectable = getInjectable({
   id: "cluster-store",

packages/core/src/common/cluster/current-cluster-channel.ts

@@ -4,7 +4,7 @@
  */
 
 import type { ClusterId } from "../cluster-types";
-import type { MessageChannel } from "../utils/channel/message-channel-listener-injection-token";
+import type { MessageChannel } from "@k8slens/messaging";
 
 export const currentClusterMessageChannel: MessageChannel<ClusterId> = {
   id: "current-visible-cluster",

packages/core/src/common/cluster/visibility-channel.ts

@@ -4,7 +4,7 @@
  */
 
 import type { ClusterId } from "../cluster-types";
-import type { MessageChannel } from "../utils/channel/message-channel-listener-injection-token";
+import type { MessageChannel } from "@k8slens/messaging";
 
 export const clusterVisibilityChannel: MessageChannel<ClusterId | null> = {
   id: "cluster-visibility",

packages/core/src/common/front-end-routing/app-navigation-channel.ts

@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { IpcRendererNavigationEvents } from "../ipc/navigation-events";
-import type { MessageChannel } from "../utils/channel/message-channel-listener-injection-token";
+import type { MessageChannel } from "@k8slens/messaging";
 
 export type AppNavigationChannel = MessageChannel<string>;
 

packages/core/src/common/front-end-routing/cluster-frame-navigation-channel.ts

@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { IpcRendererNavigationEvents } from "../ipc/navigation-events";
-import type { MessageChannel } from "../utils/channel/message-channel-listener-injection-token";
+import type { MessageChannel } from "@k8slens/messaging";
 
 export type ClusterFrameNavigationChannel = MessageChannel<string>;
 

packages/core/src/common/helm/add-helm-repository-channel.ts

@@ -3,11 +3,10 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import type { HelmRepo } from "./helm-repo";
-import type { AsyncResult } from "@k8slens/utilities";
-import type { RequestChannel } from "../utils/channel/request-channel-listener-injection-token";
+import type { Result } from "@k8slens/utilities";
+import { getRequestChannel } from "@k8slens/messaging";
 
-export type AddHelmRepositoryChannel = RequestChannel<HelmRepo, AsyncResult<void, string>>;
-
-export const addHelmRepositoryChannel: AddHelmRepositoryChannel = {
-  id: "add-helm-repository-channel",
-};
+export const addHelmRepositoryChannel = getRequestChannel<
+  HelmRepo,
+  Result<void, string>
+>("add-helm-repository-channel");

packages/core/src/common/helm/get-active-helm-repositories-channel.ts

@@ -4,10 +4,9 @@
  */
 import type { HelmRepo } from "./helm-repo";
 import type { AsyncResult } from "@k8slens/utilities";
-import type { RequestChannel } from "../utils/channel/request-channel-listener-injection-token";
+import { getRequestChannel } from "@k8slens/messaging";
 
-export type GetActiveHelmRepositoriesChannel = RequestChannel<void, AsyncResult<HelmRepo[]>>;
-
-export const getActiveHelmRepositoriesChannel: GetActiveHelmRepositoriesChannel = {
-  id: "get-helm-active-list-repositories",
-};
+export const getActiveHelmRepositoriesChannel = getRequestChannel<
+  void,
+  AsyncResult<HelmRepo[]>
+>("get-helm-active-list-repositories");

packages/core/src/common/helm/remove-helm-repository-channel.ts

@@ -3,11 +3,10 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import type { AsyncResult } from "@k8slens/utilities";
-import type { RequestChannel } from "../utils/channel/request-channel-listener-injection-token";
+import { getRequestChannel } from "@k8slens/messaging";
 import type { HelmRepo } from "./helm-repo";
 
-export type RemoveHelmRepositoryChannel = RequestChannel<HelmRepo, AsyncResult<void, string>>;
-
-export const removeHelmRepositoryChannel: RemoveHelmRepositoryChannel = {
-  id: "remove-helm-repository-channel",
-};
+export const removeHelmRepositoryChannel = getRequestChannel<
+  HelmRepo,
+  AsyncResult<void, string>
+>("remove-helm-repository-channel");

packages/core/src/common/hotbars/store.injectable.ts

@@ -14,7 +14,7 @@ import { hotbarStoreMigrationInjectionToken } from "./migrations-token";
 import getBasenameOfPathInjectable from "../path/get-basename.injectable";
 import { baseStoreIpcChannelPrefixesInjectionToken } from "../base-store/channel-prefix";
 import { persistStateToConfigInjectionToken } from "../base-store/save-to-file";
-import { enlistMessageChannelListenerInjectionToken } from "../utils/channel/enlist-message-channel-listener-injection-token";
+import { enlistMessageChannelListenerInjectionToken } from "@k8slens/messaging";
 import { shouldBaseStoreDisableSyncInIpcListenerInjectionToken } from "../base-store/disable-sync";
 
 const hotbarStoreInjectable = getInjectable({

packages/core/src/common/kube-helpers/channels.ts

@@ -4,11 +4,9 @@
  */
 
 import { getInjectionToken } from "@ogre-tools/injectable";
-import type { Asyncify } from "type-fest";
-import type { RequestChannelHandler } from "../../main/utils/channel/channel-listeners/listener-tokens";
 import type { ClusterId } from "../cluster-types";
-import type { AsyncResult } from "@k8slens/utilities";
-import type { RequestChannel } from "../utils/channel/request-channel-listener-injection-token";
+import type { AsyncResult, Result } from "@k8slens/utilities";
+import { getRequestChannel } from "@k8slens/messaging";
 
 export interface KubectlApplyAllArgs {
   clusterId: ClusterId;
@@ -16,11 +14,12 @@ export interface KubectlApplyAllArgs {
   extraArgs: string[];
 }
 
-export const kubectlApplyAllChannel: RequestChannel<KubectlApplyAllArgs, AsyncResult<string, string>> = {
-  id: "kubectl-apply-all",
-};
+export const kubectlApplyAllChannel = getRequestChannel<
+  KubectlApplyAllArgs,
+  Result<string, string>
+>("kubectl-apply-all");
 
-export type KubectlApplyAll = Asyncify<RequestChannelHandler<typeof kubectlApplyAllChannel>>;
+export type KubectlApplyAll = (req: KubectlApplyAllArgs) => AsyncResult<string, string>
 
 export const kubectlApplyAllInjectionToken = getInjectionToken<KubectlApplyAll>({
   id: "kubectl-apply-all",
@@ -32,11 +31,12 @@ export interface KubectlDeleteAllArgs {
   extraArgs: string[];
 }
 
-export const kubectlDeleteAllChannel: RequestChannel<KubectlDeleteAllArgs, AsyncResult<string, string>> = {
-  id: "kubectl-delete-all",
-};
+export const kubectlDeleteAllChannel = getRequestChannel<
+  KubectlDeleteAllArgs,
+  Result<string, string>
+>("kubectl-delete-all");
 
-export type KubectlDeleteAll = Asyncify<RequestChannelHandler<typeof kubectlDeleteAllChannel>>;
+export type KubectlDeleteAll = (req: KubectlDeleteAllArgs) => AsyncResult<string, string>;
 
 export const kubectlDeleteAllInjectionToken = getInjectionToken<KubectlDeleteAll>({
   id: "kubectl-delete-all",

packages/core/src/common/root-frame/root-frame-rendered-channel.ts

@@ -2,7 +2,7 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { MessageChannel } from "../utils/channel/message-channel-listener-injection-token";
+import type { MessageChannel } from "@k8slens/messaging";
 
 export type RootFrameHasRenderedChannel = MessageChannel<void>;
 

packages/core/src/common/user-store/user-store.injectable.ts

@@ -16,7 +16,7 @@ import { baseStoreIpcChannelPrefixesInjectionToken } from "../base-store/channel
 import { shouldBaseStoreDisableSyncInIpcListenerInjectionToken } from "../base-store/disable-sync";
 import { persistStateToConfigInjectionToken } from "../base-store/save-to-file";
 import getBasenameOfPathInjectable from "../path/get-basename.injectable";
-import { enlistMessageChannelListenerInjectionToken } from "../utils/channel/enlist-message-channel-listener-injection-token";
+import { enlistMessageChannelListenerInjectionToken } from "@k8slens/messaging";
 import userStorePreferenceDescriptorsInjectable from "./preference-descriptors.injectable";
 
 const userStoreInjectable = getInjectable({

packages/core/src/common/utils/resolve-system-proxy/resolve-system-proxy-channel.ts

@@ -2,10 +2,8 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { RequestChannel } from "../channel/request-channel-listener-injection-token";
+import { getRequestChannel } from "@k8slens/messaging";
 
-export type ResolveSystemProxyChannel = RequestChannel<string, string>;
-
-export const resolveSystemProxyChannel: ResolveSystemProxyChannel = {
-  id: "resolve-system-proxy-channel",
-};
+export const resolveSystemProxyChannel = getRequestChannel<string, string>(
+  "resolve-system-proxy-channel"
+);

packages/core/src/common/utils/sync-box/channel-listener.injectable.ts

@@ -3,13 +3,13 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { syncBoxChannel } from "./channels";
-import { getMessageChannelListenerInjectable } from "../channel/message-channel-listener-injection-token";
+import { getMessageChannelListenerInjectable } from "@k8slens/messaging";
 import syncBoxStateInjectable from "./sync-box-state.injectable";
 
 const syncBoxChannelListenerInjectable = getMessageChannelListenerInjectable({
   id: "init",
   channel: syncBoxChannel,
-  handler: (di) => ({ id, value }) => di.inject(syncBoxStateInjectable, id).set(value),
+  getHandler: (di) => ({ id, value }) => di.inject(syncBoxStateInjectable, id).set(value),
 });
 
 export default syncBoxChannelListenerInjectable;

packages/core/src/common/utils/sync-box/channels.ts

@@ -2,20 +2,12 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { MessageChannel } from "../channel/message-channel-listener-injection-token";
-import type { RequestChannel } from "../channel/request-channel-listener-injection-token";
+import { getMessageChannel, getRequestChannel } from "@k8slens/messaging";
 
-export type SyncBoxChannel = MessageChannel<{ id: string; value: any }>;
+export const syncBoxChannel =
+  getMessageChannel<{ id: string; value: any }>("sync-box-channel");
 
-export const syncBoxChannel: SyncBoxChannel = {
-  id: "sync-box-channel",
-};
-
-export type SyncBoxInitialValueChannel = RequestChannel<
+export const syncBoxInitialValueChannel = getRequestChannel<
   void,
   { id: string; value: any }[]
->;
-
-export const syncBoxInitialValueChannel: SyncBoxInitialValueChannel = {
-  id: "sync-box-initial-value-channel",
-};
+>("sync-box-initial-value-channel");

packages/core/src/common/utils/sync-box/create-sync-box.injectable.ts

@@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import type { IObservableValue } from "mobx";
 import { computed } from "mobx";
 import { syncBoxChannel } from "./channels";
-import { sendMessageToChannelInjectionToken } from "../channel/message-to-channel-injection-token";
+import { sendMessageToChannelInjectionToken } from "@k8slens/messaging";
 import syncBoxStateInjectable from "./sync-box-state.injectable";
 import type { SyncBox } from "./sync-box-injection-token";
 import { toJS } from "../toJS";

packages/core/src/common/utils/sync-box/handler.injectable.ts

@@ -1,19 +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 { MessageChannelHandler } from "../channel/message-channel-listener-injection-token";
-import type { SyncBoxChannel } from "./channels";
-import syncBoxStateInjectable from "./sync-box-state.injectable";
-
-const syncBoxChannelHandlerInjectable = getInjectable({
-  id: "sync-box-channel-handler",
-  instantiate: (di): MessageChannelHandler<SyncBoxChannel> => {
-    const getSyncBoxState = (id: string) => di.inject(syncBoxStateInjectable, id);
-
-    return ({ id, value }) => getSyncBoxState(id)?.set(value);
-  },
-});
-
-export default syncBoxChannelHandlerInjectable;

packages/core/src/common/vars/build-semantic-version.injectable.ts

@@ -7,7 +7,7 @@ import { getInjectionToken } from "@ogre-tools/injectable";
 import { SemVer } from "semver";
 import type { InitializableState } from "../initializable-state/create";
 import { createInitializableState } from "../initializable-state/create";
-import type { RequestChannel } from "../utils/channel/request-channel-listener-injection-token";
+import type { RequestChannel } from "@k8slens/messaging";
 
 export const buildVersionInjectionToken = getInjectionToken<InitializableState<string>>({
   id: "build-version-token",

packages/core/src/common/weblinks-store/weblink-store.injectable.ts

@@ -11,7 +11,7 @@ import { persistStateToConfigInjectionToken } from "../base-store/save-to-file";
 import getConfigurationFileModelInjectable from "../get-configuration-file-model/get-configuration-file-model.injectable";
 import loggerInjectable from "../logger.injectable";
 import getBasenameOfPathInjectable from "../path/get-basename.injectable";
-import { enlistMessageChannelListenerInjectionToken } from "../utils/channel/enlist-message-channel-listener-injection-token";
+import { enlistMessageChannelListenerInjectionToken } from "@k8slens/messaging";
 import storeMigrationVersionInjectable from "../vars/store-migration-version.injectable";
 import { weblinkStoreMigrationInjectionToken } from "./migration-token";
 import { WeblinkStore } from "./weblink-store";