Feature : 분산 시스템 세션 개선 - Redis Pub/sub

.env.example

@@ -3,13 +3,23 @@
 # ===========================================
 # Copy this file to .env and fill in your actual values
 
+ENVIRONMENT=development
+DEBUG_MODE=true
+LOG_LEVEL=INFO
+LOG_FORMAT=json
+DATA_PATH=../data
+
 # Database Configuration
 DB_CONNECTION_STRING=Server=host.docker.internal,1433;Database=ProjectVG;User Id=sa;Password=YOUR_DB_PASSWORD;TrustServerCertificate=true;MultipleActiveResultSets=true
 DB_PASSWORD=YOUR_DB_PASSWORD
 
 # Redis Configuration
 REDIS_CONNECTION_STRING=host.docker.internal:6380
 
+# Distributed System Configuration
+DISTRIBUTED_MODE=false
+SERVER_ID=
+
 # External Services
 LLM_BASE_URL=http://host.docker.internal:7930
 MEMORY_BASE_URL=http://host.docker.internal:7940
@@ -31,6 +41,11 @@ GOOGLE_OAUTH_REDIRECT_URI=http://localhost:7900/auth/oauth2/callback
 GOOGLE_OAUTH_AUTO_CREATE_USER=true
 GOOGLE_OAUTH_DEFAULT_ROLE=User
 
+# WebSocket Configuration
+WEBSOCKET_KEEPALIVE_MINUTES=0
+WEBSOCKET_RECEIVE_BUFFER_SIZE=4096
+WEBSOCKET_SEND_BUFFER_SIZE=4096
+
 # Application Configuration
 ASPNETCORE_ENVIRONMENT=Production
 

.gitignore

@@ -101,6 +101,7 @@ _ReSharper*/
 # Docker
 **/Dockerfile.*
 docker-compose.override.yml
+.dockerignore.local
 
 # Keep template files but ignore runtime files
 !docker-compose.prod.yml

ProjectVG.Api/ApiMiddlewareExtensions.cs

@@ -11,6 +11,7 @@ public static class ApiMiddlewareExtensions
         /// </summary>
         public static IApplicationBuilder UseApiMiddleware(this IApplicationBuilder app, IWebHostEnvironment environment)
         {
+            var configuration = app.ApplicationServices.GetRequiredService<IConfiguration>();
             // 개발 환경 설정
             if (environment.IsDevelopment()) {
                 app.UseSwagger();
@@ -23,8 +24,9 @@ public static IApplicationBuilder UseApiMiddleware(this IApplicationBuilder app,
             // 전역 예외 처리
             app.UseGlobalExceptionHandler();
 
-            // WebSocket 지원
-            app.UseWebSockets();
+            // WebSocket 지원 - 구성 가능한 옵션 사용
+            var webSocketOptions = GetWebSocketOptions(configuration);
+            app.UseWebSockets(webSocketOptions);
 
             // WebSocket 미들웨어 등록
             app.UseMiddleware<WebSocketMiddleware>();
@@ -63,5 +65,56 @@ public static IApplicationBuilder UseDevelopmentFeatures(this IApplicationBuilde
 
             return app;
         }
+
+        /// <summary>
+        /// WebSocket 옵션을 구성 파일과 환경 변수에서 가져옵니다
+        /// </summary>
+        private static WebSocketOptions GetWebSocketOptions(IConfiguration configuration)
+        {
+            var options = new WebSocketOptions();
+
+            // KeepAliveInterval 설정 (환경 변수 > appsettings.json 순서)
+            var keepAliveMinutes = Environment.GetEnvironmentVariable("WEBSOCKET_KEEPALIVE_MINUTES");
+            if (string.IsNullOrEmpty(keepAliveMinutes))
+            {
+                keepAliveMinutes = configuration.GetValue<string>("WebSocket:KeepAliveIntervalMinutes");
+            }
+
+            if (double.TryParse(keepAliveMinutes, out var minutes))
+            {
+                if (minutes <= 0)
+                {
+                    options.KeepAliveInterval = TimeSpan.Zero; // KeepAlive 비활성화
+                }
+                else
+                {
+                    options.KeepAliveInterval = TimeSpan.FromMinutes(minutes);
+                }
+            }
+            else
+            {
+                // 기본값: KeepAlive 비활성화 (연결 안정성을 위해)
+                options.KeepAliveInterval = TimeSpan.Zero;
+            }
+
+            // 수신 버퍼 크기 설정
+            var receiveBufferSize = Environment.GetEnvironmentVariable("WEBSOCKET_RECEIVE_BUFFER_SIZE") ??
+                                  configuration.GetValue<string>("WebSocket:ReceiveBufferSize");
+            if (int.TryParse(receiveBufferSize, out var recvSize) && recvSize > 0)
+            {
+                options.ReceiveBufferSize = recvSize;
+            }
+
+            // 송신 버퍼 크기 설정 (WebSocketOptions에는 없으므로 로깅만)
+            var sendBufferSize = Environment.GetEnvironmentVariable("WEBSOCKET_SEND_BUFFER_SIZE") ??
+                               configuration.GetValue<string>("WebSocket:SendBufferSize");
+
+            // 콘솔 로깅으로 설정 확인
+            Console.WriteLine($"[WebSocket 설정] KeepAlive: {(options.KeepAliveInterval == TimeSpan.Zero ? "비활성화" : $"{options.KeepAliveInterval.TotalMinutes}분")}, " +
+                            $"ReceiveBuffer: {options.ReceiveBufferSize} bytes" +
+                            $"{(int.TryParse(sendBufferSize, out var sendSize) && sendSize > 0 ? $", SendBuffer: {sendSize} bytes (참고용)" : "")}");
+
+            return options;
+        }
     }
 }

ProjectVG.Api/Middleware/WebSocketMiddleware.cs

@@ -1,7 +1,7 @@
 using ProjectVG.Application.Services.Session;
-using ProjectVG.Application.Services.WebSocket;
 using ProjectVG.Infrastructure.Auth;
 using ProjectVG.Infrastructure.Realtime.WebSocketConnection;
+using ProjectVG.Domain.Services.Server;
 using System.Net.WebSockets;
 
 namespace ProjectVG.Api.Middleware
@@ -10,22 +10,25 @@ public class WebSocketMiddleware
     {
         private readonly RequestDelegate _next;
         private readonly ILogger<WebSocketMiddleware> _logger;
-        private readonly IWebSocketManager _webSocketService;
-        private readonly IConnectionRegistry _connectionRegistry;
+        private readonly ISessionManager _sessionManager;
+        private readonly IWebSocketConnectionManager _connectionManager;
         private readonly IJwtProvider _jwtProvider;
+        private readonly IServerRegistrationService? _serverRegistrationService;
 
         public WebSocketMiddleware(
             RequestDelegate next,
             ILogger<WebSocketMiddleware> logger,
-            IWebSocketManager webSocketService,
-            IConnectionRegistry connectionRegistry,
-            IJwtProvider jwtProvider)
+            ISessionManager sessionManager,
+            IWebSocketConnectionManager connectionManager,
+            IJwtProvider jwtProvider,
+            IServerRegistrationService? serverRegistrationService = null)
         {
             _next = next;
             _logger = logger;
-            _webSocketService = webSocketService;
-            _connectionRegistry = connectionRegistry;
+            _sessionManager = sessionManager;
+            _connectionManager = connectionManager;
             _jwtProvider = jwtProvider;
+            _serverRegistrationService = serverRegistrationService;
         }
 
         public async Task InvokeAsync(HttpContext context)
@@ -88,19 +91,59 @@ private string ExtractToken(HttpContext context)
             return string.Empty;
         }
 
