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/DefaultServerNameProvider.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,6 +8,7 @@ namespace Microsoft.Azure.SignalR
     internal class DefaultServerNameProvider : IServerNameProvider
     {
         private readonly string _name = $"{Environment.MachineName}_{Guid.NewGuid():N}";
+
         public string GetName()
         {
             return _name;

src/Microsoft.Azure.SignalR.Common/ServiceConnections/ServiceConnectionBase.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;
@@ -449,6 +449,7 @@ private Task ResumeClientConnectionAsync(IClientConnection clientConnection)
         {
             serviceConnection.TryRemoveClientConnection(clientConnection.ConnectionId, out _);
         }
+
         if (TryAddClientConnection(clientConnection))
         {
             clientConnection.ServiceConnection = this;

src/Microsoft.Azure.SignalR.Management/ManagementConnectionFactory.cs

@@ -1,26 +1,27 @@
-// 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.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+
 using Microsoft.AspNetCore.Connections;
 using Microsoft.Extensions.Options;
 
 namespace Microsoft.Azure.SignalR.Management
 {
-    internal class ManagementConnectionFactory : IConnectionFactory
+    internal class ManagementConnectionFactory(IOptions<ServiceManagerOptions> context,
+                                               ConnectionFactory connectionFactory) : IConnectionFactory
     {
-        private readonly string _productInfo;
-        private readonly ConnectionFactory _connectionFactory;
-
-        public ManagementConnectionFactory(IOptions<ServiceManagerOptions> context, ConnectionFactory connectionFactory)
-        {
-            _productInfo = context.Value.ProductInfo;
-            _connectionFactory = connectionFactory;
-        }
+        private readonly string _productInfo = context.Value.ProductInfo;
+        private readonly ConnectionFactory _connectionFactory = connectionFactory;
 
-        public Task<ConnectionContext> ConnectAsync(HubServiceEndpoint endpoint, TransferFormat transferFormat, string connectionId, string target, CancellationToken cancellationToken = default, IDictionary<string, string> headers = null)
+        public Task<ConnectionContext> ConnectAsync(HubServiceEndpoint endpoint,
+                                                    TransferFormat transferFormat,
+                                                    string connectionId,
+                                                    string target,
+                                                    CancellationToken cancellationToken = default,
+                                                    IDictionary<string, string> headers = null)
         {
             if (headers == null)
             {

src/Microsoft.Azure.SignalR/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;
@@ -8,6 +8,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.SignalR;
@@ -27,16 +28,17 @@ internal partial class ServiceConnection : ServiceConnectionBase
 
     // Fix issue: https://github.com/Azure/azure-signalr/issues/198
     // .NET Framework has restriction about reserved string as the header name like "User-Agent"
-    private static readonly Dictionary<string, string> CustomHeader = new Dictionary<string, string> { { Constants.AsrsUserAgent, ProductInfo.GetProductInfo() } };
+    private readonly Dictionary<string, string> _customHeader = new() {
+        { Constants.AsrsUserAgent, ProductInfo.GetProductInfo() }
+    };
 
     private readonly IConnectionFactory _connectionFactory;
 
     private readonly IClientConnectionFactory _clientConnectionFactory;
 
     private readonly IClientConnectionManager _clientConnectionManager;
 
-    private readonly ConcurrentDictionary<string, string> _connectionIds =
-        new ConcurrentDictionary<string, string>(StringComparer.Ordinal);
+    private readonly ConcurrentDictionary<string, string> _connectionIds = new(StringComparer.Ordinal);
 
     private readonly string[] _pingMessages =
         new string[4] { ClientConnectionCountInHub, null, ClientConnectionCountInServiceConnection, null };
@@ -85,6 +87,11 @@ public ServiceConnection(IServiceProtocol serviceProtocol,
         _hubProtocolResolver = hubProtocolResolver;
     }
 
+    public void SetCustomHeader(string key, string val)
+    {
+        _customHeader[key] = val;
+    }
+
     public override bool TryAddClientConnection(IClientConnection connection)
     {
         var r = _clientConnectionManager.TryAddClientConnection(connection);
@@ -102,16 +109,6 @@ public override bool TryRemoveClientConnection(string connectionId, out IClientC
         return r;
     }
 
-    protected override Task<ConnectionContext> CreateConnection(string target = null)
-    {
-        return _connectionFactory.ConnectAsync(HubEndpoint, TransferFormat.Binary, ConnectionId, target, headers: CustomHeader);
-    }
-
-    protected override Task DisposeConnection(ConnectionContext connection)
-    {
-        return _connectionFactory.DisposeAsync(connection);
-    }
-
     public override async Task CloseClientConnections(CancellationToken token)
     {
         var tasks = new List<Task>();
@@ -137,6 +134,16 @@ public override async Task CloseClientConnections(CancellationToken token)
         }
     }
 
+    protected override Task<ConnectionContext> CreateConnection(string target = null)
+    {
+        return _connectionFactory.ConnectAsync(HubEndpoint, TransferFormat.Binary, ConnectionId, target, headers: _customHeader);
+    }
+
+    protected override Task DisposeConnection(ConnectionContext connection)
+    {
+        return _connectionFactory.DisposeAsync(connection);
+    }
+
     protected override Task CleanupClientConnections(string fromInstanceId = null)
     {
         // To gracefully complete client connections, let the client itself owns the connection lifetime
@@ -386,5 +393,4 @@ private Task OnConnectionReconnectAsync(ConnectionReconnectMessage message)
         }
         return Task.CompletedTask;
     }
-
 }

src/Microsoft.Azure.SignalR/ServerConnections/ServiceConnectionFactory.cs

@@ -1,4 +1,8 @@
-using System;
+// 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 Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.SignalR;
@@ -59,7 +63,10 @@ public ServiceConnectionFactory(
         _hubProtocolResolver = hubProtocolResolver;
     }
 
-    public virtual IServiceConnection Create(HubServiceEndpoint endpoint, IServiceMessageHandler serviceMessageHandler, AckHandler ackHandler, ServiceConnectionType type)
+    public virtual IServiceConnection Create(HubServiceEndpoint endpoint,
+                                             IServiceMessageHandler serviceMessageHandler,
+                                             AckHandler ackHandler,
+                                             ServiceConnectionType type)
     {
         return new ServiceConnection(
             _serviceProtocol,