issue 419 - websocket should be closed

Author: doghappy

src/SocketIOClient/Protocol/WebSocket/IWebSocketAdapter.cs

@@ -9,4 +9,5 @@ public interface IWebSocketAdapter : IProtocolAdapter
 {
     Task ConnectAsync(Uri uri, CancellationToken cancellationToken);
     Task SendAsync(ProtocolMessage message, CancellationToken cancellationToken);
+    Task CloseAsync(CancellationToken cancellationToken);
 }

src/SocketIOClient/Protocol/WebSocket/IWebSocketClientAdapter.cs

@@ -10,4 +10,5 @@ public interface IWebSocketClientAdapter
     Task SendAsync(byte[] data, WebSocketMessageType messageType, CancellationToken cancellationToken);
     Task<WebSocketMessage> ReceiveAsync(CancellationToken cancellationToken);
     void SetDefaultHeader(string name, string value);
+    Task CloseAsync(CancellationToken cancellationToken);
 }

src/SocketIOClient/Protocol/WebSocket/SystemClientWebSocketAdapter.cs

@@ -57,4 +57,10 @@ public async Task<WebSocketMessage> ReceiveAsync(CancellationToken cancellationT
     }
 
     public void SetDefaultHeader(string name, string value) => ws.SetDefaultHeader(name, value);
+
+    public async Task CloseAsync(CancellationToken cancellationToken)
+    {
+        await ws.CloseAsync(WebSocketCloseStatus.NormalClosure, "io client disconnect", cancellationToken)
+            .ConfigureAwait(false);
+    }
 }

src/SocketIOClient/Protocol/WebSocket/WebSocketAdapter.cs

@@ -55,8 +55,8 @@ private async Task ReceiveAsync(CancellationToken cancellationToken)
 
     public async Task SendAsync(ProtocolMessage message, CancellationToken cancellationToken)
     {
-        var isTextButNull = message.Type == ProtocolMessageType.Text && message.Text == null;
-        var isBytesButNull = message.Type == ProtocolMessageType.Bytes && message.Bytes == null;
+        var isTextButNull = message is { Type: ProtocolMessageType.Text, Text: null };
+        var isBytesButNull = message is { Type: ProtocolMessageType.Bytes, Bytes: null };
         if (isTextButNull || isBytesButNull)
         {
             throw new ArgumentNullException();
@@ -77,6 +77,11 @@ await clientAdapter
         logger.LogDebug("Sent {type} message.", message.Type);
     }
 
+    public async Task CloseAsync(CancellationToken cancellationToken)
+    {
+        await clientAdapter.CloseAsync(cancellationToken).ConfigureAwait(false);
+    }
+
     public override void SetDefaultHeader(string name, string value) => clientAdapter.SetDefaultHeader(name, value);
 
     public void Dispose()

src/SocketIOClient/Session/WebSocket/WebSocketSession.cs

@@ -122,6 +122,15 @@ public override async Task DisconnectAsync(CancellationToken cancellationToken)
     {
         var content = string.IsNullOrEmpty(Options.Namespace) ? "41" : $"41{Options.Namespace},";
         var message = new ProtocolMessage { Text = content };
-        await _wsAdapter.SendAsync(message, cancellationToken).ConfigureAwait(false);
+        try
+        {
+            await _wsAdapter.SendAsync(message, cancellationToken).ConfigureAwait(false);
+        }
+        catch (Exception e)
+        {
+            _logger.LogError("Failed to send '{content}'", content);
+            _logger.LogError(e.ToString());
+        }
+        await _wsAdapter.CloseAsync(cancellationToken).ConfigureAwait(false);
     }
 }

tests/SocketIOClient.UnitTests/Protocol/WebSocket/SystemClientWebSocketAdapterTests.cs

@@ -115,4 +115,14 @@ public void SetDefaultHeader_WhenCalled_AlwaysWsClientSetDefaultHeader()
 
         _ws.Received().SetDefaultHeader("name", "value");
     }
+
+    [Fact]
+    public async Task CloseAsync_WhenCalled_AlwaysPass()
+    {
+        using var cts = new CancellationTokenSource();
+        var token = cts.Token;
+        await _adapter.CloseAsync(token);
+
+        await _ws.Received(1).CloseAsync(WebSocketCloseStatus.NormalClosure, "io client disconnect", token);
+    }
 }

tests/SocketIOClient.UnitTests/Protocol/WebSocket/WebSocketAdapterTests.cs

@@ -145,7 +145,7 @@ public async Task ConnectAsync_ReceivedTextMessage_NotifyToObserver()
         _clientAdapter.ReceiveAsync(Arg.Is<CancellationToken>(c => c != CancellationToken.None))
             .Returns(async _ =>
             {
-                await Task.Delay(20).ConfigureAwait(false);
+                await Task.Delay(100).ConfigureAwait(false);
                 return new WebSocketMessage
                 {
                     Type = WebSocketMessageType.Text,
@@ -254,4 +254,14 @@ public void UnSubscribe_GivenNull_AlwaysPass()
             .Should()
             .NotThrow();
     }
+
+    [Fact]
+    public async Task CloseAsync_WhenCalled_AlwaysPass()
+    {
+        using var cts = new CancellationTokenSource();
+        var token = cts.Token;
+        await _wsAdapter.CloseAsync(token);
+
+        await _clientAdapter.Received(1).CloseAsync(token);
+    }
 }

tests/SocketIOClient.UnitTests/Session/WebSocket/WebSocketSessionTests.cs

@@ -208,6 +208,21 @@ public async Task DisconnectAsync_NoNamespace_SendDisconnectToServer()
         await _wsAdapter.Received(1)
             .SendAsync(Arg.Is<ProtocolMessage>(m =>
                 m.Type == ProtocolMessageType.Text && m.Text == "41"), token);
+        await _wsAdapter.Received(1).CloseAsync(token);
+    }
+
+    [Fact]
+    public async Task DisconnectAsync_FailedToSend41_StillCloseAsync()
+    {
+        using var cts = new CancellationTokenSource();
+        var token = cts.Token;
+        var session = NewSession();
+        _wsAdapter.SendAsync(Arg.Any<ProtocolMessage>(), token)
+            .Returns(Task.FromException(new Exception()));
+
+        await session.DisconnectAsync(token);
+
+        await _wsAdapter.Received(1).CloseAsync(token);
     }
 
     [Fact]