[feat] 재연결 로직 구현

backend/src/main/java/io/f1/backend/domain/auth/dto/CurrentUserAndAdminResponse.java

@@ -3,19 +3,21 @@
 import io.f1.backend.domain.admin.dto.AdminPrincipal;
 import io.f1.backend.domain.user.dto.UserPrincipal;
 
-public record CurrentUserAndAdminResponse(Long id, String name, String role) {
+public record CurrentUserAndAdminResponse(Long id, String name, String role, String providerId) {
 
     public static CurrentUserAndAdminResponse from(UserPrincipal userPrincipal) {
         return new CurrentUserAndAdminResponse(
                 userPrincipal.getUserId(),
                 userPrincipal.getUserNickname(),
-                UserPrincipal.ROLE_USER);
+                UserPrincipal.ROLE_USER,
+                userPrincipal.getName());
     }
 
     public static CurrentUserAndAdminResponse from(AdminPrincipal adminPrincipal) {
         return new CurrentUserAndAdminResponse(
                 adminPrincipal.getAuthenticationAdmin().adminId(),
                 adminPrincipal.getUsername(),
-                AdminPrincipal.ROLE_ADMIN);
+                AdminPrincipal.ROLE_ADMIN,
+                null);
     }
 }

backend/src/main/java/io/f1/backend/domain/game/app/RoomService.java

@@ -25,6 +25,7 @@
 import io.f1.backend.domain.game.dto.response.RoomSettingResponse;
 import io.f1.backend.domain.game.dto.response.SystemNoticeResponse;
 import io.f1.backend.domain.game.event.RoomCreatedEvent;
+import io.f1.backend.domain.game.model.ConnectionState;
 import io.f1.backend.domain.game.model.GameSetting;
 import io.f1.backend.domain.game.model.Player;
 import io.f1.backend.domain.game.model.Room;
@@ -81,7 +82,7 @@ public RoomCreateResponse saveRoom(RoomCreateRequest request) {
 
         Room room = new Room(newId, roomSetting, gameSetting, host);
 
-        room.getUserIdSessionMap().put(host.id, PENDING_SESSION_ID);
+        room.addValidatedUserIds(getCurrentUserId());
 
         roomRepository.saveRoom(room);
 
@@ -104,7 +105,7 @@ public void enterRoom(RoomValidationRequest request) {
             }
 
             int maxUserCnt = room.getRoomSetting().maxUserCount();
-            int currentCnt = room.getUserIdSessionMap().size();
+            int currentCnt = room.getCurrentUserCnt();
             if (maxUserCnt == currentCnt) {
                 throw new CustomException(RoomErrorCode.ROOM_USER_LIMIT_REACHED);
             }
@@ -114,7 +115,7 @@ public void enterRoom(RoomValidationRequest request) {
                 throw new CustomException(RoomErrorCode.WRONG_PASSWORD);
             }
 
-            room.getUserIdSessionMap().put(getCurrentUserId(), PENDING_SESSION_ID);
+            room.addValidatedUserIds(getCurrentUserId());
         }
     }
 
