Only initiate the WebSocket closing handshake on the client

SignalR#3342

Author: halter73

src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.transports.webSockets.js

@@ -88,7 +88,7 @@
                                 connection.transport,
                                 event);
 
-                            connection.log("Unclean disconnect from websocket: " + event.reason || "[no reason given].");
+                            connection.log("Unclean disconnect from websocket: " + (event.reason || "[no reason given]."));
                         } else {
                             connection.log("Websocket closed.");
                         }

src/Microsoft.AspNet.SignalR.Core/Owin/WebSockets/WebSocketHandler.cs

@@ -211,16 +211,18 @@ internal async Task ProcessWebSocketRequestAsync(WebSocket webSocket, Cancellati
 
             try
             {
+#if CLIENT_NET45
                 if (WebSocket.State == WebSocketState.Closed ||
                     WebSocket.State == WebSocketState.Aborted)
                 {
                     // No-op if the socket is already closed or aborted
                 }
                 else
                 {
-                    // Close the socket
+                    // Initiate the WebSocket closing handshake. Only the client should ever do this.
                     await WebSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, "", CancellationToken.None).PreserveCulture();
                 }
+#endif
             }
             finally
             {

tests/Microsoft.AspNet.SignalR.Client.Tests/Client/Transports/WebSockets/ClientWebSocketHandlerFacts.cs

@@ -1,5 +1,9 @@
 
 using System;
+using System.Net.WebSockets;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNet.SignalR.WebSockets;
 using Moq;
 using Xunit;
 
@@ -48,10 +52,46 @@ public void OnErrorCallsIntoWebSocketTransportOnErrorAndPassesException()
 
             var webSocketHandler =
                 new ClientWebSocketHandler(mockWebSocketTransport.Object) { Error = exception };
-            
+
             webSocketHandler.OnError();
 
             mockWebSocketTransport.Verify(p => p.OnError(exception), Times.Once());
         }
+
+        [Fact]
+        public async Task WebSocketHandlerClosesIfWebSocketStateIsCloseSentAfterClosing()
+        {
+            var messageIndex = 0;
+            var webSocketMessages = new[] { new WebSocketReceiveResult(0, WebSocketMessageType.Text, endOfMessage: false),
+                                            new WebSocketReceiveResult(0, WebSocketMessageType.Text, endOfMessage: false),
+                                            new WebSocketReceiveResult(0, WebSocketMessageType.Close, endOfMessage: true)};
+
+            var webSocket = new Mock<WebSocket>(MockBehavior.Strict);
+
+            webSocket.Setup(w => w.ReceiveAsync(It.IsAny<ArraySegment<byte>>(), CancellationToken.None))
+                     .Returns(() => TaskAsyncHelper.FromResult(webSocketMessages[messageIndex++]));
+
+            WebSocketState state = WebSocketState.Open;
+            webSocket.Setup(w => w.State).Returns(() => state);
+            webSocket.Setup(w => w.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, "", CancellationToken.None))
+                .Returns(() =>
+                {
+                    state = WebSocketState.CloseSent;
+                    return TaskAsyncHelper.Empty;
+                });
+
+            webSocket.Setup(w => w.CloseAsync(WebSocketCloseStatus.NormalClosure, "", CancellationToken.None))
+                .Returns(() =>
+                {
+                    state = WebSocketState.Closed;
+                    return TaskAsyncHelper.Empty;
+                });
+            webSocket.As<IDisposable>().Setup(w => w.Dispose());
+
+            var webSocketHandler = new Mock<WebSocketHandler>(64 * 1024) { CallBase = true };
+            await webSocketHandler.Object.ProcessWebSocketRequestAsync(webSocket.Object, CancellationToken.None);
+
+            webSocket.VerifyAll();
+        }
     }
 }

tests/Microsoft.AspNet.SignalR.Tests/Owin/WebSocketFacts.cs

@@ -56,8 +56,6 @@ public void WebSocketHandlesClosedMessageGracefully()
             var webSocket = new Mock<WebSocket>(MockBehavior.Strict);
             var webSocketHandler = new Mock<WebSocketHandler>(MockBehavior.Strict, 64 * 1024);
 
-            webSocket.Setup(w => w.State).Returns(WebSocketState.Closed);
-
             webSocket.Setup(w => w.ReceiveAsync(It.IsAny<ArraySegment<byte>>(), CancellationToken.None))
                      .Returns(() => TaskAsyncHelper.FromResult(webSocketMessages[messageIndex++]));
 
@@ -71,41 +69,6 @@ public void WebSocketHandlesClosedMessageGracefully()
             webSocketHandler.VerifyAll();
         }
 
-        [Fact]
-        public async Task WebSocketHandlerClosesIfWebSocketStateIsCloseSentAfterClosing()
-        {
-            var messageIndex = 0;
-            var webSocketMessages = new[] { new WebSocketReceiveResult(0, WebSocketMessageType.Text, endOfMessage: false),
-                                            new WebSocketReceiveResult(0, WebSocketMessageType.Text, endOfMessage: false),
-                                            new WebSocketReceiveResult(0, WebSocketMessageType.Close, endOfMessage: true)};
-
-            var webSocket = new Mock<WebSocket>(MockBehavior.Strict);
-
-            webSocket.Setup(w => w.ReceiveAsync(It.IsAny<ArraySegment<byte>>(), CancellationToken.None))
-                     .Returns(() => TaskAsyncHelper.FromResult(webSocketMessages[messageIndex++]));
-
-            WebSocketState state = WebSocketState.Open;
-            webSocket.Setup(w => w.State).Returns(() => state);
-            webSocket.Setup(w => w.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, "", CancellationToken.None))
-                .Returns(() =>
-                {
-                    state = WebSocketState.CloseSent;
-                    return TaskAsyncHelper.Empty;
-                });
-
-            webSocket.Setup(w => w.CloseAsync(WebSocketCloseStatus.NormalClosure, "", CancellationToken.None))
-                .Returns(() =>
-                {
-                    state = WebSocketState.Closed;
-                    return TaskAsyncHelper.Empty;
-                });
-
-            var webSocketHandler = new Mock<WebSocketHandler>(64 * 1024) {CallBase = true};
-            await webSocketHandler.Object.ProcessWebSocketRequestAsync(webSocket.Object, CancellationToken.None);
-
-            webSocket.VerifyAll();
-        }
-
         [Theory]
         [InlineData(WebSocketState.Closed)]
         [InlineData(WebSocketState.CloseSent)]