Introduce way to install update directly from tray. Make application updater unit testable... (#5433)

* Extract product name as injectable Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Make tray items comply with Open Closed Principle Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Replace duplicated overrides with global Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Add behaviour for navigating to preferences using tray Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Introduce a tray item for updating application Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Tweak naming Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Tweak more naming Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Remove redundant indirection Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Tweak more naming Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Introduce injectable for package.json being side-effect Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Relocate file to directory containing feature Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Switch to using injectable for limiting side effect Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Add missing injection token for implementation of tray item Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Remove resetting state for update is ready to be installed for being unclear Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Kill dead code Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Make label of tray item reactive Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Extract updating is enabled to separate injectable Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Introduce competition for tray Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Expand scope of behaviour for updating using tray also contain checking for updates Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Remove dead code Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Kill dead code Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Implement checking of updates from multiple update channels Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Start installing updates automatically when quitting application Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Show application window when checking of updates has happened Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Show notifications and dialog for downloading update Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Implement naive notifications for version updates Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Implement checking of Electron specific updates as responsibility Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Implement downloading of Electron specific updates as responsibility Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Introduce competition for channel abstraction Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Remove redundant global override Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Fix typing after enabling strict mode Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Introduce abstraction for a state that is shared between environments Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Extract states of application update to be usable from all environments Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Handle failing download of update Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Make code for window visibility actually work Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Consolidate code for sending messages between processes to a window Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Split bloated dependency in smaller pieces Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Make state of download progress accessible from all environments Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Rename files for accuracy Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Move channel abstraction to more global directory Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Enhance typing of channels and sync-box Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Consolidate channel abstraction types Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Update asyncFn to support strict mode Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Fix snapshot after rebase Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Add missing global override Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Introduce injection token for channels to allow injecting all of them at once Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Add notifications about change in update status Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Rename property for accuracy Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Tweak code style Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Make notifications unit testable in behaviours Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Add implementation for asking boolean over processes Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Reorganize responsibilities for checking updates Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Reorganize tests for installing update under separate scenarios Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Make stuff happening when root frame is rendered unit testable Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Introduce periodical check for updates Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Allow downgrading app versions Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Switch to using competition for checking of updates in application menu Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Kill dead code Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Make test less prone to fail for wrong reason Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Remove redundant boilerplate Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Make tests for specific migrations less prone to failing for wrong reason Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Move shared stuff under common Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Switch to using single source of truth for selected update channel Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Extract tests for installing update from different update channels to separate scenario Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Add missing global override Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Switch to using release channel of installed application version as default value for selected update channel Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Consolidate usage of channel abstraction to same implementation Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Make Channel abstraction support return values Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Fix direct calling of runnables Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Synchronize initial values of sync boxes when window starts Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Add missing global override Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Tweak message of question from user Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Consolidate names of directories Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Add TODO Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Remove unimplemented scenario from test Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Simplify test Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Improve name of test Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Remove redundant overrides Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Fix code style Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Make Animate deterministic in unit tests Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Simplify naming Co-authored-by: Janne Savolainen <janne.savolainen@live.fi> Signed-off-by: Iku-turso <mikko.aspiala@gmail.com> * Simplify more naming Co-authored-by: Janne Savolainen <janne.savolainen@live.fi> Signed-off-by: Iku-turso <mikko.aspiala@gmail.com> * Simplify even more naming Co-authored-by: Janne Savolainen <janne.savolainen@live.fi> Signed-off-by: Iku-turso <mikko.aspiala@gmail.com> * Simplify more and more naming Co-authored-by: Janne Savolainen <janne.savolainen@live.fi> Signed-off-by: Iku-turso <mikko.aspiala@gmail.com> * Add todo for cleaning unacceptable code encountered Co-authored-by: Janne Savolainen <janne.savolainen@live.fi> Signed-off-by: Iku-turso <mikko.aspiala@gmail.com> * Improve name of behaviour Co-authored-by: Janne Savolainen <janne.savolainen@live.fi> Signed-off-by: Iku-turso <mikko.aspiala@gmail.com> * Make unit test more strict Co-authored-by: Janne Savolainen <janne.savolainen@live.fi> Signed-off-by: Iku-turso <mikko.aspiala@gmail.com> * Enhance name of behaviour Co-authored-by: Janne Savolainen <janne.savolainen@live.fi> Signed-off-by: Iku-turso <mikko.aspiala@gmail.com> * Introduce dependency to get random IDs Co-authored-by: Janne Savolainen <janne.savolainen@live.fi> Signed-off-by: Iku-turso <mikko.aspiala@gmail.com> * Make asking of boolean value from user not require explicit ID for question Co-authored-by: Janne Savolainen <janne.savolainen@live.fi> Signed-off-by: Iku-turso <mikko.aspiala@gmail.com> * Simplify code for asking of boolean value from user Co-authored-by: Janne Savolainen <janne.savolainen@live.fi> Signed-off-by: Iku-turso <mikko.aspiala@gmail.com> * Make setting of initial state for sync boxes not trigger irrelevant messaging to main Co-authored-by: Janne Savolainen <janne.savolainen@live.fi> Signed-off-by: Iku-turso <mikko.aspiala@gmail.com> * Make a channel have default type for sent and returned message Co-authored-by: Janne Savolainen <janne.savolainen@live.fi> Signed-off-by: Iku-turso <mikko.aspiala@gmail.com> * Introduce higher order function to log errors in decorated functions Co-authored-by: Janne Savolainen <janne.savolainen@live.fi> Signed-off-by: Iku-turso <mikko.aspiala@gmail.com> * Export type for error logging Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Tweak test name Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Introduce higher order function for suppressing errors Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Relocate some explicit error handlings to proper level of abstraction Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Make higher order function for logging errors support asynchronous rejecting with non error instance Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Make overridden version of application exactly the one required by unit test Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Mark injectable causing side effects Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Revert not required changes Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Make code for asserting a promise more strict Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Make dependencies readonly Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Remove duplication for disposers Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Implement initial values for sync-boxes Co-authored-by: Janne Savolainen <janne.savolainen@live.fi> Signed-off-by: Iku-turso <mikko.aspiala@gmail.com> * Separate concept of message and request channels Co-authored-by: Janne Savolainen <janne.savolainen@live.fi> Signed-off-by: Iku-turso <mikko.aspiala@gmail.com> * Introduce tests for requesting from channel in renderer Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Implement requesting from renderer in main Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Revert "Implement requesting from renderer in main" This reverts commit d3e7899d7900516f3dbfacdb317a453202318305. Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Tweak typing of request channel listeners to get rid of unexpected undefined Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Remove unused variable Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Tweak timing of sentry setup Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Require messages for MessageChannels be JsonValues for serialization Co-authored-by: Janne Savolainen <janne.savolainen@live.fi> Signed-off-by: Iku-turso <mikko.aspiala@gmail.com> * Require requests and responses for RequestChannels be JsonValues for serialization Co-authored-by: Janne Savolainen <janne.savolainen@live.fi> Signed-off-by: Iku-turso <mikko.aspiala@gmail.com> * Make different MessageChannels not require explicit "extends JsonObject" Note: Non-escaped lint breaks type here for forcing interface over type. Reasonable effort brought no understanding for what is the relevant difference between the two. Co-authored-by: Janne Savolainen <janne.savolainen@live.fi> Signed-off-by: Iku-turso <mikko.aspiala@gmail.com> * Make a primitive argument an object for readability Co-authored-by: Janne Savolainen <janne.savolainen@live.fi> Signed-off-by: Iku-turso <mikko.aspiala@gmail.com> * Make typing of higher order function for error suppression not lie Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Serialize messages in channels to make IPC not blow up Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Introduce a way to make intentional orphan promises uniform, controllable and deliberate Co-authored-by: Janne Savolainen <janne.savolainen@live.fi> Signed-off-by: Iku-turso <mikko.aspiala@gmail.com> * Make downloading of update and what follows more deliberate as orphan promise Co-authored-by: Janne Savolainen <janne.savolainen@live.fi> Signed-off-by: Iku-turso <mikko.aspiala@gmail.com> * Move utility function under directory Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Move another utility function under directory Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Fix incorrect name of file Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Remove redundant code Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Kill dead code Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Round percentage of update download progress in tray Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Fix rebase conflicts Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> * Fix CheckForUpdate type errors Signed-off-by: Sebastian Malton <sebastian@malton.name> Co-authored-by: Iku-turso <mikko.aspiala@gmail.com> Co-authored-by: Sebastian Malton <sebastian@malton.name>
2025-05-20 05:10:56 +00:00 · 2022-06-03 11:21:36 +03:00
1 parent e1c1e00a2b
commit b414f9e06d
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { DiContainer } from "@ogre-tools/injectable";
+import { overrideMessagingFromMainToWindow } from "./override-messaging-from-main-to-window";
+import { overrideMessagingFromWindowToMain } from "./override-messaging-from-window-to-main";
+import { overrideRequestingFromWindowToMain } from "./override-requesting-from-window-to-main";
+
+export const overrideChannels = (mainDi: DiContainer) => {
+  const overrideMessagingFromMainToWindowForWindow = overrideMessagingFromMainToWindow(mainDi);
+  const overrideMessagingFromWindowToForWindow = overrideMessagingFromWindowToMain(mainDi);
+  const overrideRequestingFromWindowToMainForWindow = overrideRequestingFromWindowToMain(mainDi);
+
+  return (windowDi: DiContainer) => {
+    overrideMessagingFromMainToWindowForWindow(windowDi);
+    overrideMessagingFromWindowToForWindow(windowDi);
+    overrideRequestingFromWindowToMainForWindow(windowDi);
+  };
+};
@@ -0,0 +1,91 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type {  MessageChannelListener } from "../../common/utils/channel/message-channel-listener-injection-token";
+import type { MessageChannel } from "../../common/utils/channel/message-channel-injection-token";
+import sendToChannelInElectronBrowserWindowInjectable from "../../main/start-main-application/lens-window/application-window/send-to-channel-in-electron-browser-window.injectable";
+import type { SendToViewArgs } from "../../main/start-main-application/lens-window/application-window/lens-window-injection-token";
+import enlistMessageChannelListenerInjectableInRenderer from "../../renderer/utils/channel/channel-listeners/enlist-message-channel-listener.injectable";
+import type { DiContainer } from "@ogre-tools/injectable";
+import assert from "assert";
+import { tentativeParseJson } from "../../common/utils/tentative-parse-json";
+
+export const overrideMessagingFromMainToWindow = (mainDi: DiContainer) => {
+  const messageChannelListenerFakesForRenderer = new Map<
+    string,
+    Set<MessageChannelListener<MessageChannel<any>>>
+  >();
+
+  mainDi.override(
+    sendToChannelInElectronBrowserWindowInjectable,
+
+    () =>
+      (
+        browserWindow,
+        { channel: channelId, frameInfo, data = [] }: SendToViewArgs,
+      ) => {
+        const listeners =
+          messageChannelListenerFakesForRenderer.get(channelId) || new Set();
+
+        if (frameInfo) {
+          throw new Error(
+            `Tried to send message to frame "${frameInfo.frameId}" in process "${frameInfo.processId}" using channel "${channelId}" which isn't supported yet.`,
+          );
+        }
+
+        if (data.length > 1) {
+          throw new Error(
+            `Tried to send message to channel "${channelId}" with more than one argument which is not supported in MessageChannelListener yet.`,
+          );
+        }
+
+        if (listeners.size === 0) {
+          throw new Error(
+            `Tried to send message to channel "${channelId}" but there where no listeners. Current channels with listeners: "${[
+              ...messageChannelListenerFakesForRenderer.keys(),
+            ].join('", "')}"`,
+          );
+        }
+
+        const message = tentativeParseJson(data[0]);
+
+        listeners.forEach((listener) => listener.handler(message));
+      },
+  );
+
+  return (windowDi: DiContainer) => {
+    windowDi.override(
+      enlistMessageChannelListenerInjectableInRenderer,
+
+      () => (listener) => {
+        if (!messageChannelListenerFakesForRenderer.has(listener.channel.id)) {
+          messageChannelListenerFakesForRenderer.set(
+            listener.channel.id,
+            new Set(),
+          );
+        }
+
+        const listeners = messageChannelListenerFakesForRenderer.get(
+          listener.channel.id,
+        );
+
+        assert(listeners);
+
+        // TODO: Figure out typing
+        listeners.add(
+          listener as unknown as MessageChannelListener<MessageChannel<any>>,
+        );
+
+        return () => {
+          // TODO: Figure out typing
+          listeners.delete(
+            listener as unknown as MessageChannelListener<
+              MessageChannel<any>
+            >,
+          );
+        };
+      },
+    );
+  };
+};
@@ -0,0 +1,64 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { DiContainer } from "@ogre-tools/injectable";
+import assert from "assert";
+import type { MessageChannel } from "../../common/utils/channel/message-channel-injection-token";
+import type { MessageChannelListener } from "../../common/utils/channel/message-channel-listener-injection-token";
+import enlistMessageChannelListenerInjectableInMain from "../../main/utils/channel/channel-listeners/enlist-message-channel-listener.injectable";
+import sendToMainInjectable from "../../renderer/utils/channel/send-to-main.injectable";
+
+export const overrideMessagingFromWindowToMain = (mainDi: DiContainer) => {
+  const messageChannelListenerFakesForMain = new Map<
+    string,
+    Set<MessageChannelListener<MessageChannel<any>>>
+  >();
+
+  mainDi.override(
+    enlistMessageChannelListenerInjectableInMain,
+
+    () => (listener) => {
+      const channelId = listener.channel.id;
+
+      if (!messageChannelListenerFakesForMain.has(channelId)) {
+        messageChannelListenerFakesForMain.set(channelId, new Set());
+      }
+
+      const listeners = messageChannelListenerFakesForMain.get(
+        channelId,
+      );
+
+      assert(listeners);
+
+      // TODO: Figure out typing
+      listeners.add(
+        listener as unknown as MessageChannelListener<MessageChannel<any>>,
+      );
+
+      return () => {
+        // TODO: Figure out typing
+        listeners.delete(
+          listener as unknown as MessageChannelListener<MessageChannel<any>>,
+        );
+      };
+    },
+  );
+
+  return (windowDi: DiContainer) => {
+    windowDi.override(sendToMainInjectable, () => (channelId, message) => {
+      const listeners =
+        messageChannelListenerFakesForMain.get(channelId) || new Set();
+
+      if (listeners.size === 0) {
+        throw new Error(
+          `Tried to send message to channel "${channelId}" but there where no listeners. Current channels with listeners: "${[
+            ...messageChannelListenerFakesForMain.keys(),
+          ].join('", "')}"`,
+        );
+      }
+
+      listeners.forEach((listener) => listener.handler(message));
+    });
+  };
+};
@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { DiContainer } from "@ogre-tools/injectable";
+import type { RequestChannel } from "../../common/utils/channel/request-channel-injection-token";
+import type { RequestChannelListener } from "../../common/utils/channel/request-channel-listener-injection-token";
+import enlistRequestChannelListenerInjectableInMain from "../../main/utils/channel/channel-listeners/enlist-request-channel-listener.injectable";
+import requestFromChannelInjectable from "../../renderer/utils/channel/request-from-channel.injectable";
+
+export const overrideRequestingFromWindowToMain = (mainDi: DiContainer) => {
+  const requestChannelListenerFakesForMain = new Map<
+      string,
+      RequestChannelListener<RequestChannel<any, any>>
+    >();
+
+  mainDi.override(
+    enlistRequestChannelListenerInjectableInMain,
+
+    () => (listener) => {
+      if (requestChannelListenerFakesForMain.get(listener.channel.id)) {
+        throw new Error(
+          `Tried to enlist listener for channel "${listener.channel.id}", but it was already enlisted`,
+        );
+      }
+
+      requestChannelListenerFakesForMain.set(
+        listener.channel.id,
+
+          // TODO: Figure out typing
+          listener as unknown as RequestChannelListener<
+            RequestChannel<any, any>
+          >,
+      );
+
+      return () => {
+        requestChannelListenerFakesForMain.delete(listener.channel.id);
+      };
+    },
+  );
+
+  return (windowDi: DiContainer) => {
+    windowDi.override(
+      requestFromChannelInjectable,
+
+      () => async (channel, ...[request]) => {
+        const requestListener = requestChannelListenerFakesForMain.get(channel.id);
+
+        if (!requestListener) {
+          throw new Error(
+            `Tried to get value from channel "${channel.id}", but no listeners were registered`,
+          );
+        }
+
+        return requestListener.handler(request);
+      },
+    );
+  };
+};
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import { getDiForUnitTesting as getRendererDi } from "../renderer/getDiForUnitTesting";
-import { getDiForUnitTesting as getMainDi } from "../main/getDiForUnitTesting";
-import { overrideIpcBridge } from "./override-ipc-bridge";
-
-export interface GetDiForUnitTestingOptions {
-  doGeneralOverrides?: boolean;
-}
-
-export const getDisForUnitTesting = (opts?: GetDiForUnitTestingOptions) => {
-  const rendererDi = getRendererDi(opts);
-  const mainDi = getMainDi(opts);
-
-  overrideIpcBridge({ rendererDi, mainDi });
-
-  return {
-    rendererDi,
-    mainDi,
-  };
-};
@@ -1,104 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-import type { DiContainer } from "@ogre-tools/injectable";
-import type { Channel } from "../common/ipc-channel/channel";
-import getValueFromRegisteredChannelInjectable from "../renderer/app-paths/get-value-from-registered-channel/get-value-from-registered-channel.injectable";
-import registerChannelInjectable from "../main/app-paths/register-channel/register-channel.injectable";
-import asyncFn from "@async-fn/jest";
-import registerIpcChannelListenerInjectable from "../renderer/app-paths/get-value-from-registered-channel/register-ipc-channel-listener.injectable";
-import type { SendToViewArgs } from "../main/start-main-application/lens-window/application-window/lens-window-injection-token";
-import sendToChannelInElectronBrowserWindowInjectable from "../main/start-main-application/lens-window/application-window/send-to-channel-in-electron-browser-window.injectable";
-import { isEmpty } from "lodash/fp";
-
-
-export const overrideIpcBridge = ({
-  rendererDi,
-  mainDi,
-}: {
-  rendererDi: DiContainer;
-  mainDi: DiContainer;
-}) => {
-  const fakeChannelMap = new Map<
-    Channel<any>,
-    { promise: Promise<any>; resolve: (arg0: any) => Promise<void> }
-  >();
-
-  const mainIpcRegistrations = {
-    set: <TChannel extends Channel<TInstance>, TInstance>(
-      key: TChannel,
-      callback: () => TChannel["_template"],
-    ) => {
-      if (!fakeChannelMap.has(key)) {
-        const mockInstance = asyncFn();
-
-        fakeChannelMap.set(key, {
-          promise: mockInstance(),
-          resolve: mockInstance.resolve,
-        });
-      }
-
-      return fakeChannelMap.get(key)?.resolve(callback);
-    },
-
-    get: <TChannel extends Channel<TInstance>, TInstance>(key: TChannel) => {
-      if (!fakeChannelMap.has(key)) {
-        const mockInstance = asyncFn();
-
-        fakeChannelMap.set(key, {
-          promise: mockInstance(),
-          resolve: mockInstance.resolve,
-        });
-      }
-
-      return fakeChannelMap.get(key)?.promise;
-    },
-  };
-
-  rendererDi.override(
-    getValueFromRegisteredChannelInjectable,
-    () => async (channel) => {
-      const callback = await mainIpcRegistrations.get(channel);
-
-      return callback();
-    },
-  );
-
-  mainDi.override(registerChannelInjectable, () => (channel, callback) => {
-    mainIpcRegistrations.set(channel, callback);
-  });
-
-  const rendererIpcFakeHandles = new Map<
-    string,
-    ((...args: any[]) => void)[]
-  >();
-
-  rendererDi.override(
-    registerIpcChannelListenerInjectable,
-    () =>
-      ({ channel, handle }) => {
-        const existingHandles = rendererIpcFakeHandles.get(channel.name) || [];
-
-        rendererIpcFakeHandles.set(channel.name, [...existingHandles, handle]);
-      },
-  );
-
-  mainDi.override(
-    sendToChannelInElectronBrowserWindowInjectable,
-    () =>
-      (browserWindow, { channel: channelName, data = [] }: SendToViewArgs) => {
-        const handles = rendererIpcFakeHandles.get(channelName) || [];
-
-        if (isEmpty(handles)) {
-          throw new Error(
-            `Tried to send message to channel "${channelName}" but there where no listeners. Current channels with listeners: "${[
-              ...rendererIpcFakeHandles.keys(),
-            ].join('", "')}"`,
-          );
-        }
-
-        handles.forEach((handle) => handle(...data));
-      },
-  );
-};