[BE] fix: WebSocket Error Handler Interceptor 로 이동 (#97)

Author: toychip

src/backend/chat-server/src/main/kotlin/com/asyncgate/chat_server/controller/DirectController.kt

@@ -2,19 +2,14 @@ package com.asyncgate.chat_server.controller
 
 import com.asyncgate.chat_server.controller.docs.DirectControllerDocs
 import com.asyncgate.chat_server.domain.ReadStatus
-import com.asyncgate.chat_server.exception.ChatServerException
 import com.asyncgate.chat_server.filter.JwtTokenProvider
 import com.asyncgate.chat_server.service.DirectService
 import com.asyncgate.chat_server.support.response.SuccessResponse
 import com.asyncgate.chat_server.support.utility.CustomSecurityContext
 import jakarta.servlet.http.HttpServletRequest
 import org.springframework.messaging.Message
-import org.springframework.messaging.handler.annotation.MessageExceptionHandler
 import org.springframework.messaging.handler.annotation.MessageMapping
 import org.springframework.messaging.handler.annotation.Payload
-import org.springframework.messaging.simp.stomp.StompCommand
-import org.springframework.messaging.simp.stomp.StompHeaderAccessor
-import org.springframework.messaging.support.MessageBuilder
 import org.springframework.stereotype.Controller
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.ModelAttribute
@@ -97,12 +92,4 @@ class DirectController(
 
     override fun sendDeleteMessageJustDocs(directDelete: DirectMessageDeleteRequest, message: Message<*>) {
     }
-
-    // 메시지 예외 처리
-    @MessageExceptionHandler(ChatServerException::class)
-    fun handleChatServerException(e: ChatServerException): Message<*> {
-        val accessor = StompHeaderAccessor.create(StompCommand.ERROR)
-        accessor.messageHeaders[StompHeaderAccessor.STOMP_MESSAGE_HEADER] = e.failType.message
-        return MessageBuilder.createMessage(ByteArray(0), accessor.messageHeaders)
-    }
 }

src/backend/chat-server/src/main/kotlin/com/asyncgate/chat_server/filter/StompInterceptor.kt

@@ -1,5 +1,7 @@
 package com.asyncgate.chat_server.filter
 
+import com.asyncgate.chat_server.exception.ChatServerException
+import com.asyncgate.chat_server.exception.FailType
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.http.HttpStatus
@@ -8,6 +10,7 @@ import org.springframework.messaging.MessageChannel
 import org.springframework.messaging.simp.stomp.StompCommand
 import org.springframework.messaging.simp.stomp.StompHeaderAccessor
 import org.springframework.messaging.support.ChannelInterceptor
+import org.springframework.messaging.support.MessageBuilder
 import org.springframework.stereotype.Component
 import org.springframework.web.server.ResponseStatusException
 
@@ -44,11 +47,15 @@ class FilterChannelInterceptor(
                 log.error("🚨 [STOMP] Access Token is missing or improperly formatted!")
                 throw ResponseStatusException(HttpStatus.UNAUTHORIZED, "Access token is missing")
             }
-            if (!jwtTokenProvider.validate(jwtToken)) {
-                log.error("🚨 [STOMP] Access Token validation failed!")
-                throw ResponseStatusException(HttpStatus.UNAUTHORIZED)
+            try {
+                if (!jwtTokenProvider.validate(jwtToken)) {
+                    log.error("🚨 [STOMP] Access Token validation failed!")
+                    throw ResponseStatusException(HttpStatus.UNAUTHORIZED)
+                }
+                log.info("✅ [STOMP] CONNECT 요청 처리 완료")
+            } catch (e: ChatServerException) {
+                createErrorMessage(e.failType)
             }
-            log.info("✅ [STOMP] CONNECT 요청 처리 완료")
         }
         return message
     }
@@ -101,6 +108,18 @@ class FilterChannelInterceptor(
         // 시그널링 서버에 전달 (주석)
         // messageSender.signaling(stateTopic, stateRequest)
     }
+
+    /**
+     * STOMP ERROR 프레임 생성 메서드
+     */
+    private fun createErrorMessage(failType: FailType): Message<*> {
+        val errorAccessor = StompHeaderAccessor.create(StompCommand.ERROR)
+        errorAccessor.messageHeaders[StompHeaderAccessor.STOMP_MESSAGE_HEADER] = failType.message
+        errorAccessor.messageHeaders["errorCode"] = failType.errorCode
+        errorAccessor.messageHeaders["status"] = failType.status.value()
+
+        return MessageBuilder.createMessage(ByteArray(0), errorAccessor.messageHeaders)
+    }
 }
 
 data class LoginSessionRequest(

src/backend/chat-server/src/main/kotlin/com/asyncgate/chat_server/filter/WebSocketHandshakeInterceptor.kt

@@ -1,5 +1,6 @@
 package com.asyncgate.chat_server.filter
 
+import com.asyncgate.chat_server.exception.ChatServerException
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.http.HttpStatus
@@ -60,13 +61,26 @@ class WebSocketHandshakeInterceptor(
         }
         val (_, jwtToken) = pair
 
-        if (!jwtTokenProvider.validate(jwtToken)) {
-            log.info("❌ WebSocket Handshake 실패: 유효하지 않은 JWT 토큰")
-            response.setStatusCode(HttpStatus.UNAUTHORIZED)
+        try {
+            if (!jwtTokenProvider.validate(jwtToken)) {
+                log.info("❌ WebSocket Handshake 실패: 유효하지 않은 JWT 토큰")
+                response.setStatusCode(HttpStatus.UNAUTHORIZED)
+                response.headers["WWW-Authenticate"] =
+                    "Bearer error=\"invalid_token\", error_description=\"invalid JWT token\""
+                return false
+            }
+        } catch (e: ChatServerException) {
+            log.info("❌ WebSocket Handshake 실패: {}", e.failType.message)
+            val message = e.failType.message
+            val status = e.failType.status
+
+            response.setStatusCode(status)
             response.headers["WWW-Authenticate"] =
-                "Bearer error=\"invalid_token\", error_description=\"invalid JWT token\""
+                "Bearer error=\"invalid_token\", error_description=\"$message\""
+
             return false
         }
+
         val userId = jwtTokenProvider.extract(jwtToken)
         log.info("✅ WebSocket Handshake 성공 - userId: $userId")