feat: 세션 검증 추가 및 분산 세션 전달 로직 수정

ImGdevel · ImGdevel · commit 15adfec5b2f8 · 2025-09-24T11:00:51.000+09:00
diff --git a/ProjectVG.Api/appsettings.json b/ProjectVG.Api/appsettings.json
@@ -12,10 +12,23 @@
     "Audience": "ProjectVG"
   },
   "DistributedSystem": {
-    "Enabled": false,
+    "Enabled": true,
     "ServerId": "api-server-001",
     "HeartbeatIntervalSeconds": 30,
     "CleanupIntervalMinutes": 5,
     "ServerTimeoutMinutes": 2
+  },
+  "LLM": {
+    "BaseUrl": "http://localhost:7930"
+  },
+  "MEMORY": {
+    "BaseUrl": "http://localhost:7940"
+  },
+  "TTS": {
+    "BaseUrl": "https://supertoneapi.com"
+  },
+  "ConnectionStrings": {
+    "DefaultConnection": "Server=localhost,1433;Database=ProjectVG;User Id=sa;Password=ProjectVG123!;TrustServerCertificate=true;MultipleActiveResultSets=true",
+    "Redis": "projectvg-redis:6379"
   }
 } 
diff --git a/ProjectVG.Application/Services/Chat/ChatService.cs b/ProjectVG.Application/Services/Chat/ChatService.cs
@@ -7,6 +7,7 @@
 using ProjectVG.Application.Services.Chat.Processors;
 using ProjectVG.Application.Services.Chat.Validators;
 using ProjectVG.Application.Services.Conversation;
