Merge branch 'main' into zulip_dev

src/business/zulip/zulip.service.ts

@@ -120,6 +120,9 @@ export class ZulipService {
     private readonly loginService: LoginService,
   ) {
     this.logger.log('ZulipService初始化完成');
+    
+    // 启动事件处理
+    this.initializeEventProcessing();
   }
 
   /**
@@ -775,5 +778,42 @@ export class ZulipService {
   async getSocketsInMap(mapId: string): Promise<string[]> {
     return this.sessionManager.getSocketsInMap(mapId);
   }
+
+  /**
+   * 获取事件处理器实例
+   * 
+   * 功能描述：
+   * 返回ZulipEventProcessorService实例，用于设置消息分发器
+   * 
+   * @returns ZulipEventProcessorService 事件处理器实例
+   */
+  getEventProcessor(): ZulipEventProcessorService {
+    return this.eventProcessor;
+  }
+
+  /**
+   * 初始化事件处理
+   * 
+   * 功能描述：
+   * 启动Zulip事件处理循环，用于接收和处理从Zulip服务器返回的消息
+   * 
+   * @private
+   */
+  private async initializeEventProcessing(): Promise<void> {
+    try {
+      this.logger.log('开始初始化Zulip事件处理');
+      
+      // 启动事件处理循环
+      await this.eventProcessor.startEventProcessing();
+      
+      this.logger.log('Zulip事件处理初始化完成');
+    } catch (error) {
+      const err = error as Error;
+      this.logger.error('初始化Zulip事件处理失败', {
+        operation: 'initializeEventProcessing',
+        error: err.message,
+      }, err.stack);
+    }
+  }
 }
 

src/business/zulip/zulip_websocket.gateway.ts

@@ -139,6 +139,9 @@ export class ZulipWebSocketGateway implements OnGatewayConnection, OnGatewayDisc
       namespace: '/game',
       timestamp: new Date().toISOString(),
     });
+
+    // 设置消息分发器，使ZulipEventProcessorService能够向客户端发送消息
+    this.setupMessageDistributor();
   }
 
   /**
@@ -373,6 +376,13 @@ export class ZulipWebSocketGateway implements OnGatewayConnection, OnGatewayDisc
   ): Promise<void> {
     const clientData = client.data as ClientData | undefined;
     
+    console.log('🔍 DEBUG: handleChat 被调用了!', {
+      socketId: client.id,
+      data: data,
+      clientData: clientData,
+      timestamp: new Date().toISOString(),
+    });
+    
     this.logger.log('收到聊天消息', {
       operation: 'handleChat',
       socketId: client.id,
@@ -749,5 +759,41 @@ export class ZulipWebSocketGateway implements OnGatewayConnection, OnGatewayDisc
       });
     }
   }
+
+  /**
+   * 设置消息分发器
+   * 
+   * 功能描述：
+   * 将当前WebSocket网关设置为ZulipEventProcessorService的消息分发器，
+   * 使其能够接收从Zulip返回的消息并转发给游戏客户端
+   * 
+   * @private
+   */
+  private setupMessageDistributor(): void {
+    try {
+      // 获取ZulipEventProcessorService实例
+      const eventProcessor = this.zulipService.getEventProcessor();
+      
+      if (eventProcessor) {
+        // 设置消息分发器
+        eventProcessor.setMessageDistributor(this);
+        
+        this.logger.log('消息分发器设置完成', {
+          operation: 'setupMessageDistributor',
+          timestamp: new Date().toISOString(),
+        });
+      } else {
+        this.logger.warn('无法获取ZulipEventProcessorService实例', {
+          operation: 'setupMessageDistributor',
+        });
+      }
+    } catch (error) {
+      const err = error as Error;
+      this.logger.error('设置消息分发器失败', {
+        operation: 'setupMessageDistributor',
+        error: err.message,
+      }, err.stack);
+    }
+  }
 }