standardize some handling of name parts (don't always use Namespace from contract type)

Author: mgravell

src/protobuf-net.Grpc.AspNetCore/ServicesExtensions.cs

@@ -26,6 +26,7 @@ public static IGrpcServerBuilder AddCodeFirstGrpc(this IServiceCollection servic
         {
             var builder = configureOptions == null ? services.AddGrpc() : services.AddGrpc(configureOptions);
             services.TryAddEnumerable(ServiceDescriptor.Singleton(typeof(IServiceMethodProvider<>), typeof(CodeFirstServiceMethodProvider<>)));
+            services.TryAddSingleton(SimpleRpcExceptionsInterceptor.Instance);
             return builder;
         }
 

src/protobuf-net.Grpc.Reflection/FileDescriptorSetFactory.cs

@@ -9,6 +9,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Runtime.InteropServices;
 
 namespace ProtoBuf.Grpc.Reflection
 {
@@ -40,34 +41,38 @@ private static void Populate(FileDescriptorSet fileDescriptorSet, Type serviceTy
 
                 var serviceDescriptor = new ServiceDescriptorProto
                 {
-                    Name = serviceName!.Split('.').Last()
+                    Name = ServiceBinder.GetNameParts(serviceName, serviceType, out var package),
                 };
 
                 var dependencies = new HashSet<string>();
                 foreach (var op in ContractOperation.FindOperations(binderConfiguration, serviceContract, null))
                 {
                     // TODO: Validate op
-                    serviceDescriptor.Methods.Add(new MethodDescriptorProto
+                    if (TryGetType(binderConfiguration, op.From, fileDescriptorSet, out var inputType, out var inputFile)
+                        && TryGetType(binderConfiguration, op.From, fileDescriptorSet, out var outputType, out var outputFile))
                     {
-                        Name = op.Name,
-                        InputType = GetType(binderConfiguration, op.From, fileDescriptorSet, out string? inputFile),
-                        OutputType = GetType(binderConfiguration, op.To, fileDescriptorSet, out string? outputFile),
-                        ClientStreaming = op.MethodType == MethodType.ClientStreaming ||
-                                          op.MethodType == MethodType.DuplexStreaming,
-                        ServerStreaming = op.MethodType == MethodType.ServerStreaming ||
-                                          op.MethodType == MethodType.DuplexStreaming
-                    });
-
-                    dependencies.Add(inputFile);
-                    dependencies.Add(outputFile);
+                        serviceDescriptor.Methods.Add(new MethodDescriptorProto
+                        {
+                            Name = op.Name,
+                            InputType = inputType,
+                            OutputType = outputType,
+                            ClientStreaming = op.MethodType == MethodType.ClientStreaming ||
+                                              op.MethodType == MethodType.DuplexStreaming,
+                            ServerStreaming = op.MethodType == MethodType.ServerStreaming ||
+                                              op.MethodType == MethodType.DuplexStreaming
+                        });
+
+                        dependencies.Add(inputFile);
+                        dependencies.Add(outputFile);
+                    }
                 }
 
                 var fileDescriptor = new FileDescriptorProto
                 {
                     Name = serviceName + ".proto",
                     Services = { serviceDescriptor },
                     Syntax = "proto3",
-                    Package = serviceContract.Namespace
+                    Package = package
                 };
 
                 foreach (var dependency in dependencies)
@@ -80,7 +85,7 @@ private static void Populate(FileDescriptorSet fileDescriptorSet, Type serviceTy
             }
         }
 
-        private static string GetType(BinderConfiguration binderConfiguration, Type type, FileDescriptorSet fileDescriptorSet, out string descriptorProto)
+        private static bool TryGetType(BinderConfiguration binderConfiguration, Type type, FileDescriptorSet fileDescriptorSet, out string fullyQualifiedName, out string descriptorProto)
         {
             var typeName = type.Name;
             var fileName = type.FullName + ".proto";
@@ -95,13 +100,23 @@ private static string GetType(BinderConfiguration binderConfiguration, Type type
                 using var reader = new StringReader(schema);
 
                 fileDescriptorSet.Add(fileName, includeInOutput: true, reader);
-                fileDescriptor = fileDescriptorSet.Files.Single(f => f.Name.Equals(fileName, StringComparison.Ordinal));
+                fileDescriptor = fileDescriptorSet.Files.SingleOrDefault(f => f.Name.Equals(fileName, StringComparison.Ordinal));
+                if (fileDescriptor is null)
+                {
+                    fullyQualifiedName = descriptorProto = "";
+                    return false;
+                }
             }
 
+            var msgType = fileDescriptor.MessageTypes.SingleOrDefault(m => m.Name.Equals(typeName, StringComparison.OrdinalIgnoreCase));
+            if (msgType is null)
+            {
+                fullyQualifiedName = descriptorProto = "";
+                return false;
+            }
             descriptorProto = fileDescriptor.Name;
-
-            return "." + fileDescriptor.Package + "." + fileDescriptor.MessageTypes
-                .Single(m => m.Name.Equals(typeName, StringComparison.OrdinalIgnoreCase)).Name;
+            fullyQualifiedName = "." + fileDescriptor.Package + "." + msgType.Name;
+            return true;
         }
     }
 }

src/protobuf-net.Grpc.Reflection/SchemaGenerator.cs

@@ -42,13 +42,7 @@ public string GetSchema(Type contractType)
                 throw new ArgumentException($"Type '{contractType.Name}' is not a service contract", nameof(contractType));
             }
 
-            string package = "";
-            var idx = name!.LastIndexOf('.');
-            if (idx >= 0)
-            {
-                package = name.Substring(0, idx);
-                name = name.Substring(idx + 1);
-            }
+            name = ServiceBinder.GetNameParts(name, contractType, out var package);
             var service = new Service
             {
                 Name = name

src/protobuf-net.Grpc/Configuration/ServiceBinder.cs

@@ -69,6 +69,19 @@ protected virtual string GetDefaultName(MethodInfo method)
             return opName ?? "";
         }
 
+        internal static string GetNameParts(string? declaredName, Type? type, out string package)
+        {
+            declaredName ??= "";
+            var idx = declaredName.LastIndexOf('.');
+            if (idx >= 0)
+            {
+                package = declaredName.Substring(0, idx);
+                return declaredName.Substring(idx + 1);
+            }
+            package = type?.Namespace ?? "";
+            return declaredName;
+        }
+
         /// <summary>
         /// Indicates whether an interface should be considered a service-contract (and if so: by what name)
         /// </summary>