Merge branch 'temp'

Author: gedem

src/NetCoreStack.WebSockets/ConnectionManager.cs

@@ -124,18 +124,8 @@ await transport.WebSocket.SendAsync(segments,
             }
         }
 
-        public async Task ConnectAsync(WebSocket webSocket, string connectorName = "")
+        public async Task ConnectAsync(WebSocket webSocket, string connectionId, string connectorName = "")
         {
-            WebSocketTransport transport = new WebSocketTransport(webSocket, connectorName);
-            var connectionId = transport.ConnectionId;
-            var context = new WebSocketMessageContext();
-            context.Command = WebSocketCommands.Handshake;
-            context.Value = connectionId;
-            context.Header = await _initState.GetStateAsync();
-            Connections.TryAdd(connectionId, transport);
-
-            await SendAsync(connectionId, context);
-
             var receiverContext = new WebSocketReceiverContext
             {
                 Compressor = _compressor,
@@ -145,6 +135,24 @@ public async Task ConnectAsync(WebSocket webSocket, string connectorName = "")
                 Options = _options,
                 WebSocket = webSocket
             };
+            
+            WebSocketTransport transport = null;
+            if (Connections.TryGetValue(connectionId, out transport))
+            {
+                transport.ReConnect(webSocket);
+            }
+            else
+            {
+                transport = new WebSocketTransport(webSocket, connectionId, connectorName);
+                var context = new WebSocketMessageContext();
+                context.Command = WebSocketCommands.Handshake;
+                context.Value = connectionId;
+                context.Header = await _initState.GetStateAsync();
+                Connections.TryAdd(connectionId, transport);
+
+                await SendAsync(connectionId, context);
+            }
+
             var receiver = new WebSocketReceiver(receiverContext, CloseConnection);
             await receiver.ReceiveAsync();
         }
@@ -281,18 +289,34 @@ await transport.WebSocket.SendAsync(segments,
             }
         }
 
-        public void CloseConnection(string connectionId)
+        public void CloseConnection(string connectionId, bool keepAlive)
         {
             WebSocketTransport transport = null;
-            if (Connections.TryRemove(connectionId, out transport))
+            if (keepAlive)
             {
-                transport.Dispose();
+                if (Connections.TryGetValue(connectionId, out transport))
+                {
+                    transport.Dispose();
+                }
+            }
+            else
+            {
+                if (Connections.TryRemove(connectionId, out transport))
+                {
+                    transport.Dispose();
+                }
             }
         }
 
         public void CloseConnection(WebSocketReceiverContext context)
         {
-            CloseConnection(context.ConnectionId);
+            bool keepAlive = false;
+            if (context.WebSocket.CloseStatus == WebSocketCloseStatus.EndpointUnavailable)
+            {
+                keepAlive = true;
+            }
+
+            CloseConnection(context.ConnectionId, keepAlive);
         }
     }
 }

src/NetCoreStack.WebSockets/Interfaces/IConnectionManager.cs

@@ -10,7 +10,7 @@ public interface IConnectionManager
     {
         ConcurrentDictionary<string, WebSocketTransport> Connections { get; }
 
-        Task ConnectAsync(WebSocket webSocket, string connectorName = "");
+        Task ConnectAsync(WebSocket webSocket, string connectionId, string connectorName = "");
 
         /// <summary>
         /// Text message broadcaster
@@ -49,6 +49,6 @@ public interface IConnectionManager
         /// Close the specified connection
         /// </summary>
         /// <param name="connectionId"></param>
-        void CloseConnection(string connectionId);
+        void CloseConnection(string connectionId, bool keepAlive);
     }
 }

src/NetCoreStack.WebSockets/Internal/WebSocketMiddleware.cs

@@ -4,7 +4,6 @@
 using Microsoft.Extensions.Primitives;
 using NetCoreStack.WebSockets.Interfaces;
 using System;
-using System.Net.WebSockets;
 using System.Threading.Tasks;
 
 namespace NetCoreStack.WebSockets.Internal