+using ProjectVG.Application.Services.WebSocket;
 
 namespace ProjectVG.Application.Services.Chat
 {
@@ -18,6 +19,7 @@ public class ChatService : IChatService
 
         private readonly IConversationService _conversationService;
         private readonly ICharacterService _characterService;
+        private readonly IWebSocketManager _webSocketManager;
 
         private readonly ChatRequestValidator _validator;
         private readonly MemoryContextPreprocessor _memoryPreprocessor;
@@ -36,6 +38,7 @@ public ChatService(
             ILogger<ChatService> logger,
             IConversationService conversationService,
             ICharacterService characterService,
+            IWebSocketManager webSocketManager,
             ChatRequestValidator validator,
             MemoryContextPreprocessor memoryPreprocessor,
             ICostTrackingDecorator<UserInputAnalysisProcessor> inputProcessor,
@@ -52,6 +55,7 @@ ChatFailureHandler chatFailureHandler
 
             _conversationService = conversationService;
             _characterService = characterService;
+            _webSocketManager = webSocketManager;
             _validator = validator;
             _memoryPreprocessor = memoryPreprocessor;
             _inputProcessor = inputProcessor;
@@ -67,6 +71,8 @@ public async Task<ChatRequestResult> EnqueueChatRequestAsync(ChatRequestCommand
             _metricsService.StartChatMetrics(command.Id.ToString(), command.UserId.ToString(), command.CharacterId.ToString());
             
             await _validator.ValidateAsync(command);
+            _logger.LogDebug("[채팅서비스] 요청 검증 완료: UserId={UserId}, CharacterId={CharacterId}",
+                command.UserId, command.CharacterId);
 
             var preprocessContext = await PrepareChatRequestAsync(command);
 
diff --git a/ProjectVG.Application/Services/Chat/Validators/ChatRequestValidator.cs b/ProjectVG.Application/Services/Chat/Validators/ChatRequestValidator.cs
@@ -2,6 +2,7 @@
 using ProjectVG.Application.Services.Users;
 using ProjectVG.Application.Services.Character;
 using ProjectVG.Application.Services.Credit;
+using ProjectVG.Application.Services.WebSocket;
 using Microsoft.Extensions.Logging;
 using ProjectVG.Application.Models.Chat;
 
@@ -10,6 +11,7 @@ namespace ProjectVG.Application.Services.Chat.Validators
     public class ChatRequestValidator
     {
         private readonly ISessionStorage _sessionStorage;
+        private readonly IWebSocketManager _webSocketManager;
         private readonly IUserService _userService;
         private readonly ICharacterService _characterService;
         private readonly ICreditManagementService _tokenManagementService;
@@ -20,12 +22,14 @@ public class ChatRequestValidator
 
         public ChatRequestValidator(
             ISessionStorage sessionStorage,
+            IWebSocketManager webSocketManager,
             IUserService userService,
             ICharacterService characterService,
             ICreditManagementService tokenManagementService,
             ILogger<ChatRequestValidator> logger)
         {
             _sessionStorage = sessionStorage;
+            _webSocketManager = webSocketManager;
             _userService = userService;
             _characterService = characterService;
             _tokenManagementService = tokenManagementService;
@@ -69,31 +73,35 @@ public async Task ValidateAsync(ChatRequestCommand command)
         }
 
         /// <summary>
-        /// 사용자 세션 유효성 검증
+        /// 사용자 WebSocket 세션 유효성 검증
+        /// 분산 환경에서 WebSocket 연결이 활성화되어 있는지 확인합니다.
         /// </summary>
         private async Task ValidateUserSessionAsync(Guid userId)
         {
-            try {
-                // 사용자 ID를 기반으로 세션 조회
-                var userSessions = (await _sessionStorage
-                    .GetSessionsByUserIdAsync(userId.ToString()))
-                    .ToList();
+            var userIdString = userId.ToString();
 
-                if (userSessions.Count == 0) {
-                    _logger.LogWarning("유효하지 않은 사용자 세션: {UserId}", userId);
-                    throw new ValidationException(ErrorCode.SESSION_EXPIRED, "세션이 만료되었습니다. 다시 로그인해 주세요.");
-                }
+            // 분산 WebSocket 매니저에서 실제 연결 상태 확인
+            bool isWebSocketConnected = _webSocketManager.IsSessionActive(userIdString);
 
-                // 세션이 존재하면 로그 기록
-                _logger.LogDebug("세션 검증 성공: {UserId}, 활성 세션 수: {SessionCount}", userId, userSessions.Count);
+            if (!isWebSocketConnected)
+            {
+                _logger.LogWarning("WebSocket 세션이 연결되어 있지 않습니다: {UserId}", userId);
+                throw new ValidationException(ErrorCode.WEBSOCKET_SESSION_REQUIRED,
+                    "채팅 요청을 처리하려면 WebSocket 연결이 필요합니다. 먼저 WebSocket에 연결해주세요.");
             }
-            catch (ValidationException) {
-                throw; // 검증 예외는 그대로 전파
+
+            _logger.LogDebug("WebSocket 세션 검증 성공: {UserId}", userId);
+
+            // 추가로 세션 하트비트 업데이트 (선택사항)
+            try
+            {
+                await _webSocketManager.UpdateSessionHeartbeatAsync(userIdString);
+                _logger.LogDebug("세션 하트비트 업데이트 완료: {UserId}", userId);
             }
-            catch (Exception ex) {
-                _logger.LogError(ex, "세션 검증 중 예상치 못한 오류: {UserId}", userId);
-                // 세션 스토리지 오류 시에는 검증을 통과시키되 로그는 남김 (서비스 가용성 우선)
-                _logger.LogWarning("세션 스토리지 오류로 인해 세션 검증을 건너뜁니다: {UserId}", userId);
+            catch (Exception ex)
+            {
+                // 하트비트 업데이트 실패는 로그만 남기고 진행
+                _logger.LogWarning(ex, "세션 하트비트 업데이트 실패 (계속 진행): {UserId}", userId);
             }
         }
     }
diff --git a/ProjectVG.Application/Services/MessageBroker/DistributedMessageBroker.cs b/ProjectVG.Application/Services/MessageBroker/DistributedMessageBroker.cs
@@ -2,7 +2,7 @@
 using ProjectVG.Application.Models.MessageBroker;
 using ProjectVG.Application.Models.WebSocket;
 using ProjectVG.Domain.Services.Server;
-using ProjectVG.Application.Services.WebSocket;
+using ProjectVG.Application.Services.Session;
 using StackExchange.Redis;
 
 namespace ProjectVG.Application.Services.MessageBroker
@@ -14,7 +14,7 @@ public class DistributedMessageBroker : IMessageBroker, IDisposable
     {
         private readonly IConnectionMultiplexer _redis;
         private readonly ISubscriber _subscriber;
-        private readonly IWebSocketManager _webSocketManager;
+        private readonly IConnectionRegistry _connectionRegistry;
         private readonly IServerRegistrationService _serverRegistration;
         private readonly ILogger<DistributedMessageBroker> _logger;
         private readonly string _serverId;
@@ -27,13 +27,13 @@ public class DistributedMessageBroker : IMessageBroker, IDisposable
 
         public DistributedMessageBroker(
             IConnectionMultiplexer redis,
-            IWebSocketManager webSocketManager,
+            IConnectionRegistry connectionRegistry,
             IServerRegistrationService serverRegistration,
             ILogger<DistributedMessageBroker> logger)
         {
             _redis = redis;
             _subscriber = redis.GetSubscriber();
-            _webSocketManager = webSocketManager;
+            _connectionRegistry = connectionRegistry;
             _serverRegistration = serverRegistration;
             _logger = logger;
             _serverId = serverRegistration.GetServerId();
@@ -70,7 +70,7 @@ public async Task SendToUserAsync(string userId, object message)
                 _logger.LogInformation("[분산브로커] SendToUserAsync 시작: UserId={UserId}, ServerId={ServerId}", userId, _serverId);
 
                 // 1. 먼저 로컬에 해당 사용자가 있는지 확인
-                var isLocalActive = _webSocketManager.IsSessionActive(userId);
+                var isLocalActive = _connectionRegistry.IsConnected(userId);
                 _logger.LogInformation("[분산브로커] 로컬 세션 확인: UserId={UserId}, IsLocalActive={IsLocalActive}", userId, isLocalActive);
 
                 if (isLocalActive)
@@ -201,7 +201,7 @@ private async void OnUserMessageReceived(RedisChannel channel, RedisValue messag
                     brokerMessage.TargetUserId, brokerMessage.SourceServerId, brokerMessage.MessageType);
 
                 // 로컬에서 해당 사용자가 연결되어 있는지 확인
-                var isLocalActive = _webSocketManager.IsSessionActive(brokerMessage.TargetUserId);
+                var isLocalActive = _connectionRegistry.IsConnected(brokerMessage.TargetUserId);
                 _logger.LogInformation("[분산브로커] 로컬 세션 확인: TargetUserId={TargetUserId}, IsLocalActive={IsLocalActive}",
                     brokerMessage.TargetUserId, isLocalActive);
 
@@ -280,17 +280,28 @@ private async Task SendLocalMessage(string userId, object? message)
 
             try
             {
-                if (message is WebSocketMessage wsMessage)
+                if (_connectionRegistry.TryGet(userId, out var connection) && connection != null)
                 {
-                    await _webSocketManager.SendAsync(userId, wsMessage);
-                    _logger.LogInformation("[분산브로커] WebSocketMessage 전송 완료: UserId={UserId}, Type={Type}",
-                        userId, wsMessage.Type);
+                    string messageText;
+
+                    if (message is WebSocketMessage wsMessage)
+                    {
+                        messageText = System.Text.Json.JsonSerializer.Serialize(wsMessage);
+                        _logger.LogInformation("[분산브로커] WebSocketMessage 전송 완료: UserId={UserId}, Type={Type}",
+                            userId, wsMessage.Type);
+                    }
+                    else
+                    {
+                        var wrappedMessage = new WebSocketMessage("message", message);
+                        messageText = System.Text.Json.JsonSerializer.Serialize(wrappedMessage);
+                        _logger.LogInformation("[분산브로커] 래핑된 메시지 전송 완료: UserId={UserId}", userId);
+                    }
+
+                    await connection.SendTextAsync(messageText);
                 }
                 else
                 {
-                    var wrappedMessage = new WebSocketMessage("message", message);
-                    await _webSocketManager.SendAsync(userId, wrappedMessage);
-                    _logger.LogInformation("[분산브로커] 래핑된 메시지 전송 완료: UserId={UserId}", userId);
+                    _logger.LogWarning("[분산브로커] 로컬 연결을 찾을 수 없음: UserId={UserId}", userId);
                 }
             }
             catch (Exception ex)
diff --git a/ProjectVG.Application/Services/WebSocket/DistributedWebSocketManager.cs b/ProjectVG.Application/Services/WebSocket/DistributedWebSocketManager.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.DependencyInjection;
 using ProjectVG.Application.Models.WebSocket;
 using ProjectVG.Application.Services.MessageBroker;
 using ProjectVG.Application.Services.Session;
@@ -16,20 +17,18 @@ public class DistributedWebSocketManager : IWebSocketManager
         private readonly ILogger<DistributedWebSocketManager> _logger;
         private readonly IConnectionRegistry _connectionRegistry;
         private readonly ISessionStorage _sessionStorage;
-        private readonly DistributedMessageBroker? _distributedBroker;
+        private readonly IServiceProvider _serviceProvider;
 
         public DistributedWebSocketManager(
             ILogger<DistributedWebSocketManager> logger,
             IConnectionRegistry connectionRegistry,
             ISessionStorage sessionStorage,
-            IMessageBroker messageBroker)
+            IServiceProvider serviceProvider)
         {
             _logger = logger;
             _connectionRegistry = connectionRegistry;
             _sessionStorage = sessionStorage;
-
-            // MessageBroker가 분산 브로커인지 확인
-            _distributedBroker = messageBroker as DistributedMessageBroker;
+            _serviceProvider = serviceProvider;
         }
 
         public async Task<string> ConnectAsync(string userId)
@@ -43,18 +42,21 @@ await _sessionStorage.CreateAsync(new SessionInfo
                 ConnectedAt = DateTime.UtcNow
             });
 
-            // 분산 환경인 경우 사용자 채널 구독
-            if (_distributedBroker != null)
+            // 분산 메시지 브로커에서 사용자 채널 구독
+            var messageBroker = _serviceProvider.GetService<IMessageBroker>() as DistributedMessageBroker;
+            if (messageBroker != null)
             {
                 _logger.LogInformation("[분산WebSocket] 분산 브로커 채널 구독 시작: UserId={UserId}", userId);
-                await _distributedBroker.SubscribeToUserChannelAsync(userId);
+                await messageBroker.SubscribeToUserChannelAsync(userId);
                 _logger.LogInformation("[분산WebSocket] 분산 사용자 채널 구독 완료: UserId={UserId}", userId);
             }
             else
             {
                 _logger.LogWarning("[분산WebSocket] 분산 브로커가 null입니다: UserId={UserId}", userId);
             }
 
+            _logger.LogInformation("[분산WebSocket] 분산 WebSocket 세션 생성 완료: UserId={UserId}", userId);
+
             return userId;
         }
 
@@ -97,11 +99,12 @@ public async Task DisconnectAsync(string userId)
 
             _connectionRegistry.Unregister(userId);
 
-            // 분산 환경인 경우 사용자 채널 구독 해제
-            if (_distributedBroker != null)
+            // 분산 메시지 브로커에서 사용자 채널 구독 해제
+            var messageBroker = _serviceProvider.GetService<IMessageBroker>() as DistributedMessageBroker;
+            if (messageBroker != null)
             {
                 _logger.LogInformation("[분산WebSocket] 분산 브로커 채널 구독 해제 시작: UserId={UserId}", userId);
-                await _distributedBroker.UnsubscribeFromUserChannelAsync(userId);
+                await messageBroker.UnsubscribeFromUserChannelAsync(userId);
                 _logger.LogInformation("[분산WebSocket] 분산 사용자 채널 구독 해제 완료: UserId={UserId}", userId);
             }
 
diff --git a/ProjectVG.Common/Constants/ErrorCodes.cs b/ProjectVG.Common/Constants/ErrorCodes.cs
@@ -84,6 +84,7 @@ public enum ErrorCode
         GUEST_ID_INVALID,
         PROVIDER_USER_ID_INVALID,
         SESSION_EXPIRED,
+        WEBSOCKET_SESSION_REQUIRED,
         RATE_LIMIT_EXCEEDED,
         RESOURCE_QUOTA_EXCEEDED,
         
@@ -179,6 +180,7 @@ public static class ErrorCodeExtensions
             { ErrorCode.GUEST_ID_INVALID, "유효하지 않은 게스트 ID입니다" },
             { ErrorCode.PROVIDER_USER_ID_INVALID, "유효하지 않은 제공자 사용자 ID입니다" },
             { ErrorCode.SESSION_EXPIRED, "세션이 만료되었습니다" },
+            { ErrorCode.WEBSOCKET_SESSION_REQUIRED, "WebSocket 연결이 필요합니다" },
             { ErrorCode.RATE_LIMIT_EXCEEDED, "요청 한도를 초과했습니다" },
             { ErrorCode.RESOURCE_QUOTA_EXCEEDED, "리소스 할당량을 초과했습니다" },
             
diff --git a/ProjectVG.Infrastructure/InfrastructureServiceCollectionExtensions.cs b/ProjectVG.Infrastructure/InfrastructureServiceCollectionExtensions.cs
@@ -30,7 +30,7 @@ public static IServiceCollection AddInfrastructureServices(this IServiceCollecti
             AddAuthServices(services, configuration);
             AddRedisServices(services, configuration);
             AddOAuth2Services(services, configuration);
-            // AddDistributedSystemServices(services, configuration);
+            AddDistributedSystemServices(services, configuration);
 
             return services;
         }
@@ -212,7 +212,6 @@ private static void AddRedisServices(IServiceCollection services, IConfiguration
             }
         }
 
-        /*
         /// <summary>
         /// 분산 시스템 서비스
         /// </summary>
@@ -233,6 +232,5 @@ private static void AddDistributedSystemServices(IServiceCollection services, IC
                 Console.WriteLine("단일 서버 모드");
             }
         }
-        */
     }
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,9 +1,11 @@
-
 name: projectvg-api-server
 
 networks:
   projectvg-network:
     driver: bridge
+  projectvg-external-db:
+    external: true
+    name: projectvg-database_projectvg-external-db
 
 volumes:
   projectvg-api-logs:
@@ -28,6 +30,8 @@ services:
     mem_limit: ${API_MEMORY_LIMIT:-1g}
     memswap_limit: ${API_MEMORY_LIMIT:-1g}
     environment:
+      # 분산 시스템 설정
+      - SERVER_ID=${SERVER_ID:-api-server-001}
       # 글로벌 환경 설정
       - ENVIRONMENT=${ENVIRONMENT:-development}
       - DEBUG_MODE=${DEBUG_MODE:-false}
@@ -57,12 +61,12 @@ services:
       - projectvg-api-logs:/app/logs
     networks:
       - projectvg-network
+      - projectvg-external-db
     restart: unless-stopped
     extra_hosts:
       - "host.docker.internal:host-gateway"
     logging:
       driver: "json-file"
       options:
         max-size: "10m"
-        max-file: "3"
-
+        max-file: "3"

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public static IServiceCollection AddInfrastructureServices(this IServiceCollecti`
`30`	`30`	`AddAuthServices(services, configuration);`
`31`	`31`	`AddRedisServices(services, configuration);`
`32`	`32`	`AddOAuth2Services(services, configuration);`
`33`		`- // AddDistributedSystemServices(services, configuration);`
	`33`	`+ AddDistributedSystemServices(services, configuration);`
`34`	`34`
`35`	`35`	`return services;`
`36`	`36`	`}`
`@@ -212,7 +212,6 @@ private static void AddRedisServices(IServiceCollection services, IConfiguration`
`212`	`212`	`}`
`213`	`213`	`}`
`214`	`214`
`215`		`- /*`
`216`	`215`	`/// <summary>`
`217`	`216`	`/// 분산 시스템 서비스`
`218`	`217`	`/// </summary>`
`@@ -233,6 +232,5 @@ private static void AddDistributedSystemServices(IServiceCollection services, IC`
`233`	`232`	`Console.WriteLine("단일 서버 모드");`
`234`	`233`	`}`
`235`	`234`	`}`
`236`		`- */`
`237`	`235`	`}`
`238`	`236`	`}`