-        /// <summary> 
-        /// 기존 연결 정리 후 새 연결 등록 
+        /// <summary>
+        /// 새 아키텍처: 세션 관리와 WebSocket 연결 관리 분리
         /// </summary>
         private async Task RegisterConnection(Guid userId, WebSocket socket)
         {
-            if (_connectionRegistry.TryGet(userId.ToString(), out var existing) && existing != null) {
-                _logger.LogInformation("기존 연결 정리: {UserId}", userId);
-                await _webSocketService.DisconnectAsync(userId.ToString());
-            }
+            var userIdString = userId.ToString();
+            _logger.LogInformation("[WebSocketMiddleware] 연결 등록 시작: UserId={UserId}", userId);
+
+            try
+            {
+                // 기존 로컬 연결이 있으면 정리
+                if (_connectionManager.HasLocalConnection(userIdString))
+                {
+                    _logger.LogInformation("[WebSocketMiddleware] 기존 로컬 연결 발견 - 정리 중: UserId={UserId}", userId);
+                    _connectionManager.UnregisterConnection(userIdString);
+                }
+
+                // 1. 세션 관리자에 세션 생성 (Redis 저장)
+                await _sessionManager.CreateSessionAsync(userId);
+                _logger.LogInformation("[WebSocketMiddleware] 세션 관리자에 세션 저장 완료: UserId={UserId}", userId);
+
+                // 2. WebSocket 연결 관리자에 로컬 연결 등록
+                var connection = new WebSocketClientConnection(userIdString, socket);
+                _connectionManager.RegisterConnection(userIdString, connection);
+                _logger.LogInformation("[WebSocketMiddleware] 로컬 WebSocket 연결 등록 완료: UserId={UserId}", userId);
+
+                // 3. 분산 시스템: 사용자-서버 매핑 저장 (Redis)
+                if (_serverRegistrationService != null)
+                {
+                    try
+                    {
+                        var serverId = _serverRegistrationService.GetServerId();
+                        await _serverRegistrationService.SetUserServerAsync(userIdString, serverId);
+                        _logger.LogInformation("[WebSocketMiddleware] 사용자-서버 매핑 저장 완료: UserId={UserId}, ServerId={ServerId}", userId, serverId);
+                    }
+                    catch (Exception mapEx)
+                    {
+                        _logger.LogWarning(mapEx, "[WebSocketMiddleware] 사용자-서버 매핑 저장 실패: UserId={UserId}", userId);
+                        // 매핑 저장 실패는 로그만 남기고 연결은 계속 진행
+                    }
+                }
 
-            var connection = new WebSocketClientConnection(userId.ToString(), socket);
-            _connectionRegistry.Register(userId.ToString(), connection);
-            await _webSocketService.ConnectAsync(userId.ToString());
+                // [디버그] 등록 후 상태 확인
+                var isSessionActive = await _sessionManager.IsSessionActiveAsync(userId);
+                var hasLocalConnection = _connectionManager.HasLocalConnection(userIdString);
+                _logger.LogInformation("[WebSocketMiddleware] 연결 등록 완료: UserId={UserId}, SessionActive={SessionActive}, LocalConnection={LocalConnection}",
+                    userId, isSessionActive, hasLocalConnection);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "[WebSocketMiddleware] 연결 등록 실패: UserId={UserId}", userId);
+                throw;
+            }
         }
 
         /// <summary>
