[BE] feat#263 강퇴구현, 모니터링 도입

BE/.eslintrc.js

@@ -15,7 +15,7 @@ module.exports = {
     node: true,
     jest: true,
   },
-  ignorePatterns: ['.eslintrc.js'],
+  ignorePatterns: ['.eslintrc.js', 'main.ts'],
   rules: {
     "eqeqeq": "off",
     "curly": "error",

BE/package.json

@@ -53,6 +53,7 @@
     "passport": "^0.7.0",
     "passport-jwt": "^4.0.1",
     "passport-local": "^1.0.0",
+    "pinpoint-node-agent": "^0.9.0-next.0",
     "redis": "^4.7.0",
     "reflect-metadata": "^0.2.0",
     "rxjs": "^7.8.1",

BE/src/common/constants/exception-message.ts

@@ -5,5 +5,6 @@ export const ExceptionMessage = {
   ONLY_HOST: '방장이 아닙니다.',
   GAME_NOT_STARTED: '게임이 시작되지 않았습니다.',
   EXCEEDS_QUIZ_SET_LIMIT: '선택된 퀴즈 수가 퀴즈셋에 있는 퀴즈 수를 초과했습니다.',
-  GAME_ALREADY_STARTED: '게임이 이미 시작되었습니다.'
+  GAME_ALREADY_STARTED: '게임이 이미 시작되었습니다.',
+  PLAYER_NOT_FOUND: '존재하지 않는 플레이어입니다.'
 };

BE/src/common/constants/socket-events.ts

@@ -1,16 +1,17 @@
-const SocketEvents = {
-  CHAT_MESSAGE: 'chatMessage',
-  UPDATE_POSITION: 'updatePosition',
-  CREATE_ROOM: 'createRoom',
-  UPDATE_ROOM_OPTION: 'updateRoomOption',
-  UPDATE_ROOM_QUIZSET: 'updateRoomQuizset',
-  JOIN_ROOM: 'joinRoom',
-  START_GAME: 'startGame',
-  END_GAME: 'endGame',
-  END_QUIZ_TIME: 'endQuizTime',
-  START_QUIZ_TIME: 'startQuizTime',
-  UPDATE_SCORE: 'updateScore',
-  EXIT_ROOM: 'exitRoom'
-} as const;
-
-export default SocketEvents;
+const SocketEvents = {
+  CHAT_MESSAGE: 'chatMessage',
+  UPDATE_POSITION: 'updatePosition',
+  CREATE_ROOM: 'createRoom',
+  UPDATE_ROOM_OPTION: 'updateRoomOption',
+  UPDATE_ROOM_QUIZSET: 'updateRoomQuizset',
+  JOIN_ROOM: 'joinRoom',
+  START_GAME: 'startGame',
+  END_GAME: 'endGame',
+  END_QUIZ_TIME: 'endQuizTime',
+  START_QUIZ_TIME: 'startQuizTime',
+  UPDATE_SCORE: 'updateScore',
+  EXIT_ROOM: 'exitRoom',
+  KICK_ROOM: 'kickRoom'
+} as const;
+
+export default SocketEvents;

BE/src/game/dto/kick-room.dto.ts

@@ -0,0 +1,10 @@
+import { IsString, Length } from 'class-validator';
+
+export class KickRoomDto {
+  @IsString()
+  @Length(6, 6, { message: 'PIN번호는 6자리이어야 합니다.' })
+  gameId: string;
+
+  @IsString()
+  kickPlayerId: string;
+}

BE/src/game/game.gateway.ts

@@ -22,6 +22,7 @@ import { GameChatService } from './service/game.chat.service';
 import { GameRoomService } from './service/game.room.service';
 import { WsJwtAuthGuard } from '../auth/guard/ws-jwt-auth.guard';
 import { GameActivityInterceptor } from './interceptor/gameActivity.interceptor';
+import { KickRoomDto } from './dto/kick-room.dto';
 
 @UseInterceptors(GameActivityInterceptor)
 @UseFilters(new WsExceptionFilter())
@@ -111,6 +112,12 @@ export class GameGateway {
     await this.gameService.startGame(startGameDto, client.id);
   }
 
+  @SubscribeMessage(SocketEvents.KICK_ROOM)
+  @UsePipes(new GameValidationPipe(SocketEvents.KICK_ROOM))
+  async handleKickRoom(@MessageBody() kickRoomDto: KickRoomDto, @ConnectedSocket() client: Socket) {
+    await this.gameRoomService.kickRoom(kickRoomDto, client.id);
+  }
+
   afterInit() {
     this.logger.verbose('WebSocket 서버 초기화 완료했어요!');
 

BE/src/game/redis/subscribers/player.subscriber.ts

@@ -50,6 +50,9 @@ export class PlayerSubscriber extends RedisSubscriber {
       case 'Disconnect':
         await this.handlePlayerDisconnect(playerId, playerData, server);
         break;
+      case 'Kicked':
+        await this.handlePlayerKicked(playerId, playerData, server);
+        break;
     }
   }
 
@@ -80,4 +83,13 @@ export class PlayerSubscriber extends RedisSubscriber {
     });
     this.logger.verbose(`Player disconnected: ${playerId} from game: ${playerData.gameId}`);
   }
