buddy-workbench 0.1.39 → 0.1.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "buddy-workbench",
-  "version": "0.1.39",
+  "version": "0.1.40",
   "private": false,
   "type": "module",
   "bin": {

package/server/services/dev-configurations.js

@@ -1,5 +1,5 @@
 import { execFile } from 'node:child_process';
-import { existsSync, readFileSync, writeFileSync } from 'node:fs';
+import { existsSync, readFileSync, readdirSync, writeFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { basename, join } from 'node:path';
 import { promisify } from 'node:util';
@@ -8,15 +8,72 @@ const execFileAsync = promisify(execFile);
 const NPM_KEYS = ['prefix', 'registry', 'strict-ssl', 'cache', 'proxy', 'https-proxy'];
 const NVM_LOAD = 'if [ -s "$NVM_DIR/nvm.sh" ]; then . "$NVM_DIR/nvm.sh"; elif [ -s "$HOME/.nvm/nvm.sh" ]; then . "$HOME/.nvm/nvm.sh"; fi; ';
 
-async function run(command, args) {
-  const { stdout } = await execFileAsync(command, args, { timeout: 5000, maxBuffer: 1024 * 1024 });
-  return stdout.trim();
+function getEnrichedEnv() {
+  const home = homedir();
+  const extraPaths = [
+    join(home, '.nvm', 'current', 'bin'),
+    join(home, '.npm-global', 'bin'),
+    '/opt/homebrew/bin',
+    '/usr/local/bin',
+    '/usr/bin',
+    '/bin',
+    '/usr/sbin',
+    '/sbin'
+  ];
+  const nvmDir = process.env.NVM_DIR || join(home, '.nvm');
+  if (existsSync(nvmDir)) {
+    try {
+      const versionsDir = join(nvmDir, 'versions', 'node');
+      if (existsSync(versionsDir)) {
+        for (const v of readdirSync(versionsDir)) {
+          extraPaths.unshift(join(versionsDir, v, 'bin'));
+        }
+      }
+    } catch {}
+  }
+  const currentPath = process.env.PATH || '';
+  const mergedPath = [...new Set([...extraPaths, ...currentPath.split(':')])].filter(Boolean).join(':');
+  return { ...process.env, PATH: mergedPath };
+}
+
+function parseJsonOutput(text) {
+  const str = String(text || '').trim();
+  const objStart = str.indexOf('{');
+  const arrStart = str.indexOf('[');
+  let start = -1;
+  let end = -1;
+  if (objStart !== -1 && (arrStart === -1 || objStart < arrStart)) {
+    start = objStart;
+    end = str.lastIndexOf('}');
+  } else if (arrStart !== -1) {
+    start = arrStart;
+    end = str.lastIndexOf(']');
+  }
+  if (start !== -1 && end !== -1 && end > start) {
+    return JSON.parse(str.slice(start, end + 1));
+  }
+  return JSON.parse(str);
+}
+
+async function run(command, args, timeout = 5000) {
+  try {
+    const { stdout } = await execFileAsync(command, args, { timeout, maxBuffer: 8 * 1024 * 1024, env: getEnrichedEnv() });
+    return stdout.trim();
+  } catch (error) {
+    if (['node', 'npm'].includes(command)) {
+      try {
+        const cmdStr = `${command} ${args.map(shellQuote).join(' ')}`;
+        return await runNvm(cmdStr, timeout);
+      } catch {}
+    }
+    throw error;
+  }
 }
 
 async function runNvm(script, timeout = 5000) {
   for (const shell of ['zsh', 'bash']) {
     try {
-      const { stdout } = await execFileAsync(shell, ['-ilc', `${NVM_LOAD}${script}`], { timeout, maxBuffer: 2 * 1024 * 1024 });
+      const { stdout } = await execFileAsync(shell, ['-ilc', `${NVM_LOAD}${script}`], { timeout, maxBuffer: 4 * 1024 * 1024, env: getEnrichedEnv() });
       return stdout.trim();
     } catch {}
   }
@@ -61,14 +118,20 @@ async function readGitConfig(key) {
 
 async function readGlobalNpmPackages() {
   try {
-    const { stdout } = await execFileAsync('npm', ['ls', '--global', '--depth=0', '--json'], { timeout: 10000, maxBuffer: 4 * 1024 * 1024 });
-    const packageJson = JSON.parse(stdout);
+    const stdout = await run('npm', ['ls', '--global', '--depth=0', '--json'], 10000);
+    const packageJson = parseJsonOutput(stdout);
     return Object.entries(packageJson.dependencies || {}).map(([name, info]) => ({ name, version: info.version || '' }));
   } catch (error) {
     try {
-      const packageJson = JSON.parse(error.stdout || '');
+      const packageJson = parseJsonOutput(error.stdout || '');
       return Object.entries(packageJson.dependencies || {}).map(([name, info]) => ({ name, version: info.version || '' }));
-    } catch { return []; }
+    } catch {
+      try {
+        const output = await runNvm('npm ls --global --depth=0 --json', 10000);
+        const packageJson = parseJsonOutput(output);
+        return Object.entries(packageJson.dependencies || {}).map(([name, info]) => ({ name, version: info.version || '' }));
+      } catch { return []; }
+    }
   }
 }
 
@@ -86,15 +149,15 @@ export async function manageGlobalNpmPackage(action, packageName) {
     ? ['update', '--global', name]
     : ['uninstall', '--global', name];
   if (!['install', 'upgrade', 'uninstall'].includes(action)) throw new Error('Unsupported npm package action.');
-  await execFileAsync('npm', args, { timeout: 10 * 60 * 1000, maxBuffer: 4 * 1024 * 1024 });
+  await run('npm', args, 10 * 60 * 1000);
   return readGlobalNpmPackages();
 }
 
 export async function searchNpmPackages(query) {
   const term = String(query || '').trim();
   if (!term || term.length > 100) throw new Error('Enter a package search term.');
-  const { stdout } = await execFileAsync('npm', ['search', term, '--json', '--long'], { timeout: 30 * 1000, maxBuffer: 8 * 1024 * 1024 });
-  const results = JSON.parse(stdout);
+  const stdout = await run('npm', ['search', term, '--json', '--long'], 30 * 1000);
+  const results = parseJsonOutput(stdout);
   return (Array.isArray(results) ? results : []).slice(0, 20).map((item) => ({
     name: item.name,
     version: item.version || '',
@@ -104,12 +167,12 @@ export async function searchNpmPackages(query) {
 
 export async function getNpmPackageVersions(packageName) {
   const name = validateNpmPackageName(packageName).replace(/@[^@]+$/, '');
-  const [{ stdout: versionsOutput }, { stdout: timeOutput }] = await Promise.all([
-    execFileAsync('npm', ['view', name, 'versions', '--json'], { timeout: 30 * 1000, maxBuffer: 4 * 1024 * 1024 }),
-    execFileAsync('npm', ['view', name, 'time', '--json'], { timeout: 30 * 1000, maxBuffer: 4 * 1024 * 1024 })
+  const [versionsOutput, timeOutput] = await Promise.all([
+    run('npm', ['view', name, 'versions', '--json'], 30 * 1000),
+    run('npm', ['view', name, 'time', '--json'], 30 * 1000)
   ]);
-  const versions = JSON.parse(versionsOutput);
-  const publishTimes = JSON.parse(timeOutput) || {};
+  const versions = parseJsonOutput(versionsOutput);
+  const publishTimes = parseJsonOutput(timeOutput) || {};
   return (Array.isArray(versions) ? versions : versions ? [versions] : []).slice(-100).reverse().map((version) => ({ version, publishedAt: publishTimes[version] || '' }));
 }
 
@@ -204,3 +267,4 @@ export async function installNvmVersion(version) {
   await runNvm(`nvm install ${shellQuote(target)}`, 10 * 60 * 1000);
   return readNvmConfiguration();
 }
+