@lvce-editor/pty-host 8.11.1 → 8.11.4

package/dist/ptyHostMain.js

@@ -1,6 +1,8 @@
 import { spawn } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
 import Headless from '@xterm/headless';
+import { stat } from 'node:fs/promises';
+import { win32 } from 'node:path';
 import { Console } from 'node:console';
 import { createWriteStream, readFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
@@ -1622,6 +1624,31 @@ class ExitEvent extends Event {
   }
 }
 
+const isFile = async path => {
+  try {
+    const info = await stat(path);
+    return info.isFile();
+  } catch (error) {
+    const {
+      code
+    } = error;
+    if (code !== 'ENOENT' && code !== 'ENOTDIR') throw error;
+    return false;
+  }
+};
+const resolveWindowsCommand = async (command, cwd, searchPath) => {
+  if (win32.isAbsolute(command)) return command;
+  const directories = /[/\\]/.test(command) ? [cwd] : searchPath.split(';').filter(Boolean);
+  const names = win32.extname(command) ? [command] : [command, `${command}.exe`];
+  for (const directory of directories) {
+    for (const name of names) {
+      const candidate = win32.resolve(cwd, directory.replace(/^"(.*)"$/, '$1'), name);
+      if (await isFile(candidate)) return candidate;
+    }
+  }
+  throw new Error(`Executable not found: ${command}`);
+};
+
 class Pty extends EventTarget {
   /**
    *
@@ -1670,7 +1697,8 @@ const toPath = pathOrUri => {
 const create$1 = async ({
   args,
   command,
-  cwd
+  cwd,
+  env
 } = {}) => {
   try {
     string(cwd);
@@ -1680,9 +1708,28 @@ const create$1 = async ({
       spawn
     } = await import('node-pty');
     const cwdPath = toPath(cwd);
-    const pty = spawn(command, args, {
+    const childEnv = env ? {
+      ...process.env,
+      ...env
+    } : {
+      ...process.env
+    };
+    let executable = command;
+    if (process.platform === 'win32') {
+      const pathOverride = Object.entries(env || {}).find(([key]) => key.toLowerCase() === 'path');
+      const searchPath = pathOverride ? String(pathOverride[1]) : process.env.PATH || '';
+      // CreateProcess searches System32 before PATH for bare names, even though
+      // node-pty validates a PATH match first. Pass that match to the spawn too.
+      executable = await resolveWindowsCommand(command, cwdPath, searchPath);
+      for (const key of Object.keys(childEnv)) {
+        if (key.toLowerCase() === 'path') delete childEnv[key];
+      }
+      childEnv.Path = searchPath;
+    }
+    const pty = spawn(executable, args, {
       cwd: cwdPath,
-      encoding: null
+      encoding: null,
+      env: childEnv
       // cols: 10,
       // rows: 10,
     });
@@ -1713,7 +1760,7 @@ const disposeConnection = ipc => {
 };
 
 // TODO maybe merge pty and pty controller
-const createWithDependencies = async (ipc, id, cwd, command, args, createPty) => {
+const createWithDependencies = async (ipc, id, cwd, command, args, createPty, options = {}) => {
   number(id);
   string(cwd);
   string(command);
@@ -1734,7 +1781,10 @@ const createWithDependencies = async (ipc, id, cwd, command, args, createPty) =>
     pty = await createPty({
       args,
       command,
-      cwd
+      cwd,
+      ...(options.env && {
+        env: options.env
+      })
     });
   } catch (error) {
     entries.delete(entry);
@@ -1787,10 +1837,13 @@ const create = (ipc, id, cwd, command, args, options) => {
     return create$2(ipc, id, options.sessionToken, options.restoreOnly === true, () => create$1({
       args,
       command,
-      cwd
+      cwd,
+      ...(options.env && {
+        env: options.env
+      })
     }));
   }
-  return createWithDependencies(ipc, id, cwd, command, args, create$1);
+  return createWithDependencies(ipc, id, cwd, command, args, create$1, options);
 };
 const write = (ipc, id, data) => {
   const pty = get(ipc, id);

package/package.json

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