@lvce-editor/pty-host 0.15.17 → 0.15.19

package/package.json

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

package/src/parts/CommandMap/CommandMap.js

@@ -1,10 +1,13 @@
-import * as PtyController from '../PtyController/PtyController.js'
-import * as HandleWebSocket from '../HandleWebSocket/HandleWebSocket.js'
 import * as HandleElectronMessagePort from '../HandleElectronMessagePort/HandleElectronMessagePort.js'
+import * as HandleNodeMessagePort from '../HandleNodeMessagePort/HandleNodeMessagePort.js'
+import * as HandleWebSocket from '../HandleWebSocket/HandleWebSocket.js'
+import * as PtyController from '../PtyController/PtyController.js'
 
 export const commandMap = {
+  'HandleElectronMessagePort.handleElectronMessagePort': HandleElectronMessagePort.handleElectronMessagePort,
+  'HandleNodeMessagePort.handleNodeMessagePort': HandleNodeMessagePort.handleNodeMessagePort,
+  'HandleWebSocket.handleWebSocket': HandleWebSocket.handleWebSocket,
   'Terminal.create': PtyController.create,
   'Terminal.write': PtyController.write,
-  'HandleWebSocket.handleWebSocket': HandleWebSocket.handleWebSocket,
-  'HandleElectronMessagePort.handleElectronMessagePort': HandleElectronMessagePort.handleElectronMessagePort,
+  'Terminal.dispose': PtyController.dispose,
 }

package/src/parts/HandleNodeMessagePort/HandleNodeMessagePort.js

@@ -0,0 +1,12 @@
+import * as HandleIpc from '../HandleIpc/HandleIpc.js'
+import * as IpcChild from '../IpcChild/IpcChild.js'
+import * as IpcChildType from '../IpcChildType/IpcChildType.js'
+
+export const handleNodeMessagePort = async (messagePort) => {
+  const ipc = await IpcChild.listen({
+    method: IpcChildType.NodeMessagePort,
+    messagePort,
+  })
+  HandleIpc.handleIpc(ipc)
+  messagePort.start()
+}

package/src/parts/IpcChildModule/IpcChildModule.js

@@ -12,6 +12,8 @@ export const getModule = (method) => {
       return import('../IpcChildWithElectronUtilityProcess/IpcChildWithElectronUtilityProcess.js')
     case IpcChildType.ElectronMessagePort:
       return import('../IpcChildWithElectronMessagePort/IpcChildWithElectronMessagePort.js')
+    case IpcChildType.NodeMessagePort:
+      return import('../IpcChildWithNodeMessagePort/IpcChildWithNodeMessagePort.js')
     default:
       throw new Error('unexpected ipc type')
   }

package/src/parts/IpcChildType/IpcChildType.js

@@ -3,6 +3,7 @@ export const NodeForkedProcess = 2
 export const WebSocket = 3
 export const ElectronUtilityProcess = 4
 export const ElectronMessagePort = 5
