@lvce-editor/pty-host 1.0.1 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/pty-host",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "",
   "main": "src/ptyHostMain.js",
   "bin": "bin/ptyHost.js",

package/src/parts/NodePty/NodePty.js

@@ -1,46 +1,68 @@
-import { spawn } from 'node-pty'
-import { VError } from '../VError/VError.js'
-import * as Assert from '../Assert/Assert.js'
+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 {
-    Assert.string(cwd)
-    Assert.string(command)
-    Assert.array(args)
+    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) {
-    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)
+    });
+    const wrapped = new Pty(pty);
+    return wrapped;
   } catch (error) {
-    throw new VError(error, `Failed to write data to terminal`)
+    throw new VError(error, `Failed to create 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/PtyController/PtyController.js

@@ -1,55 +1,56 @@
-import * as Assert from '../Assert/Assert.js'
-import * as Debug from '../Debug/Debug.js'
-import * as Pty from '../Pty/Pty.js'
-import * as PtyState from '../PtyState/PtyState.js'
+import * as Assert from "../Assert/Assert.js";
+import * as Debug from "../Debug/Debug.js";
+import * as Pty from "../Pty/Pty.js";
+import * as PtyState from "../PtyState/PtyState.js";
 
 // TODO maybe merge pty and pty controller
 export const create = (ipc, id, cwd, command, args) => {
-  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, command, args })
-  const handleData = (data) => {
+  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, command, args });
+  const handleData = (event) => {
     ipc.send({
-      jsonrpc: '2.0',
-      method: 'Viewlet.send',
-      params: [id, 'handleData', data],
-    })
-  }
-  Pty.onData(pty, handleData)
-  PtyState.set(id, pty)
-}
+      jsonrpc: "2.0",
+      method: "Viewlet.send",
+      params: [id, "handleData", event.data],
+    });
+  };
+
+  pty.addEventListener("data", handleData);
+  PtyState.set(id, pty);
+};
 
 export const write = (id, data) => {
-  const pty = PtyState.get(id)
+  const pty = PtyState.get(id);
   if (!pty) {
-    throw new Error(`pty ${id} not found`)
+    throw new Error(`pty ${id} not found`);
   }
-  Pty.write(pty, data)
-}
+  pty.write(data);
+};
 
 export const resize = (id, columns, rows) => {
-  const pty = PtyState.get(id)
+  const pty = PtyState.get(id);
   if (!pty) {
-    throw new Error(`pty ${id} not found`)
+    throw new Error(`pty ${id} not found`);
   }
-  Pty.resize(pty, columns, rows)
-}
+  pty.resize(columns, rows);
+};
 
 export const dispose = (id) => {
-  const pty = PtyState.get(id)
+  const pty = PtyState.get(id);
   if (!pty) {
-    throw new Error(`pty ${id} not found`)
+    throw new Error(`pty ${id} not found`);
   }
-  Pty.dispose(pty)
-  PtyState.remove(id)
-}
+  pty.dispose();
+  PtyState.remove(id);
+};
 
 export const disposeAll = () => {
   for (const id in PtyState.getAll()) {
-    dispose(id)
+    dispose(id);
   }
-}
+};