@@ -160,6 +203,17 @@ await socket.SendAsync(
                                 WebSocketMessageType.Text,
                                 true,
                                 cancellationTokenSource.Token);
+
+                            // 세션 하트비트 업데이트 (Redis TTL 갱신)
+                            try {
+                                if (Guid.TryParse(userId, out var userGuid))
+                                {
+                                    await _sessionManager.UpdateSessionHeartbeatAsync(userGuid);
+                                }
+                            }
+                            catch (Exception heartbeatEx) {
+                                _logger.LogWarning(heartbeatEx, "세션 하트비트 업데이트 실패: {UserId}", userId);
+                            }
                         }
                     }
                 }
@@ -177,14 +231,39 @@ await socket.SendAsync(
                 _logger.LogInformation("WebSocket 연결 해제: {UserId}", userId);
 
                 try {
-                    await _webSocketService.DisconnectAsync(userId);
-                    _connectionRegistry.Unregister(userId);
+                    // 새 아키텍처: 세션과 로컬 연결 분리해서 정리
+                    if (Guid.TryParse(userId, out var userGuid))
+                    {
+                        // 1. 세션 관리자에서 세션 삭제 (Redis에서 제거)
+                        await _sessionManager.DeleteSessionAsync(userGuid);
+                        _logger.LogDebug("세션 관리자에서 세션 삭제 완료: {UserId}", userId);
+                    }
+
+                    // 2. 분산 시스템: 사용자-서버 매핑 제거 (Redis)
+                    if (_serverRegistrationService != null)
+                    {
+                        try
+                        {
+                            await _serverRegistrationService.RemoveUserServerAsync(userId);
+                            _logger.LogDebug("사용자-서버 매핑 제거 완료: {UserId}", userId);
+                        }
+                        catch (Exception mapEx)
+                        {
+                            _logger.LogWarning(mapEx, "사용자-서버 매핑 제거 실패: {UserId}", userId);
+                        }
+                    }
+
+                    // 3. 로컬 WebSocket 연결 해제
+                    _connectionManager.UnregisterConnection(userId);
+                    _logger.LogDebug("로컬 WebSocket 연결 해제 완료: {UserId}", userId);
 
+                    // 4. WebSocket 소켓 정리
                     if (socket.State == WebSocketState.Open || socket.State == WebSocketState.CloseReceived) {
                         await socket.CloseAsync(
                             WebSocketCloseStatus.NormalClosure,
                             "Connection closed",
                             CancellationToken.None);
+                        _logger.LogDebug("WebSocket 소켓 정리 완료: {UserId}", userId);
                     }
                 }
                 catch (Exception ex) {

ProjectVG.Api/Program.cs

@@ -38,7 +38,7 @@
 }
 
 builder.Services.AddInfrastructureServices(builder.Configuration);
-builder.Services.AddApplicationServices();
+builder.Services.AddApplicationServices(builder.Configuration);
 builder.Services.AddDevelopmentCors();
 
 // 부하테스트 환경에서 성능 모니터링 서비스 추가

ProjectVG.Api/appsettings.json

@@ -10,5 +10,30 @@
   "JWT": {
     "Issuer": "ProjectVG",
     "Audience": "ProjectVG"
+  },
+  "DistributedSystem": {
+    "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"
+  },
+  "WebSocket": {
+    "KeepAliveIntervalMinutes": 10,
+    "ReceiveBufferSize": 4096,
+    "SendBufferSize": 4096
+  },
+  "ConnectionStrings": {
+    "DefaultConnection": "Server=localhost,1433;Database=ProjectVG;User Id=sa;Password=ProjectVG123!;TrustServerCertificate=true;MultipleActiveResultSets=true",
+    "Redis": "projectvg-redis:6379"
   }
 }