@lvce-editor/pty-host 0.21.0 → 0.21.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/pty-host",
-  "version": "0.21.0",
+  "version": "0.21.2",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -13,7 +13,7 @@
     "directory": "packages/pty-host"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "dependencies": {
     "@lvce-editor/json-rpc": "^0.4.0",

package/src/parts/GetFirstEvent/GetFirstEvent.js

@@ -0,0 +1,24 @@
+import * as Promises from '../Promises/Promises.js'
+
+export const getFirstEvent = async (eventEmitter, eventMap) => {
+  const { resolve, promise } = Promises.withResolvers()
+  const listenerMap = Object.create(null)
+  const cleanup = (value) => {
+    for (const event of Object.keys(eventMap)) {
+      eventEmitter.off(event, listenerMap[event])
+    }
+    resolve(value)
+  }
+  for (const [event, type] of Object.entries(eventMap)) {
+    const listener = (event) => {
+      cleanup({
+        type,
+        event,
+      })
+    }
+    eventEmitter.on(event, listener)
+    listenerMap[event] = listener
+  }
+  const { type, event } = await promise
+  return { type, event }
+}

package/src/parts/GetFirstWebSocketEvent/GetFirstWebSocketEvent.js

@@ -1,5 +1,6 @@
-import * as FirstWebSocketEventType from '../FirstWebSocketEventType/FirstWebSocketEventType.js'
 import { WebSocket } from 'ws'
+import * as FirstWebSocketEventType from '../FirstWebSocketEventType/FirstWebSocketEventType.js'
+import * as GetFirstEvent from '../GetFirstEvent/GetFirstEvent.js'
 
 export const getFirstWebSocketEvent = async (webSocket) => {
   switch (webSocket.readyState) {
@@ -16,26 +17,9 @@ export const getFirstWebSocketEvent = async (webSocket) => {
     default:
       break
   }
-  const { type, event } = await new Promise((resolve) => {
-    const cleanup = (value) => {
-      webSocket.off('open', handleOpen)
-      webSocket.off('close', handleClose)
-      resolve(value)
-    }
-    const handleOpen = (event) => {
-      cleanup({
-        type: FirstWebSocketEventType.Open,
-        event,
-      })
-    }
-    const handleClose = (event) => {
-      cleanup({
-        type: FirstWebSocketEventType.Close,
-        event,
-      })
-    }
-    webSocket.on('open', handleOpen)
-    webSocket.on('close', handleClose)
+  const { type, event } = await GetFirstEvent.getFirstEvent(webSocket, {
+    open: FirstWebSocketEventType.Open,
+    close: FirstWebSocketEventType.Close,
   })
   return { type, event }
 }

package/src/parts/HandleIpc/HandleIpc.js

@@ -15,7 +15,6 @@ const logError = (error, prettyError) => {
 export const handleIpc = (ipc) => {
   Assert.object(ipc)
   const handleMessage = (message) => {
-    // @ts-ignore
     return JsonRpc.handleJsonRpcMessage(ipc, message, Command.execute, Callback.resolve, preparePrettyError, logError, RequiresSocket.requiresSocket)
   }
   ipc.on('message', handleMessage)

package/src/parts/IpcChildWithElectronMessagePort/IpcChildWithElectronMessagePort.js

@@ -9,7 +9,14 @@ export const listen = ({ messagePort }) => {
 }
 
 const getActualData = (event) => {
-  return event.data
+  const { data, ports } = event
+  if (ports.length === 0) {
+    return data
+  }
+  return {
+    ...data,
+    params: [...data.params, ...ports],
+  }
 }
 
 export const wrap = (messagePort) => {

package/src/parts/Main/Main.js

@@ -7,6 +7,7 @@ import * as ProcessListeners from '../ProcessListeners/ProcessListeners.js'
 
 export const main = async () => {
   process.on('uncaughtExceptionMonitor', ProcessListeners.handleUncaughtExceptionMonitor)
+  process.on('disconnect', ProcessListeners.handleDisconnect)
   CommandState.registerCommands(CommandMap.commandMap)
   const ipc = await IpcChild.listen({ method: IpcChildType.Auto() })
   HandleIpc.handleIpc(ipc)