@nuwax-ai/app-cli 0.3.5 → 0.3.9

package/bin/cli.js

@@ -41,12 +41,12 @@ try {
   process.exit(1);
 }
 
-// win32：serve 需要 pingap 反代，把包内 pingap.exe 经 env 注入（app-cli 的
-// 默认值 /usr/local/bin/pingap 在 Windows 不存在）。仅用户未显式设置时注入——
+// All bundled platforms use their paired Pingap instead of a possibly stale
+// system installation. Only inject when the caller has not configured it:
 // 显式 APP_CLI_PINGAP_BIN / --pingap-bin 优先。
 let childEnv;
-if (platform === "win32") {
-  const pingapPath = path.join(path.dirname(binPath), "pingap.exe");
+{
+  const pingapPath = path.join(path.dirname(binPath), platform === "win32" ? "pingap.exe" : "pingap");
   if (!process.env.APP_CLI_PINGAP_BIN && fs.existsSync(pingapPath)) {
     childEnv = { ...process.env, APP_CLI_PINGAP_BIN: pingapPath };
   }

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@nuwax-ai/app-cli",
-  "version": "0.3.5",
+  "version": "0.3.9",
   "description": "UserApp workspace runtime orchestrator (service orchestration + pingap routing + admin API; local build tool)",
   "main": "./bin/cli.js",
   "bin": {
     "app-cli": "./bin/cli.js"
   },
   "optionalDependencies": {
-    "@nuwax-ai/app-cli-linux-x64": "0.3.5",
-    "@nuwax-ai/app-cli-linux-arm64": "0.3.5",
-    "@nuwax-ai/app-cli-darwin-x64": "0.3.5",
-    "@nuwax-ai/app-cli-darwin-arm64": "0.3.5",
-    "@nuwax-ai/app-cli-windows-x64": "0.3.5"
+    "@nuwax-ai/app-cli-linux-x64": "0.3.9",
+    "@nuwax-ai/app-cli-linux-arm64": "0.3.9",
+    "@nuwax-ai/app-cli-darwin-x64": "0.3.9",
+    "@nuwax-ai/app-cli-darwin-arm64": "0.3.9",
+    "@nuwax-ai/app-cli-windows-x64": "0.3.9"
   },
   "os": [
     "linux",

package/test/launcher.test.cjs

@@ -0,0 +1,36 @@
+const { test } = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+const path = require('node:path');
+const vm = require('node:vm');
+const os = require('node:os');
+const { execFileSync } = require('node:child_process');
+const { EventEmitter } = require('node:events');
+const source = fs.readFileSync(path.join(__dirname, '../bin/cli.js'), 'utf8');
+
+for (const [platform, arch, suffix] of [['darwin', 'arm64', 'darwin-arm64'], ['darwin', 'x64', 'darwin-x64'], ['linux', 'x64', 'linux-x64'], ['win32', 'x64', 'windows-x64']]) {
+  test(`${suffix}: launcher selects paired Pingap and respects explicit env`, () => {
+    for (const explicit of [undefined, '/custom/pingap']) {
+      let captured;
+      const env = explicit ? { APP_CLI_PINGAP_BIN: explicit } : {};
+      const req = name => ({ child_process: { spawn: (...args) => { captured = args; return new EventEmitter(); } }, fs: { existsSync: () => true }, path })[name];
+      req.resolve = () => `/packages/${suffix}/package.json`;
+      vm.runInNewContext(source, { require: req, console, process: { platform, arch, env, argv: ['node', 'cli', 'serve'], on() {}, exit(code) { throw new Error(`unexpected exit ${code}`); } } });
+      const selectedEnv = captured[2].env || env;
+      assert.equal(selectedEnv.APP_CLI_PINGAP_BIN, explicit || `/packages/${suffix}/${platform === 'win32' ? 'pingap.exe' : 'pingap'}`);
+      assert.equal(captured[1][0], 'serve');
+    }
+  });
+  test(`${suffix}: npm tarball includes both executables`, () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), 'app-cli-pack-'));
+    try {
+      fs.copyFileSync(path.join(__dirname, `../../app-cli-${suffix}/package.json`), path.join(root, 'package.json'));
+      const binaries = platform === 'win32' ? ['app-cli.exe', 'pingap.exe'] : ['app-cli', 'pingap'];
+      for (const name of binaries) fs.writeFileSync(path.join(root, name), 'packaging fixture');
+      const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+      const result = JSON.parse(execFileSync(npm, ['pack', '--dry-run', '--ignore-scripts', '--json'], { cwd: root, encoding: 'utf8', shell: process.platform === 'win32' }));
+      const files = result[0].files.map(file => file.path);
+      for (const name of binaries) assert.ok(files.includes(name), `missing ${name}`);
+    } finally { fs.rmSync(root, { recursive: true, force: true }); }
+  });
+}