client-server isolation, awaiter fix

Author: gencebay

src/NetCoreStack.WebSockets.ProxyClient/ClientWebSocketConnector.cs

@@ -45,9 +45,9 @@ public ClientWebSocketConnector(IServiceProvider serviceProvider,
             _loggerFactory = loggerFactory;
         }
 
-        public abstract InvocatorContext InvocatorContext { get; }
+        public abstract ClientInvocatorContext InvocatorContext { get; }
 
-        private async Task<WebSocketReceiver> TryConnectAsync(CancellationTokenSource cancellationTokenSource = null)
+        private async Task<ClientWebSocketReceiver> TryConnectAsync(CancellationTokenSource cancellationTokenSource = null)
         {
             _webSocket = new ClientWebSocket();
             _webSocket.Options.SetRequestHeader(NCSConstants.ConnectorName, InvocatorContext.ConnectorName);
@@ -62,15 +62,15 @@ private async Task<WebSocketReceiver> TryConnectAsync(CancellationTokenSource ca
                 return null;
             }
 
-            var receiverContext = new WebSocketReceiverContext
+            var receiverContext = new ClientWebSocketReceiverContext
             {
                 Compressor = _compressor,
                 InvocatorContext = InvocatorContext,
                 LoggerFactory = _loggerFactory,
                 WebSocket = _webSocket
             };
 
-            var receiver = new WebSocketReceiver(_serviceProvider, receiverContext, Close, (connectionId) => {
+            var receiver = new ClientWebSocketReceiver(_serviceProvider, receiverContext, Close, (connectionId) => {
                 _connectionId = connectionId;
             });
 
@@ -82,7 +82,7 @@ public async Task ConnectAsync(CancellationTokenSource cancellationTokenSource =
             if (cancellationTokenSource == null)
                 cancellationTokenSource = new CancellationTokenSource();
 
-            WebSocketReceiver receiver = null;
+            ClientWebSocketReceiver receiver = null;
             while (!cancellationTokenSource.IsCancellationRequested)
             {
                 receiver = await TryConnectAsync(cancellationTokenSource);
@@ -138,10 +138,10 @@ public async Task SendBinaryAsync(byte[] bytes)
             await _webSocket.SendAsync(segments, WebSocketMessageType.Binary, true, CancellationToken.None);
         }
 
-        internal void Close(WebSocketReceiverContext context)
+        internal void Close(ClientWebSocketReceiverContext context)
         {
             context.WebSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, 
-                nameof(WebSocketReceiverContext), 
+                nameof(ClientWebSocketReceiverContext), 
                 CancellationToken.None);
         }
 

src/NetCoreStack.WebSockets.ProxyClient/ClientWebSocketConnectorOfT.cs

@@ -9,7 +9,7 @@ public class ClientWebSocketConnectorOfT<TInvocator> : ClientWebSocketConnector,
     {
         private readonly IClientInvocatorContextFactory<TInvocator> _invocatorContextFactory;
 
-        public override InvocatorContext InvocatorContext { get; }
+        public override ClientInvocatorContext InvocatorContext { get; }
 
         public ClientWebSocketConnectorOfT(IServiceProvider serviceProvider,
             IClientInvocatorContextFactory<TInvocator> invocatorContextFactory,

src/NetCoreStack.WebSockets.ProxyClient/ClientWebSocketReceiver.cs

@@ -1,4 +1,5 @@
 using Microsoft.Extensions.Logging;
+using NetCoreStack.WebSockets.Internal;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -7,19 +8,19 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace NetCoreStack.WebSockets.Internal
+namespace NetCoreStack.WebSockets.ProxyClient
 {
     public class ClientWebSocketReceiver
     {
         private readonly IServiceProvider _serviceProvider;
-        private readonly WebSocketReceiverContext _context;
-        private readonly Action<WebSocketReceiverContext> _closeCallback;
+        private readonly ClientWebSocketReceiverContext _context;
+        private readonly Action<ClientWebSocketReceiverContext> _closeCallback;
         private readonly Action<string> _handshakeCallback;
         private readonly ILogger<ClientWebSocketReceiver> _logger;
 
-        public ClientWebSocketReceiver(IServiceProvider serviceProvider, 
-            WebSocketReceiverContext context, 
-            Action<WebSocketReceiverContext> closeCallback, 
+        public ClientWebSocketReceiver(IServiceProvider serviceProvider,
+            ClientWebSocketReceiverContext context, 
+            Action<ClientWebSocketReceiverContext> closeCallback, 
             Action<string> handshakeCallback = null)
         {
             _serviceProvider = serviceProvider;
@@ -49,7 +50,10 @@ public async Task ReceiveAsync()
                             }
 
                             var invocator = _context.GetInvocator(_serviceProvider);
-                            invocator?.InvokeAsync(context);
+                            if (invocator != null)
+                            {
+                                await invocator.InvokeAsync(context);
+                            }
                         }
                         catch (Exception ex)
                         {
@@ -84,7 +88,10 @@ public async Task ReceiveAsync()
                         {
                             var context = await result.ToBinaryContextAsync(_context.Compressor, binaryResult);
                             var invocator = _context.GetInvocator(_serviceProvider);
-                            invocator?.InvokeAsync(context);
+                            if (invocator != null)
+                            {
+                                await invocator.InvokeAsync(context);
+                            }
                         }
                         catch (Exception ex)
                         {
@@ -99,11 +106,6 @@ public async Task ReceiveAsync()
             }
             catch (Exception ex)
             {
-                if (ex is TaskCanceledException)
-                {
-                    return;
-                }
-
                 var dictionary = new Dictionary<string, string>();
                 dictionary.Add(nameof(_context.ConnectionId), _context.ConnectionId);
 

src/NetCoreStack.WebSockets.ProxyClient/DefaultClientInvocatorContextFactory.cs

@@ -18,9 +18,9 @@ public DefaultClientInvocatorContextFactory(IOptions<ProxyOptions<TInvocator>> o
             _proxyOptions = options.Value;
         }
 
-        public InvocatorContext CreateInvocatorContext()
+        public ClientInvocatorContext CreateInvocatorContext()
         {
-            return new InvocatorContext(_proxyOptions.Invocator, _proxyOptions.ConnectorName, _proxyOptions.WebSocketHostAddress);
+            return new ClientInvocatorContext(_proxyOptions.Invocator, _proxyOptions.ConnectorName, _proxyOptions.WebSocketHostAddress);
         }
     }
 }

…xyClient/ApplicationBuilderExtensions.cs …tensions/ApplicationBuilderExtensions.cssrc/NetCoreStack.WebSockets.ProxyClient/ApplicationBuilderExtensions.cs renamed to src/NetCoreStack.WebSockets.ProxyClient/Extensions/ApplicationBuilderExtensions.cs src/NetCoreStack.WebSockets.ProxyClient/ApplicationBuilderExtensions.cs renamed to src/NetCoreStack.WebSockets.ProxyClient/Extensions/ApplicationBuilderExtensions.cs

@@ -0,0 +1,21 @@
+using System;
+
+namespace NetCoreStack.WebSockets.ProxyClient
+{
+    public static class ClientWebSocketReceiverExtensions
+    {
+        public static IClientWebSocketCommandInvocator GetInvocator(this ClientWebSocketReceiverContext context, IServiceProvider serviceProvider)
+        {
+            if (context.InvocatorContext != null)
+            {
+                var instance = serviceProvider.GetService(context.InvocatorContext.Invocator);
+                if (instance != null && instance is IClientWebSocketCommandInvocator)
+                {
+                    return (IClientWebSocketCommandInvocator)instance;
+                }
+            }
+
+            return null;
+        }
+    }
+}

src/NetCoreStack.WebSockets.ProxyClient/Extensions/ClientWebSocketReceiverExtensions.cs

@@ -3,7 +3,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace NetCoreStack.WebSockets.ProxyClient.Console
+namespace NetCoreStack.WebSockets.ProxyClient
 {
     public static class ConsoleApplicationBuilderExtensions
     {

…t/ConsoleApplicationBuilderExtensions.cs …s/ConsoleApplicationBuilderExtensions.cssrc/NetCoreStack.WebSockets.ProxyClient/ConsoleApplicationBuilderExtensions.cs renamed to src/NetCoreStack.WebSockets.ProxyClient/Extensions/ConsoleApplicationBuilderExtensions.cs src/NetCoreStack.WebSockets.ProxyClient/ConsoleApplicationBuilderExtensions.cs renamed to src/NetCoreStack.WebSockets.ProxyClient/Extensions/ConsoleApplicationBuilderExtensions.cs

@@ -2,6 +2,6 @@
 {
     public interface IClientInvocatorContextFactory<TInvocator> where TInvocator : IClientWebSocketCommandInvocator
     {
-        InvocatorContext CreateInvocatorContext();
+        ClientInvocatorContext CreateInvocatorContext();
     }
 }

…oxyClient/ServiceCollectionExtensions.cs …xtensions/ServiceCollectionExtensions.cssrc/NetCoreStack.WebSockets.ProxyClient/ServiceCollectionExtensions.cs renamed to src/NetCoreStack.WebSockets.ProxyClient/Extensions/ServiceCollectionExtensions.cs src/NetCoreStack.WebSockets.ProxyClient/ServiceCollectionExtensions.cs renamed to src/NetCoreStack.WebSockets.ProxyClient/Extensions/ServiceCollectionExtensions.cs

@@ -11,7 +11,7 @@ public interface IWebSocketConnector
         Task ConnectAsync(CancellationTokenSource cancellationTokenSource);
         Task SendAsync(WebSocketMessageContext context);
         Task SendBinaryAsync(byte[] bytes);
-        InvocatorContext InvocatorContext { get; }
+        ClientInvocatorContext InvocatorContext { get; }
     }
 
     public interface IWebSocketConnector<TInvocator> : IWebSocketConnector where TInvocator : IClientWebSocketCommandInvocator