@lvce-editor/pty-host 0.15.21 → 0.15.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/pty-host",
-  "version": "0.15.21",
+  "version": "0.15.22",
   "description": "",
   "main": "index.js",
   "type": "module",

package/src/parts/Callback/Callback.js

@@ -0,0 +1,42 @@
+import * as Assert from '../Assert/Assert.js'
+import * as Id from '../Id/Id.js'
+
+export const state = {
+  callbacks: Object.create(null),
+}
+
+export const registerPromise = () => {
+  const id = Id.create()
+  const promise = new Promise((resolve, reject) => {
+    state.callbacks[id] = {
+      resolve,
+      reject,
+    }
+  })
+  return { id, promise }
+}
+
+export const unregister = (id) => {
+  delete state.callbacks[id]
+}
+
+export const resolve = (id, args) => {
+  Assert.number(id)
+  if (!(id in state.callbacks)) {
+    console.log(args)
+    console.warn(`callback ${id} may already be disposed`)
+    return
+  }
+  state.callbacks[id].resolve(args)
+  delete state.callbacks[id]
+}
+
+export const reject = (id, error) => {
+  Assert.number(id)
+  if (!(id in state.callbacks)) {
+    console.warn(`callback ${id} may already be disposed`)
+    return
+  }
+  state.callbacks[id].reject(error)
+  delete state.callbacks[id]
+}

package/src/parts/CommandMap/CommandMap.js

@@ -2,12 +2,13 @@ import * as HandleElectronMessagePort from '../HandleElectronMessagePort/HandleE
 import * as HandleNodeMessagePort from '../HandleNodeMessagePort/HandleNodeMessagePort.js'
 import * as HandleWebSocket from '../HandleWebSocket/HandleWebSocket.js'
 import * as PtyController from '../PtyController/PtyController.js'
+import * as TerminalProcessCommandType from '../TerminalProcessCommandType/TerminalProcessCommandType.js'
 
 export const commandMap = {
-  'HandleElectronMessagePort.handleElectronMessagePort': HandleElectronMessagePort.handleElectronMessagePort,
-  'HandleNodeMessagePort.handleNodeMessagePort': HandleNodeMessagePort.handleNodeMessagePort,
-  'HandleWebSocket.handleWebSocket': HandleWebSocket.handleWebSocket,
-  'Terminal.create': PtyController.create,
-  'Terminal.write': PtyController.write,
-  'Terminal.dispose': PtyController.dispose,
+  [TerminalProcessCommandType.HandleElectronMessagePort]: HandleElectronMessagePort.handleElectronMessagePort,
+  [TerminalProcessCommandType.HandleNodeMessagePort]: HandleNodeMessagePort.handleNodeMessagePort,
+  [TerminalProcessCommandType.HandleWebSocket]: HandleWebSocket.handleWebSocket,
+  [TerminalProcessCommandType.TerminalCreate]: PtyController.create,
+  [TerminalProcessCommandType.TerminalWrite]: PtyController.write,
+  [TerminalProcessCommandType.TerminalDispose]: PtyController.dispose,
 }

package/src/parts/GetResponse/GetResponse.js

@@ -1,13 +1,12 @@
-import * as Command from '../Command/Command.js'
 import * as GetErrorResponse from '../GetErrorResponse/GetErrorResponse.js'
 import * as GetSuccessResponse from '../GetSuccessResponse/GetSuccessResponse.js'
 import * as RequiresSocket from '../RequiresSocket/RequiresSocket.js'
 
