perf: 优化ws异常处理和资源释放方式

Author: Cyaim

Cyaim.WebSocketServer/Cyaim.WebSocketServer/Infrastructure/Handlers/MvcHandler/MvcChannelHandler.cs

@@ -839,7 +839,7 @@ public static async Task<MvcResponseScheme> MvcDistributeAsync(WebSocketRouteOpt
         {
             long requestTime = DateTime.Now.Ticks;
             string requestPath = request.Target.ToLower();
-
+            IServiceScope serviceScope = null;
             try
             {
                 // 从键值对中获取对应的执行函数 
@@ -849,20 +849,20 @@ public static async Task<MvcResponseScheme> MvcDistributeAsync(WebSocketRouteOpt
                 {
                     goto NotFound;
                 }
-                Type clss = webSocketOptions.WatchAssemblyContext.WatchEndPoint.FirstOrDefault(x => x.MethodPath == requestPath)?.Class;
-                if (clss == null)
+                Type targetClass = webSocketOptions.WatchAssemblyContext.WatchEndPoint.FirstOrDefault(x => x.MethodPath == requestPath)?.Class;
+                if (targetClass == null)
                 {
                     //找不到访问目标
                     goto NotFound;
                 }
 
                 #region 注入Socket的HttpContext和WebSocket客户端
-                webSocketOptions.WatchAssemblyContext.MaxConstructorParameters.TryGetValue(clss, out ConstructorParameter constructorParameter);
+                webSocketOptions.WatchAssemblyContext.MaxConstructorParameters.TryGetValue(targetClass, out ConstructorParameter constructorParameter);
 
                 object[] instanceParmas = new object[constructorParameter.ParameterInfos.Length];
                 // 从Scope DI容器提取目标类构造函数所需的对象 
                 var serviceScopeFactory = WebSocketRouteOption.ApplicationServices.GetService<IServiceScopeFactory>();
-                var serviceScope = serviceScopeFactory.CreateScope();
+                serviceScope = serviceScopeFactory.CreateScope();
                 var scopeIocProvider = serviceScope.ServiceProvider;
                 for (int i = 0; i < constructorParameter.ParameterInfos.Length; i++)
                 {
@@ -885,11 +885,11 @@ public static async Task<MvcResponseScheme> MvcDistributeAsync(WebSocketRouteOpt
                     }
                 }
 
-                object inst = Activator.CreateInstance(clss, instanceParmas);
+                object inst = Activator.CreateInstance(targetClass, instanceParmas);
 
                 // 使用注入器工厂注入 HttpContext 和 WebSocket（支持源代码生成和反射两种方式）
                 var injectorFactory = webSocketOptions.InjectorFactory ?? new EndpointInjectorFactory(webSocketOptions);
-                var injector = injectorFactory.GetOrCreateInjector(clss);
+                var injector = injectorFactory.GetOrCreateInjector(targetClass);
                 injector.Inject(inst, context, webSocket);
                 #endregion
 
@@ -1081,22 +1081,22 @@ public static async Task<MvcResponseScheme> MvcDistributeAsync(WebSocketRouteOpt
                         // await 会抛出 AggregateException，提取内部异常
                         if (ex is AggregateException aggEx && aggEx.InnerException != null)
                         {
-                            throw aggEx.InnerException;
+                            ex = aggEx.InnerException;
                         }
-                        throw;
+                        mvcResponse = await webSocketOptions.OnException(ex, request, mvcResponse, context, webSocketOptions, context.Request.Path, logger).ConfigureAwait(false);
                     }
 
                     // 检查任务状态（await 后任务已完成，但需要检查是否有异常或取消）
                     if (task.IsFaulted && task.Exception != null)
                     {
                         // 抛出内部异常（AggregateException 的第一个内部异常）
                         var innerException = task.Exception.InnerException ?? task.Exception;
-                        throw innerException;
+                        mvcResponse = await webSocketOptions.OnException(innerException, request, mvcResponse, context, webSocketOptions, context.Request.Path, logger).ConfigureAwait(false);
                     }
 
                     if (task.IsCanceled)
                     {
-                        throw new TaskCanceledException(task);
+                        mvcResponse = await webSocketOptions.OnException(new TaskCanceledException(task), request, mvcResponse, context, webSocketOptions, context.Request.Path, logger).ConfigureAwait(false);
                     }
 
                     // 检查是否是 Task<T> 类型，需要获取返回值
@@ -1113,9 +1113,6 @@ public static async Task<MvcResponseScheme> MvcDistributeAsync(WebSocketRouteOpt
 
                 #endregion
 
-                // Dispose ioc scope
-                serviceScope?.Dispose();
-                serviceScope = null;
 
                 mvcResponse.Id = request.Id;
                 mvcResponse.Target = request.Target;
@@ -1136,6 +1133,12 @@ public static async Task<MvcResponseScheme> MvcDistributeAsync(WebSocketRouteOpt
 
                 return customResp;
             }
+            finally
+            {
+                // Dispose ioc scope
+                serviceScope?.Dispose();
+                serviceScope = null;
+            }
 
         NotFound:
             logger.LogInformation(string.Format(I18nText.WS_INTERACTIVE_TEXT_TEMPALTE, context.Connection.RemoteIpAddress, context.Connection.RemotePort, context.Connection.Id, I18nText.MvcDistributeAsync_EndPointNotFound + requestPath));