Refactor method discovery (#268)

Author: JamesNK

src/Grpc.AspNetCore.Server/GrpcEndpointRouteBuilderExtensions.cs

@@ -19,6 +19,7 @@
 using System;
 using Grpc.AspNetCore.Server;
 using Grpc.AspNetCore.Server.Internal;
+using Grpc.AspNetCore.Server.Model.Internal;
 using Grpc.Core;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
@@ -44,57 +45,12 @@ public static IEndpointConventionBuilder MapGrpcService<TService>(this IEndpoint
                 throw new ArgumentNullException(nameof(builder));
             }
 
-            return builder.MapGrpcService<TService>(configureOptions: null);
-        }
-
-        /// <summary>
-        /// Maps incoming requests to the specified <typeparamref name="TService"/> type.
-        /// </summary>
-        /// <typeparam name="TService">The service type to map requests to.</typeparam>
-        /// <param name="builder">The <see cref="IEndpointRouteBuilder"/> to add the route to.</param>
-        /// <param name="configureOptions">A callback to configure binding options.</param>
-        /// <returns>An <see cref="IEndpointConventionBuilder"/> for endpoints associated with the service.</returns>
-        public static IEndpointConventionBuilder MapGrpcService<TService>(this IEndpointRouteBuilder builder, Action<GrpcBindingOptions<TService>>? configureOptions) where TService : class
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
             ValidateServicesRegistered(builder.ServiceProvider);
 
-            var options = new GrpcBindingOptions<TService>();
-            options.BindAction = ReflectionBind;
-            options.ModelFactory = new ReflectionMethodModelFactory<TService>();
-
-            configureOptions?.Invoke(options);
-
-            var callHandlerFactory = builder.ServiceProvider.GetRequiredService<ServerCallHandlerFactory<TService>>();
-            var serviceMethodsRegistry = builder.ServiceProvider.GetRequiredService<ServiceMethodsRegistry>();
-            var loggerFactory = builder.ServiceProvider.GetRequiredService<ILoggerFactory>();
-
-            var serviceBinder = new GrpcServiceBinder<TService>(builder, options.ModelFactory, callHandlerFactory, serviceMethodsRegistry, loggerFactory);
-
-            try
-            {
-                options.BindAction(serviceBinder, null);
-            }
-            catch (Exception ex)
-            {
-                throw new InvalidOperationException($"Error binding gRPC service '{typeof(TService).Name}'.", ex);
-            }
-
-            serviceBinder.CreateUnimplementedEndpoints();
-
-            return new CompositeEndpointConventionBuilder(serviceBinder.EndpointConventionBuilders);
-        }
-
-        private static void ReflectionBind<TService>(ServiceBinderBase binder, TService service)
-        {
-            var bindMethodInfo = BindMethodFinder.GetBindMethod(typeof(TService));
+            var serviceRouteBuilder = builder.ServiceProvider.GetRequiredService<ServiceRouteBuilder<TService>>();
+            var endpointConventionBuilders = serviceRouteBuilder.Build(builder);
 
-            // Invoke BindService(ServiceBinderBase, BaseType)
-            bindMethodInfo.Invoke(null, new object?[] { binder, service });
+            return new CompositeEndpointConventionBuilder(endpointConventionBuilders);
         }
 
         private static void ValidateServicesRegistered(IServiceProvider serviceProvider)

src/Grpc.AspNetCore.Server/GrpcServiceExtensions.cs

@@ -19,6 +19,8 @@
 using System;
 using Grpc.AspNetCore.Server;
 using Grpc.AspNetCore.Server.Internal;
+using Grpc.AspNetCore.Server.Model;
+using Grpc.AspNetCore.Server.Model.Internal;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
 
@@ -63,11 +65,15 @@ public static IGrpcServerBuilder AddGrpc(this IServiceCollection services)
             services.AddRouting();
             services.AddOptions();
             services.TryAddSingleton<GrpcMarkerService>();
-            services.TryAddSingleton<ServiceMethodsRegistry>();
             services.TryAddSingleton(typeof(ServerCallHandlerFactory<>));
             services.TryAddScoped(typeof(IGrpcServiceActivator<>), typeof(DefaultGrpcServiceActivator<>));
             services.TryAddScoped(typeof(IGrpcInterceptorActivator<>), typeof(DefaultGrpcInterceptorActivator<>));
             services.TryAddEnumerable(ServiceDescriptor.Singleton<IConfigureOptions<GrpcServiceOptions>, GrpcServiceOptionsSetup>());
+            
+            // Model
+            services.TryAddSingleton<ServiceMethodsRegistry>();
+            services.TryAddSingleton(typeof(ServiceRouteBuilder<>));
+            services.TryAddEnumerable(ServiceDescriptor.Singleton(typeof(IServiceMethodProvider<>), typeof(BinderServiceMethodProvider<>)));
 
             return new GrpcServerBuilder(services);
         }

src/Grpc.AspNetCore.Server/Internal/CallHandlers/ClientStreamingServerCallHandler.cs

@@ -18,6 +18,7 @@
 
 using System;
 using System.Threading.Tasks;
+using Grpc.AspNetCore.Server.Model;
 using Grpc.Core;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;

src/Grpc.AspNetCore.Server/Internal/CallHandlers/DuplexStreamingServerCallHandler.cs

@@ -18,6 +18,7 @@
 
 using System;
 using System.Threading.Tasks;
+using Grpc.AspNetCore.Server.Model;
 using Grpc.Core;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;

src/Grpc.AspNetCore.Server/Internal/CallHandlers/ServerStreamingServerCallHandler.cs

@@ -18,6 +18,7 @@
 
 using System;
 using System.Threading.Tasks;
+using Grpc.AspNetCore.Server.Model;
 using Grpc.Core;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;

src/Grpc.AspNetCore.Server/Internal/CallHandlers/UnaryServerCallHandler.cs

@@ -18,6 +18,7 @@
 
 using System;
 using System.Threading.Tasks;
+using Grpc.AspNetCore.Server.Model;
 using Grpc.Core;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;