@lvce-editor/pty-host 0.22.7 → 0.23.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/pty-host",
-  "version": "0.22.7",
+  "version": "0.23.0",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -16,6 +16,7 @@
     "node": ">=18"
   },
   "dependencies": {
+    "@lvce-editor/ipc": "^2.1.0",
     "@lvce-editor/json-rpc": "^1.0.0",
     "@lvce-editor/pretty-error": "^1.4.1",
     "@lvce-editor/verror": "^1.1.2",

package/src/parts/IpcChild/IpcChild.js

@@ -4,6 +4,9 @@ export const listen = async ({ method, ...params }) => {
   const module = await IpcChildModule.getModule(method)
   // @ts-ignore
   const rawIpc = await module.listen(params)
+  if (module.signal) {
+    module.signal(rawIpc)
+  }
   const ipc = module.wrap(rawIpc)
   return ipc
 }

package/src/parts/IpcChildWithElectronUtilityProcess/IpcChildWithElectronUtilityProcess.js

@@ -1,48 +1 @@
-import { IpcError } from '../IpcError/IpcError.js'
-
-export const listen = () => {
-  // @ts-ignore
-  const parentPort = process.parentPort
-  if (!parentPort) {
-    throw new IpcError('parent port must be defined')
-  }
-  parentPort.postMessage('ready')
-  return parentPort
-}
-
-const getActualData = (event) => {
-  const { data, ports } = event
-  if (ports.length === 0) {
-    return data
-  }
-  return {
-    ...data,
-    params: [...data.params, ...ports],
-  }
-}
-
-export const wrap = (parentPort) => {
-  return {
-    parentPort,
-    on(event, listener) {
-      if (event === 'message') {
-        const wrappedListener = (event) => {
-          const actualData = getActualData(event)
-          listener(actualData)
-        }
-        this.parentPort.on(event, wrappedListener)
-      } else {
-        throw new Error('unsupported event type')
-      }
-    },
-    off(event, listener) {
-      this.parentPort.off(event, listener)
-    },
-    send(message) {
-      this.parentPort.postMessage(message)
-    },
-    dispose() {
-      this.parentPort.close()
-    },
-  }
-}
+export * from '@lvce-editor/ipc/dist/parts/IpcChildWithElectronUtilityProcess/IpcChildWithElectronUtilityProcess.js'

package/src/parts/IpcChildWithWebSocket/IpcChildWithWebSocket.js

@@ -1,56 +1 @@
-import * as GetFirstWebSocketEvent from '../GetFirstWebSocketEvent/GetFirstWebSocketEvent.js'
-import { IpcError } from '../IpcError/IpcError.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 ({ request, handle }) => {
-  if (!request) {
-    throw new IpcError('request must be defined')
-  }
-  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)
-  }
-  return webSocket
-}
-
-export const wrap = (webSocket) => {
-  return {
-    webSocket,
-    /**
-     * @type {any}
-     */
-    wrappedListener: undefined,
-    on(event, listener) {
-      switch (event) {
-        case 'message':
-          const wrappedListener = (message) => {
-            const data = WebSocketSerialization.deserialize(message)
-            listener(data)
-          }
-          webSocket.on('message', wrappedListener)
-          break
-        default:
-          throw new Error('unknown event listener type')
-      }
-    },
-    off(event, listener) {
-      this.webSocket.off(event, listener)
-    },
-    send(message) {
-      const stringifiedMessage = WebSocketSerialization.serialize(message)
-      this.webSocket.send(stringifiedMessage)
-    },
-    dispose() {
-      this.webSocket.close()
-    },
-    start() {
-      this.webSocket.resume()
-    },
-  }
-}
+export * from '@lvce-editor/ipc/dist/parts/IpcChildWithWebSocket/IpcChildWithWebSocket.js'

package/src/parts/CleanStack/CleanStack.js

