connection reroute test cases

Author: terencefan

.editorconfig

@@ -51,7 +51,7 @@ csharp_new_line_before_members_in_object_initializers = true
 csharp_new_line_before_members_in_anonymous_types = true
 
 # Namespace settings
-csharp_style_namespace_declarations = file_scoped:silent
+csharp_style_namespace_declarations = file_scoped:error
 
 # Brace settings
 csharp_prefer_braces = true:silent# Prefer curly braces even for one line of code
@@ -102,6 +102,7 @@ csharp_prefer_simple_default_expression = true:suggestion
 csharp_style_prefer_local_over_anonymous_function = true:suggestion
 csharp_style_prefer_index_operator = true:suggestion
 csharp_style_prefer_range_operator = true:suggestion
+csharp_space_around_binary_operators = before_and_after
 
 [*.{xml,config,*proj,nuspec,props,resx,targets,yml,tasks}]
 indent_size = 2

samples/ChatSample/ChatSample.Net70/Program.cs

@@ -1,4 +1,8 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
 using ClientResultSample;
+
 using Microsoft.AspNetCore.SignalR;
 
 var builder = WebApplication.CreateBuilder(args);

src/Microsoft.Azure.SignalR.AspNet/ServerConnections/ServiceConnection.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
@@ -10,6 +10,7 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+
 using Microsoft.AspNetCore.Connections;
 using Microsoft.Azure.SignalR.Protocol;
 using Microsoft.Extensions.Logging;
@@ -21,13 +22,13 @@ internal partial class ServiceConnection : ServiceConnectionBase
 {
     private const string ReconnectMessage = "asrs:reconnect";
 
-    private static readonly Dictionary<string, string> CustomHeader = new Dictionary<string, string>
-        {{Constants.AsrsUserAgent, ProductInfo.GetProductInfo()}};
+    private static readonly Dictionary<string, string> CustomHeader = new() {
+        {Constants.AsrsUserAgent, ProductInfo.GetProductInfo()}
+    };
 
     private static readonly TimeSpan CloseApplicationTimeout = TimeSpan.FromSeconds(5);
 
-    private readonly ConcurrentDictionary<string, ClientConnectionContext> _clientConnections =
-        new ConcurrentDictionary<string, ClientConnectionContext>(StringComparer.Ordinal);
+    private readonly ConcurrentDictionary<string, ClientConnectionContext> _clientConnections = new(StringComparer.Ordinal);
 
     private readonly IConnectionFactory _connectionFactory;
 
@@ -75,6 +76,11 @@ public override bool TryRemoveClientConnection(string connectionId, out IClientC
         return r;
     }
 
+    public override Task CloseClientConnections(CancellationToken token)
+    {
+        throw new NotSupportedException();
+    }
+
     protected override Task<ConnectionContext> CreateConnection(string target = null)
     {
         return _connectionFactory.ConnectAsync(HubEndpoint, TransferFormat.Binary, ConnectionId, target,
@@ -97,11 +103,6 @@ protected override Task CleanupClientConnections(string fromInstanceId = null)
         return Task.CompletedTask;
     }
 
-    public override Task CloseClientConnections(CancellationToken token)
-    {
-        throw new NotSupportedException();
-    }
-
     protected override Task OnClientConnectedAsync(OpenConnectionMessage openConnectionMessage)
     {
         // Create empty transport with only channel for async processing messages

src/Microsoft.Azure.SignalR.Common/ClientInvocation/DummyClientInvocationManager.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
@@ -8,13 +8,14 @@ namespace Microsoft.Azure.SignalR
     internal sealed class DummyClientInvocationManager : IClientInvocationManager
     {
         public ICallerClientResultsManager Caller => throw new NotSupportedException();
+
         public IRoutedClientResultsManager Router => throw new NotSupportedException();
 
         public DummyClientInvocationManager()
         {
         }
 
-        public void CleanupInvocationsByConnection(string connectionId) => throw new NotSupportedException();
+        public void CleanupInvocationsByConnection(string connectionId) { }
 
         public bool TryGetInvocationReturnType(string invocationId, out Type type) => throw new NotSupportedException();
     }

src/Microsoft.Azure.SignalR.Common/Constants.cs

@@ -167,4 +167,4 @@ public static class HttpClientNames
 
         public const string InternalDefault = "InternalDefault";
     }
-}
+}

src/Microsoft.Azure.SignalR.Common/DefaultHeaderProvider.cs

@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+
+namespace Microsoft.Azure.SignalR;
+
+internal class DefaultHeaderProvider : ICustomHeaderProvider
+{
+    public IEnumerable<(string key, string val)> Headers => [];
+}

src/Microsoft.Azure.SignalR.Common/DefaultServerNameProvider.cs

@@ -1,16 +1,16 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
 
-namespace Microsoft.Azure.SignalR
+namespace Microsoft.Azure.SignalR;
+
+internal class DefaultServerNameProvider : IServerNameProvider
 {
-    internal class DefaultServerNameProvider : IServerNameProvider
+    private readonly string _name = $"{Environment.MachineName}_{Guid.NewGuid():N}";
+
+    public string GetName()
     {
-        private readonly string _name = $"{Environment.MachineName}_{Guid.NewGuid():N}";
-        public string GetName()
-        {
-            return _name;
-        }
+        return _name;
     }
 }

src/Microsoft.Azure.SignalR.Common/Interfaces/ICustomHeaderProvider.cs

@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections.Generic;
+
+namespace Microsoft.Azure.SignalR;
+
+internal interface ICustomHeaderProvider
+{
+    IEnumerable<(string key, string val)> Headers { get; }
+}

src/Microsoft.Azure.SignalR.Common/Microsoft.Azure.SignalR.Common.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <LangVersion>11</LangVersion>
+    <LangVersion>12.0</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup>

src/Microsoft.Azure.SignalR.Common/ServiceConnections/ConnectionFactory.cs

@@ -1,27 +1,23 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
+
 using Microsoft.AspNetCore.Connections;
 using Microsoft.Extensions.Logging;
 
 namespace Microsoft.Azure.SignalR;
 
-internal class ConnectionFactory : IConnectionFactory
+internal class ConnectionFactory(IServerNameProvider nameProvider,
+                                 ILoggerFactory loggerFactory) : IConnectionFactory
 {
-    private readonly ILoggerFactory _loggerFactory;
-
-    private readonly string _serverId;
+    private readonly ILoggerFactory _loggerFactory = loggerFactory != null ? new GracefulLoggerFactory(loggerFactory) : throw new ArgumentNullException(nameof(loggerFactory));
 
-    public ConnectionFactory(IServerNameProvider nameProvider, ILoggerFactory loggerFactory)
-    {
-        _loggerFactory = loggerFactory != null ? new GracefulLoggerFactory(loggerFactory) : throw new ArgumentNullException(nameof(loggerFactory));
-        _serverId = nameProvider?.GetName();
-    }
+    private readonly string _serverId = nameProvider?.GetName();
 
     public async Task<ConnectionContext> ConnectAsync(HubServiceEndpoint hubServiceEndpoint,
                                                       TransferFormat transferFormat,