@deveco-test/deveco-cli 1.3.5-Test.4 → 1.3.10-Test.1

package/cli.js

@@ -1,17 +1,19 @@
 #!/usr/bin/env node
 // Shell entry: map process.platform to an implementation package, resolve its
-// absolute cli.js path, and spawnSync-exec it with all argv forwarded.
+// absolute cli.js path, and spawn it with all argv forwarded.
 // Command parsing, error handling, and exit code are all owned by the impl pkg.
-import { spawnSync } from 'node:child_process';
+import { spawn } from 'node:child_process';
 import { createRequire } from 'node:module';
 import { readFileSync } from 'node:fs';
+import { constants } from 'node:os';
+import process from 'node:process';
 
 // Pass wrapper identity to the impl process so `devecocli update` installs
 // THIS package (the one the user installed), not the nested impl dependency.
 // These env names are NOT in tsup's `env` map, so they survive as runtime
 // process.env reads in the built impl bundle.
 const wrapperPkg = JSON.parse(
-  readFileSync(new URL('./package.json', import.meta.url), 'utf8'),
+  readFileSync(new URL('./package.json', import.meta.url), 'utf8')
 );
 process.env.DEVECO_CLI_WRAPPER_NAME = wrapperPkg.name;
 process.env.DEVECO_CLI_WRAPPER_VERSION = wrapperPkg.version;
@@ -25,8 +27,8 @@ const IMPL_PKG = (() => {
   if (!match) {
     process.stderr.write(
       `devecocli: no implementation package found for platform "${process.platform}".\n` +
-      `  available: ${deps.length ? deps.join(', ') : '(none)'}\n` +
-      `  expected a package containing "${needle}"\n`
+        `  available: ${deps.length ? deps.join(', ') : '(none)'}\n` +
+        `  expected a package containing "${needle}"\n`
     );
     process.exit(1);
   }
@@ -39,19 +41,60 @@ try {
 } catch (err) {
   process.stderr.write(
     `devecocli: implementation package "${IMPL_PKG}" is not installed for this platform.\n` +
-    `  platform: ${process.platform}\n` +
-    `  expected: ${IMPL_PKG}\n` +
-    `  cause: ${err && err.message ? err.message : err}\n`
+      `  platform: ${process.platform}\n` +
+      `  expected: ${IMPL_PKG}\n` +
+      `  cause: ${err && err.message ? err.message : err}\n`
   );
   process.exit(1);
 }
 
-const result = spawnSync(process.execPath, [cliPath, ...process.argv.slice(2)], {
+const args = [cliPath, ...process.argv.slice(2)];
+if (process.env.DEVECO_CLI_DEBUG) {
+  process.stderr.write(
+    `[DEBUG] Executing: ${process.execPath} ${args.join(' ')}\n`
+  );
+}
+const child = spawn(process.execPath, args, {
   stdio: 'inherit',
+  windowsHide: true,
 });
 
-if (result.error) {
-  process.stderr.write(`devecocli: failed to spawn implementation: ${result.error.message}\n`);
-  process.exit(1);
+let interrupted = false;
+const handlers = new Map();
+for (const signal of ['SIGINT', 'SIGTERM', 'SIGHUP']) {
+  const handler = () => {
+    if (child.exitCode !== null || child.signalCode !== null) {
+      return;
+    }
+    if (interrupted) {
+      child.kill('SIGKILL');
+      return;
+    }
+    interrupted = true;
+    // Windows console Ctrl+C reaches the child; kill('SIGINT') would force it to exit.
+    if (process.platform !== 'win32' || signal !== 'SIGINT') {
+      child.kill(signal);
+    }
+  };
+  handlers.set(signal, handler);
+  process.on(signal, handler);
+}
+
+function cleanup() {
+  for (const [signal, handler] of handlers) {
+    process.off(signal, handler);
+  }
 }
-process.exit(result.status ?? 1);
+
+child.once('error', (error) => {
+  cleanup();
+  process.stderr.write(
+    `devecocli: failed to spawn implementation: ${error.message}\n`
+  );
+  process.exitCode = 1;
+});
+child.once('close', (code, signal) => {
+  cleanup();
+  process.exitCode ??=
+    code ?? (signal ? 128 + (constants.signals[signal] || 1) : 1);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deveco-test/deveco-cli",
-  "version": "1.3.5-Test.4",
+  "version": "1.3.10-Test.1",
   "description": "HarmonyOS application development command line tool",
   "license": "MIT",
   "type": "module",
@@ -20,7 +20,7 @@
     "openharmony"
   ],
   "optionalDependencies": {
-    "@deveco-test/deveco-cli-openharmony-arm64": "1.3.5-Test.4",
-    "@deveco-test/deveco-cli-common": "1.3.5-Test.4"
+    "@deveco-test/deveco-cli-openharmony-arm64": "1.3.10-Test.1",
+    "@deveco-test/deveco-cli-common": "1.3.10-Test.1"
   }
 }