Add main logic for Client Invocation

build/dependencies.props

@@ -8,6 +8,7 @@
     <MicrosoftAspNetCoreHttpConnectionsClientPackage3_0Version>3.0.0</MicrosoftAspNetCoreHttpConnectionsClientPackage3_0Version>
     <MicrosoftAspNetCoreHttpConnectionsClientPackage3_1Version>3.1.9</MicrosoftAspNetCoreHttpConnectionsClientPackage3_1Version>
     <MicrosoftAspNetCoreHttpConnectionsClientPackage5_0Version>5.0.1</MicrosoftAspNetCoreHttpConnectionsClientPackage5_0Version>
+    <MicrosoftAspNetCoreHttpConnectionsClientPackage7_0Version>7.0.0-preview.7.22376.6</MicrosoftAspNetCoreHttpConnectionsClientPackage7_0Version>
     <MicrosoftAspNetCoreHttpConnectionsCommonPackageVersion>1.0.4</MicrosoftAspNetCoreHttpConnectionsCommonPackageVersion>
     <MicrosoftAspNetCoreHttpConnectionsCommonPackage3_0Version>3.0.0</MicrosoftAspNetCoreHttpConnectionsCommonPackage3_0Version>
     <MicrosoftAspNetCoreHttpConnectionsCommonPackage3_1Version>3.1.9</MicrosoftAspNetCoreHttpConnectionsCommonPackage3_1Version>

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

@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.AspNetCore.SignalR;
+
+namespace Microsoft.Azure.SignalR
+{
+    internal class ClientInvocationManager
+    {
+        public IClientResultsManager Caller => _clientResultsManager;
+        public IRoutedClientResultsManager Router => _routedClientResultsManager;
+
+        private readonly IClientResultsManager _clientResultsManager;
+        private readonly IRoutedClientResultsManager _routedClientResultsManager;
+
+        public ClientInvocationManager(IHubProtocolResolver hubProtocolResolver)
+        {
+            _clientResultsManager = new ClientResultsManager(hubProtocolResolver);
+            _routedClientResultsManager = new RoutedClientResultsManager();
+        }
+    }
+}

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