@@ -27,22 +26,44 @@ public async Task Invoke(HttpContext httpContext,
         {
             if (httpContext.WebSockets.IsWebSocketRequest)
             {
+                string connectionId = string.Empty;
                 string connectorName = string.Empty;
                 StringValues headerValue = "";
                 if (httpContext.Request.Headers.TryGetValue(SocketsConstants.ConnectorName, out headerValue))
                 {
                     connectorName = headerValue.ToString();
                 }
+                if (httpContext.Request.Headers.TryGetValue(SocketsConstants.ConnectionId, out headerValue))
+                {
+                    connectionId = headerValue.ToString();
+                }
+
                 if (string.IsNullOrEmpty(connectorName))
                 {
                     if (httpContext.Request.Query.ContainsKey(SocketsConstants.ConnectorName))
                     {
                         connectorName = httpContext.Request.Query[SocketsConstants.ConnectorName];
                     }
                 }
+                if (string.IsNullOrEmpty(connectionId))
+                {
+                    if (httpContext.Request.Query.ContainsKey(SocketsConstants.ConnectionId))
+                    {
+                        connectionId = httpContext.Request.Query[SocketsConstants.ConnectionId];
+                        Guid connectionIdGuid = Guid.Empty;
+                        if (!Guid.TryParse(connectionId, out connectionIdGuid))
+                        {
+                            connectionId = string.Empty;
+                        }
+                    }
+                }
 
                 var webSocket = await httpContext.WebSockets.AcceptWebSocketAsync();
-                await manager.ConnectAsync(webSocket, connectorName);
+                if (string.IsNullOrEmpty(connectionId))
+                {
+                    connectionId = Guid.NewGuid().ToString("N");
+                }
+                await manager.ConnectAsync(webSocket, connectionId: connectionId, connectorName: connectorName);
             }
             else
             {

src/NetCoreStack.WebSockets/Internal/WebSocketTransport.cs

@@ -5,17 +5,22 @@ namespace NetCoreStack.WebSockets.Internal
 {
     public class WebSocketTransport : IDisposable
     {
-        public WebSocket WebSocket { get; }
+        public WebSocket WebSocket { get; private set; }
         public string ConnectionId { get; }
         public string ConnectorName { get; }
 
-        public WebSocketTransport(WebSocket webSocket, string connectorName)
+        public WebSocketTransport(WebSocket webSocket, string connectionId, string connectorName)
         {
-            ConnectionId = Guid.NewGuid().ToString();
+            ConnectionId = connectionId;
             WebSocket = webSocket;
             ConnectorName = connectorName;
         }
 
+        public void ReConnect(WebSocket webSocket)
+        {
+            WebSocket = webSocket;
+        }
+
         public void Dispose()
         {
             WebSocket.Dispose();

test/WebClientTestApp/Controllers/HomeController.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
 namespace WebClientTestApp.Controllers
 {
@@ -13,6 +9,11 @@ public IActionResult Index()
             return View();
         }
 
+        public IActionResult ReConnectTest()
+        {
+            return View();
+        }
+
         public IActionResult About()
         {
             ViewData["Message"] = "Your application description page.";

test/WebClientTestApp/Views/Home/Index.cshtml

@@ -86,7 +86,8 @@
         $(function () {
             'use strict';
 
-            var connectorName = "@Constants.ConnectorName"
+            var connectionId = Cookies.get("connectionId");            
+            var connectorName = "@Constants.ConnectorName";
             var containerId = "connectionContainer";
             var scheme = document.location.protocol == "https:" ? "wss" : "ws";
             var port = document.location.port ? (":" + document.location.port) : "";
@@ -110,7 +111,7 @@
                 this.connectionId = ko.observable();
                 this.data = ko.observable();
                 this.dataRows = ko.observableArray([]);
-                this.connectionUrl = ko.observable(scheme + "://" + document.location.hostname + port + "?connectorName=" + connectorName);
+                this.connectionUrl = ko.observable(scheme + "://" + document.location.hostname + port + "?connectionId=" + connectionId + "&connectorName=" + connectorName);
                 this.logInfo = ko.observable("Waiting for connection. To connect click the Connect button");
                 this.connectionState = ko.observable(state.connect);
                 this.connectionStatus = ko.pureComputed(function () {
@@ -162,6 +163,7 @@
                             console.log(vm.connectionId());
                             if (context && context.Command == WebSocketCommands.Handshake) {
                                 vm.connectionId(context.Value);
+                                Cookies.set('connectionId', context.Value);
                             }
 
                             var row = {