@infly/libs 2.0.52 → 2.0.54

package/cli/project-command.js

@@ -1,5 +1,5 @@
 // 配置驱动的公共项目命令编排。
-const { execFileSync } = require("node:child_process");
+const { spawn, spawnSync } = require("node:child_process");
 const fs = require("node:fs");
 const path = require("node:path");
 
@@ -77,17 +77,101 @@ function commandParts(command) {
   return { command: parts[0], args: parts.slice(1) };
 }
 
-function defaultRunCommand(command, args, options) {
-  // Windows: node_modules/.bin 的 npm-script 命令是 .CMD 批处理垫片，
-  // execFileSync 无 shell 时 CreateProcess 只解析 .exe → ENOENT；与 build-utils/command.js 约定一致。
-  const useShell = process.platform === "win32";
+function attachChildLifecycle(child, command, resolve, reject) {
+  // 把子进程的生命周期（信号转发/退出语义）挂接到一个已启动的 child 上。
+  const forwardSignal = (signal) => {
+    try {
+      child.kill(signal);
+    } catch {
+      // 子进程已退出时忽略转发失败
+    }
+    // Windows 下 cmd 批处理在 Ctrl+C 时会弹"终止批处理操作吗(Y/N)?"等待输入，主进程等
+    // 子进程 exit 会永久阻塞；补杀整棵进程树（taskkill /T）并立即退出主进程，保证终端干净。
+    if (process.platform === "win32" && child.pid) {
+      try {
+        spawnSync("taskkill", ["/T", "/F", "/PID", String(child.pid)], {
+          stdio: "ignore",
+          windowsHide: true,
+        });
+      } catch {
+        // taskkill 失败不影响退出：子进程可能已结束
+      }
+    }
+    process.exit(0);
+  };
+  process.once("SIGINT", forwardSignal);
+  process.once("SIGTERM", forwardSignal);
+
+  const cleanup = () => {
+    process.removeListener("SIGINT", forwardSignal);
+    process.removeListener("SIGTERM", forwardSignal);
+  };
+
+  child.on("error", (error) => {
+    cleanup();
+    reject(error);
+  });
+  child.on("exit", (code, signal) => {
+    cleanup();
+    // 被信号终止（如用户 Ctrl+C）视为正常结束：dev server 由中断信号退出，
+    // 主进程随后返回，CLI 自然退出，不将 Ctrl+C 视为命令失败。
+    if (code === 0 || signal) {
+      resolve({ signal: signal || null });
+      return;
+    }
+    const error = new Error(`Command failed with exit code ${code ?? "unknown"}: ${command}`);
+    error.code = code;
+    reject(error);
+  });
+}
+
+function spawnCommand(command, args, options, useShell) {
   // shell=true 时按 build-utils/command.js 约定传单字符串，规避 DEP0190
   const [cmd, cmdArgs] = useShell ? [[command, ...args].join(" "), []] : [command, args];
-  execFileSync(cmd, cmdArgs, {
-    cwd: options.cwd,
-    env: options.env,
-    stdio: "inherit",
-    shell: useShell,
+  // 用 spawn（异步、非阻塞）替代 execFileSync：dev 场景（长驻进程）下，
+  // execFileSync 同步阻塞 + 多层 cmd/pnpm 嵌套在 Windows 上 Ctrl+C 后易留孤儿进程占用终端与端口。
+  return new Promise((resolve, reject) => {
+    const child = spawn(cmd, cmdArgs, {
+      cwd: options.cwd,
+      env: options.env,
+      stdio: "inherit",
+      shell: useShell,
+    });
+    attachChildLifecycle(child, command, resolve, reject);
+  });
+}
+
+function defaultRunCommand(command, args, options) {
+  // 非 Windows 统一走无 shell 形态。
+  if (process.platform !== "win32") {
+    return spawnCommand(command, args, options, false);
+  }
+  // Windows: 先尝试无 shell 直跑（.exe，如 node）——避免 cmd 批处理层在 Ctrl+C 时弹
+  // "终止批处理操作吗(Y/N)?" 等待输入；.CMD 垫片（如 pnpm/npm）无 shell 会 ENOENT，回退 cmd shell。
+  return new Promise((resolve, reject) => {
+    const child = spawn(command, args, {
+      cwd: options.cwd,
+      env: options.env,
+      stdio: "inherit",
+      shell: false,
+    });
+    let settled = false;
+    child.once("error", (error) => {
+      if (settled) return;
+      settled = true;
+      if (error.code === "ENOENT") {
+        // .cmd/.bat 垫片：回退 cmd shell（保留原有行为）
+        spawnCommand(command, args, options, true).then(resolve, reject);
+        return;
+      }
+      reject(error);
+    });
+    child.once("spawn", () => {
+      if (settled) return;
+      settled = true;
+      // 无 shell 直跑成功：挂接生命周期到当前 child（不再二次启动）
+      attachChildLifecycle(child, command, resolve, reject);
+    });
   });
 }
 
@@ -146,7 +230,7 @@ async function runProjectCommand(options = {}, dependencies = {}) {
     const parts = commandParts(devConfig.command);
     const env = { ...process.env, VUE_APP_PLATFORM: targetName };
     if (options.dryRun) printDryRun(parts.command, parts.args, env);
-    else runCommand(parts.command, parts.args, { cwd: configDir, env });
+    else await runCommand(parts.command, parts.args, { cwd: configDir, env });
     return { action, target: targetName };
   }
 
@@ -191,7 +275,7 @@ async function runProjectCommand(options = {}, dependencies = {}) {
       const parts = commandParts(step.command);
       const args = [...parts.args, ...step.extraArgs];
       if (options.dryRun) printDryRun(parts.command, args, env);
-      else runCommand(parts.command, args, { cwd: configDir, env });
+      else await runCommand(parts.command, args, { cwd: configDir, env });
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infly/libs",
-  "version": "2.0.52",
+  "version": "2.0.54",
   "description": "不受前端框架限制的独立工具库",
   "main": "index.js",
   "types": "index.d.ts",
@@ -23,21 +23,6 @@
     "!**/*.test.js",
     "!**/*.test.mjs"
   ],
-  "scripts": {
-    "test": "vitest run",
-    "test:coverage": "vitest run --coverage",
-    "test:watch": "vitest",
-    "check": "vitest run core-entry.test.js",
-    "prepublishOnly": "pnpm test",
-    "lint": "eslint .",
-    "lint:strict": "eslint . --max-warnings 0",
-    "postinstall": "node adapters/vue2/postinstall.js",
-    "publishPkg": "npm publish --access=public --registry=https://registry.npmjs.org/",
-    "preview": "infly-libs --preview",
-    "preview:no-build": "infly-libs --preview --no-build",
-    "origin:preview": "infly-libs --preview",
-    "origin:preview:no-build": "infly-libs --preview --no-build"
-  },
   "bin": {
     "infly-libs": "bin/cli.js"
   },
@@ -74,7 +59,7 @@
   "author": "Kahal",
   "license": "ISC",
   "dependencies": {
-    "@infly/ts-libs": "^0.1.12",
+    "@infly/ts-libs": "^0.1.15",
     "connect": "^3.7.0",
     "dotenv": "16.6.1",
     "enquirer": "^2.4.1",
@@ -135,5 +120,19 @@
         "staging  [禁用更新版本号的环境， 比如测试环境构建不需要更新version, 不配置默认禁用stage测试环境]"
       ]
     }
+  },
+  "scripts": {
+    "test": "vitest run",
+    "test:coverage": "vitest run --coverage",
+    "test:watch": "vitest",
+    "check": "vitest run core-entry.test.js",
+    "lint": "eslint .",
+    "lint:strict": "eslint . --max-warnings 0",
+    "postinstall": "node adapters/vue2/postinstall.js",
+    "publishPkg": "pnpm publish --access=public --registry=https://registry.npmjs.org/ --no-git-checks",
+    "preview": "infly-libs --preview",
+    "preview:no-build": "infly-libs --preview --no-build",
+    "origin:preview": "infly-libs --preview",
+    "origin:preview:no-build": "infly-libs --preview --no-build"
   }
-}
+}