refactor: chat server blacklist 로직 수정

refactor: chat server 의 blacklist user 를 가져올 때, server.handshake 를 참조하는 것에서 user 에 미리 등록해놓고 user 에서 가져오기

Author: hoeeeeeh

backend/chatServer/src/chat/chat.gateway.ts

@@ -47,7 +47,7 @@ export class ChatGateway implements OnGatewayInit, OnGatewayConnection, OnGatewa
 
   async handleConnection(client: Socket) {
     console.log(`Client connected: ${client.id}`);
-    const user = await this.roomService.createUser(client.id);
+    const user = await this.roomService.createUser(client);
     console.log(user);
 
     /*
@@ -102,7 +102,9 @@ export class ChatGateway implements OnGatewayInit, OnGatewayConnection, OnGatewa
     const user = await this.roomService.getUserByClientId(client.id);
     const normalOutgoingMessage: Omit<NormalOutgoingMessageDto, 'owner'> = {
       roomId,
-      ...user,
+      nickname: user.nickname,
+      color: user.color,
+      entryTime: user.entryTime,
       msg,
       msgTime: new Date().toISOString(),
       msgType: 'normal',
@@ -131,7 +133,9 @@ export class ChatGateway implements OnGatewayInit, OnGatewayConnection, OnGatewa
     const user = await this.roomService.getUserByClientId(client.id);
     const questionWithoutId: Omit<QuestionDto, 'questionId'> = {
       roomId,
-      ...user,
+      nickname: user.nickname,
+      color: user.color,
+      entryTime: user.entryTime,
       msg,
       msgTime: new Date().toISOString(),
       msgType: 'question',
@@ -161,7 +165,9 @@ export class ChatGateway implements OnGatewayInit, OnGatewayConnection, OnGatewa
     const user = await this.roomService.getUserByClientId(client.id);
     const noticeOutgoingMessage: NoticeOutgoingMessageDto = {
       roomId,
-      ...user,
+      nickname: user.nickname,
+      color: user.color,
+      entryTime: user.entryTime,
       msg,
       msgTime: new Date().toISOString(),
       msgType: 'notice'
@@ -173,12 +179,10 @@ export class ChatGateway implements OnGatewayInit, OnGatewayConnection, OnGatewa
   @SubscribeMessage(CHATTING_SOCKET_DEFAULT_EVENT.BAN_USER)
   async handleBanUserMessage(@ConnectedSocket() client: Socket, @MessageBody() payload: BanUserIncomingMessageDto) {
     const { roomId, socketId } = payload;
-    const banUser = this.server.sockets.sockets.get(socketId);
-    const address = banUser?.handshake.address.replaceAll('::ffff:', '');
-
-    if(!address) throw new ChatException(CHATTING_SOCKET_ERROR.INVALID_USER, roomId);
-
-    const userAgent = banUser?.handshake.headers['user-agent'];
+    const banUser = await this.roomService.getUserByClientId(socketId);
+    console.log('banUSer = ', banUser);
+    if(!banUser) throw new ChatException(CHATTING_SOCKET_ERROR.INVALID_USER, roomId);
+    const { address, userAgent } = banUser;
     if(!userAgent) throw new ChatException(CHATTING_SOCKET_ERROR.INVALID_USER, roomId);
 
     await this.roomService.addUserToBlacklist(roomId, address, userAgent);

backend/chatServer/src/room/room.service.ts

@@ -11,6 +11,7 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 import { dirname } from 'path';
 import { ChatException, CHATTING_SOCKET_ERROR } from '../chat/chat.error';
+import { Socket } from 'socket.io';
 
 // 현재 파일의 URL을 파일 경로로 변환
 const __filename = fileURLToPath(import.meta.url);
@@ -24,8 +25,10 @@ function createRandomNickname(){
   return `${getRandomAdjective()} ${getRandomNoun()}`;
 }
 
-function createRandomUserInstance(): User {
+function createRandomUserInstance(address: string, userAgent: string): User {
   return {
+    address,
+    userAgent,
     nickname: createRandomNickname(),
     color: getRandomBrightColor(),
     entryTime: new Date().toISOString()
@@ -139,10 +142,17 @@ export class RoomService implements OnModuleInit, OnModuleDestroy {
   }
 
   // 유저 생성
-  async createUser(clientId: string) {
-    const newUser = createRandomUserInstance();
+  async createUser(socket: Socket) {
+    const clientId = socket.id;
+    const address = socket.handshake.address.replaceAll('::ffff:', '');
+    const userAgent = socket.handshake.headers['user-agent'];
+
+    if(!address || !userAgent) throw new ChatException(CHATTING_SOCKET_ERROR.INVALID_USER);
+
+    const newUser = createRandomUserInstance(address, userAgent);
     const isCreatedDone = await this.redisRepository.createUser(clientId, newUser);
     if(!isCreatedDone) throw new ChatException(CHATTING_SOCKET_ERROR.INVALID_USER);
+    console.log(newUser);
     return newUser;
   }
 

backend/chatServer/src/room/user.interface.ts

@@ -1,4 +1,6 @@
 interface User {
+  address: string;
+  userAgent: string;
   entryTime: string;
   nickname: string;
   color: string;