@lvce-editor/pty-host 1.0.1 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/pty-host",
-  "version": "1.0.1",
+  "version": "1.2.0",
   "description": "",
   "main": "src/ptyHostMain.js",
   "bin": "bin/ptyHost.js",
@@ -19,7 +19,7 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@lvce-editor/ipc": "^8.2.1",
+    "@lvce-editor/ipc": "^9.1.0",
     "@lvce-editor/json-rpc": "^1.3.0",
     "@lvce-editor/pretty-error": "^1.5.0",
     "@lvce-editor/verror": "^1.2.0",

package/src/parts/CommandMap/CommandMap.js

@@ -5,8 +5,10 @@ import * as PtyController from '../PtyController/PtyController.js'
 import * as TerminalProcessCommandType from '../TerminalProcessCommandType/TerminalProcessCommandType.js'
 
 export const commandMap = {
-  [TerminalProcessCommandType.HandleElectronMessagePort]: HandleElectronMessagePort.handleElectronMessagePort,
-  [TerminalProcessCommandType.HandleNodeMessagePort]: HandleNodeMessagePort.handleNodeMessagePort,
+  [TerminalProcessCommandType.HandleElectronMessagePort]:
+    HandleElectronMessagePort.handleElectronMessagePort,
+  [TerminalProcessCommandType.HandleNodeMessagePort]:
+    HandleNodeMessagePort.handleNodeMessagePort,
   [TerminalProcessCommandType.HandleWebSocket]: HandleWebSocket.handleWebSocket,
   [TerminalProcessCommandType.TerminalCreate]: PtyController.create,
   [TerminalProcessCommandType.TerminalResize]: PtyController.resize,

package/src/parts/ErrorCodes/ErrorCodes.js

@@ -3,7 +3,8 @@ export const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND'
 export const E_ICON_THEME_NOT_FOUND = 'E_ICON_THEME_NOT_FOUND'
 export const E_INCOMPATIBLE_NATIVE_MODULE = 'E_INCOMPATIBLE_NATIVE_MODULE'
 export const E_MANIFEST_NOT_FOUND = 'E_MANIFEST_NOT_FOUND'
-export const E_MODULES_NOT_SUPPORTED_IN_ELECTRON = 'E_MODULES_NOT_SUPPORTED_IN_ELECTRON'
+export const E_MODULES_NOT_SUPPORTED_IN_ELECTRON =
+  'E_MODULES_NOT_SUPPORTED_IN_ELECTRON'
 export const EACCES = 'EACCES'
 export const ECONNRESET = 'ECONNRESET'
 export const EEXIST = 'EEXIST'

package/src/parts/ErrorHandling/ErrorHandling.js

@@ -20,7 +20,9 @@ const preparePrettyError = (error) => {
 }
 
 const printPrettyError = (prettyError) => {
-  console.error(`${prettyError.message}\n${prettyError.codeFrame}\n${prettyError.stack}`)
+  console.error(
+    `${prettyError.message}\n${prettyError.codeFrame}\n${prettyError.stack}`,
+  )
 }
 
 export const handleError = (error) => {
@@ -62,7 +64,12 @@ export const handleUncaughtExceptionMonitor = (error, origin) => {
     return
   }
   const prettyError = PrettyError.prepare(error)
-  // @ts-ignore
-  Logger.error(prettyError.codeFrame + Character.NewLine + prettyError.stack + Character.NewLine)
+  Logger.error(
+    // @ts-ignore
+    prettyError.codeFrame +
+      Character.NewLine +
+      prettyError.stack +
+      Character.NewLine,
+  )
   Process.setExitCode(ExitCode.Error)
 }

package/src/parts/HandleWebSocket/HandleWebSocket.js

@@ -3,9 +3,9 @@ import * as HandleIpc from '../HandleIpc/HandleIpc.js'
 import * as IpcChild from '../IpcChild/IpcChild.js'
 import * as IpcChildType from '../IpcChildType/IpcChildType.js'
 
-export const handleWebSocket = async (request, handle) => {
-  Assert.object(request)
+export const handleWebSocket = async (handle, request) => {
   Assert.object(handle)
+  Assert.object(request)
   const ipc = await IpcChild.listen({
     method: IpcChildType.WebSocket,
     request,

package/src/parts/IsIgnoredError/IsIgnoredError.js

@@ -6,7 +6,11 @@ export const isIgnoredError = (error) => {
     // parent process is disposed, ignore
     return true
   }
-  if (error && error.code === ErrorCodes.ERR_IPC_CHANNEL_CLOSED && !Process.isConnected()) {
+  if (
+    error &&
+    error.code === ErrorCodes.ERR_IPC_CHANNEL_CLOSED &&
+    !Process.isConnected()
+  ) {
     // parent process is disposed, ignore
     return true
   }

package/src/parts/Main/Main.js

@@ -4,7 +4,10 @@ import * as Listen from '../Listen/Listen.js'
 import * as ProcessListeners from '../ProcessListeners/ProcessListeners.js'
 
 export const main = async () => {
-  process.on('uncaughtExceptionMonitor', ProcessListeners.handleUncaughtExceptionMonitor)
+  process.on(
+    'uncaughtExceptionMonitor',
+    ProcessListeners.handleUncaughtExceptionMonitor,
+  )
   process.on('disconnect', ProcessListeners.handleDisconnect)
   CommandState.registerCommands(CommandMap.commandMap)
   await Listen.listen()

package/src/parts/NodePty/NodePty.js

@@ -2,6 +2,52 @@ import { spawn } from 'node-pty'
 import { VError } from '../VError/VError.js'
 import * as Assert from '../Assert/Assert.js'
 
+class DataEvent extends Event {
+  constructor(data) {
+    super('data')
+    this.data = data
+  }
+}
+
+class ExitEvent extends Event {
+  constructor(data) {
+    super('exit')
+    this.data = data
+  }
+}
+
+class Pty extends EventTarget {
+  /**
+   *
+   * @param {import('node-pty').IPty} pty
+   */
+  constructor(pty) {
+    super()
+    this.pty = pty
+
+    const handleData = (data) => {
+      this.dispatchEvent(new DataEvent(data))
+    }
+    const handleExit = (data) => {
+      this.dispatchEvent(new ExitEvent(data))
+    }
+    this.pty.onData(handleData)
+    this.pty.onExit(handleExit)
+  }
+
+  resize(columns, rows) {
+    this.pty.resize(columns, rows)
+  }
+
+  dispose() {
+    this.pty.kill()
+  }
+
+  write(data) {
+    this.pty.write(data)
+  }
+}
+
 // @ts-ignore
 export const create = ({ env = {}, cwd, command, args } = {}) => {
   try {
@@ -14,33 +60,9 @@ export const create = ({ env = {}, cwd, command, args } = {}) => {
       // cols: 10,
       // rows: 10,
     })
-    return pty
+    const wrapped = new Pty(pty)
+    return wrapped
   } catch (error) {
     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) {
-    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/PrintPrettyError/PrintPrettyError.js

@@ -1,5 +1,7 @@
 import * as Logger from '../Logger/Logger.js'
 
 export const printPrettyError = (prettyError, prefix = '') => {
-  Logger.error(`${prefix}${prettyError.type}: ${prettyError.message}\n\n${prettyError.codeFrame}\n\n${prettyError.stack}\n`)
+  Logger.error(
+    `${prefix}${prettyError.type}: ${prettyError.message}\n\n${prettyError.codeFrame}\n\n${prettyError.stack}\n`,
+  )
 }

package/src/parts/PtyController/PtyController.js

@@ -12,14 +12,15 @@ export const create = (ipc, id, cwd, command, args) => {
   Assert.object(ipc)
   Debug.debug(`create ${id} ${cwd}`)
   const pty = Pty.create({ cwd, command, args })
-  const handleData = (data) => {
+  const handleData = (event) => {
     ipc.send({
       jsonrpc: '2.0',
       method: 'Viewlet.send',
-      params: [id, 'handleData', data],
+      params: [id, 'handleData', event.data],
     })
   }
-  Pty.onData(pty, handleData)
+
+  pty.addEventListener('data', handleData)
   PtyState.set(id, pty)
 }
 
@@ -28,7 +29,7 @@ export const write = (id, data) => {
   if (!pty) {
     throw new Error(`pty ${id} not found`)
   }
-  Pty.write(pty, data)
+  pty.write(data)
 }
 
 export const resize = (id, columns, rows) => {
@@ -36,7 +37,7 @@ export const resize = (id, columns, rows) => {
   if (!pty) {
     throw new Error(`pty ${id} not found`)
   }
-  Pty.resize(pty, columns, rows)
+  pty.resize(columns, rows)
 }
 
 export const dispose = (id) => {
@@ -44,7 +45,7 @@ export const dispose = (id) => {
   if (!pty) {
     throw new Error(`pty ${id} not found`)
   }
-  Pty.dispose(pty)
+  pty.dispose()
   PtyState.remove(id)
 }
 

package/src/parts/TerminalProcessCommandType/TerminalProcessCommandType.js

@@ -1,5 +1,7 @@
-export const HandleElectronMessagePort = 'HandleElectronMessagePort.handleElectronMessagePort'
-export const HandleNodeMessagePort = 'HandleNodeMessagePort.handleNodeMessagePort'
+export const HandleElectronMessagePort =
+  'HandleElectronMessagePort.handleElectronMessagePort'
+export const HandleNodeMessagePort =
+  'HandleNodeMessagePort.handleNodeMessagePort'
 export const HandleWebSocket = 'HandleWebSocket.handleWebSocket'
 export const TerminalCreate = 'Terminal.create'
 export const TerminalResize = 'Terminal.resize'