moonbridge-ts 0.6.1 → 0.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "moonbridge-ts",
-    "version": "0.6.1",
+    "version": "0.6.2",
     "description": "MoonBridge IPC by WebSocket for node(server) and browser(client).",
     "main": "dist/index.js",
     "module": "dist/index.mjs",

package/src/moonbridge/logger/logger.ts

@@ -21,7 +21,6 @@ export class Logger {
   private static _subscribers: LogSubscriber[] = [];
 
   readonly tag: string;
-  private _subscriber?: LogSubscriber;
 
   private constructor(tag: string) {
     this.tag = tag;
@@ -51,18 +50,13 @@ export class Logger {
     Logger._loggers.forEach((logger, tag) => action(tag, logger));
   }
 
-  set subscriber(cb: LogSubscriber) {
-    this._subscriber = cb;
-  }
-
   private notify(level: LogLevel, message: string, opts?: { file?: string; func?: string }): void {
     const subs = [...Logger._subscribers];
-    if (this._subscriber) subs.push(this._subscriber);
     for (const cb of subs) {
       try {
         cb(this.tag, level, message, opts);
       } catch {
-        // 静默处理，不影响 SDK
+        // Do nothing...
       }
     }
   }

package/src/moonbridge-ipc/client/moonbridge_ipc_client.ts

@@ -13,6 +13,7 @@ import { EventBus } from './types/ipc_event_bus';
 import { Messenger } from './types/ipc_messenger';
 import { RpcServiceFactory } from './rpc/rpc_service_factory';
 import { RealMoonBridgeIpcClient } from './internal/moonbridge_ipc_client.internal';
+import { Logger, LogSubscriber } from '../../moonbridge/logger/logger';
 
 /** 
  * MoonBridge IPC 客户端抽象接口 
@@ -70,6 +71,7 @@ export class MoonBridgeIpcClientBuilder {
   private _messageInterceptor?: MessageInterceptor;
   private _connectionObserver?: ConnectionObserver;
   private _appLauncher?: AppLauncher;
+  private _logSubscriber?: LogSubscriber;
 
   // PUBLIC METHODS
 
@@ -154,6 +156,14 @@ export class MoonBridgeIpcClientBuilder {
     return this;
   }
 
+  /**
+   * 添加日志订阅者
+   */
+  logSubscriber(subscriber: LogSubscriber): this {
+    this._logSubscriber = subscriber;
+    return this;
+  }
+
   /**
    * 构建客户端实例并可选注册为默认客户端。
    */
@@ -167,6 +177,12 @@ export class MoonBridgeIpcClientBuilder {
       );
     }
 
+    // 添加日志订阅者
+    if (this._logSubscriber) {
+      Logger.addSubscriber(this._logSubscriber);
+    }
+
+    // 创建客户端设置
     const settings = new IpcClientSettings({
       clientName: this._clientName,
       webSocketServerEndpoint: this._webSocketServerEndpoint,

package/src/moonbridge-ipc/server/internal/moonbridge_ipc_server.internal.ts

@@ -140,6 +140,8 @@ export class RealMoonBridgeIpcServer implements MoonBridgeIpcServer {
     return this._webSocketServer?.serverAddressInfo?.port ?? undefined;
   }
 
+  // PRIVATE METHODS
+
   private _addClient(clientIdentity: ClientIdentity, client: SerialMessageChannel): void {
     const clientName = clientIdentity.clientName;
     const clientAddress = this._getClientAddress(client);

package/src/moonbridge-ipc/server/moonbridge_ipc_server.ts

@@ -6,6 +6,7 @@ import { SocketServer } from '../general/transport/websocket/websocket_server';
 import type { WebSocketServerEndpoint } from '../general/config/websocket_server_endpoint';
 import type { ClientIdentity, ClientIdentityProvider } from './credential/client_identity';
 import { RealMoonBridgeIpcServer } from './internal/moonbridge_ipc_server.internal';
+import { Logger, LogSubscriber } from '../../moonbridge/logger/logger';
 
 /** 消息回复函数，用于向客户端发送响应消息 */
 export type IpcMessageReply = (message: string) => Promise<boolean>;
@@ -78,6 +79,7 @@ export class MoonBridgeIpcServerBuilder {
   private _onClientDisconnected?: DisconnectedCallback;
   private _messagePreprocessor?: MessagePreprocessor;
   private _onMessageReceived?: OnMessageReceived;
+  private _logSubscriber?: LogSubscriber;
 
   /** 设置服务器名称 */
   serverName(name: string): this {
@@ -121,6 +123,12 @@ export class MoonBridgeIpcServerBuilder {
     return this;
   }
 
+  /** 设置日志订阅者 */
+  logSubscriber(subscriber: LogSubscriber): this {
+    this._logSubscriber = subscriber;
+    return this;
+  }
+
   /**
    * 构建并返回配置完成的服务器实例
    * @param makeDefault 是否将该服务器实例设置为默认服务器，默认为 false
@@ -130,6 +138,12 @@ export class MoonBridgeIpcServerBuilder {
       throw new Error('请使用 useWebSocketChannel 设置传输配置。',);
     }
 
+    // 添加日志订阅者
+    if (this._logSubscriber) {
+      Logger.addSubscriber(this._logSubscriber);
+    }
+
+    // 创建服务器实例
     const server = new RealMoonBridgeIpcServer(
       this._serverName,
       this._webSocketServerEndpoint,
@@ -141,7 +155,6 @@ export class MoonBridgeIpcServerBuilder {
     );
 
     MoonBridgeIpcServerRegistry.instance.register(server);
-
     if (makeDefault) {
       MoonBridgeIpcServerRegistry.instance.setDefault(server);
     }