refactor: simplify rpc code (#2823)

apps/electron/src/helper/index.ts

@@ -1,30 +1,8 @@
-import type { EventBasedChannel } from 'async-call-rpc';
 import { AsyncCall } from 'async-call-rpc';
 
 import { events, handlers } from './exposed';
 import { logger } from './logger';
 
-const createMessagePortMainChannel = (
-  connection: Electron.MessagePortMain
-): EventBasedChannel => {
-  return {
-    on(listener) {
-      const f = (e: Electron.MessageEvent) => {
-        listener(e.data);
-      };
-      connection.on('message', f);
-      // MUST start the connection to receive messages
-      connection.start();
-      return () => {
-        connection.off('message', f);
-      };
-    },
-    send(data) {
-      connection.postMessage(data);
-    },
-  };
-};
-
 function setupRendererConnection(rendererPort: Electron.MessagePortMain) {
   const flattenedHandlers = Object.entries(handlers).flatMap(
     ([namespace, namespaceHandlers]) => {
@@ -55,7 +33,22 @@ function setupRendererConnection(rendererPort: Electron.MessagePortMain) {
   const rpc = AsyncCall<PeersAPIs.RendererToHelper>(
     Object.fromEntries(flattenedHandlers),
     {
-      channel: createMessagePortMainChannel(rendererPort),
+      channel: {
+        on(listener) {
+          const f = (e: Electron.MessageEvent) => {
+            listener(e.data);
+          };
+          rendererPort.on('message', f);
+          // MUST start the connection to receive messages
+          rendererPort.start();
+          return () => {
+            rendererPort.off('message', f);
+          };
+        },
+        send(data) {
+          rendererPort.postMessage(data);
+        },
+      },
       log: false,
     }
   );

apps/electron/src/helper/main-rpc.ts

@@ -1,26 +1,7 @@
-import { AsyncCall, type EventBasedChannel } from 'async-call-rpc';
+import { AsyncCall } from 'async-call-rpc';
 
 import { getExposedMeta } from './exposed';
 
-function createMessagePortMainChannel(
-  connection: Electron.ParentPort
-): EventBasedChannel {
-  return {
-    on(listener) {
-      const f = (e: Electron.MessageEvent) => {
-        listener(e.data);
-      };
-      connection.on('message', f);
-      return () => {
-        connection.off('message', f);
-      };
-    },
-    send(data) {
-      connection.postMessage(data);
-    },
-  };
-}
-
 const helperToMainServer: PeersAPIs.HelperToMain = {
   getMeta: () => getExposedMeta(),
 };
@@ -29,5 +10,18 @@ export const mainRPC = AsyncCall<PeersAPIs.MainToHelper>(helperToMainServer, {
   strict: {
     unknownMessage: false,
   },
-  channel: createMessagePortMainChannel(process.parentPort),
+  channel: {
+    on(listener) {
+      const f = (e: Electron.MessageEvent) => {
+        listener(e.data);
+      };
+      process.parentPort.on('message', f);
+      return () => {
+        process.parentPort.off('message', f);
+      };
+    },
+    send(data) {
+      process.parentPort.postMessage(data);
+    },
+  },
 });

apps/electron/src/main/helper-process.ts

@@ -92,7 +92,7 @@ class HelperProcessManager {
       ...appMethods,
     };
 
-    const server = AsyncCall<PeersAPIs.HelperToMain>(mainToHelperServer, {
+    this.rpc = AsyncCall<PeersAPIs.HelperToMain>(mainToHelperServer, {
       strict: {
         // the channel is shared for other purposes as well so that we do not want to
         // restrict to only JSONRPC messages
@@ -100,7 +100,6 @@ class HelperProcessManager {
       },
       channel: new MessageEventChannel(this.#process),
     });
-    this.rpc = server;
   }
 }
 

apps/electron/src/main/index.ts

@@ -66,6 +66,5 @@ app
   .then(ensureHelperProcess)
   .then(restoreOrCreateWindow)
   .then(createApplicationMenu)
-  .then()
   .then(registerUpdater)
   .catch(e => console.error('Failed create window:', e));