+
+  private async handlePlayerKicked(playerId: string, playerData: any, server: Server) {
+    server.to(playerData.gameId).emit(SocketEvents.KICK_ROOM, {
+      playerId
+    });
+    this.logger.verbose(`Player kicked: ${playerId} from game: ${playerData.gameId}`);
+    //클라에서 exitRoom도 주기를 원함
+    await this.handlePlayerDisconnect(playerId, playerData, server);
+  }
 }

BE/src/game/service/game.room.service.ts

@@ -11,6 +11,7 @@ import { UpdateRoomOptionDto } from '../dto/update-room-option.dto';
 import { UpdateRoomQuizsetDto } from '../dto/update-room-quizset.dto';
 import { Cron, CronExpression } from '@nestjs/schedule';
 import { Socket } from 'socket.io';
+import { KickRoomDto } from '../dto/kick-room.dto';
 
 @Injectable()
 export class GameRoomService {
@@ -150,7 +151,6 @@ export class GameRoomService {
 
     // 플레이어 제거
     pipeline.srem(REDIS_KEY.ROOM_PLAYERS(roomId), clientId);
-    // pipeline.del(REDIS_KEY.PLAYER(clientId));
     // 1. 플레이어 상태를 'disconnected'로 변경하고 TTL 설정
     pipeline.hmset(REDIS_KEY.PLAYER(clientId), {
       disconnected: '1',
@@ -227,4 +227,20 @@ export class GameRoomService {
 
     await pipeline.exec();
   }
+
+  async kickRoom(kickRoomDto: KickRoomDto, clientId: string) {
+    const { gameId, kickPlayerId } = kickRoomDto;
+
+    const roomKey = REDIS_KEY.ROOM(gameId);
+    const room = await this.redis.hgetall(roomKey);
+    this.gameValidator.validateRoomExists(SocketEvents.KICK_ROOM, room);
+    this.gameValidator.validatePlayerIsHost(SocketEvents.KICK_ROOM, room, clientId);
+
+    const targetPlayerKey = REDIS_KEY.PLAYER(kickPlayerId);
+    const targetPlayer = await this.redis.hgetall(targetPlayerKey);
+    this.gameValidator.validatePlayerExists(SocketEvents.KICK_ROOM, targetPlayer);
+    await this.redis.set(`${targetPlayerKey}:Changes`, 'Kicked', 'EX', 6000); // 해당플레이어의 변화정보 10분 후에 삭제
+
+    await this.handlePlayerExit(kickPlayerId);
+  }
 }

BE/src/game/validations/game.validator.ts

@@ -39,4 +39,10 @@ export class GameValidator {
       throw new GameWsException(eventName, ExceptionMessage.GAME_ALREADY_STARTED);
     }
   }
+
+  validatePlayerExists(eventName: string, targetPlayer: any) {
+    if (!targetPlayer) {
+      throw new GameWsException(eventName, ExceptionMessage.PLAYER_NOT_FOUND);
+    }
+  }
 }

BE/src/main.ts

@@ -1,7 +1,12 @@
+import { config } from 'dotenv';
+import { join } from 'path';
+import 'pinpoint-node-agent';
 import { NestFactory } from '@nestjs/core';
 import { AppModule } from './app.module';
 import { Logger } from '@nestjs/common';
 import { GameActivityInterceptor } from './game/interceptor/gameActivity.interceptor';
+// env 불러오기
+config({ path: join(__dirname, '..', '.env') }); // ../ 경로의 .env 로드
 
 async function bootstrap() {
   const app = await NestFactory.create(AppModule);