Read WebSocket state directly from socket type and update default ada…

…pter. (#168)
heroiclabs · Feb 22, 2024 · 4a7b6a2 · 4a7b6a2
1 parent d719ab2
commit 4a7b6a2
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+### Changed
+- Nakama: `IsConnected` and `IsConnecting` will now read directly from the underlying .NET socket status. This will allow application code to more quickly and easily detect connectivity loss arising from a lack of internet access.
+- Nakama: Default socket adapter changed from `WebSocketAdapter` to `WebSocketStdlibAdapter`. This was done to utilize the native .NET Websocket library for improved stability and maintenance.
+
 ## [3.10.0] - 2023-11-21
 ### Changed
 - Nakama: Mark socket as connected before event handler is called.

diff --git a/Nakama.Tests/Socket/WebSocketTest.cs b/Nakama.Tests/Socket/WebSocketTest.cs
@@ -119,17 +119,28 @@ public async Task SocketDetectsLossOfInternet()
             var session = await _client.AuthenticateCustomAsync($"{Guid.NewGuid()}");
             await _socket.ConnectAsync(session, false, 5);
             var closeTriggered = false;
-            
+
             _socket.Closed += () =>
             {
                 _testOutputHelper.WriteLine($"Socket was closed");
                 closeTriggered = true;
             };
-            
+
             _testOutputHelper.WriteLine("---Disconnect Internet Now---");
             await Task.Delay(TimeSpan.FromSeconds(60));
             Assert.False(_socket.IsConnected);
             Assert.True(closeTriggered);
         }
+
+        [Fact]
+        public async Task SocketCanReconnectAfterClose()
+        {
+            var session = await _client.AuthenticateCustomAsync($"{Guid.NewGuid()}");
+            await _socket.ConnectAsync(session, false, 5);
+            await _socket.CloseAsync();
+            await _socket.ConnectAsync(session, false, 5);
+            var match = await _socket.CreateMatchAsync($"${Guid.NewGuid()}");
+            Assert.True(match != null);
+        }
     }
 }
diff --git a/Nakama/Socket.cs b/Nakama/Socket.cs
@@ -117,7 +117,7 @@ public class Socket : ISocket
         /// <summary>
         /// A new socket with default options.
         /// </summary>
-        public Socket() : this(Client.DefaultScheme, Client.DefaultHost, Client.DefaultPort, new WebSocketAdapter())
+        public Socket() : this(Client.DefaultScheme, Client.DefaultHost, Client.DefaultPort, new WebSocketStdlibAdapter())
         {
         }
 

diff --git a/Nakama/WebSocketStdlibAdapter.cs b/Nakama/WebSocketStdlibAdapter.cs
@@ -44,12 +44,12 @@ public class WebSocketStdlibAdapter : ISocketAdapter
         /// <summary>
         /// If the WebSocket is connected.
         /// </summary>
-        public bool IsConnected { get; private set; }
+        public bool IsConnected => _webSocket != null && _webSocket.State == WebSocketState.Open;
 
         /// <summary>
         /// If the WebSocket is connecting.
         /// </summary>
-        public bool IsConnecting { get; private set; }
+        public bool IsConnecting => _webSocket != null && _webSocket.State == WebSocketState.Connecting;
 
         private CancellationTokenSource _cancellationSource;
         private Uri _uri;
@@ -86,8 +86,6 @@ public async Task CloseAsync()
             }
 
             _webSocket = null;
-            IsConnecting = false;
-            IsConnected = false;
         }
 
         /// <inheritdoc cref="ISocketAdapter.ConnectAsync"/>
@@ -102,26 +100,12 @@ public async Task ConnectAsync(Uri uri, int timeout)
             _cancellationSource = new CancellationTokenSource();
             _uri = uri;
             _webSocket = new ClientWebSocket();
-            IsConnecting = true;
 
-            try
-            {
-                var cts = new CancellationTokenSource(TimeSpan.FromSeconds(timeout));
-                var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(_cancellationSource.Token, cts.Token);
-                await _webSocket.ConnectAsync(_uri, linkedCts.Token).ConfigureAwait(false);
-                _ = ReceiveLoop(_webSocket, _cancellationSource.Token);
-                IsConnected = true;
-                Connected?.Invoke();
-            }
-            catch (Exception)
-            {
-                IsConnected = false;
-                throw;
-            }
-            finally
-            {
-                IsConnecting = false;
-            }
+            var cts = new CancellationTokenSource(TimeSpan.FromSeconds(timeout));
+            var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(_cancellationSource.Token, cts.Token);
+            await _webSocket.ConnectAsync(_uri, linkedCts.Token).ConfigureAwait(false);
+            _ = ReceiveLoop(_webSocket, _cancellationSource.Token);
+            Connected?.Invoke();
         }
 
         /// <inheritdoc cref="ISocketAdapter.SendAsync"/>
@@ -197,8 +181,6 @@ private async Task ReceiveLoop(WebSocket webSocket, CancellationToken canceller)
             }
             finally
             {
-                IsConnecting = false;
-                IsConnected = false;
                 Closed?.Invoke();
             }
         }