@@ -124,19 +125,7 @@ public void initializeRoomSocket(Long roomId, String sessionId, UserPrincipal pr
 
         Player player = createPlayer(principal);
 
-        Map<String, Player> playerSessionMap = room.getPlayerSessionMap();
-        Map<Long, String> userIdSessionMap = room.getUserIdSessionMap();
-
-        if (room.isHost(player.getId())) {
-            player.toggleReady();
-        }
-
-        playerSessionMap.put(sessionId, player);
-        String existingSession = userIdSessionMap.get(player.getId());
-        /* 정상 흐름 or 재연결 */
-        if (existingSession.equals(PENDING_SESSION_ID) || !existingSession.equals(sessionId)) {
-            userIdSessionMap.put(player.getId(), sessionId);
-        }
+        room.addPlayer(getCurrentUserId(), sessionId, player);
 
         RoomSettingResponse roomSettingResponse = toRoomSettingResponse(room);
 
@@ -168,6 +157,8 @@ public void exitRoom(Long roomId, String sessionId, UserPrincipal principal) {
 
             Player removePlayer = getRemovePlayer(room, sessionId, principal);
 
+            String destination = getDestination(roomId);
+
             /* 방 삭제 */
             if (isLastPlayer(room, sessionId)) {
                 removeRoom(room);
@@ -187,8 +178,6 @@ public void exitRoom(Long roomId, String sessionId, UserPrincipal principal) {
 
             PlayerListResponse playerListResponse = toPlayerListResponse(room);
 
-            String destination = getDestination(roomId);
-
             messageSender.send(destination, MessageType.PLAYER_LIST, playerListResponse);
             messageSender.send(destination, MessageType.SYSTEM_NOTICE, systemNoticeResponse);
         }
@@ -255,6 +244,60 @@ public void chat(Long roomId, String sessionId, ChatMessage chatMessage) {
         }
     }
 
+    public boolean isReconnectTarget(Long roomId, String sessionId) {
+        Room room = findRoom(roomId);
+        return room.isReconnectTarget(sessionId);
+    }
+
+    public void reconnectSession(Long roomId, String oldSessionId, String newSessionId) {
+        Room room = findRoom(roomId);
+        room.reconnectSession(oldSessionId, newSessionId);
+    }
+
+    public void changeConnectedStatus(Long roomId, String sessionId, ConnectionState newState) {
+        Room room = findRoom(roomId);
+        room.updatePlayerConnectionState(sessionId, newState);
+    }
+
+    public boolean isExit(String sessionId, Long roomId) {
+        Room room = findRoom(roomId);
+        return room.isExit(sessionId);
+    }
+
+    public void exitIfNotPlaying(Long roomId, String sessionId, UserPrincipal principal) {
+        Room room = findRoom(roomId);
+        if (!room.isPlaying()) {
+            exitRoom(roomId, sessionId, principal);
+        }
+    }
+
+    // todo 브로드캐스팅 말고 개인메세지
+    public void notifyIfReconnected(Long roomId, UserPrincipal principal) {
+
+        Room room = findRoom(roomId);
+
+        String destination = getDestination(roomId);
+
+        RoomSettingResponse roomSettingResponse = toRoomSettingResponse(room);
+
+        Long quizId = room.getGameSetting().getQuizId();
+        Quiz quiz = quizService.getQuizWithQuestionsById(quizId);
+
+        GameSettingResponse gameSettingResponse =
+                toGameSettingResponse(room.getGameSetting(), quiz);
+
+        PlayerListResponse playerListResponse = toPlayerListResponse(room);
+
+        messageSender.send(destination, MessageType.ROOM_SETTING, roomSettingResponse);
+        messageSender.send(destination, MessageType.GAME_SETTING, gameSettingResponse);
+        messageSender.send(destination, MessageType.PLAYER_LIST, playerListResponse);
+
+        messageSender.send(
+                destination,
+                MessageType.SYSTEM_NOTICE,
+                ofPlayerEvent(principal.getUserNickname(), RoomEventType.RECONNECT));
+    }
+
     private Player getRemovePlayer(Room room, String sessionId, UserPrincipal principal) {
         Player removePlayer = room.getPlayerSessionMap().get(sessionId);
         if (removePlayer == null) {

backend/src/main/java/io/f1/backend/domain/game/dto/RoomEventType.java

@@ -5,4 +5,5 @@ public enum RoomEventType {
     EXIT,
     START,
     END,
+    RECONNECT,
 }

backend/src/main/java/io/f1/backend/domain/game/mapper/RoomMapper.java

@@ -92,6 +92,8 @@ public static SystemNoticeResponse ofPlayerEvent(String nickname, RoomEventType
             message = " 님이 입장하셨습니다";
         } else if (roomEventType == RoomEventType.EXIT) {
             message = " 님이 퇴장하셨습니다";
+        } else if (roomEventType == RoomEventType.RECONNECT) {
+            message = " 님이 재연결 되었습니다.";
         }
         return new SystemNoticeResponse(nickname + message, Instant.now());
     }

backend/src/main/java/io/f1/backend/domain/game/model/Player.java

@@ -27,4 +27,8 @@ public void toggleReady() {
     public void increaseCorrectCount() {
         correctCount++;
     }
+
+    public void updateState(ConnectionState newState) {
+        state = newState;
+    }
 }

backend/src/main/java/io/f1/backend/domain/game/model/Room.java

@@ -1,18 +1,24 @@
 package io.f1.backend.domain.game.model;
 
 import io.f1.backend.domain.question.entity.Question;
+import io.f1.backend.global.exception.CustomException;
+import io.f1.backend.global.exception.errorcode.RoomErrorCode;
 
 import lombok.Getter;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 @Getter
 public class Room {
 
+    private static final String PENDING_SESSION_ID = "PENDING_SESSION_ID";
+
     private final Long id;
 
     private final RoomSetting roomSetting;
@@ -27,7 +33,7 @@ public class Room {
 
     private Map<String, Player> playerSessionMap = new ConcurrentHashMap<>();
 
-    private Map<Long, String> userIdSessionMap = new ConcurrentHashMap<>();
+    private final Set<Long> validatedUserIds = new HashSet<>();
 
     private final LocalDateTime createdAt = LocalDateTime.now();
 
@@ -40,6 +46,26 @@ public Room(Long id, RoomSetting roomSetting, GameSetting gameSetting, Player ho
         this.host = host;
     }
 
+    public boolean addValidatedUserIds(Long userId) {
+        return validatedUserIds.add(userId);
+    }
+
+    public int getCurrentUserCnt() {
+        return validatedUserIds.size();
+    }
+
+    public void addPlayer(Long userId, String sessionId, Player player) {
+
+        if (!validatedUserIds.contains(userId)) {
+            throw new CustomException(RoomErrorCode.ROOM_ENTER_REQUIRED);
+        }
+
+        if (isHost(player.getId())) {
+            player.toggleReady();
+        }
+        playerSessionMap.put(sessionId, player);
+    }
+
     public boolean isHost(Long id) {
         return this.host.getId().equals(id);
     }
@@ -56,14 +82,14 @@ public void updateRoomState(RoomState newState) {
         this.state = newState;
     }
 
-    public void removeUserId(Long id) {
-        this.userIdSessionMap.remove(id);
-    }
-
     public void removeSessionId(String sessionId) {
         this.playerSessionMap.remove(sessionId);
     }
 
+    public void removeUserId(Long userId) {
+        validatedUserIds.remove(userId);
+    }
+
     public void increasePlayerCorrectCount(String sessionId) {
         this.playerSessionMap.get(sessionId).increaseCorrectCount();
     }
@@ -79,4 +105,22 @@ public Boolean isPlaying() {
     public void increaseCorrectCount() {
         currentRound++;
     }
+
+    public void reconnectSession(String oldSessionId, String newSessionId) {
+        Player player = playerSessionMap.get(oldSessionId);
+        removeSessionId(oldSessionId);
+        playerSessionMap.put(newSessionId, player);
+    }
+
+    public void updatePlayerConnectionState(String sessionId, ConnectionState newState) {
+        playerSessionMap.get(sessionId).updateState(newState);
+    }
+
+    public boolean isReconnectTarget(String sessionId) {
+        return playerSessionMap.get(sessionId) != null;
+    }
+
+    public boolean isExit(String sessionId) {
+        return playerSessionMap.get(sessionId) == null;
+    }
 }

backend/src/main/java/io/f1/backend/domain/game/websocket/Service/SessionService.java

@@ -0,0 +1,82 @@
+package io.f1.backend.domain.game.websocket.Service;
+
+import io.f1.backend.domain.game.app.RoomService;
+import io.f1.backend.domain.game.model.ConnectionState;
+import io.f1.backend.domain.user.dto.UserPrincipal;
+
+import lombok.RequiredArgsConstructor;
+
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+@Service
+@RequiredArgsConstructor
+public class SessionService {
+
+    private final RoomService roomService;
+    private final Map<String, Long> sessionIdUser = new ConcurrentHashMap<>();
+    private final Map<String, Long> sessionIdRoom = new ConcurrentHashMap<>();
+    private final Map<Long, String> userIdSession = new ConcurrentHashMap<>();
+    private final Map<Long, String> userIdLatestSession = new ConcurrentHashMap<>();
+    private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
+
+    public void addSession(String sessionId, Long userId) {
+        sessionIdUser.put(sessionId, userId);
+        userIdSession.put(userId, sessionId);
+    }
+
+    public void addRoomId(Long roomId, String sessionId) {
+        sessionIdRoom.put(sessionId, roomId);
+    }
+
+    public void handleUserReconnect(Long roomId, String newSessionId, Long userId) {
+
+        String oldSessionId = userIdLatestSession.get(userId);
+        /* room 재연결 대상인지 아닌지 판별 */
+        if (roomService.isReconnectTarget(roomId, oldSessionId)) {
+            roomService.reconnectSession(roomId, oldSessionId, newSessionId);
+        }
+    }
+
+    public void handleUserDisconnect(String sessionId, UserPrincipal principal) {
+
+        Long roomId = sessionIdRoom.get(sessionId);
+
+        /* 정상 동작*/
+        if (roomService.isExit(sessionId, roomId)) {
+            removeSession(sessionId, roomId);
+            return;
+        }
+
+        Long userId = principal.getUserId();
+
+        roomService.changeConnectedStatus(roomId, sessionId, ConnectionState.DISCONNECTED);
+
+        // 5초 뒤 실행
+        scheduler.schedule(
+                () -> {
+                    if (userIdSession.get(userId).equals(sessionId)) {
+                        roomService.exitIfNotPlaying(roomId, sessionId, principal);
+                    } else {
+                        roomService.notifyIfReconnected(roomId, principal);
+                    }
+                    userIdLatestSession.remove(principal.getUserId());
+                    removeSession(sessionId, roomId);
+                },
+                5,
+                TimeUnit.SECONDS);
+    }
+
+    public void removeSession(String sessionId, Long userId) {
+        sessionIdUser.remove(sessionId);
+        sessionIdRoom.remove(sessionId);
+        userIdSession.remove(userId);
+
+        userIdLatestSession.put(userId, sessionId);
+    }
+}