Merge pull request #21 from softlgl/dev

优化接口注册逻辑

Author: softlgl

src/DotNetCoreRpc.Server/DotNetCoreRpcMiddleware.cs

@@ -14,48 +14,42 @@ namespace DotNetCoreRpc.Server
 {
     public class DotNetCoreRpcMiddleware
     {
-        private readonly IDictionary<string,Type> _types;
+        private readonly IDictionary<string, Type> _types;
         private readonly IEnumerable<Type> _filterTypes;
         private readonly ConcurrentDictionary<string, List<RpcFilterAttribute>> _methodFilters = new ConcurrentDictionary<string, List<RpcFilterAttribute>>();
 
         public DotNetCoreRpcMiddleware(RequestDelegate next, RpcServerOptions rpcServerOptions)
         {
-            _types = rpcServerOptions.GetTypes();
+            _types = rpcServerOptions.GetRegisterTypes();
             _filterTypes = rpcServerOptions.GetFilterTypes();
         }
 
         public async Task InvokeAsync(HttpContext context)
         {
-            //context.Request.EnableBuffering();
-            //context.Request.Body.Seek(0, SeekOrigin.Begin);
-            //var requestReader = new StreamReader(context.Request.Body);
-            //var requestContent = await requestReader.ReadToEndAsync();
-            //context.Request.Body.Seek(0, SeekOrigin.Begin);
-
             var requestContent = await context.Request.ReadStringAsync();
-            ResponseModel responseModel = new ResponseModel
-            {
-                Code = 500
-            };
+            ResponseModel responseModel = new ResponseModel{ Code = 500 };
             if (string.IsNullOrEmpty(requestContent))
             {
                 responseModel.Message = "未读取到请求信息";
                 await context.Response.WriteAsync(responseModel.ToJson());
                 return;
             }
+
             RequestModel requestModel = requestContent.FromJson<RequestModel>();
             if (requestModel == null)
             {
                 responseModel.Message = "读取请求数据失败";
                 await context.Response.WriteAsync(responseModel.ToJson());
                 return;
             }
+
             if (!_types.ContainsKey(requestModel.TypeFullName))
             {
                 responseModel.Message = $"{requestModel.TypeFullName}未注册";
                 await context.Response.WriteAsync(responseModel.ToJson());
                 return;
             }
+
             await HandleRequest(context, requestModel);
             return;
         }
@@ -79,6 +73,7 @@ private async Task HandleRequest(HttpContext context, RequestModel requestModel)
                     paramters[i] = paramters[i].ToJson().FromJson(methodParamters[i].ParameterType);
                 }
             }
+
             RpcContext aspectContext = new RpcContext
             {
                 Parameters = paramters,
@@ -110,6 +105,7 @@ private AspectPiplineBuilder CreatPipleline(RpcContext aspectContext)
                 };
                 await aspectContext.HttpContext.Response.WriteAsync(responseModel.ToJson());
             });
+
             List<RpcFilterAttribute> interceptorAttributes = GetFilterAttributes(aspectContext);
             if (interceptorAttributes.Any())
             {

src/DotNetCoreRpc.Server/RpcServerOptions.cs

@@ -8,8 +8,12 @@ namespace DotNetCoreRpc.Server
 {
     public class RpcServerOptions
     {
-        private readonly IDictionary<string, Type> _types = new Dictionary<string, Type>();
+        private readonly IDictionary<string, Type> _serviceTypes = new Dictionary<string, Type>();
+        private readonly HashSet<Type> _serviceTypeSet = new HashSet<Type>();
+        private readonly HashSet<string> _serviceNameSet = new HashSet<string>();
+        private readonly HashSet<string> _serviceNameSpaceSet = new HashSet<string>();
         private readonly IList<Type> _filterTypes = new List<Type>();
+
         private readonly IServiceCollection _services;
 
         public RpcServerOptions(IServiceCollection services)
@@ -26,44 +30,59 @@ public RpcServerOptions AddFilter<RpcFilterAttribute>()
         public RpcServerOptions AddService<TService>()
             where TService:class
         {
-            Type serviceType = typeof(TService);
-            _types.TryAdd(serviceType.FullName, serviceType);
+            _serviceTypeSet.Add(typeof(TService));
             return this;
         }
 
         public RpcServerOptions AddService(string serviceName)
         {
-            foreach (var service in _services)
-            {
-                if (serviceName.StartsWith("*")
-                    && service.ServiceType.Name.EndsWith(serviceName.Substring(1)))
-                {
-                    _types.TryAdd(service.ServiceType.FullName, service.ServiceType);
-                    continue;
-                }
-                if (service.ServiceType.Name == serviceName)
-                {
-                    _types.TryAdd(service.ServiceType.FullName, service.ServiceType);
-                }
-            }
+            _serviceNameSet.Add(serviceName);
             return this;
         }
 
         public RpcServerOptions AddNameSpace(string nameSpace)
         {
-            foreach (var service in _services)
+            _serviceNameSpaceSet.Add(nameSpace);
+            return this;
+        }
+
+        public IDictionary<string, Type> GetRegisterTypes()
+        {
+            foreach (var serviceType in _serviceTypeSet)
             {
-                if (service.ServiceType.Namespace == nameSpace)
+                _serviceTypes.TryAdd(serviceType.FullName, serviceType);
+            }
+
+            foreach (var serviceName in _serviceNameSet)
+            {
+                string subServiceName = serviceName[1..];
+                foreach (var service in _services)
                 {
-                    _types.TryAdd(service.ServiceType.FullName, service.ServiceType);
+                    if (serviceName.StartsWith("*") && service.ServiceType.Name.EndsWith(subServiceName))
+                    {
+                        _serviceTypes.TryAdd(service.ServiceType.FullName, service.ServiceType);
+                        continue;
+                    }
+
+                    if (service.ServiceType.Name == serviceName)
+                    {
+                        _serviceTypes.TryAdd(service.ServiceType.FullName, service.ServiceType);
+                    }
                 }
             }
-            return this;
-        }
 
-        public IDictionary<string, Type> GetTypes()
-        {
-            return _types.ToDictionary(i=>i.Key,i=>i.Value);
+            foreach (var nameSpace in _serviceNameSpaceSet)
+            {
+                foreach (var service in _services)
+                {
+                    if (service.ServiceType.Namespace == nameSpace)
+                    {
+                        _serviceTypes.TryAdd(service.ServiceType.FullName, service.ServiceType);
+                    }
+                }
+            }
+
+            return _serviceTypes.ToDictionary(i => i.Key, i => i.Value);
         }
 
         public IEnumerable<Type> GetFilterTypes()

src/DotNetCoreRpc.Server/ServerServiceCollectionExtensions.cs

@@ -1,5 +1,6 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace DotNetCoreRpc.Server
 {
@@ -9,7 +10,7 @@ public static IServiceCollection AddDotNetCoreRpcServer(this IServiceCollection
         {
             RpcServerOptions rpcServerOptions = new RpcServerOptions(services);
             options.Invoke(rpcServerOptions);
-            services.AddSingleton(rpcServerOptions);
+            services.TryAddSingleton(rpcServerOptions);
             return services;
         }
     }