refactor: Less boilerplate around SophieRenderer

4 files changed, 119 insertions, 114 deletions

diff --git a/packages/preload/src/SophieRendererImpl.ts b/packages/preload/src/SophieRendererImpl.ts
deleted file mode 100644
index a06433f..0000000
--- a/packages/preload/src/SophieRendererImpl.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C)  2021-2022 Kristóf Marussy <kristof@marussy.com>
- *
- * This file is part of Sophie.
- *
- * Sophie is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { ipcRenderer } from 'electron';
-import type { IJsonPatch } from 'mobx-state-tree';
-import {
-  BrowserViewBounds,
-  browserViewBounds,
-  MainToRendererIpcMessage,
-  RendererToMainIpcMessage,
-  sharedStore,
-  SharedStoreListener,
-  SharedStoreSnapshotIn,
-  SophieRenderer,
-  themeSource,
-  ThemeSource,
-} from '@sophie/shared';
-
-export type MessageSender = (channel: RendererToMainIpcMessage, ...args: unknown[]) => void;
-
-export class SophieRendererImpl implements SophieRenderer {
-  readonly #send: MessageSender;
-
-  #listener: SharedStoreListener | null = null;
-
-  #snapshot: SharedStoreSnapshotIn | null = null;
-
-  constructor(send: MessageSender) {
-    this.#send = send;
-  }
-
-  sharedStoreSnapshotReceived(snapshot: unknown): void {
-    if (sharedStore.is(snapshot)) {
-      if (this.#listener === null) {
-        this.#snapshot = snapshot;
-      } else {
-        this.#listener.onSnapshot(snapshot);
-      }
-    } else {
-      console.error('Received invalid snapshot', snapshot);
-      this.#snapshot = null;
-    }
-  }
-
-  sharedStorePatchReceived(patch: unknown): void {
-    if (this.#listener !== null) {
-      // `mobx-state-tree` will validate the patch, so we can safely cast here.
-      this.#listener.onPatch(patch as IJsonPatch);
-    }
-  }
-
-  setSharedStoreListener(listener: SharedStoreListener): void {
-    this.#listener = listener;
-    if (this.#snapshot !== null) {
-      listener.onSnapshot(this.#snapshot);
-      this.#snapshot = null;
-    }
-    this.#send(RendererToMainIpcMessage.SharedStoreSnapshotRequest);
-  }
-
-  setBrowserViewBounds(bounds: BrowserViewBounds): void {
-    if (browserViewBounds.safeParse(bounds).success) {
-      this.#send(RendererToMainIpcMessage.SetBrowserViewBounds, bounds);
-    }
-  }
-
-  setThemeSource(mode: ThemeSource): void {
-    if (themeSource.safeParse(mode).success) {
-      this.#send(RendererToMainIpcMessage.SetThemeSource, mode);
-    }
-  }
-
-  reloadAllServices(): void {
-    this.#send(RendererToMainIpcMessage.ReloadAllServices);
-  }
-}
-
-export function createSophieRenderer(): SophieRenderer {
-  const impl = new SophieRendererImpl(ipcRenderer.send);
-
-  ipcRenderer.on(MainToRendererIpcMessage.SharedStoreSnapshot, (_event, snapshot) => {
-    impl.sharedStoreSnapshotReceived(snapshot);
-  });
-
-  ipcRenderer.on(MainToRendererIpcMessage.SharedStorePatch, (_event, patch) => {
-    impl.sharedStorePatchReceived(patch);
-  });
-
-  return {
-    setSharedStoreListener: impl.setSharedStoreListener.bind(impl),
-    setBrowserViewBounds: impl.setBrowserViewBounds.bind(impl),
-    setThemeSource: impl.setThemeSource.bind(impl),
-    reloadAllServices: impl.reloadAllServices.bind(impl),
-  };
-}
diff --git a/packages/preload/src/contextBridge/SophieRendererImpl.ts b/packages/preload/src/contextBridge/SophieRendererImpl.ts
new file mode 100644
index 0000000..5d29071
--- /dev/null
+++ b/packages/preload/src/contextBridge/SophieRendererImpl.ts
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C)  2021-2022 Kristóf Marussy <kristof@marussy.com>
+ *
+ * This file is part of Sophie.
+ *
+ * Sophie is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import type { IJsonPatch } from 'mobx-state-tree';
+import {
+  Action,
+  action,
+  sharedStore,
+  SharedStoreListener,
+  SophieRenderer,
+} from '@sophie/shared';
+
+import { RendererToMainIpcService } from '../services/RendererToMainIpcService';
+
+class SophieRendererImpl implements SophieRenderer {
+  readonly #ipcService: RendererToMainIpcService;
+
+  #listener: SharedStoreListener | null = null;
+
+  constructor(ipcService: RendererToMainIpcService) {
+    this.#ipcService = ipcService;
+    ipcService.onSharedStorePatch((patch) => {
+      // `mobx-state-tree` will validate the patch, so we can safely cast here.
+      this.#listener?.onPatch(patch as IJsonPatch);
+    });
+  }
+
+  onSharedStoreChange(listener: SharedStoreListener): void {
+    this.#ipcService.getSharedStoreSnapshot().then((snapshot) => {
+      if (sharedStore.is(snapshot)) {
+        listener.onSnapshot(snapshot);
+        this.#listener = listener;
+      } else {
+        console.error('Got invalid initial shared store snapshot', snapshot);
+      }
+    }).catch((err) => {
+      console.error('Failed set initial shared store snapshot', err);
+    });
+  }
+
+  dispatchAction(actionToDispatch: Action): void {
+    const parsedAction = action.safeParse(actionToDispatch);
+    if (parsedAction.success) {
+      this.#ipcService.dispatchAction(parsedAction.data);
+    } else {
+      console.error('Trying to dispatch invalid action', actionToDispatch, parsedAction.error);
+    }
+  }
+}
+
+export function createSophieRenderer(ipcService: RendererToMainIpcService): SophieRenderer {
+  const impl = new SophieRendererImpl(ipcService);
+  return {
+    onSharedStoreChange: impl.onSharedStoreChange.bind(impl),
+    dispatchAction: impl.dispatchAction.bind(impl),
+  };
+}
diff --git a/packages/preload/src/index.ts b/packages/preload/src/index.ts
index ef85f70..9336433 100644
--- a/packages/preload/src/index.ts
+++ b/packages/preload/src/index.ts
@@ -20,8 +20,9 @@
 
 import { contextBridge } from 'electron';
 
