Merge pull request #130 from JRWinter1/bugfix/hub-name

Adds HubUtility to resolve hub names.

Author: galvesribeiro

Diff for: src/SignalR.Orleans/Core/GrainExtensions.cs

@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.AspNetCore.SignalR.Protocol;
 using Orleans.Concurrency;
 using SignalR.Orleans.Core;
@@ -37,7 +38,7 @@ public static void SendOneWay(this IHubMessageInvoker grain, string methodName,
 
     public static class GrainFactoryExtensions
     {
-        public static HubContext<THub> GetHub<THub>(this IGrainFactory grainFactory)
+        public static HubContext<THub> GetHub<THub>(this IGrainFactory grainFactory) where THub : Hub
         {
             return new HubContext<THub>(grainFactory);
         }

Diff for: src/SignalR.Orleans/Core/HubContext.cs

@@ -1,22 +1,20 @@
-using Orleans;
+using Microsoft.AspNetCore.SignalR;
+using Orleans;
 using SignalR.Orleans.Users;
 using SignalR.Orleans.Groups;
 using SignalR.Orleans.Clients;
 
 namespace SignalR.Orleans.Core
 {
-    public class HubContext<THub>
+    public class HubContext<THub> where THub : Hub
     {
         private readonly IGrainFactory _grainFactory;
         private readonly string _hubName;
 
         public HubContext(IGrainFactory grainFactory)
         {
             _grainFactory = grainFactory;
-            var hubType = typeof(THub);
-            _hubName = hubType.IsInterface && hubType.Name.StartsWith("I")
-                ? hubType.Name[1..]
-                : hubType.Name;
+            _hubName = HubUtility.GetHubName<THub>();
         }
 
         public IClientGrain Client(string connectionId) => _grainFactory.GetClientGrain(_hubName, connectionId);

Diff for: src/SignalR.Orleans/HubUtility.cs

@@ -0,0 +1,11 @@
+using Microsoft.AspNetCore.SignalR;
+
+namespace SignalR.Orleans;
+
+internal static class HubUtility
+{
+    internal static string GetHubName<THub>() where THub : Hub
+    {
+        return typeof(THub).Name;
+    }
+}

Diff for: src/SignalR.Orleans/OrleansHubLifetimeManager.cs

@@ -34,11 +34,7 @@ public OrleansHubLifetimeManager(
             IClusterClientProvider clusterClientProvider
         )
         {
-            var hubType = typeof(THub).BaseType?.GenericTypeArguments.FirstOrDefault() ?? typeof(THub);
-            var name = hubType.Name.AsSpan();
-            _hubName = hubType.IsInterface && name[0] == 'I'
-                ? new string(name.Slice(1))
-                : hubType.Name;
+            _hubName = HubUtility.GetHubName<THub>();
             _serverId = Guid.NewGuid();
             _logger = logger;
             _clusterClientProvider = clusterClientProvider;

Diff for: test/SignalR.Orleans.Tests/HubUtilityTests.cs

@@ -0,0 +1,36 @@
+using Microsoft.AspNetCore.SignalR;
+using Xunit;
+
+namespace SignalR.Orleans.Tests
+{
+    public class HubUtilityTests
+    {
+        [Fact]
+        public void GivenAWeaklyTypedHub_WhenGetHubName_ThenReturnsHubName()
+        {
+            var result = HubUtility.GetHubName<MyWeaklyTypedHub>();
+
+            Assert.Equal("MyWeaklyTypedHub", result);
+        }
+
+        [Fact]
+        public void GivenAStronglyTypedHub_WhenGetHubName_ThenReturnsHubName()
+        {
+            var result = HubUtility.GetHubName<MyStronglyTypedHub>();
+
+            Assert.Equal("MyStronglyTypedHub", result);
+        }
+
+        private class MyWeaklyTypedHub : Hub
+        {
+        }
+
+        private interface IHubClient
+        {
+        }
+
+        private class MyStronglyTypedHub : Hub<IHubClient>
+        {
+        }
+    }
+}