@hile/micro 2.0.4 → 2.0.5

package/dist/application.js

@@ -85,11 +85,11 @@ export class Application extends Server {
         // 这里不清理 topics 由业务方自己清理
         // 这里也不清理 declare 和 undeclare 由业务方自己清理
         return async () => {
+            this.stopped = true;
             for (const fallback of this.fallbacks) {
                 fallback();
             }
             this.fallbacks.clear();
-            this.stopped = true;
             if (this.reconnectTimeout) {
                 clearTimeout(this.reconnectTimeout);
                 this.reconnectTimeout = undefined;
@@ -106,6 +106,7 @@ export class Application extends Server {
             clearTimeout(this.reconnectTimeout);
         this.reconnectTimeout = setTimeout(() => {
             this.reconnectTimeout = undefined;
+            this.logger.debug('[reconnecting] %s:%d', this._registry_address.host, this._registry_address.port);
             void this.reconnectToRegistry().catch(() => {
                 if (this.stopped)
                     return;
@@ -141,6 +142,7 @@ export class Application extends Server {
             for (const [topic, callback] of this.topics) {
                 await this.subscribe(topic, callback, true);
             }
+            this.logger.debug('[reconnected] %s:%d', this._registry_address.host, this._registry_address.port);
         })().finally(() => {
             this.registryReconnectPromise = undefined;
         });

package/dist/registry.js

@@ -3,6 +3,7 @@ import { homedir } from 'node:os';
 import { resolve, join } from 'node:path';
 import { existsSync, mkdirSync, readdirSync, readFileSync, watch } from 'node:fs';
 import YAML from 'yaml';
+import { createLogger } from '@hile/logger';
 /** 将 `host:port` 或 `[ipv6]:port` 形式的 key 解析为地址（端口取最后一个 `:` 之后） */
 export function parseAddressKey(key) {
     const i = key.lastIndexOf(':');
@@ -51,7 +52,12 @@ export class Registry extends Server {
         if (!existsSync(workspace)) {
             mkdirSync(workspace, { recursive: true });
         }
-        super('registry', props);
+        super('registry', {
+            logger: props.logger ?? createLogger({
+                level: 'debug',
+                pretty: process.env.NODE_ENV !== 'production',
+            }), ...props
+        });
         this.workspace = workspace;
         this.events.on('connect', (client, extras) => {
             const key = client.host + ':' + client.port;
@@ -60,15 +66,20 @@ export class Registry extends Server {
                 this.namespaces.set(namespace, new Set());
             }
             this.namespaces.get(namespace).add(key);
+            this.logger.debug('[connect] %s/%s', key, namespace);
         });
         this.events.on('disconnect', (client, extras) => {
             const key = client.host + ':' + client.port;
             // 清理 topic 中的关联（不删除 topic，保留 data 供后续 subscriber 使用）
             for (const [, { publishers, subscribers }] of this.topics) {
-                if (publishers.has(key))
+                if (publishers.has(key)) {
                     publishers.delete(key);
-                if (subscribers.has(key))
+                    this.logger.debug('[delete publisher] %s', key);
+                }
+                if (subscribers.has(key)) {
                     subscribers.delete(key);
+                    this.logger.debug('[delete subscriber] %s', key);
+                }
             }
             // 清理 namespace 中的关联
             const namespace = extras.join('/');
@@ -76,8 +87,10 @@ export class Registry extends Server {
                 const keys = this.namespaces.get(namespace);
                 if (keys.has(key)) {
                     keys.delete(key);
+                    this.logger.debug('[disconnect] %s/%s', key, namespace);
                     if (keys.size === 0) {
                         this.namespaces.delete(namespace);
+                        this.logger.debug('[delete namespace] %s', namespace);
                     }
                 }
             }
@@ -183,6 +196,7 @@ export class Registry extends Server {
             entry.data = data.payload;
             publishers.add(key);
             this.publish(data.topic, data.payload);
+            this.logger.debug('[declare] %s/%s', key, data.topic);
             return Date.now();
         }));
     }
@@ -197,8 +211,10 @@ export class Registry extends Server {
             const i = publishers.size;
             if (publishers.has(key)) {
                 publishers.delete(key);
+                this.logger.debug('[undeclare] %s/%s', key, data.topic);
                 if (publishers.size === 0 && subscribers.size === 0) {
                     this.topics.delete(data.topic);
+                    this.logger.debug('[delete topic] %s', data.topic);
                 }
             }
             return i - publishers.size;
@@ -213,6 +229,7 @@ export class Registry extends Server {
             const entry = this.topics.get(data.topic);
             const subscribers = entry.subscribers;
             subscribers.add(key);
+            this.logger.debug('[subscribe] %s/%s', key, data.topic);
             return entry.data;
         }));
     }
@@ -223,14 +240,11 @@ export class Registry extends Server {
                 return 0;
             const entry = this.topics.get(data.topic);
             const subscribers = entry.subscribers;
-            const publishers = entry.publishers;
             const i = subscribers.size;
             if (subscribers.has(key)) {
                 subscribers.delete(key);
-                if (subscribers.size === 0 && publishers.size === 0) {
-                    this.topics.delete(data.topic);
-                }
             }
+            this.logger.debug('[unsubscribe] %s/%s', key, data.topic);
             return i - subscribers.size;
         }));
     }

package/dist/server.d.ts

@@ -3,6 +3,7 @@ import { Client } from './client.js';
 import { IncomingMessage } from 'http';
 import { EventEmitter } from 'node:events';
 import type { Duplex } from "node:stream";
+import type { Logger } from '@hile/logger';
 /** {@link MessageLoaderProps} 加上出站 WebSocket 宣告地址 */
 export type MicroServerProps = MessageLoaderProps & {
     /**
@@ -10,11 +11,16 @@ export type MicroServerProps = MessageLoaderProps & {
      * 缺省使用 `getLocalIPv4()`；若仍为 `undefined`（无可用 IPv4）则构造 {@link Server} 时抛错。
      */
     advertiseHost?: string;
+    /**
+     * 日志记录器
+     */
+    logger?: Logger;
 };
 export declare class Server extends MessageLoader {
     readonly namespace: string;
     private wss?;
     port?: number;
+    readonly logger: Logger | Console;
     readonly clients: Map<string, Client>;
     private readonly announceHost;
     readonly events: EventEmitter<any>;

package/dist/server.js

@@ -9,6 +9,7 @@ export class Server extends MessageLoader {
     namespace;
     wss;
     port;
+    logger;
     clients = new Map();
     announceHost;
     events = new EventEmitter();
@@ -16,7 +17,7 @@ export class Server extends MessageLoader {
         return this.announceHost;
     }
     constructor(namespace, props = {}) {
-        const { advertiseHost, ...loaderProps } = props;
+        const { advertiseHost, logger, ...loaderProps } = props;
         super(loaderProps);
         this.namespace = namespace;
         const resolved = advertiseHost?.trim() || getLocalIPv4();
@@ -24,6 +25,7 @@ export class Server extends MessageLoader {
             throw new Error('Unable to resolve advertise host for @hile/micro Server: pass `advertiseHost` (e.g. "127.0.0.1") in constructor options, or ensure getLocalIPv4() returns an address.');
         }
         this.announceHost = resolved;
+        this.logger = logger ?? console;
         this.events.on('connect', (client, extras) => {
             client.events.emit('connect', extras);
         });
@@ -133,12 +135,12 @@ export class Server extends MessageLoader {
             this.wss = new WebSocketServer({ noServer: true });
         }
         return async () => {
-            const toDispose = [...this.clients.values()];
-            for (const client of toDispose) {
-                client.dispose();
-            }
-            this.clients.clear();
             if (this.wss) {
+                // terminate 立即销毁 socket，不等待对端 close frame
+                // 避免 graceful close 时对端无响应导致 HTTP server 无法关闭
+                for (const ws of [...this.wss.clients]) {
+                    ws.terminate();
+                }
                 await new Promise((resolve, reject) => {
                     this.wss.close((err) => {
                         if (err)
@@ -147,6 +149,11 @@ export class Server extends MessageLoader {
                     });
                 });
             }
+            const toDispose = [...this.clients.values()];
+            for (const client of toDispose) {
+                client.dispose();
+            }
+            this.clients.clear();
             this.wss = undefined;
             this.port = undefined;
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hile/micro",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {
@@ -23,11 +23,12 @@
     "vitest": "^4.0.18"
   },
   "dependencies": {
+    "@hile/logger": "^2.0.1",
     "@hile/message-loader": "^2.0.1",
     "@hile/message-ws": "^2.0.3",
     "internal-ip": "^9.0.0",
     "ws": "^8.21.0",
     "yaml": "^2.9.0"
   },
-  "gitHead": "adb7e7814470cef03cb577682f76b530b8af761e"
+  "gitHead": "aaa46af05d9fe0d658b4f7a8d54ad8da088a10f6"
 }