fix broadcast

src/room/actions/actions.service.ts

@@ -12,12 +12,17 @@ export class ActionsService {
     private roomService: RoomService,
     @Inject(forwardRef(() => UsersService))
     private userService: UsersService,
-  ) {}
+  ) { }
 
   async handleAllAction(socket: Socket, data: ActionsParams): Promise<void> {
     const isSocketLeader = () => {
       return socket.data.user?.Role === 'leader';
     };
+    const roomId = socket.data.user.RoomId;
+    this.roomService.logger.warn(
+      `当前--broadcast：${roomId}`,
+      'handleAllAction',
+    );
     switch (data.type) {
       case 'danmumsg':
         const params = {} as DanmakuDataType;
@@ -46,7 +51,8 @@ export class ActionsService {
       default:
         break;
     }
-    socket.broadcast.emit('action', data);
+
+    socket.broadcast.to(roomId).emit('action', data);
   }
   // answer(data: any) {
   //   this.roomService.socketGateway._socket.broadcast.emit('action', data);

src/room/room.service.ts

@@ -118,7 +118,7 @@ export class RoomService {
           roomConfig.masterId = UserId;
           this.logger.log(JSON.stringify(userInfo), 'room-config');
           userInfo.roomConfig &&
-            (await this.userService.setRoomConfig(RoomId, roomConfig, socket));
+            (await this.userService.setRoomConfig(RoomId, roomConfig));
         } else {
           blockJoin = true;
           socket.emit('manager-error', {

src/room/users/users.service.ts

@@ -112,7 +112,7 @@ export class UsersService {
   async setRoomConfig(
     RoomId: string,
     RoomConfig: RoomConfigType,
-    socket?: Socket,
+    // socket?: Socket,
   ): Promise<void> {
     const isExist = await this.redis.hget(`kankan:socket:roomConfig`, RoomId);
     // console.log('setRoomConfig', isExist);
@@ -133,18 +133,6 @@ export class UsersService {
           'EX',
           RoomConfig.ttl,
         );
-      } else {
-        this.roomService.logger.log(
-          `'已过期-ttl: ${RoomConfig.ttl}`,
-          'room-ttl',
-        );
-        socket &&
-          socket.emit('manager-error', {
-            type: 'ttl-out',
-            code: 410,
-          });
-        // await this.roomService.handleRoomDismiss(RoomId);
-        socket.disconnect();
       }
     }
 

src/socket/socket.gateway.ts

@@ -97,6 +97,10 @@ export class SocketGateway
     const isRepeat = await this.handleRepeatJoin(socket, message);
     // console.log('isRepeat', isRepeat);
     if (!isRepeat) {
+      this.logger.warn(
+        `当前加入房间：roomId: ${message.roomId} userId: ${message.userId}`,
+        'join-user',
+      );
       socket.join(message.roomId);
       if (!message.isClient) {
         await this.roomService.handleUserJoin(socket, message);