1 files changed, 16 insertions, 20 deletions

diff --git a/packages/preload/src/contextBridge/SophieRendererImpl.ts b/packages/preload/src/contextBridge/SophieRendererImpl.ts
index bbb4f65..18ab07e 100644
--- a/packages/preload/src/contextBridge/SophieRendererImpl.ts
+++ b/packages/preload/src/contextBridge/SophieRendererImpl.ts
@@ -18,46 +18,44 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
+import { ipcRenderer } from 'electron';
 import type { IJsonPatch } from 'mobx-state-tree';
 import {
   Action,
   action,
+  MainToRendererIpcMessage,
+  RendererToMainIpcMessage,
   sharedStore,
   SharedStoreListener,
   SophieRenderer,
 } from '@sophie/shared';
 
-import { IpcRendererService } from '../services/IpcRendererService';
-
 class SophieRendererImpl implements SophieRenderer {
-  readonly #ipcService;
-
-  #onSharedStoreChangeCalled: boolean = false;
+  private onSharedStoreChangeCalled: boolean = false;
 
-  #listener: SharedStoreListener | null = null;
+  private listener: SharedStoreListener | null = null;
 
-  constructor(ipcService: IpcRendererService) {
-    this.#ipcService = ipcService;
-    this.#ipcService.onSharedStorePatch((patch) => {
+  constructor() {
+    ipcRenderer.on(MainToRendererIpcMessage.SharedStorePatch, (_event, patch) => {
       try {
         // `mobx-state-tree` will validate the patch, so we can safely cast here.
-        this.#listener?.onPatch(patch as IJsonPatch);
+        this.listener?.onPatch(patch as IJsonPatch);
       } catch (err) {
         console.error('Shared store listener onPatch failed', err);
-        this.#listener = null;
+        this.listener = null;
       }
     });
   }
 
   async onSharedStoreChange(listener: SharedStoreListener): Promise<void> {
-    if (this.#onSharedStoreChangeCalled) {
+    if (this.onSharedStoreChangeCalled) {
       throw new Error('Shared store change listener was already set');
     }
-    this.#onSharedStoreChangeCalled = true;
+    this.onSharedStoreChangeCalled = true;
     let success = false;
     let snapshot: unknown | null = null;
     try {
-      snapshot = await this.#ipcService.getSharedStoreSnapshot();
+      snapshot = await ipcRenderer.invoke(RendererToMainIpcMessage.GetSharedStoreSnapshot);
       success = true;
     } catch (err) {
       console.error('Failed to get initial shared store snapshot', err);
@@ -65,7 +63,7 @@ class SophieRendererImpl implements SophieRenderer {
     if (success) {
       if (sharedStore.is(snapshot)) {
         listener.onSnapshot(snapshot);
-        this.#listener = listener;
+        this.listener = listener;
         return;
       }
       console.error('Got invalid initial shared store snapshot', snapshot);
@@ -78,7 +76,7 @@ class SophieRendererImpl implements SophieRenderer {
     // since all data it may contain was provided from the main world.
     const parsedAction = action.parse(actionToDispatch);
     try {
-      this.#ipcService.dispatchAction(parsedAction);
+      ipcRenderer.send(RendererToMainIpcMessage.DispatchAction, parsedAction);
     } catch (err) {
       // Do not leak IPC failure details into the main world.
       const message = 'Failed to dispatch action';
@@ -88,10 +86,8 @@ class SophieRendererImpl implements SophieRenderer {
   }
 }
 
-export function createSophieRenderer(
-  ipcService: IpcRendererService,
-): SophieRenderer {
-  const impl = new SophieRendererImpl(ipcService);
+export function createSophieRenderer(): SophieRenderer {
+  const impl = new SophieRendererImpl();
   return {
     onSharedStoreChange: impl.onSharedStoreChange.bind(impl),
     dispatchAction: impl.dispatchAction.bind(impl),