@hile/cli 2.0.8 → 2.0.10

package/dist/exitHook.d.ts

@@ -1,6 +1,7 @@
 /**
- * 注册进程退出钩子：进程退出时先执行 container.shutdown()，**仅在其完成后**才执行 offEvent 并 exit。
- * 若 shutdown() 未完成，进程会挂起，不会被关闭（受 FORCE_EXIT_AFTER_MS 上限保护）。
+ * 注册进程退出钩子。
+ * 进程退出时先执行 container.shutdown()，完成后调用 exit() 调度 process.exit()。
+ * 若 process.exit() 被 pino/thread-stream 的 Atomics.wait() 阻塞，1s 后 process.abort() 兜底。
  */
 export declare function registerExitHook(offEvent: () => void): void;
 export declare function useExit(fn: () => void | Promise<void>): Promise<void>;

package/dist/exitHook.js

@@ -1,10 +1,11 @@
 import exitHook from 'async-exit-hook';
 import { container } from '@hile/core';
-/** 强制退出超时：仅当 shutdown 未在该时间内完成时才强制退出，默认约 24 天，等效于「等 shutdown 完成再退出」 */
-const FORCE_EXIT_AFTER_MS = 2 ** 31 - 1;
+/** shutdown 未在该时间内完成时强制退出 */
+const FORCE_EXIT_AFTER_MS = 10_000;
 /**
- * 注册进程退出钩子：进程退出时先执行 container.shutdown()，**仅在其完成后**才执行 offEvent 并 exit。
- * 若 shutdown() 未完成，进程会挂起，不会被关闭（受 FORCE_EXIT_AFTER_MS 上限保护）。
+ * 注册进程退出钩子。
+ * 进程退出时先执行 container.shutdown()，完成后调用 exit() 调度 process.exit()。
+ * 若 process.exit() 被 pino/thread-stream 的 Atomics.wait() 阻塞，1s 后 process.abort() 兜底。
  */
 export function registerExitHook(offEvent) {
     const hook = exitHook;
@@ -14,17 +15,9 @@ export function registerExitHook(offEvent) {
     exitHook(async (exit) => {
         try {
             await container.shutdown();
-            await new Promise((resolve, reject) => {
-                try {
-                    if (process.stdin.isTTY) {
-                        process.stdin.unref();
-                    }
-                    resolve();
-                }
-                catch (e) {
-                    reject(e);
-                }
-            });
+            if (process.stdin.isTTY) {
+                process.stdin.unref();
+            }
         }
         catch (e) {
             console.error(e);
@@ -32,6 +25,10 @@ export function registerExitHook(offEvent) {
         finally {
             offEvent();
             exit();
+            // process.exit() can hang due to pino/thread-stream exit handlers
+            // that use Atomics.wait() to block on worker threads.
+            // If we're still running after 1s, force kill.
+            setTimeout(() => process.abort(), 1000).unref();
         }
     });
 }
@@ -39,23 +36,16 @@ export async function useExit(fn) {
     exitHook(async (exit) => {
         try {
             await Promise.resolve(fn());
-            await new Promise((resolve, reject) => {
-                try {
-                    if (process.stdin.isTTY) {
-                        process.stdin.unref();
-                    }
-                    resolve();
-                }
-                catch (e) {
-                    reject(e);
-                }
-            });
+            if (process.stdin.isTTY) {
+                process.stdin.unref();
+            }
         }
         catch (e) {
             console.error(e);
         }
         finally {
             exit();
+            setTimeout(() => process.abort(), 1000).unref();
         }
     });
 }

package/dist/index.js

@@ -120,15 +120,20 @@ registryCmd
     .description('启动注册中心')
     .action(async (options) => {
     const port = options.port ? Number(options.port) : 9876;
+    const { logger, teardown } = createLogger({
+        level: options.level,
+        pretty: !!options.pretty
+    });
     const registry = new Registry({
         advertiseHost: options.host,
-        logger: createLogger({
-            level: options.level,
-            pretty: !!options.pretty
-        })
+        logger,
+    });
+    const unListen = await registry.listen(port);
+    useExit(async () => {
+        await unListen();
+        teardown();
     });
-    useExit(await registry.listen(port));
-    registry.logger.info(`+ registry started on port ${port}`);
+    logger.info(`+ registry started on port ${port}`);
 });
 // Registry configs subcommands
 const configs = registryCmd.command('configs');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hile/cli",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {
@@ -29,8 +29,8 @@
   },
   "dependencies": {
     "@hile/core": "^2.0.1",
-    "@hile/logger": "^2.0.1",
-    "@hile/micro": "^2.0.5",
+    "@hile/logger": "^2.0.3",
+    "@hile/micro": "^2.0.7",
     "async-exit-hook": "^2.0.1",
     "commander": "^14.0.3",
     "glob": "^13.0.6",
@@ -38,5 +38,5 @@
     "tsx": "^4.21.0",
     "yaml": "^2.9.0"
   },
-  "gitHead": "ee65892b77e87ff14470dee72a3ff45b6c467311"
+  "gitHead": "cf057f1833ad144a6d7812d2d190d3a9d903429f"
 }