Feat: 게임방 퇴장 시 웹소켓 종료 완료

Feat: 게임방 퇴장 시 웹소켓 종료 완료

Author: hoheesu

src/chat/chat.gateway.ts

@@ -50,15 +50,21 @@ export class ChatGateway
 
   async handleDisconnect(client: Socket) {
     console.log(`Client disconnected: ${client.id}`);
-    const roomId = await this.gameRoomService.getRoomIdByClient(client.id);
-    const token = client.handshake.auth.token.replace('Bearer ', '');
-    const decoded: any = jwt.verify(token, process.env.JWT_SECRET);
-    const userId = Number(decoded?.userId);
+
+    // 1) userId를 client.data.userId 로 가져옴
+    const userId = client.data.userId;
+
+    // 2) DB에서 userId를 이용해 어느 방에 있었는지 찾기
+    const roomId = await this.gameRoomService.getRoomIdByClient(
+      userId.toString(),
+    );
+
     if (roomId) {
       await this.gameRoomService.leaveRoom(roomId, userId);
       this.server.to(roomId.toString()).emit('message', {
         sender: 'System',
-        message: `User ${client.id} has disconnected.`,
+        // 소켓 식별자는 client.id, 그러나 실제 "유저명"을 보여주려면 userId를 써도 됨
+        message: `User ${userId} has disconnected.`,
       });
     }
   }
@@ -114,20 +120,19 @@ export class ChatGateway
   async handleLeaveRoom(client: Socket, payload: { roomId: number }) {
     const { roomId } = payload;
 
-    const token = client.handshake.auth.token.replace('Bearer ', '');
-    const decoded: any = jwt.verify(token, process.env.JWT_SECRET);
-    const userId = Number(decoded?.userId);
+    // const token = client.handshake.auth.token.replace('Bearer ', '');
+    // const decoded: any = jwt.verify(token, process.env.JWT_SECRET);
+    // const userId = Number(decoded?.userId);
+    const userId = client.data.userId;
+
     console.log(userId, ' want to leave', roomId, 'room');
 
-    try {
+    if (roomId) {
       await this.gameRoomService.leaveRoom(roomId, userId);
       this.server.to(roomId.toString()).emit('message', {
         sender: 'System',
-        message: `User ${userId} left the room.`,
+        message: `User ${userId} has disconnected.`,
       });
-      client.leave(roomId.toString());
-    } catch (error) {
-      client.emit('error', { message: error.message });
     }
   }
 }

src/gameRoom/gameRoom.service.ts

@@ -93,6 +93,7 @@ export class GameRoomService {
     const currentCount = await this.gameRoomUserRepository.count({
       where: { roomId },
     });
+
     if (currentCount >= room.maxPlayers) {
       throw new BadRequestException('Room is full');
     }
@@ -186,7 +187,7 @@ export class GameRoomService {
 
   async getRoomIdByClient(userId: string): Promise<number | null> {
     const user = await this.gameRoomUserRepository.findOne({
-      where: { userId: +userId },
+      where: { userId: +userId }, // 정수 변환
     });
     return user ? user.roomId : null;
   }