@hile/cli 1.0.18 → 1.0.19

package/README.md

@@ -48,14 +48,14 @@ hile start --env-file .env --env-file .env.local
 
 ### 启动日志（基于 @hile/core 事件）
 
-CLI 已接入容器事件日志，默认会输出：
+CLI 已接入容器事件日志（仅开发模式输出），格式统一、列对齐：
 
 - 服务启动：`service:init` / `service:ready`（含耗时）
-- 服务失败：`service:error`
+- 服务失败：`service:error`（错误对象单独一行）
 - 关闭阶段：`service:shutdown:start` / `service:shutdown:done`
 - 容器关闭：`container:shutdown:start` / `container:shutdown:done`
 
-这使得线上启动问题与关闭过程更容易观测。
+在 TTY 环境下会使用颜色（成功绿、错误红、警告黄等）；重定向或管道时自动禁用颜色，便于日志采集。
 
 ### 其他命令
 
@@ -120,7 +120,12 @@ export default defineService(async (shutdown) => {
 
 ## 优雅关闭
 
-进程收到 `SIGTERM`、`SIGINT` 等信号时，CLI 会自动调用 `container.shutdown()`，按逆序销毁已启动服务。
+进程收到 `SIGTERM`、`SIGINT` 等信号时，CLI 通过 `registerExitHook` 注册的退出钩子会：
+
+1. 先 **await** `container.shutdown()`（确保所有在 defineService 中注册的 shutdown 回调被执行）
+2. **仅在其完成后**再取消事件订阅并调用 exit 退出进程
+
+若 `shutdown()` 未完成，进程会挂起不退出；内部将 async-exit-hook 的强制退出超时设为极大值，等效于「等 shutdown 完成再退出」。
 
 ## 项目结构示例
 
@@ -144,6 +149,7 @@ my-app/
 pnpm install
 pnpm build
 pnpm dev
+pnpm test
 ```
 
 ## License

package/dist/exitHook.d.ts

@@ -0,0 +1,8 @@
+export interface Shutdownable {
+    shutdown(): Promise<void>;
+}
+/**
+ * 注册进程退出钩子：进程退出时先执行 container.shutdown()，**仅在其完成后**才执行 offEvent 并 exit。
+ * 若 shutdown() 未完成，进程会挂起，不会被关闭（受 FORCE_EXIT_AFTER_MS 上限保护）。
+ */
+export declare function registerExitHook(container: Shutdownable, offEvent: () => void): void;

package/dist/exitHook.js

@@ -0,0 +1,25 @@
+import exitHook from 'async-exit-hook';
+/** 强制退出超时：仅当 shutdown 未在该时间内完成时才强制退出，默认约 24 天，等效于「等 shutdown 完成再退出」 */
+const FORCE_EXIT_AFTER_MS = 2 ** 31 - 1;
+/**
+ * 注册进程退出钩子：进程退出时先执行 container.shutdown()，**仅在其完成后**才执行 offEvent 并 exit。
+ * 若 shutdown() 未完成，进程会挂起，不会被关闭（受 FORCE_EXIT_AFTER_MS 上限保护）。
+ */
+export function registerExitHook(container, offEvent) {
+    const hook = exitHook;
+    if (typeof hook.forceExitTimeout === 'function') {
+        hook.forceExitTimeout(FORCE_EXIT_AFTER_MS);
+    }
+    exitHook(async (exit) => {
+        try {
+            await container.shutdown();
+        }
+        catch (e) {
+            console.error(e);
+        }
+        finally {
+            offEvent();
+            exit();
+        }
+    });
+}

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import pkg from '../package.json' with { type: 'json' };
-import exitHook from 'async-exit-hook';
 import { program } from 'commander';
+import { registerExitHook } from './exitHook.js';
 import { glob } from 'glob';
 import { resolve } from 'node:path';
 import { container, isService, loadService } from '@hile/core';
@@ -11,34 +11,58 @@ const require = createRequire(import.meta.url);
 function loadEnvFile(filePath) {
     process.loadEnvFile(resolve(process.cwd(), filePath));
 }
+const TAG = '[hile]';
+const c = {
+    reset: '\x1b[0m',
+    dim: '\x1b[2m',
+    red: '\x1b[31m',
+    green: '\x1b[32m',
+    yellow: '\x1b[33m',
+    cyan: '\x1b[36m',
+};
+const colorize = process.stdout.isTTY;
 function logContainerEvent(event) {
+    const pad = (s, n) => s.padEnd(n);
+    const padNum = (n, width) => n.toString().padStart(width);
+    const tag = colorize ? `${c.dim}${c.cyan}${TAG}${c.reset}` : TAG;
+    const target = (s) => (colorize ? `${c.cyan}${s}${c.reset}` : s);
+    const ok = (s) => (colorize ? `${c.green}${s}${c.reset}` : s);
+    const warn = (s) => (colorize ? `${c.yellow}${s}${c.reset}` : s);
+    const err = (s) => (colorize ? `${c.red}${s}${c.reset}` : s);
+    const dim = (s) => (colorize ? `${c.dim}${s}${c.reset}` : s);
+    const fmt = (t, status, durationMs) => durationMs !== undefined
+        ? `${tag}  ${target(pad(t, 14))}  ${status}  ${dim(padNum(durationMs, 5) + 'ms')}`
+        : `${tag}  ${target(pad(t, 14))}  ${status}`;
     switch (event.type) {
         case 'service:init':
-            console.info(`[hile] service#${event.id} init`);
+            console.info(fmt(`service#${event.id}`, dim('init')));
             break;
         case 'service:ready':
-            console.info(`[hile] service#${event.id} ready (${event.durationMs}ms)`);
+            console.info(fmt(`service#${event.id}`, ok(pad('ready', 14)), event.durationMs));
             break;
         case 'service:error':
-            console.error(`[hile] service#${event.id} failed (${event.durationMs}ms):`, event.error);
+            console.error(fmt(`service#${event.id}`, err(`failed (${event.durationMs}ms)`)));
+            console.error(event.error);
             break;
         case 'service:shutdown:start':
-            console.info(`[hile] service#${event.id} stopping`);
+            console.info(fmt(`service#${event.id}`, warn('stopping')));
             break;
         case 'service:shutdown:done':
-            console.info(`[hile] service#${event.id} stopped (${event.durationMs}ms)`);
+            console.info(fmt(`service#${event.id}`, dim(pad('stopped', 14)), event.durationMs));
             break;
         case 'service:shutdown:error':
-            console.error(`[hile] service#${event.id} shutdown error:`, event.error);
+            console.error(fmt(`service#${event.id}`, err('shutdown error')));
+            console.error(event.error);
             break;
         case 'container:shutdown:start':
-            console.info('[hile] container shutdown start');
+            console.info(fmt('container', dim('shutdown start')));
             break;
         case 'container:shutdown:done':
-            console.info(`[hile] container shutdown done (${event.durationMs}ms)`);
+            console.info(fmt('container', ok(pad('shutdown done', 14)), event.durationMs));
             break;
         case 'container:error':
-            console.error('[hile] container error:', event.error);
+            console.error(fmt('container', err('error')));
+            console.error(event.error);
             break;
     }
 }
@@ -106,13 +130,6 @@ program
         return;
     }
     // 注册退出钩子，在进程退出时销毁所有服务
-    exitHook(exit => {
-        container.shutdown()
-            .catch(e => console.error(e))
-            .finally(() => {
-            offEvent();
-            exit();
-        });
-    });
+    registerExitHook(container, offEvent);
 });
 program.parseAsync(process.argv);

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@hile/cli",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {
     "build": "tsc -b && fix-esm-import-path --preserve-import-type ./dist",
-    "dev": "tsc -b --watch"
+    "dev": "tsc -b --watch",
+    "test": "vitest run"
   },
   "files": [
     "dist",
@@ -24,11 +25,11 @@
     "vitest": "^4.0.18"
   },
   "dependencies": {
-    "@hile/core": "^1.0.20",
+    "@hile/core": "^1.0.21",
     "async-exit-hook": "^2.0.1",
     "commander": "^14.0.3",
     "glob": "^13.0.6",
     "tsx": "^4.21.0"
   },
-  "gitHead": "07067534cbd2e1c4011c72f74d16d18506081aac"
+  "gitHead": "f5d59f9f131456cf14e5ca62eeea6becde84ebef"
 }