优化ProxyClassType的查找

Author: xljiulang

WebApiClientCore/Implementations/EmitHttpApiActivator.cs

@@ -33,7 +33,7 @@ public EmitHttpApiActivator(IApiActionDescriptorProvider apiActionDescriptorProv
 
             this.actionInvokers = apiMethods
                 .Select(item => apiActionDescriptorProvider.CreateActionDescriptor(item, typeof(THttpApi)))
-                .Select(item => actionInvokerProvider.CreateActionInvoker(item))
+                .Select(actionInvokerProvider.CreateActionInvoker)
                 .ToArray();
 
             var proxyType = BuildProxyType(typeof(THttpApi), apiMethods);

WebApiClientCore/Implementations/SourceGeneratorHttpApiActivator.cs

@@ -19,12 +19,12 @@ public class SourceGeneratorHttpApiActivator<
     {
         private readonly ApiActionInvoker[] actionInvokers;
         private readonly Func<IHttpApiInterceptor, ApiActionInvoker[], THttpApi> activator;
-        private static readonly Type? proxyClassType = FindProxyTypeFromAssembly();
+        private static readonly Type? _proxyClassType = SourceGeneratorProxyClassType.Find(typeof(THttpApi));
 
         /// <summary>
         /// 获取是否支持
         /// </summary>
-        public static bool IsSupported => proxyClassType != null;
+        public static bool IsSupported => _proxyClassType != null;
 
         /// <summary>
         /// 通过查找类型代理类型创建实例
@@ -36,19 +36,20 @@ public class SourceGeneratorHttpApiActivator<
         /// <exception cref="ProxyTypeCreateException"></exception>
         public SourceGeneratorHttpApiActivator(IApiActionDescriptorProvider apiActionDescriptorProvider, IApiActionInvokerProvider actionInvokerProvider)
         {
-            var proxyType = proxyClassType;
-            if (proxyType == null)
+            var httpApiType = typeof(THttpApi);
+            var proxyClassType = _proxyClassType;
+            if (proxyClassType == null)
             {
-                var message = $"找不到{typeof(THttpApi)}的代理类";
-                throw new ProxyTypeCreateException(typeof(THttpApi), message);
+                var message = $"找不到{httpApiType}的代理类";
+                throw new ProxyTypeCreateException(httpApiType, message);
             }
 
-            this.actionInvokers = FindApiMethods(proxyType)
-                .Select(item => apiActionDescriptorProvider.CreateActionDescriptor(item, typeof(THttpApi)))
+            this.actionInvokers = FindApiMethods(httpApiType, proxyClassType)
+                .Select(item => apiActionDescriptorProvider.CreateActionDescriptor(item, httpApiType))
                 .Select(actionInvokerProvider.CreateActionInvoker)
                 .ToArray();
 
-            this.activator = LambdaUtil.CreateCtorFunc<IHttpApiInterceptor, ApiActionInvoker[], THttpApi>(proxyType);
+            this.activator = LambdaUtil.CreateCtorFunc<IHttpApiInterceptor, ApiActionInvoker[], THttpApi>(proxyClassType);
         }
 
         /// <summary>
@@ -62,49 +63,25 @@ public THttpApi CreateInstance(IHttpApiInterceptor apiInterceptor)
         }
 
         /// <summary>
-        /// 查找接口的Api方法 
+        /// 查找接口的方法
         /// </summary>
+        /// <param name="httpApiType">接口类型</param> 
+        /// <param name="proxyClassType">接口的实现类型</param>
         /// <returns></returns>
-        private static MethodInfo[] FindApiMethods(Type proxyType)
+        private static MethodInfo[] FindApiMethods(Type httpApiType, Type proxyClassType)
         {
-            var apiMethods = HttpApi.FindApiMethods(typeof(THttpApi));
-            var proxyMethods = proxyType.GetMethods(BindingFlags.NonPublic | BindingFlags.Instance);
+            var apiMethods = HttpApi.FindApiMethods(httpApiType);
+            var classMethods = proxyClassType.GetMethods(BindingFlags.NonPublic | BindingFlags.Instance);
 
             var methods = from a in apiMethods.Select(item => new MethodFeature(item))
-                          join p in proxyMethods.Select(item => new MethodFeature(item))
-                          on a equals p
-                          orderby p.Index
+                          join c in classMethods.Select(item => new MethodFeature(item))
+                          on a equals c
+                          orderby c.Index
                           select a.Method;
 
             return methods.ToArray();
         }
 
-        /// <summary>
-        /// 从接口所在程序集查找代理类
-        /// </summary> 
-        /// <returns></returns>
-        private static Type? FindProxyTypeFromAssembly()
-        {
-            var interfaceType = typeof(THttpApi);
-            foreach (var proxyType in interfaceType.Assembly.GetTypes())
-            {
-                if (proxyType.IsClass == false)
-                {
-                    continue;
-                }
-
-                var proxyClassAttr = proxyType.GetCustomAttribute<HttpApiProxyClassAttribute>();
-                if (proxyClassAttr == null || proxyClassAttr.HttpApiType != interfaceType)
-                {
-                    continue;
-                }
-
-                return proxyType;
-            }
-
-            return null;
-        }
-
         /// <summary>
         /// 表示MethodInfo的特征
         /// </summary>

WebApiClientCore/Implementations/SourceGeneratorProxyClassType.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace WebApiClientCore.Implementations
+{
+    /// <summary>
+    /// 提供获取SourceGenerator生成的代理类型
+    /// </summary>
+    static class SourceGeneratorProxyClassType
+    {
+        private static readonly object syncRoot = new();
+        private static readonly HashSet<Assembly> assemblies = [];
+        private static readonly ConcurrentDictionary<Type, Type> httpApiProxyClassTable = [];
+
+        /// <summary>
+        /// 查找指定接口类型的代理类类型
+        /// </summary>
+        /// <param name="httpApiType">接口类型</param> 
+        /// <returns></returns>
+        public static Type? Find(Type httpApiType)
+        {
+            AnalyzeAssembly(httpApiType.Assembly);
+
+            if (httpApiProxyClassTable.TryGetValue(httpApiType, out var proxyClassType))
+            {
+                return proxyClassType;
+            }
+            return null;
+        }
+
+
+        private static void AnalyzeAssembly(Assembly assembly)
+        {
+            if (AddAssembly(assembly))
+            {
+                foreach (var classType in assembly.GetTypes())
+                {
+                    if (classType.IsClass)
+                    {
+                        var proxyClassAttr = classType.GetCustomAttribute<HttpApiProxyClassAttribute>();
+                        if (proxyClassAttr != null)
+                        {
+                            httpApiProxyClassTable.TryAdd(proxyClassAttr.HttpApiType, classType);
+                        }
+                    }
+                }
+            }
+        }
+
+        private static bool AddAssembly(Assembly assembly)
+        {
+            lock (syncRoot)
+            {
+                return assemblies.Add(assembly);
+            }
+        }
+    }
+}