@lvce-editor/pty-host 0.22.1 → 0.22.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/pty-host",
-  "version": "0.22.1",
+  "version": "0.22.3",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -17,10 +17,10 @@
   },
   "dependencies": {
     "@lvce-editor/json-rpc": "^1.0.0",
-    "@lvce-editor/pretty-error": "^1.3.0",
+    "@lvce-editor/pretty-error": "^1.4.0",
     "@lvce-editor/verror": "^1.1.2",
-    "debug": "^4.3.4",
-    "ws": "^8.16.0"
+    "@lvce-editor/web-socket-server": "1.1.0",
+    "debug": "^4.3.4"
   },
   "optionalDependencies": {
     "node-pty": "^1.0.0"

package/src/parts/HandleElectronMessagePort/HandleElectronMessagePort.js

@@ -10,5 +10,4 @@ export const handleElectronMessagePort = async (messagePort) => {
     messagePort,
   })
   HandleIpc.handleIpc(ipc)
-  messagePort.start()
 }

package/src/parts/HandleIpc/HandleIpc.js

@@ -18,4 +18,7 @@ export const handleIpc = (ipc) => {
     return JsonRpc.handleJsonRpcMessage(ipc, message, Command.execute, Callback.resolve, preparePrettyError, logError, RequiresSocket.requiresSocket)
   }
   ipc.on('message', handleMessage)
+  if (ipc.start) {
+    ipc.start()
+  }
 }

package/src/parts/HandleNodeMessagePort/HandleNodeMessagePort.js

@@ -8,5 +8,4 @@ export const handleNodeMessagePort = async (messagePort) => {
     messagePort,
   })
   HandleIpc.handleIpc(ipc)
-  messagePort.start()
 }

package/src/parts/HandleWebSocket/HandleWebSocket.js

@@ -6,13 +6,10 @@ import * as IpcChildType from '../IpcChildType/IpcChildType.js'
 export const handleWebSocket = async (request, handle) => {
   Assert.object(request)
   Assert.object(handle)
-  const WebSocketServer = await import('../WebSocketServer/WebSocketServer.js')
-  const webSocket = await WebSocketServer.handleUpgrade(request, handle)
-  webSocket.pause()
   const ipc = await IpcChild.listen({
     method: IpcChildType.WebSocket,
-    webSocket,
+    request,
+    handle,
   })
   HandleIpc.handleIpc(ipc)
-  webSocket.resume()
 }

package/src/parts/IpcChildWithElectronMessagePort/IpcChildWithElectronMessagePort.js

@@ -42,5 +42,8 @@ export const wrap = (messagePort) => {
     dispose() {
       this.messagePort.close()
     },
+    start() {
+      this.messagePort.start()
+    },
   }
 }

package/src/parts/IpcChildWithNodeMessagePort/IpcChildWithNodeMessagePort.js

@@ -23,5 +23,8 @@ export const wrap = (port) => {
     dispose() {
       this.port.close()
     },
+    start() {
+      this.port.start()
+    },
   }
 }

package/src/parts/IpcChildWithWebSocket/IpcChildWithWebSocket.js

@@ -1,19 +1,20 @@
 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'
+import * as WebSocketServer from '../WebSocketServer/WebSocketServer.js'
 
-export const listen = async ({ webSocket }) => {
-  if (!webSocket) {
-    throw new IpcError('webSocket must be defined')
+export const listen = async ({ request, handle }) => {
+  if (!request) {
+    throw new IpcError('request must be defined')
   }
-  if (!IsWebSocket.isWebSocket(webSocket)) {
-    throw new IpcError(`webSocket must be of type WebSocket`)
+  if (!handle) {
+    throw new IpcError('handle must be defined')
   }
+  const webSocket = await WebSocketServer.handleUpgrade(request, handle)
+  webSocket.pause()
   if (!IsWebSocketOpen.isWebSocketOpen(webSocket)) {
     const { type, event } = await GetFirstWebSocketEvent.getFirstWebSocketEvent(webSocket)
-    console.log({ type, event })
   }
   return webSocket
 }
@@ -48,5 +49,8 @@ export const wrap = (webSocket) => {
     dispose() {
       this.webSocket.close()
     },
+    start() {
+      this.webSocket.resume()
+    },
   }
 }

package/src/parts/WebSocketServer/WebSocketServer.js

@@ -1,24 +1 @@
-import { Buffer } from 'node:buffer'
-import * as _ws from 'ws'
-
-// workaround for jest or node bug
-const WebSocketServer = _ws.WebSocketServer
-  ? _ws.WebSocketServer
-  : // @ts-ignore
-    _ws.default.WebSocketServer
-
-const webSocketServer = new WebSocketServer({
-  noServer: true,
-
-  // TODO not sure if ws compress is working at all
-  // perMessageDeflate: true
-})
-
-export const handleUpgrade = (request, socket) => {
-  return new Promise((resolve, reject) => {
-    const upgradeCallback = (ws) => {
-      resolve(ws)
-    }
-    webSocketServer.handleUpgrade(request, socket, Buffer.alloc(0), upgradeCallback)
-  })
-}
+export * from '@lvce-editor/web-socket-server'