Convert seting cluster frame to be IPC injectable

Signed-off-by: Sebastian Malton <sebastian@malton.name>

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

@@ -3,12 +3,17 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { clusterFrameMap } from "./cluster-frames";
+import { observable } from "mobx";
+import type { ClusterId } from "./cluster-types";
+
+export interface ClusterFrameInfo {
+  frameId: number;
+  processId: number;
+}
 
 const clusterFramesInjectable = getInjectable({
   id: "cluster-frames",
-  instantiate: () => clusterFrameMap,
-  causesSideEffects: true,
+  instantiate: () => observable.map<ClusterId, ClusterFrameInfo>(),
 });
 
 export default clusterFramesInjectable;

packages/core/src/common/cluster-frames.ts

@@ -1,13 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { observable } from "mobx";
-
-export interface ClusterFrameInfo {
-  frameId: number;
-  processId: number;
-}
-
-export const clusterFrameMap = observable.map<string, ClusterFrameInfo>();

packages/core/src/common/ipc/cluster.ts

@@ -4,7 +4,6 @@
  */
 
 export const clusterActivateHandler = "cluster:activate";
-export const clusterSetFrameIdHandler = "cluster:set-frame-id";
 export const clusterVisibilityHandler = "cluster:visibility";
 export const clusterDisconnectHandler = "cluster:disconnect";
 export const clusterStates = "cluster:states";

packages/core/src/common/ipc/ipc.ts

@@ -9,13 +9,12 @@
 
 import { ipcMain, ipcRenderer, webContents } from "electron";
 import { toJS } from "../utils/toJS";
-import type { ClusterFrameInfo } from "../cluster-frames";
-import { clusterFrameMap } from "../cluster-frames";
 import type { Disposer } from "../utils";
 import { getLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
 import ipcRendererInjectable from "../../renderer/utils/channel/ipc-renderer.injectable";
 import loggerInjectable from "../logger.injectable";
 import ipcMainInjectionToken from "./ipc-main-injection-token";
+import clusterFramesInjectable from "../cluster-frames.injectable";
 
 export const broadcastMainChannel = "ipc:broadcast-main";
 
@@ -29,10 +28,6 @@ export function ipcMainHandle(channel: string, listener: (event: Electron.IpcMai
   });
 }
 
-function getSubFrames(): ClusterFrameInfo[] {
-  return Array.from(clusterFrameMap.values());
-}
-
 export async function broadcastMessage(channel: string, ...args: any[]): Promise<void> {
   if (ipcRenderer) {
     return ipcRenderer.invoke(broadcastMainChannel, channel, ...args.map(sanitizePayload));
@@ -44,12 +39,13 @@ export async function broadcastMessage(channel: string, ...args: any[]): Promise
 
   const di = getLegacyGlobalDiForExtensionApi();
   const logger = di.inject(loggerInjectable);
+  const clusterFrames = di.inject(clusterFramesInjectable);
 
   ipcMain.listeners(channel).forEach((func) => func({
     processId: undefined, frameId: undefined, sender: undefined, senderFrame: undefined,
   }, ...args));
 
-  const subFrames = getSubFrames();
+  const subFrames = [...clusterFrames.values()];
   const views = webContents.getAllWebContents();
 
   if (!views || !Array.isArray(views) || views.length === 0) return;

packages/core/src/common/utils/channel/request-from-channel-injection-token.ts

@@ -10,6 +10,10 @@ export interface RequestFromChannel {
   <Response>(channel: RequestChannel<void, Response>): Promise<Response>;
 }
 
+export type ChannelRequester<Channel> = Channel extends RequestChannel<infer Req, infer Res>
+  ? (req: Req) => Promise<Res>
+  : never;
+
 export const requestFromChannelInjectionToken = getInjectionToken<RequestFromChannel>({
   id: "request-from-request-channel",
 });