@lvce-editor/pty-host 7.0.0 → 8.0.0

package/dist/ptyHostMain.js

@@ -1,8 +1,9 @@
+import { spawn } from 'node:child_process';
+import { fileURLToPath } from 'node:url';
 import { Console } from 'node:console';
 import { createWriteStream, readFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { fileURLToPath } from 'node:url';
-import { Buffer } from 'node:buffer';
+import { Buffer as Buffer$1 } from 'node:buffer';
 
 class CommandNotFoundError extends Error {
   constructor(command) {
@@ -25,62 +26,6 @@ const execute = (command, ...args) => {
   return fn(...args);
 };
 
-const normalizeLine = line => {
-  if (line.startsWith('Error: ')) {
-    return line.slice('Error: '.length);
-  }
-  if (line.startsWith('VError: ')) {
-    return line.slice('VError: '.length);
-  }
-  return line;
-};
-const getCombinedMessage = (error, message) => {
-  const stringifiedError = normalizeLine(`${error}`);
-  if (message) {
-    return `${message}: ${stringifiedError}`;
-  }
-  return stringifiedError;
-};
-const NewLine$4 = '\n';
-const getNewLineIndex$2 = (string, startIndex = undefined) => {
-  return string.indexOf(NewLine$4, startIndex);
-};
-const mergeStacks = (parent, child) => {
-  if (!child) {
-    return parent;
-  }
-  const parentNewLineIndex = getNewLineIndex$2(parent);
-  const childNewLineIndex = getNewLineIndex$2(child);
-  if (childNewLineIndex === -1) {
-    return parent;
-  }
-  const parentFirstLine = parent.slice(0, parentNewLineIndex);
-  const childRest = child.slice(childNewLineIndex);
-  const childFirstLine = normalizeLine(child.slice(0, childNewLineIndex));
-  if (parentFirstLine.includes(childFirstLine)) {
-    return parentFirstLine + childRest;
-  }
-  return child;
-};
-class VError extends Error {
-  constructor(error, message) {
-    const combinedMessage = getCombinedMessage(error, message);
-    super(combinedMessage);
-    this.name = 'VError';
-    if (error instanceof Error) {
-      this.stack = mergeStacks(this.stack, error.stack);
-    }
-    if (error.codeFrame) {
-      // @ts-ignore
-      this.codeFrame = error.codeFrame;
-    }
-    if (error.code) {
-      // @ts-ignore
-      this.code = error.code;
-    }
-  }
-}
-
 class AssertionError extends Error {
   constructor(message) {
     super(message);
@@ -142,6 +87,147 @@ const string = value => {
   }
 };
 
+const serializeError = error => {
+  if (error && typeof error === 'object') {
+    return {
+      errorCode: 'code' in error && typeof error.code === 'string' ? error.code : undefined,
+      errorMessage: 'message' in error && typeof error.message === 'string' ? error.message : 'Unknown error',
+      errorStack: 'stack' in error && typeof error.stack === 'string' ? error.stack : undefined
+    };
+  }
+  if (typeof error === 'string') {
+    return {
+      errorCode: undefined,
+      errorMessage: error,
+      errorStack: undefined
+    };
+  }
+  return {
+    errorCode: undefined,
+    errorMessage: 'Unknown error',
+    errorStack: undefined
+  };
+};
+
+const toPath$1 = pathOrUri => {
+  if (pathOrUri.startsWith('file://')) {
+    return fileURLToPath(pathOrUri);
+  }
+  return pathOrUri;
+};
+const toString = chunks => {
+  return Buffer.concat(chunks).toString();
+};
+const executeShellCommand = async ({
+  args,
+  cwd,
+  toSpawn
+}) => {
+  array(args);
+  string(cwd);
+  string(toSpawn);
+  try {
+    const {
+      promise,
+      resolve
+    } = Promise.withResolvers();
+    const childProcess = spawn(toSpawn, args, {
+      cwd: toPath$1(cwd)
+    });
+    const stdoutChunks = [];
+    const stderrChunks = [];
+    const handleStdoutData = chunk => {
+      stdoutChunks.push(chunk);
+    };
+    const handleStderrData = chunk => {
+      stderrChunks.push(chunk);
+    };
+    const cleanup = () => {
+      childProcess.stdout.off('data', handleStdoutData);
+      childProcess.stderr.off('data', handleStderrData);
+      childProcess.off('error', handleError);
+      childProcess.off('close', handleClose);
+    };
+    const resolveWithCleanup = result => {
+      cleanup();
+      resolve(result);
+    };
+    const handleError = error => {
+      resolveWithCleanup(serializeError(error));
+    };
+    const handleClose = exitCode => {
+      resolveWithCleanup({
+        exitCode,
+        stderr: toString(stderrChunks),
+        stdout: toString(stdoutChunks)
+      });
+    };
+    childProcess.stdout.on('data', handleStdoutData);
+    childProcess.stderr.on('data', handleStderrData);
+    childProcess.on('error', handleError);
+    childProcess.on('close', handleClose);
+    return await promise;
+  } catch (error) {
+    return serializeError(error);
+  }
+};
+
+const normalizeLine = line => {
+  if (line.startsWith('Error: ')) {
+    return line.slice('Error: '.length);
+  }
+  if (line.startsWith('VError: ')) {
+    return line.slice('VError: '.length);
+  }
+  return line;
+};
+const getCombinedMessage = (error, message) => {
+  const stringifiedError = normalizeLine(`${error}`);
+  if (message) {
+    return `${message}: ${stringifiedError}`;
+  }
+  return stringifiedError;
+};
+const NewLine$4 = '\n';
+const getNewLineIndex$2 = (string, startIndex = undefined) => {
+  return string.indexOf(NewLine$4, startIndex);
+};
+const mergeStacks = (parent, child) => {
+  if (!child) {
+    return parent;
+  }
+  const parentNewLineIndex = getNewLineIndex$2(parent);
+  const childNewLineIndex = getNewLineIndex$2(child);
+  if (childNewLineIndex === -1) {
+    return parent;
+  }
+  const parentFirstLine = parent.slice(0, parentNewLineIndex);
+  const childRest = child.slice(childNewLineIndex);
+  const childFirstLine = normalizeLine(child.slice(0, childNewLineIndex));
+  if (parentFirstLine.includes(childFirstLine)) {
+    return parentFirstLine + childRest;
+  }
+  return child;
+};
+class VError extends Error {
+  constructor(error, message) {
+    const combinedMessage = getCombinedMessage(error, message);
+    super(combinedMessage);
+    this.name = 'VError';
+    if (error instanceof Error) {
+      this.stack = mergeStacks(this.stack, error.stack);
+    }
+    if (error.codeFrame) {
+      // @ts-ignore
+      this.codeFrame = error.codeFrame;
+    }
+    if (error.code) {
+      // @ts-ignore
+      this.code = error.code;
+    }
+  }
+}
+
 const isMessagePort = value => {
   return value && value instanceof MessagePort;
 };
@@ -1358,6 +1444,12 @@ class Pty extends EventTarget {
     this.pty.write(data);
   }
 }
+const toPath = pathOrUri => {
+  if (pathOrUri && pathOrUri.startsWith('file://')) {
+    return fileURLToPath(pathOrUri).toString();
+  }
+  return pathOrUri;
+};
 
 /**
  *
@@ -1376,8 +1468,9 @@ const create$1 = async ({
     const {
       spawn
     } = await import('node-pty');
+    const cwdPath = toPath(cwd);
     const pty = spawn(command, args, {
-      cwd,
+      cwd: cwdPath,
       encoding: null
       // cols: 10,
       // rows: 10,
@@ -1452,6 +1545,7 @@ const HandleElectronMessagePort = 'HandleElectronMessagePort.handleElectronMessa
 const HandleNodeMessagePort = 'HandleNodeMessagePort.handleNodeMessagePort';
 const HandleWebSocket = 'HandleWebSocket.handleWebSocket';
 const TerminalCreate = 'Terminal.create';
+const TerminalExecuteShellCommand = 'Terminal.executeShellCommand';
 const TerminalResize = 'Terminal.resize';
 const TerminalWrite = 'Terminal.write';
 const TerminalDispose = 'Terminal.dispose';
@@ -1462,6 +1556,7 @@ const commandMap = {
   [HandleWebSocket]: handleWebSocket,
   [TerminalCreate]: create,
   [TerminalDispose]: dispose,
+  [TerminalExecuteShellCommand]: executeShellCommand,
   [TerminalResize]: resize,
   [TerminalWrite]: write
 };
@@ -2314,7 +2409,7 @@ const doSocketUpgrade = (webSocketServer, request, socket) => {
     promise,
     resolve
   } = Promise.withResolvers();
-  webSocketServer.handleUpgrade(request, socket, Buffer.alloc(0), resolve);
+  webSocketServer.handleUpgrade(request, socket, Buffer$1.alloc(0), resolve);
   return promise;
 };
 const handleUpgrade = async (request, socket) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/pty-host",
-  "version": "7.0.0",
+  "version": "8.0.0",
   "keywords": [
     "lvce-editor",
     "pty-host"