feature: use new rpc (#66)

package.json

@@ -29,8 +29,6 @@
   },
   "dependencies": {
     "@lvce-editor/assert": "^1.3.0",
-    "@lvce-editor/ipc": "^12.0.0",
-    "@lvce-editor/json-rpc": "^5.3.0",
     "@lvce-editor/rpc": "^1.13.0",
     "@lvce-editor/verror": "^1.6.0"
   },

src/parts/HandleElectronMessagePort/HandleElectronMessagePort.ts

@@ -1,11 +1,9 @@
-import * as HandleIpc from '../HandleIpc/HandleIpc.ts'
-import * as IpcChild from '../IpcChild/IpcChild.ts'
-import * as IpcChildType from '../IpcChildType/IpcChildType.ts'
+import { ElectronMessagePortRpcClient } from '@lvce-editor/rpc'
+import * as CommandMap from '../CommandMap/CommandMap.ts'
 
 export const handleElectronMessagePort = async (messagePort: any) => {
-  const ipc = await IpcChild.listen({
-    method: IpcChildType.ElectronMessagePort,
+  await ElectronMessagePortRpcClient.create({
     messagePort,
+    commandMap: CommandMap.commandMap,
   })
-  HandleIpc.handleIpc(ipc)
 }

src/parts/IpcChild/IpcChild.ts

@@ -1,22 +1,9 @@
 import * as IpcChildModule from '../IpcChildModule/IpcChildModule.ts'
 
-export const listen = async ({
-  method,
-  ...params
-}: {
-  method: number
-  [key: string]: any
-}) => {
-  const module = await IpcChildModule.getModule(method)
+export const listen = async ({ method, ...params }: { method: number; [key: string]: any }) => {
+  const module = IpcChildModule.getModule(method)
   // @ts-ignore
-  const rawIpc = await module.listen(params)
+  const rpc = await module.create(params)
   // @ts-ignore
-  if (module.signal) {
-    // @ts-ignore
-    module.signal(rawIpc)
-  }
-
-  // @ts-ignore
-  const ipc = module.wrap(rawIpc)
-  return ipc
+  return rpc
 }

src/parts/IpcChildModule/IpcChildModule.ts

@@ -1,24 +1,21 @@
 import {
-  IpcChildWithElectronMessagePort,
-  IpcChildWithElectronUtilityProcess,
-  IpcChildWithNodeForkedProcess,
-  IpcChildWithNodeWorker,
-  IpcChildWithWebSocket,
-} from '@lvce-editor/ipc'
+  ElectronMessagePortRpcClient,
+  ElectronUtilityProcessRpcClient,
+  NodeForkedProcessRpcClient,
+  NodeWorkerRpcClient,
+} from '@lvce-editor/rpc'
 import * as IpcChildType from '../IpcChildType/IpcChildType.ts'
 
 export const getModule = (method: number) => {
   switch (method) {
     case IpcChildType.NodeForkedProcess:
-      return IpcChildWithNodeForkedProcess
+      return NodeForkedProcessRpcClient
     case IpcChildType.NodeWorker:
-      return IpcChildWithNodeWorker
+      return NodeWorkerRpcClient
     case IpcChildType.ElectronUtilityProcess:
-      return IpcChildWithElectronUtilityProcess
+      return ElectronUtilityProcessRpcClient
     case IpcChildType.ElectronMessagePort:
-      return IpcChildWithElectronMessagePort
-    case IpcChildType.WebSocket:
-      return IpcChildWithWebSocket
+      return ElectronMessagePortRpcClient
     default:
       throw new Error('unexpected ipc type')
   }

src/parts/Listen/Listen.ts

@@ -1,8 +1,10 @@
-import * as HandleIpc from '../HandleIpc/HandleIpc.ts'
 import * as IpcChild from '../IpcChild/IpcChild.ts'
 import * as IpcChildType from '../IpcChildType/IpcChildType.ts'
+import * as CommandMap from '../CommandMap/CommandMap.ts'
 
 export const listen = async () => {
-  const ipc = await IpcChild.listen({ method: IpcChildType.Auto() })
-  HandleIpc.handleIpc(ipc)
+  await IpcChild.listen({
+    method: IpcChildType.Auto(),
+    commandMap: CommandMap.commandMap,
+  })
 }