Merge pull request #1424 from longfin/bugfix/turn-reconnection

Release 0.13.2 & Fix TURN reconnection
planetarium · Aug 5, 2021 · dd22711 · dd22711
2 parents 5d631fd + ef47369
commit dd22711
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 21 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -4,13 +4,16 @@ Libplanet changelog
 Version 0.13.2
 --------------
 
-To be released.
+Released on Aug 5, 2021.
 
- - When a reorg happens, `Swarm<T>` now broadcasts a reorged chain tip first
-   before rendering. [[#1385], [#1415]]
+ -  When a reorg happens, `Swarm<T>` now broadcasts a reorged chain tip first
+    before rendering. [[#1385], [#1415]]
+ -  Fixed a bug where `TurnClient` hadn't been recovered when TURN connection
+    had been disconnected.  [[#1424]]
 
 [#1385]: https://github.com/planetarium/libplanet/issues/1385
 [#1415]: https://github.com/planetarium/libplanet/pull/1415
+[#1424]: https://github.com/planetarium/libplanet/pull/1424
 
 
 Version 0.13.1

diff --git a/Libplanet.Stun/Stun/TurnClient.cs b/Libplanet.Stun/Stun/TurnClient.cs
@@ -74,9 +74,7 @@ public TurnClient(
         public async Task InitializeTurnAsync(CancellationToken cancellationToken)
         {
             _control = new TcpClient();
-#pragma warning disable PC001 // API not supported on all platforms
-            _control.Connect(_host, _port);
-#pragma warning restore PC001 // API not supported on all platforms
+            await _control.ConnectAsync(_host, _port);
             _processMessage = ProcessMessage(_turnTaskCts.Token);
 
             BehindNAT = await IsBehindNAT(cancellationToken);
@@ -119,7 +117,19 @@ public async Task ReconnectTurn(int listenPort, CancellationToken cancellationTo
                     ClearSession();
                     _turnTaskCts = new CancellationTokenSource();
 
-                    await InitializeTurnAsync(cancellationToken);
+                    try
+                    {
+                        await InitializeTurnAsync(cancellationToken);
+                    }
+                    catch (Exception e)
+                    {
+                        _logger.Error(
+                            e,
+                            "Failed to initialize due to error ({Exception}); retry...",
+                            e
+                        );
+                        await Task.Delay(1000, cancellationToken);
+                    }
                 }
             }
         }
@@ -384,24 +394,14 @@ await stream.WriteAsync(
 
         private async Task ProcessMessage(CancellationToken cancellationToken)
         {
-            while (!cancellationToken.IsCancellationRequested || _control.Connected)
+            while (!cancellationToken.IsCancellationRequested && _control.Connected)
             {
-                NetworkStream stream = _control.GetStream();
-
                 try
                 {
+                    NetworkStream stream = _control.GetStream();
                     StunMessage message;
-                    try
-                    {
-                        message = await StunMessage.ParseAsync(stream, cancellationToken);
-                        _logger.Debug("Stun Message is: {message}", message);
-                    }
-                    catch (TurnClientException e)
-                    {
-                        _logger.Error(e, "Failed to parse StunMessage. {e}", e);
-                        ClearResponses();
-                        break;
-                    }
+                    message = await StunMessage.ParseAsync(stream, cancellationToken);
+                    _logger.Debug("Parsed " + nameof(StunMessage) + ": {Message}", message);
 
                     if (message is ConnectionAttempt attempt)
                     {
@@ -415,6 +415,12 @@ private async Task ProcessMessage(CancellationToken cancellationToken)
                         tcs.TrySetResult(message);
                     }
                 }
+                catch (TurnClientException e)
+                {
+                    _logger.Error(e, "Failed to parse " + nameof(StunMessage) + ": {Exception}", e);
+                    ClearResponses();
+                    break;
+                }
                 catch (Exception e)
                 {
                     _logger.Error(