gpteam 0.1.12 → 0.1.13

package/lib/client-install.js

@@ -78,28 +78,54 @@ async function shouldInstallMissingClient(spec, options) {
 
 async function runInstallCommand(spec, runCommand, platform) {
   const [command, args] = spec.installCommand;
-  const result = await runCommand(resolveSpawnCommand(command, platform), args, { stdio: 'inherit' });
+  const invocation = resolveSpawnInvocation(command, args, platform);
+  const result = await runCommand(invocation.command, invocation.args, { stdio: 'inherit' });
   if (result.status !== 0) {
-    throw new Error(`${spec.label} 安装失败，命令：${formatInstallCommand(spec)}`);
+    throw new Error(`${spec.label} 安装失败，命令：${formatInstallCommand(spec)}${formatRunError(result)}`);
   }
 }
 
-export function resolveSpawnCommand(command, platform = process.platform) {
-  if (platform === 'win32' && command === 'npm') return 'npm.cmd';
-  return command;
+export function resolveSpawnInvocation(command, args, platform = process.platform) {
+  if (platform === 'win32' && command === 'npm') {
+    return {
+      command: 'cmd.exe',
+      args: ['/d', '/s', '/c', windowsCommandLine('npm.cmd', args)]
+    };
+  }
+  return { command, args };
 }
 
 export function defaultRunCommand(command, args, options = {}) {
   return new Promise((resolve) => {
-    const child = spawn(command, args, {
-      stdio: options.stdio || 'ignore',
-      shell: options.shell || false
-    });
-    child.on('error', () => resolve({ status: 127 }));
+    let child;
+    try {
+      child = spawn(command, args, {
+        stdio: options.stdio || 'ignore',
+        shell: options.shell || false
+      });
+    } catch (error) {
+      resolve({ status: 127, error });
+      return;
+    }
+    child.on('error', (error) => resolve({ status: 127, error }));
     child.on('close', (status) => resolve({ status: status ?? 1 }));
   });
 }
 
+function formatRunError(result) {
+  if (!result || !result.error) return '';
+  const code = result.error.code || result.error.message;
+  return `，底层错误：${code}`;
+}
+
+function windowsCommandLine(command, args) {
+  return [command, ...args].map(windowsQuoteArg).join(' ');
+}
+
+function windowsQuoteArg(value) {
+  return `"${String(value).replace(/"/g, '\\"')}"`;
+}
+
 function shellQuote(value) {
   return `'${String(value).replace(/'/g, "'\\''")}'`;
 }

package/lib/help.js

@@ -1,5 +1,5 @@
 export const PACKAGE_NAME = 'gpteam';
-export const PACKAGE_VERSION = '0.1.12';
+export const PACKAGE_VERSION = '0.1.13';
 
 export function getHelpText() {
   return [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gpteam",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "GPTeam API interactive client configurator and ingress benchmark CLI.",
   "type": "module",
   "bin": {