Merge branch 'main' of github.com:protobuf-net/protobuf-net.Grpc into main

Author: mgravell

docs/index.md

@@ -6,6 +6,7 @@
 - [Build Tools ("code-first" focus)](https://protobuf-net.github.io/protobuf-net/build_tools)
 - [Build Tools ("contract-first" focus)](https://protobuf-net.github.io/protobuf-net/contract_first)
 - [Create Proto File](createProtoFile)
+- [Register Client Service in Startup.cs](registerClientService)
 
 Other Content
 

docs/registerClientService.md

@@ -0,0 +1,60 @@
+# Register Client Service
+
+## What is it?
+
+> Client service lets you to inject Grpc client dependency to your controllers.
+
+## Register client service
+
+``` c#
+public void ConfigureServices(IServiceCollection services)
+{
+    // other service setup above ...
+
+    //this registers ICalculator Grpc client service
+    services.AddCodeFirstGrpcClient<ICalculator>(o => {
+        
+        // Address of grpc server
+        o.Address = new Uri(Configuration.GetValue<string>("https://localhost:5001"));
+        
+        // another channel options (based on best practices docs on https://docs.microsoft.com/en-us/aspnet/core/grpc/performance?view=aspnetcore-6.0)
+        o.ChannelOptionsActions.Add(options =>
+        {
+            options.HttpHandler = new SocketsHttpHandler()
+            {
+                // keeps connection alive
+                PooledConnectionIdleTimeout = Timeout.InfiniteTimeSpan,
+                KeepAlivePingDelay = TimeSpan.FromSeconds(60),
+                KeepAlivePingTimeout = TimeSpan.FromSeconds(30),
+                
+                // allows channel to add additional HTTP/2 connections
+                EnableMultipleHttp2Connections = true
+            };
+        });
+    });
+}
+```
+
+## How use it?
+
+Then in your controller you can use the registered dependency.
+
+``` c#
+public class GrpcController : Controller
+{
+    private readonly ICalculator _calculatorClient;
+    public GrpcController(ICalculator calculatorClient)
+    {
+        _calculatorClient = calculatorClient;
+    }
+    
+    //otestovat
+    public async Task<int> Multiply(int x, int y)
+    {
+        
+        var result = await _calculatorClient.MultiplyAsync(new MultiplyRequest { X = x, Y = y });
+
+        return result;
+    }
+}
+```

nuget.config

@@ -4,6 +4,6 @@
     <!--To inherit the global NuGet package sources remove the <clear/> line below -->
     <clear />
     <add key="nuget" value="https://api.nuget.org/v3/index.json" />
-    <add key="myget" value="https://www.myget.org/F/protobuf-net/api/v3/index.json " />
+    <add key="myget" value="https://www.myget.org/F/protobuf-net/api/v3/index.json" />
   </packageSources>
 </configuration>

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

@@ -1,7 +1,8 @@
-using System;
+using ProtoBuf.Grpc.Internal;
+using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Reflection;
-using ProtoBuf.Grpc.Internal;
 
 namespace ProtoBuf.Grpc.Configuration
 {
@@ -19,13 +20,14 @@ public class ServiceBinder
         /// </summary>
         protected ServiceBinder() { }
 
-        private readonly Dictionary<Type, InterfaceMapping> _map = new Dictionary<Type, InterfaceMapping>();
-        private InterfaceMapping GetMap(Type contractType, Type serviceType)
+        private static readonly ConcurrentDictionary<Type, InterfaceMapping> s_map = new ConcurrentDictionary<Type, InterfaceMapping>();
+        private static InterfaceMapping GetMap(Type contractType, Type serviceType)
         {
-            if (!_map.TryGetValue(contractType, out var interfaceMapping))
-            {
+            if (!s_map.TryGetValue(contractType, out var interfaceMapping))
+            {   // note: it doesn't matter if this ends up getting called more than once
+                // in a race condition - we don't need to block etc (the result will be compatible)
                 interfaceMapping = serviceType.GetInterfaceMap(contractType);
-                _map[contractType] = interfaceMapping;
+                s_map[contractType] = interfaceMapping;
             }
             return interfaceMapping;
         }

tests/protobuf-net.Grpc.Test.Integration/GrpcServiceTests.cs

@@ -291,7 +291,7 @@ public void CanCallAllApplyServicesTypedUnarySync()
         }
 
         [Fact]
-        public void CanCallAdocService()
+        public void CanCallAdhocService()
         {
             GrpcClientFactory.AllowUnencryptedHttp2 = true;
             using var http = GrpcChannel.ForAddress($"http://localhost:{Port}");
@@ -318,4 +318,4 @@ public async Task CanCallInterceptedService()
         }
     }
 }
-#endif
+#endif