-export const getResponse = async (message, handle) => {
+export const getResponse = async (message, execute, handle) => {
   try {
     const result = RequiresSocket.requiresSocket(message.method)
-      ? await Command.execute(message.method, ...message.params, handle)
-      : await Command.execute(message.method, ...message.params)
+      ? await execute(message.method, ...message.params, handle)
+      : await execute(message.method, ...message.params)
     return GetSuccessResponse.getSuccessResponse(message, result)
   } catch (error) {
     return GetErrorResponse.getErrorResponse(message, error)

package/src/parts/HandleIpc/HandleIpc.js

@@ -1,13 +1,12 @@
 import * as Assert from '../Assert/Assert.js'
-import * as GetResponse from '../GetResponse/GetResponse.js'
+import * as Command from '../Command/Command.js'
+import * as Callback from '../Callback/Callback.js'
+import * as HandleJsonRpcMessage from '../HandleJsonRpcMessage/HandleJsonRpcMessage.js'
 
 export const handleIpc = (ipc) => {
   Assert.object(ipc)
   const handleMessage = async (message) => {
-    const response = await GetResponse.getResponse(message, ipc)
-    if (response) {
-      ipc.send(response)
-    }
+    return HandleJsonRpcMessage.handleJsonRpcMessage(ipc, message, Command.execute, Callback.resolve)
   }
   ipc.on('message', handleMessage)
 }

package/src/parts/HandleJsonRpcMessage/HandleJsonRpcMessage.js

@@ -0,0 +1,10 @@
+import * as GetResponse from '../GetResponse/GetResponse.js'
+
+export const handleJsonRpcMessage = async (ipc, message, execute, resolve) => {
+  if ('result' in message || 'error' in message) {
+    resolve(message.id, message)
+    return
+  }
+  const response = await GetResponse.getResponse(message, execute, ipc)
+  ipc.send(response)
+}

package/src/parts/Id/Id.js

@@ -0,0 +1,7 @@
+export const state = {
+  id: 0,
+}
+
+export const create = () => {
+  return ++state.id
+}

package/src/parts/IpcChildWithWebSocket/IpcChildWithWebSocket.js

@@ -1,7 +1,16 @@
 import * as GetFirstWebSocketEvent from '../GetFirstWebSocketEvent/GetFirstWebSocketEvent.js'
+import { IpcError } from '../IpcError/IpcError.js'
+import * as IsWebSocket from '../IsWebSocket/IsWebSocket.js'
 import * as IsWebSocketOpen from '../IsWebSocketOpen/IsWebSocketOpen.js'
+import * as WebSocketSerialization from '../WebSocketSerialization/WebSocketSerialization.js'
 
 export const listen = async ({ webSocket }) => {
+  if (!webSocket) {
+    throw new IpcError('webSocket must be defined')
+  }
+  if (!IsWebSocket.isWebSocket(webSocket)) {
+    throw new IpcError(`webSocket must be of type WebSocket`)
+  }
   if (!IsWebSocketOpen.isWebSocketOpen(webSocket)) {
     const { type, event } = await GetFirstWebSocketEvent.getFirstWebSocketEvent(webSocket)
     console.log({ type, event })
@@ -9,14 +18,6 @@ export const listen = async ({ webSocket }) => {
   return webSocket
 }
 
-class MessageEvent extends Event {
-  constructor(data, target) {
-    super('message')
-    this.data = data
-    this.target = target
-  }
-}
-
 export const wrap = (webSocket) => {
   return {
     webSocket,
@@ -28,7 +29,7 @@ export const wrap = (webSocket) => {
       switch (event) {
         case 'message':
           const wrappedListener = (message) => {
-            const data = JSON.parse(message.toString())
+            const data = WebSocketSerialization.deserialize(message)
             listener(data)
           }
           webSocket.on('message', wrappedListener)
@@ -41,7 +42,7 @@ export const wrap = (webSocket) => {
       this.webSocket.off(event, listener)
     },
     send(message) {
-      const stringifiedMessage = JSON.stringify(message)
+      const stringifiedMessage = WebSocketSerialization.serialize(message)
       this.webSocket.send(stringifiedMessage)
     },
     dispose() {

package/src/parts/IsWebSocket/IsWebSocket.js

@@ -0,0 +1,5 @@
+import { WebSocket } from 'ws'
+
+export const isWebSocket = (value) => {
+  return value instanceof WebSocket
+}

package/src/parts/TerminalProcessCommandType/TerminalProcessCommandType.js

@@ -0,0 +1,6 @@
+export const HandleElectronMessagePort = 'HandleElectronMessagePort.handleElectronMessagePort'
+export const HandleNodeMessagePort = 'HandleNodeMessagePort.handleNodeMessagePort'
+export const HandleWebSocket = 'HandleWebSocket.handleWebSocket'
+export const TerminalCreate = 'Terminal.create'
+export const TerminalWrite = 'Terminal.write'
+export const TerminalDispose = 'Terminal.dispose'

package/src/parts/WebSocketSerialization/WebSocketSerialization.js

@@ -0,0 +1,7 @@
+export const serialize = (message) => {
+  return JSON.stringify(message)
+}
+
+export const deserialize = (message) => {
+  return JSON.parse(message.toString())
+}

package/src/ptyHostMain.cjs

@@ -1 +0,0 @@
-import('./ptyHostMain.js')