@travetto/cli 7.1.1 → 7.1.3

package/README.md

@@ -498,7 +498,8 @@ export class WebHttpCommand implements CliCommandShape {
       const result = this.killConflict ? await NetUtil.freePortOnConflict(err) : undefined;
       if (result?.processId) {
         console.warn('Killed process owning port', result);
-        process.exit(1);
+        process.exitCode = 1; // Indicate error, restart will use if in that mode
+        return;
       }
       throw err;
     }

package/bin/trv.js

@@ -2,4 +2,4 @@
 // @ts-check
 import '@travetto/compiler/bin/hook.js';
 const { invoke } = await import('@travetto/compiler/support/invoke.ts');
-await invoke('exec', ['@travetto/cli/support/entry.trv.js', ...process.argv.slice(2)]);
+await invoke('exec', ['@travetto/cli/support/entry.trv.ts', ...process.argv.slice(2)]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/cli",
-  "version": "7.1.1",
+  "version": "7.1.3",
   "type": "module",
   "description": "CLI infrastructure for Travetto framework",
   "keywords": [
@@ -29,8 +29,8 @@
     "directory": "module/cli"
   },
   "dependencies": {
-    "@travetto/schema": "^7.1.1",
-    "@travetto/terminal": "^7.1.1"
+    "@travetto/schema": "^7.1.3",
+    "@travetto/terminal": "^7.1.3"
   },
   "travetto": {
     "displayName": "Command Line Interface",

package/src/execute.ts

@@ -1,4 +1,4 @@
-import { ConsoleManager, Runtime, ShutdownManager } from '@travetto/runtime';
+import { ConsoleManager, Runtime, ShutdownManager, Util } from '@travetto/runtime';
 
 import { HelpUtil } from './help.ts';
 import { CliCommandRegistryIndex } from './registry/registry-index.ts';
@@ -63,6 +63,9 @@ export class ExecutionManager {
    */
   static async run(argv: string[]): Promise<void> {
     try {
+      // Wait 50ms to allow stdout to flush on shutdown
+      ShutdownManager.signal.addEventListener('abort', () => Util.blockingTimeout(50));
+
       const { cmd, args, help } = CliParseUtil.getArgs(argv);
       if (!cmd) {
         console.info!(await HelpUtil.renderAllHelp());

package/src/util.ts

@@ -31,7 +31,7 @@ export class CliUtil {
   static async runWithRestartOnChange<T extends CliCommandShapeFields>(cmd: T): Promise<void> {
     if (Env.TRV_RESTART_TARGET.isTrue) {
       Env.TRV_RESTART_TARGET.clear();
-      WatchUtil.listenForSignals();
+      ShutdownManager.disableInterrupt();
       return;
     } else if (cmd.restartOnChange !== true) {
       return; // Not restarting, run normal
@@ -40,16 +40,18 @@ export class CliUtil {
     ShutdownManager.disableInterrupt();
 
     let child: ChildProcess | undefined;
-    void WatchUtil.watchCompilerEvents('file', () => child && WatchUtil.triggerSignal(child, 'WATCH_RESTART'));
-    process.on('SIGINT', () => child && WatchUtil.triggerSignal(child, 'WATCH_SHUTDOWN'));
+    void WatchUtil.watchCompilerEvents('file', () => ShutdownManager.shutdownChild(child!, { reason: 'restart', mode: 'exit' }));
+    process
+      .on('SIGINT', () => ShutdownManager.shutdownChild(child!, { mode: 'exit' }))
+      .on('message', msg => child?.send?.(msg!));
 
     const env = { ...process.env, ...Env.TRV_RESTART_TARGET.export(true) };
 
     await WatchUtil.runWithRetry(
       async () => {
         child = spawn(process.argv0, process.argv.slice(1), { env, stdio: ['pipe', 1, 2, 'ipc'] });
-        const { code } = await ExecUtil.deferToSubprocess(child);
-        return WatchUtil.exitCodeToResult(code);
+        const { code } = await ExecUtil.getResult(child, { catch: true });
+        return ShutdownManager.reasonForExitCode(code);
       },
       {
         maxRetries: 5,
@@ -64,8 +66,7 @@ export class CliUtil {
       }
     );
 
-    await ShutdownManager.shutdown();
-    process.exit();
+    await ShutdownManager.shutdown({ mode: 'exit' });
   }
 
   /**