+export const NodeMessagePort = 6
 
 export const Auto = () => {
   const { argv } = process

package/src/parts/IpcChildWithElectronMessagePort/IpcChildWithElectronMessagePort.js

@@ -1,4 +1,10 @@
+import { IpcError } from '../IpcError/IpcError.js'
+import * as IsMessagePortMain from '../IsMessagePortMain/IsMessagePortMain.js'
+
 export const listen = ({ messagePort }) => {
+  if (!IsMessagePortMain.isMessagePortMain(messagePort)) {
+    throw new IpcError('port must be of type MessagePortMain')
+  }
   return messagePort
 }
 

package/src/parts/IpcChildWithElectronUtilityProcess/IpcChildWithElectronUtilityProcess.js

@@ -1,8 +1,10 @@
+import { IpcError } from '../IpcError/IpcError.js'
+
 export const listen = () => {
   // @ts-ignore
   const parentPort = process.parentPort
   if (!parentPort) {
-    throw new Error('parent port must be defined')
+    throw new IpcError('parent port must be defined')
   }
   parentPort.postMessage('ready')
   return parentPort

package/src/parts/IpcChildWithNodeForkedProcess/IpcChildWithNodeForkedProcess.js

@@ -1,6 +1,8 @@
+import { IpcError } from '../IpcError/IpcError.js'
+
 export const listen = async () => {
   if (!process.send) {
-    throw new Error('process ipc is not available')
+    throw new IpcError('process ipc is not available')
   }
   process.send('ready')
   return process

package/src/parts/IpcChildWithNodeMessagePort/IpcChildWithNodeMessagePort.js

@@ -0,0 +1,27 @@
+import { IpcError } from '../IpcError/IpcError.js'
+import * as IsMessagePort from '../IsMessagePort/IsMessagePort.js'
+
+export const listen = async ({ messagePort }) => {
+  if (!IsMessagePort.isMessagePort(messagePort)) {
+    throw new IpcError(`port must be of type MessagePort`)
+  }
+  return messagePort
+}
+
+export const wrap = (port) => {
+  return {
+    port,
+    on(event, listener) {
+      this.port.on(event, listener)
+    },
+    off(event, listener) {
+      this.port.off(event, listener)
+    },
+    send(message) {
+      this.port.postMessage(message)
+    },
+    dispose() {
+      this.port.close()
+    },
+  }
+}

package/src/parts/IpcError/IpcError.js

@@ -0,0 +1,6 @@
+export class IpcError extends Error {
+  constructor(message) {
+    super(message)
+    this.name = 'IpcError'
+  }
+}

package/src/parts/IsMessagePort/IsMessagePort.js

@@ -0,0 +1,3 @@
+export const isMessagePort = (value) => {
+  return value && value instanceof MessagePort
+}

package/src/parts/IsMessagePortMain/IsMessagePortMain.js

@@ -0,0 +1,3 @@
+export const isMessagePortMain = (value) => {
+  return value && value.constructor && value.constructor.name === 'MessagePortMain'
+}

package/src/parts/NodePty/NodePty.js

@@ -0,0 +1,47 @@
+import { spawn } from 'node-pty'
+import VError from 'verror'
+import * as Assert from '../Assert/Assert.js'
+
+export const create = ({ env = {}, cwd, command, args } = {}) => {
+  try {
+    Assert.string(cwd)
+    Assert.string(command)
+    Assert.array(args)
+    const pty = spawn(command, args, {
+      encoding: null,
+      cwd,
+      // cols: 10,
+      // rows: 10,
+    })
+    return pty
+  } catch (error) {
+    // @ts-ignore
+    throw new VError(error, `Failed to create terminal`)
+  }
+}
+
+export const onData = (pty, fn) => {
+  Assert.object(pty)
+  pty.onData(fn)
+}
+
+export const write = (pty, data) => {
+  try {
+    Assert.object(pty)
+    pty.write(data)
+  } catch (error) {
+    // @ts-ignore
+    throw new VError(error, `Failed to write data to terminal`)
+  }
+}
+
+export const resize = (pty, columns, rows) => {
+  Assert.object(pty)
+  Assert.number(columns)
+  Assert.number(rows)
+  pty.resize(columns, rows)
+}
+
+export const dispose = (pty) => {
+  pty.kill()
+}

package/src/parts/Pty/Pty.js

@@ -1,60 +1 @@
-import { spawn } from 'node-pty'
-import * as Platform from '../Platform/Platform.js'
-import * as Assert from '../Assert/Assert.js'
-import VError from 'verror'
-
-const getSpawnOptions = () => {
-  if (Platform.isWindows) {
-    return {
-      command: 'powershell.exe',
-      args: [],
-    }
-  }
-  return {
-    command: 'bash',
-    args: ['-i'],
-  }
-}
-
-export const create = ({ env = {}, cwd } = {}) => {
-  try {
-    Assert.string(cwd)
-    const spawnOptions = getSpawnOptions()
-    const pty = spawn(spawnOptions.command, spawnOptions.args, {
-      encoding: null,
-      cwd,
-      // cols: 10,
-      // rows: 10,
-    })
-    return pty
-  } catch (error) {
-    // @ts-ignore
-    throw new VError(error, `Failed to create terminal`)
-  }
-}
-
-export const onData = (pty, fn) => {
-  Assert.object(pty)
-  pty.onData(fn)
-}
-
-export const write = (pty, data) => {
-  try {
-    Assert.object(pty)
-    pty.write(data)
-  } catch (error) {
-    // @ts-ignore
-    throw new VError(error, `Failed to write data to terminal`)
-  }
-}
-
-export const resize = (pty, columns, rows) => {
-  Assert.object(pty)
-  Assert.number(columns)
-  Assert.number(rows)
-  pty.resize(columns, rows)
-}
-
-export const dispose = (pty) => {
-  pty.kill()
-}
+export * from '../NodePty/NodePty.js'

package/src/parts/PtyController/PtyController.js

@@ -7,12 +7,14 @@ export const state = {
 }
 
 // TODO maybe merge pty and pty controller
-export const create = (id, cwd, ipc) => {
+export const create = (id, cwd, command, args, ipc) => {
   Assert.number(id)
   Assert.string(cwd)
+  Assert.string(command)
+  Assert.array(args)
   Assert.object(ipc)
   Debug.debug(`create ${id} ${cwd}`)
-  const pty = Pty.create({ cwd })
+  const pty = Pty.create({ cwd, command, args })
   const handleData = (data) => {
     ipc.send({
       jsonrpc: '2.0',
@@ -33,7 +35,8 @@ export const write = (id, data) => {
 }
 
 export const dispose = (id) => {
-  const pty = state.ptyMap[id]
+  const { ptyMap } = state
+  const pty = ptyMap[id]
   if (!pty) {
     throw new Error(`pty ${id} not found`)
   }