@@ -0,0 +1,75 @@
+// 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.Buffers;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using Microsoft.Azure.SignalR.Protocol;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.AspNetCore.SignalR.Protocol;
+
+namespace Microsoft.Azure.SignalR
+{
+    internal class ClientResultsManager : IClientResultsManager, IInvocationBinder
+    {
+        public ClientResultsManager(IHubProtocolResolver hubProtocolResolver)
+        {
+            throw new NotImplementedException();
+        }
+
+        public string GetNewInvocationId(string connectionId, string serverGUID)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<T> AddInvocation<T>(string connectionId, string invocationId, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AddServiceMappingMessage(string invocationId, ServiceMappingMessage serviceMappingMessage)
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool TryRemoveInvocation(string invocationId, out PendingInvocation invocation)
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool TryCompleteResult(string connectionId, CompletionMessage message)
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool TryCompleteResultFromSerializedMessage(string connectionId, string protocol, ReadOnlySequence<byte> message)
+        {
+            throw new NotImplementedException();
+        }
+
+        // Implemented for interface `IInvocationBinder`
+        public Type GetReturnType(string invocationId)
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool TryGetInvocationReturnType(string invocationId, out Type type)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void CleanupInvocations(string instanceId)
+        {
+            throw new NotImplementedException();
+        }
+
+        // Unused, here to honor the IInvocationBinder interface but should never be called
+        public IReadOnlyList<Type> GetParameterTypes(string methodName) => throw new NotImplementedException();
+
+        // Unused, here to honor the IInvocationBinder interface but should never be called
+        public Type GetStreamItemType(string streamId) => throw new NotImplementedException();
+#pragma warning restore IDE0060 // Remove unused parameter
+    }
+}

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

@@ -0,0 +1,42 @@
+// 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.Buffers;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Azure.SignalR.Protocol;
+using Microsoft.AspNetCore.SignalR.Protocol;
+
+namespace Microsoft.Azure.SignalR
+{
+    internal interface IClientResultsManager
+    {
+        string GetNewInvocationId(string connectionId, string serverGUID);
+
+        Task<T> AddInvocation<T>(string connectionId, string invocationId, CancellationToken cancellationToken);
+
+        void AddServiceMappingMessage(string invocationId, ServiceMappingMessage serviceMappingMessage);
+
+        bool TryRemoveInvocation(string invocationId, out PendingInvocation invocation);
+
+        bool TryCompleteResult(string connectionId, CompletionMessage message);
+
+        /// <summary>
+        /// Try complete from <paramref name="message"/> which is serialized from a <see cref="CompletionMessage"/> in <paramref name="protocol"/>
+        /// </summary>
+        /// <param name="connectionId"></param>
+        /// <param name="protocol">Serialization protocol of <paramref name="message"/></param>
+        /// <param name="message">the seriazliation result of a <see cref="CompletionMessage"/></param>
+        /// <returns></returns>
+        bool TryCompleteResultFromSerializedMessage(string connectionId, string protocol, ReadOnlySequence<byte> message);
+
+        bool TryGetInvocationReturnType(string invocationId, out Type type);
+
+        void CleanupInvocations(string instanceId);
+    }
+
+    internal record PendingInvocation(Type Type, string ConnectionId, object Tcs, Action<object, CompletionMessage> Complete)
+    {
+    }
+}

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

@@ -0,0 +1,27 @@
+// 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.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.SignalR.Protocol;
+
+namespace Microsoft.Azure.SignalR
+{
+    internal interface IRoutedClientResultsManager
+    {
+        Task<object> AddRoutedInvocation(string connectionId, string invocationId, string callerServerId, CancellationToken cancellationToken);
+
+        bool TryCompleteResult(string connectionId, CompletionMessage message);
+
+        bool TryGetRoutedInvocation(string invocationId, out RoutedInvocation routedInvocation);
+
+        bool TryGetInvocationReturnType(string invocationId, out Type type);
+
+        void CleanupInvocations(string instanceId);
+    }
+
+    internal record RoutedInvocation(string ConnectionId, string CallerServerId, object Tcs, Action<object, CompletionMessage> Complete)
+    {
+    }
+}

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

@@ -0,0 +1,38 @@
+// 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.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.SignalR.Protocol;
+
+namespace Microsoft.Azure.SignalR
+{
+    internal class RoutedClientResultsManager : IRoutedClientResultsManager
+    {
+        public Task<object> AddRoutedInvocation(string connectionId, string invocationId, string callerServerId, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool TryCompleteResult(string connectionId, CompletionMessage message)
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool TryGetRoutedInvocation(string invocationId, out RoutedInvocation routedInvocation)
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool TryGetInvocationReturnType(string invocationId, out Type type)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void CleanupInvocations(string instanceId)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

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

@@ -5,13 +5,33 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0;net7.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Azure.SignalR.Protocols\Microsoft.Azure.SignalR.Protocols.csproj" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0'">
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Connections.Client" Version="$(MicrosoftAspNetCoreHttpConnectionsClientPackage7_0Version)" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0'">
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Connections.Client" Version="$(MicrosoftAspNetCoreHttpConnectionsClientPackage5_0Version)" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0'">
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Connections.Client" Version="$(MicrosoftAspNetCoreHttpConnectionsClientPackage3_0Version)" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="$(MicrosoftAspNetCoreSignalRPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Connections.Client" Version="$(MicrosoftAspNetCoreHttpConnectionsClientPackageVersion)" />
+  </ItemGroup>
+
   <!-- New packages should be added to Directory.Build.props! -->
-</Project>
+</Project>

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

@@ -50,6 +50,8 @@ internal abstract class ServiceConnectionBase : IServiceConnection
 
         private readonly IServiceEventHandler _serviceEventHandler;
 
+        private readonly ClientInvocationManager _clientInvocationManager;
+
         private readonly object _statusLock = new object();
 
         private volatile string _errorMessage;
@@ -103,6 +105,7 @@ protected set
 
         public Task ConnectionOfflineTask => _serviceConnectionOfflineTcs.Task;
 
+        // TODO: use DependencyInjection for ClientInvocationManager and then sort parameter order 
         protected ServiceConnectionBase(
             IServiceProtocol serviceProtocol,
             string serverId,
@@ -112,7 +115,8 @@ protected ServiceConnectionBase(
             IServiceEventHandler serviceEventHandler,
             ServiceConnectionType connectionType,
             ILogger logger,
-            GracefulShutdownMode mode = GracefulShutdownMode.Off)
+            GracefulShutdownMode mode = GracefulShutdownMode.Off,
+            ClientInvocationManager clientInvocationManager = null)
         {
             ServiceProtocol = serviceProtocol;
             ServerId = serverId;
@@ -132,6 +136,7 @@ protected ServiceConnectionBase(
             Logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _serviceMessageHandler = serviceMessageHandler;
             _serviceEventHandler = serviceEventHandler;
+            _clientInvocationManager = clientInvocationManager;
         }
 
         /// <summary>
@@ -300,6 +305,9 @@ protected Task OnPingMessageAsync(PingMessage pingMessage)
             if (RuntimeServicePingMessage.TryGetOffline(pingMessage, out var instanceId))
             {
                 Log.ReceivedInstanceOfflinePing(Logger, instanceId);
+#if NET7_0_OR_GREATER
+                _clientInvocationManager?.Caller.CleanupInvocations(instanceId);
+#endif
                 return CleanupClientConnections(instanceId);
             }
             if (RuntimeServicePingMessage.IsFinAck(pingMessage))
@@ -310,6 +318,32 @@ protected Task OnPingMessageAsync(PingMessage pingMessage)
             return _serviceMessageHandler.HandlePingAsync(pingMessage);
         }
 
+#if NET7_0_OR_GREATER
+        private Task OnClientInvocationAsync(ClientInvocationMessage message)
+        {
+            _clientInvocationManager.Router.AddRoutedInvocation(message.ConnectionId, message.InvocationId, message.CallerServerId, new CancellationToken());
+            return Task.CompletedTask;
+        }
+
+        private Task OnServiceMappingAsync(ServiceMappingMessage message)
+        {
+            _clientInvocationManager.Caller.AddServiceMappingMessage(message.InstanceId, message);
+            return Task.CompletedTask;
+        }
+
+        private Task OnClientCompletionAsync(ClientCompletionMessage clientCompletionMessage)
+        {
+            _clientInvocationManager.Caller.TryCompleteResultFromSerializedMessage
+(clientCompletionMessage.ConnectionId, clientCompletionMessage.Protocol, clientCompletionMessage.Payload);
+            return Task.CompletedTask;
+        }
+
+        private Task OnErrorCompletionAsync(ErrorCompletionMessage errorCompletionMessage)
+        {
+            return Task.CompletedTask;
+        }
+#endif
+
         protected Task OnAckMessageAsync(AckMessage ackMessage)
         {
             _serviceMessageHandler.HandleAck(ackMessage);
@@ -562,6 +596,12 @@ private Task DispatchMessageAsync(ServiceMessage message)
                 AckMessage ackMessage => OnAckMessageAsync(ackMessage),
                 ServiceEventMessage eventMessage => OnEventMessageAsync(eventMessage),
                 AccessKeyResponseMessage keyMessage => OnAccessKeyMessageAsync(keyMessage),
+#if NET7_0_OR_GREATER
+                ClientInvocationMessage clientInvocationMessage => OnClientInvocationAsync(clientInvocationMessage),
+                ServiceMappingMessage serviceMappingMessage => OnServiceMappingAsync(serviceMappingMessage),
+                ClientCompletionMessage clientCompletionMessage => OnClientCompletionAsync(clientCompletionMessage),
+                ErrorCompletionMessage errorCompletionMessage => OnErrorCompletionAsync(errorCompletionMessage),
+#endif
                 _ => Task.CompletedTask,
             };
         }