1 files changed, 21 insertions, 27 deletions

diff --git a/packages/preload/src/contextBridge/SophieRendererImpl.ts b/packages/preload/src/contextBridge/SophieRendererImpl.ts
index 153fdd1..61b01e9 100644
--- a/packages/preload/src/contextBridge/SophieRendererImpl.ts
+++ b/packages/preload/src/contextBridge/SophieRendererImpl.ts
@@ -30,52 +30,46 @@ import {
 import { RendererToMainIpcService } from '../services/RendererToMainIpcService';
 
 class SophieRendererImpl implements SophieRenderer {
-  readonly #ipcService: RendererToMainIpcService;
+  readonly #ipcService = new RendererToMainIpcService();
 
-  #onSharedStoreChangeCalled = false;
+  #onSharedStoreChangeCalled: boolean = false;
 
   #listener: SharedStoreListener | null = null;
 
-  constructor(ipcService: RendererToMainIpcService) {
-    this.#ipcService = ipcService;
-    ipcService.onSharedStorePatch((patch) => {
+  constructor() {
+    this.#ipcService.onSharedStorePatch((patch) => {
       try {
         // `mobx-state-tree` will validate the patch, so we can safely cast here.
         this.#listener?.onPatch(patch as IJsonPatch);
       } catch (err) {
-        console.log('Shared store listener onPatch failed', err);
+        console.error('Shared store listener onPatch failed', err);
+        this.#listener = null;
       }
     });
   }
 
-  async #setSharedStoreChangeListener(listener: SharedStoreListener): Promise<void> {
-    let snapshot: unknown;
+  async onSharedStoreChange(listener: SharedStoreListener): Promise<void> {
+    if (this.#onSharedStoreChangeCalled) {
+      throw new Error('Shared store change listener was already set');
+    }
+    this.#onSharedStoreChangeCalled = true;
+    let success = false;
+    let snapshot: unknown | null = null;
     try {
       snapshot = await this.#ipcService.getSharedStoreSnapshot();
+      success = true;
     } catch (err) {
       console.error('Failed to get initial shared store snapshot', err);
-      return;
     }
-    if (sharedStore.is(snapshot)) {
-      try {
+    if (success) {
+      if (sharedStore.is(snapshot)) {
         listener.onSnapshot(snapshot);
-      } catch (err) {
-        console.error('Shared store listener onSnapshot failed', err);
+        this.#listener = listener;
         return;
       }
-      this.#listener = listener;
-      return;
+      console.error('Got invalid initial shared store snapshot', snapshot);
     }
-    console.error('Got invalid initial shared store snapshot', snapshot);
-  }
-
-  onSharedStoreChange(listener: SharedStoreListener): void {
-    if (this.#onSharedStoreChangeCalled) {
-      throw new Error('Shared store change listener was already set');
-    }
-    this.#setSharedStoreChangeListener(listener).catch((err) => {
-      console.log('Failed to set shared store change listener', err);
-    });
+    throw new Error('Failed to connect to shared store');
   }
 
   dispatchAction(actionToDispatch: Action): void {
@@ -93,8 +87,8 @@ class SophieRendererImpl implements SophieRenderer {
   }
 }
 
-export function createSophieRenderer(ipcService: RendererToMainIpcService): 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),