@@ -1,93 +0,0 @@
-import * as SplitLines from '../SplitLines/SplitLines.js'
-
-const RE_AT = /^\s+at/
-const RE_AT_PROMISE_INDEX = /^\s*at async Promise.all \(index \d+\)$/
-const RE_OBJECT_AS = /^\s*at (async )?Object\.\w+ \[as ([\w\.]+)\]/
-const RE_GET_RESPONSE = /^\s*at async getResponse/
-const RE_WEBSOCKET_HANDLE_MESSAGE = /^\s*at async WebSocket.handleMessage/
-const RE_EXECUTE_COMMAND_ASYNC = /^\s*at executeCommandAsync/
-const RE_HANDLE_OTHER_MESSAGES_FROM_MESSAGE_PORT = /^\s*at async MessagePort\.handleOtherMessagesFromMessagePort/
-
-const isInternalLine = (line) => {
-  return line.includes('node:') || RE_AT_PROMISE_INDEX.test(line) || line.includes('node_modules/ws')
-}
-
-const isRelevantLine = (line) => {
-  return !isInternalLine(line)
-}
-
-const isApplicationUsefulLine = (line, index) => {
-  if (index === 0) {
-    return true
-  }
-  if (RE_GET_RESPONSE.test(line)) {
-    return false
-  }
-  if (RE_WEBSOCKET_HANDLE_MESSAGE.test(line)) {
-    return false
-  }
-  if (RE_EXECUTE_COMMAND_ASYNC.test(line)) {
-    return false
-  }
-  if (RE_HANDLE_OTHER_MESSAGES_FROM_MESSAGE_PORT.test(line)) {
-    return false
-  }
-  return true
-}
-
-const isNormalStackLine = (line) => {
-  return RE_AT.test(line) && !RE_AT_PROMISE_INDEX.test(line)
-}
-
-const cleanLine = (line) => {
-  if (line.startsWith('    at exports.')) {
-    return '    at ' + line.slice('    at exports.'.length)
-  }
-  if (line.startsWith('    at async exports.')) {
-    return '    at async ' + line.slice('    at async exports.'.length)
-  }
-  if (line.startsWith('    at async Module.')) {
-    return '    at async ' + line.slice('    at async Module.'.length)
-  }
-  if (line.startsWith('    at Module.')) {
-    return '    at ' + line.slice('    at Module.'.length)
-  }
-  const objectMatch = line.match(RE_OBJECT_AS)
-  if (objectMatch) {
-    const rest = line.slice(objectMatch[0].length)
-    if (objectMatch[1]) {
-      return '    at ' + objectMatch[1] + objectMatch[2] + rest
-    }
-    return '    at ' + objectMatch[2] + rest
-  }
-  return line
-}
-
-const getDetails = (lines) => {
-  const index = lines.findIndex(isNormalStackLine)
-  return {
-    custom: lines.slice(0, index),
-    actualStack: lines.slice(index).map(cleanLine),
-  }
-}
-
-const RE_PATH_1 = /^\/(.*)(\d+)$/
-
-const mergeCustom = (custom, relevantStack) => {
-  if (custom.length === 0) {
-    return relevantStack
-  }
-  const firstLine = custom[0]
-  if (RE_PATH_1.test(firstLine)) {
-    return [`    at ${firstLine}`, ...relevantStack]
-  }
-  return relevantStack
-}
-
-export const cleanStack = (stack) => {
-  const lines = SplitLines.splitLines(stack)
-  const { custom, actualStack } = getDetails(lines)
-  const relevantStack = actualStack.filter(isRelevantLine).filter(isApplicationUsefulLine)
-  const merged = mergeCustom(custom, relevantStack)
-  return merged
-}

package/src/parts/CommandNotFoundError/CommandNotFoundError.js

@@ -1,9 +0,0 @@
-import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
-
-export class CommandNotFoundError extends Error {
-  constructor(id) {
-    super(`command ${id} not found`)
-    this.name = 'CommandNotFoundError'
-    this.code = ErrorCodes.E_COMMAND_NOT_FOUND
-  }
-}

package/src/parts/EncodingType/EncodingType.js

@@ -1 +0,0 @@
-export const Utf8 = 'utf8'

package/src/parts/FirstWebSocketEventType/FirstWebSocketEventType.js

@@ -1,2 +0,0 @@
-export const Open = 1
-export const Close = 2

package/src/parts/GetFirstEvent/GetFirstEvent.js

@@ -1,24 +0,0 @@
-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,25 +0,0 @@
-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) {
-    case WebSocket.OPEN:
-      return {
-        type: FirstWebSocketEventType.Open,
-        event: undefined,
-      }
-    case WebSocket.CLOSED:
-      return {
-        type: FirstWebSocketEventType.Close,
-        event: undefined,
-      }
-    default:
-      break
-  }
-  const { type, event } = await GetFirstEvent.getFirstEvent(webSocket, {
-    open: FirstWebSocketEventType.Open,
-    close: FirstWebSocketEventType.Close,
-  })
-  return { type, event }
-}

package/src/parts/Id/Id.js

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

package/src/parts/IsWebSocket/IsWebSocket.js

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

package/src/parts/IsWebSocketOpen/IsWebSocketOpen.js

@@ -1,5 +0,0 @@
-import { WebSocket } from 'ws'
-
-export const isWebSocketOpen = (webSocket) => {
-  return webSocket.readyState === WebSocket.OPEN
-}

package/src/parts/JoinLines/JoinLines.js

@@ -1,3 +0,0 @@
-export const joinLines = (lines) => {
-  return lines.join('\n')
-}

package/src/parts/Platform/Platform.js

@@ -1 +0,0 @@
-export const isWindows = process.platform === 'win32'

package/src/parts/Promises/Promises.js

@@ -1,19 +0,0 @@
-export const withResolvers = () => {
-  /**
-   * @type {any}
-   */
-  let _resolve
-  /**
-   * @type {any}
-   */
-  let _reject
-  const promise = new Promise((resolve, reject) => {
-    _resolve = resolve
-    _reject = reject
-  })
-  return {
-    resolve: _resolve,
-    reject: _reject,
-    promise,
-  }
-}

package/src/parts/SplitLines/SplitLines.js

@@ -1,3 +0,0 @@
-export const splitLines = (lines) => {
-  return lines.split('\n')
-}

package/src/parts/WebSocketSerialization/WebSocketSerialization.js

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

package/src/parts/WebSocketServer/WebSocketServer.ipc.js

@@ -1,7 +0,0 @@
-import * as WebSocketServer from './WebSocketServer.js'
-
-export const name = 'WebSocketServer'
-
-export const Commands = {
-  handleUpgrade: WebSocketServer.handleUpgrade,
-}

package/src/parts/WebSocketServer/WebSocketServer.js

@@ -1 +0,0 @@
-export * from '@lvce-editor/web-socket-server'