Merge pull request #291 from boostcampwm-2024/dev-be

Dev be to release

BE/src/game/game.gateway.ts

@@ -31,12 +31,13 @@ import { ExceptionMessage } from '../common/constants/exception-message';
 @UseInterceptors(GameActivityInterceptor)
 @UseFilters(new WsExceptionFilter())
 @WebSocketGateway({
-  // cors: {
-  //   origin: ['*,', 'https://admin.socket.io'], //이러면 배포에서 cors오류 생김
-  //   credentials: true
-  // },
   cors: {
-    origin: '*' //이러면 배포에서 admin ui 접근 안됨
+    origin: [
+      'https://news.taskify.shop',
+      'https://quizground.duckdns.org',
+      'https://admin.socket.io'
+    ],
+    credentials: true
   },
   namespace: '/game'
 })
@@ -179,7 +180,7 @@ export class GameGateway {
 
   setNewPlayerIdToCookie(headers) {
     const playerId = uuidv4();
-    headers['Set-Cookie'] = serialize('playerId', playerId);
+    headers['Set-Cookie'] = serialize('playerId', playerId, { sameSite: 'none', secure: true });
     return playerId;
   }
 

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

@@ -21,9 +21,7 @@ export class PlayerSubscriber extends RedisSubscriber {
       if (!playerId || message !== 'hset') {
         return;
       }
-
       const key = `Player:${playerId}`;
-
       await this.handlePlayerChanges(key, playerId, server);
     });
   }
@@ -62,10 +60,15 @@ export class PlayerSubscriber extends RedisSubscriber {
   }
 
   private async handlePlayerJoin(playerId: string, playerData: any, server: Namespace) {
+    const findRoom = await this.redis.hgetall(REDIS_KEY.ROOM(playerData.gameId));
+    const findHost = findRoom.host;
+    const isHost = findHost === playerId;
+
     const newPlayer = {
       playerId,
       playerName: playerData.playerName,
-      playerPosition: [parseFloat(playerData.positionX), parseFloat(playerData.positionY)]
+      playerPosition: [parseFloat(playerData.positionX), parseFloat(playerData.positionY)],
+      isHost
     };
 
     server.to(playerData.gameId).emit(SocketEvents.JOIN_ROOM, {

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

@@ -62,7 +62,12 @@ export class TimerSubscriber extends RedisSubscriber {
         continue;
       }
 
-      const selectAnswer = this.calculateAnswer(player.positionX, player.positionY);
+      const selectAnswer = this.calculateAnswer(
+        player.positionX,
+        player.positionY,
+        quizList.length
+      );
+      // this.logger.verbose(selectAnswer);
 
       await this.redis.set(`${REDIS_KEY.PLAYER(clientId)}:Changes`, 'AnswerCorrect');
       if (selectAnswer.toString() === quiz.answer) {
@@ -161,10 +166,32 @@ export class TimerSubscriber extends RedisSubscriber {
     this.logger.verbose(`startQuizTime: ${gameId} - ${newQuizNum}`);
   }
 
-  private calculateAnswer(positionX: string, positionY: string): number {
-    if (parseFloat(positionY) < 0.5) {
-      return parseFloat(positionX) < 0.5 ? 1 : 2;
-    }
-    return parseFloat(positionX) < 0.5 ? 3 : 4;
+  private calculateAnswer(positionX: string, positionY: string, quizLen: number): number {
+    const x = parseFloat(positionX);
+    const y = parseFloat(positionY);
+
+    // 행의 개수 계산 (2열 고정이므로 총 개수의 절반을 올림)
+    const rows = Math.ceil(quizLen / 2);
+
+    // Y 좌표를 행 번호로 변환
+    const rowIndex = Math.floor(y * rows);
+
+    // X 좌표로 왼쪽/오른쪽 결정
+    const colIndex = x < 0.5 ? 0 : 1;
+
+    // 최종 선택지 번호 계산
+    const answer = rowIndex * 2 + colIndex + 1;
+
+    // 실제 선택지 범위를 벗어나지 않도록 보정
+    return Math.min(answer, quizLen);
+    // return (
+    //   Math.round(
+    //     parseFloat(positionX) + Math.floor(parseFloat(positionY) * Math.ceil(quizLen / 2))
+    //   ) * 2
+    // );
+    // if (parseFloat(positionY) < 0.5) {
+    //   return parseFloat(positionX) < 0.5 ? 1 : 2;
+    // }
+    // return parseFloat(positionX) < 0.5 ? 3 : 4;
   }
 }

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

@@ -83,9 +83,14 @@ export class GameRoomService {
           playerPosition: [parseFloat(player.positionX), parseFloat(player.positionY)]
         });
       }
+
+      // 방장의 id를 보내줘야함
+      const findRoom = await this.redis.hgetall(REDIS_KEY.ROOM(gameId));
+      const findHost = findRoom.host;
+      const isHost = findHost === clientId;
       client.join(gameId);
       client.emit(SocketEvents.GET_SELF_ID, { playerId: clientId });
-      client.emit(SocketEvents.JOIN_ROOM, { players });
+      client.emit(SocketEvents.JOIN_ROOM, { players, isHost });
       return;
     }
 
@@ -121,16 +126,19 @@ export class GameRoomService {
     await this.redis.sadd(REDIS_KEY.ROOM_PLAYERS(gameId), clientId);
 
     const players = [];
+    const roomData = await this.redis.hgetall(REDIS_KEY.ROOM(gameId));
+
     for (const playerId of currentPlayers) {
       const player = await this.redis.hgetall(REDIS_KEY.PLAYER(playerId));
+      const isHost = roomData.host === playerId;
       players.push({
         playerId,
         playerName: player.playerName,
-        playerPosition: [parseFloat(player.positionX), parseFloat(player.positionY)]
+        playerPosition: [parseFloat(player.positionX), parseFloat(player.positionY)],
+        isHost
       });
     }
 
-    const roomData = await this.redis.hgetall(REDIS_KEY.ROOM(gameId));
     client.emit(SocketEvents.UPDATE_ROOM_OPTION, {
       title: roomData.title,
       gameMode: roomData.gameMode,
@@ -300,7 +308,9 @@ export class GameRoomService {
     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);
+    await this.redis.hset(targetPlayerKey, {
+      isAlive: '0'
+    });
+    // await this.handlePlayerExit(kickPlayerId);
   }
 }