-import { createSophieRenderer } from './SophieRendererImpl';
+import { createSophieRenderer } from './contextBridge/SophieRendererImpl';
+import { RendererToMainIpcService } from './services/RendererToMainIpcService';
 
-const sophieRenderer = createSophieRenderer();
+const sophieRenderer = createSophieRenderer(new RendererToMainIpcService());
 
 contextBridge.exposeInMainWorld('sophieRenderer', sophieRenderer);
diff --git a/packages/preload/src/services/RendererToMainIpcService.ts b/packages/preload/src/services/RendererToMainIpcService.ts
new file mode 100644
index 0000000..40f1339
--- /dev/null
+++ b/packages/preload/src/services/RendererToMainIpcService.ts
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C)  2021-2022 Kristóf Marussy <kristof@marussy.com>
+ *
+ * This file is part of Sophie.
+ *
+ * Sophie is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { ipcRenderer } from 'electron';
+import {
+  Action,
+  MainToRendererIpcMessage,
+  RendererToMainIpcMessage,
+} from '@sophie/shared';
+
+export class RendererToMainIpcService {
+  getSharedStoreSnapshot(): Promise<unknown> {
+    return ipcRenderer.invoke(RendererToMainIpcMessage.GetSharedStoreSnapshot);
+  }
+
+  dispatchAction(actionToDispatch: Action): void {
+    ipcRenderer.send(RendererToMainIpcMessage.DispatchAction, actionToDispatch);
+  }
+
+  onSharedStorePatch(callback: (patch: unknown) => void): void {
+    ipcRenderer.on(MainToRendererIpcMessage.SharedStorePatch, (_event, patch) => {
+      callback(patch);
+    })
+  }
+}