fix

Author: BrennanConroy

src/SignalR/server/Core/src/HubOptions.cs

@@ -56,7 +56,7 @@ public class HubOptions
 
         /// <summary>
         /// By default a client is only allowed to invoke a single Hub method at a time.
-        /// Changing this property will allow clients to invoke multiple invocations at the same time before queueing.
+        /// Changing this property will allow clients to invoke multiple methods at the same time before queueing.
         /// </summary>
         public int MaxParallelInvocationsPerClient
         {

src/SignalR/server/Core/src/Internal/DefaultHubDispatcher.cs

@@ -331,8 +331,19 @@ async Task ExecuteStreamInvocation()
                         {
                             cts = cts ?? CancellationTokenSource.CreateLinkedTokenSource(connection.ConnectionAborted);
                             connection.ActiveRequestCancellationSources.TryAdd(hubMethodInvocationMessage.InvocationId, cts);
+                            object result;
 
-                            var result = await ExecuteHubMethod(methodExecutor, hub, arguments, connection, scope.ServiceProvider);
+                            try
+                            {
+                                result = await ExecuteHubMethod(methodExecutor, hub, arguments, connection, scope.ServiceProvider);
+                            }
+                            catch (Exception ex)
+                            {
+                                Log.FailedInvokingHubMethod(_logger, hubMethodInvocationMessage.Target, ex);
+                                await SendInvocationError(hubMethodInvocationMessage.InvocationId, connection,
+                                    ErrorMessageHelper.BuildErrorMessage($"An unexpected error occurred invoking '{hubMethodInvocationMessage.Target}' on the server.", ex, _enableDetailedErrors));
+                                return;
+                            }
 
                             if (result == null)
                             {

src/SignalR/server/Core/src/Internal/SemaphoreSlimExtensions.cs

@@ -1,3 +1,6 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 using System;
 using System.Threading;
 using System.Threading.Tasks;

src/SignalR/server/SignalR/test/AddSignalRTests.cs

@@ -7,6 +7,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Connections;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.AspNetCore.SignalR.Internal;
 using Microsoft.AspNetCore.SignalR.Protocol;
 using Microsoft.Extensions.DependencyInjection;
@@ -78,11 +79,15 @@ public void HubSpecificOptionsDoNotAffectGlobalHubOptions()
             serviceCollection.AddSignalR().AddHubOptions<CustomHub>(options =>
             {
                 options.SupportedProtocols.Clear();
+                options.AddFilter(new CustomHubFilter());
             });
 
             var serviceProvider = serviceCollection.BuildServiceProvider();
             Assert.Equal(1, serviceProvider.GetRequiredService<IOptions<HubOptions>>().Value.SupportedProtocols.Count);
             Assert.Equal(0, serviceProvider.GetRequiredService<IOptions<HubOptions<CustomHub>>>().Value.SupportedProtocols.Count);
+
+            Assert.Null(serviceProvider.GetRequiredService<IOptions<HubOptions>>().Value.HubFilters);
+            Assert.Single(serviceProvider.GetRequiredService<IOptions<HubOptions<CustomHub>>>().Value.HubFilters);
         }
 
         [Fact]
@@ -342,6 +347,14 @@ public void WriteMessage(HubMessage message, IBufferWriter<byte> output)
             throw new NotImplementedException();
         }
     }
+
+    internal class CustomHubFilter : IHubFilter
+    {
+        public ValueTask<object> InvokeMethodAsync(HubInvocationContext invocationContext, Func<HubInvocationContext, ValueTask<object>> next)
+        {
+            throw new NotImplementedException();
+        }
+    }
 }
 
 namespace Microsoft.AspNetCore.SignalR.Internal

src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs

@@ -2794,7 +2794,6 @@ public async Task ConnectionTimesOutIfInitialPingAndThenNoMessages()
                     var connectionHandlerTask = await client.ConnectAsync(connectionHandler);
                     await client.Connected.OrTimeout();
                     await client.SendHubMessageAsync(PingMessage.Instance);
-                    await client.InvokeAsync(nameof(MethodHub.ValueMethod));
 
                     clock.UtcNow = clock.UtcNow.AddMilliseconds(timeout + 1);
                     client.TickHeartbeat();
@@ -2945,7 +2944,7 @@ public async Task HubMethodInvokeDoesNotCountTowardsClientTimeout()
 
                     // Invoke another hub method (which will be blocked by the first method) in order to stop the timeout
                     // This is how a real-world example would behave
-                    await client.SendInvocationAsync(nameof(LongRunningHub.LongRunningMethod));
+                    await client.SendInvocationAsync(nameof(LongRunningHub.LongRunningMethod)).OrTimeout();
 
                     // Tick heartbeat while hub method is running to show that close isn't triggered
                     client.TickHeartbeat();