Fix for await calls.

Additional exception catching on session closure.
Dtronix · Sep 13, 2023 · ad07c54 · ad07c54
1 parent 6f19beb
commit ad07c54
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 9 deletions.
diff --git a/src/NexNet/Internals/NexusSession.cs b/src/NexNet/Internals/NexusSession.cs
@@ -279,7 +279,15 @@ private async ValueTask DisconnectCore(DisconnectReason reason, bool sendDisconn
 
         if (_config.InternalNoLingerOnShutdown)
         {
-            await _transportConnection.CloseAsync(false).ConfigureAwait(false);
+            try
+            {
+                await _transportConnection.CloseAsync(false).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                Logger?.LogError(e, "Error while closing transport connection.");
+            }
+
             return;
         }
         else
@@ -302,7 +310,15 @@ private async ValueTask DisconnectCore(DisconnectReason reason, bool sendDisconn
             }
 
             _pipeOutput = null;
-            await _transportConnection.CloseAsync(true);
+            try
+            {
+                await _transportConnection.CloseAsync(true).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                Logger?.LogError(e, "Error while closing transport connection.");
+            }
+
         }
 
         // If we match a limited type of disconnects, attempt to reconnect if we are the client

diff --git a/src/NexNet/Pipes/NexusChannelExtensions.cs b/src/NexNet/Pipes/NexusChannelExtensions.cs
@@ -31,7 +31,7 @@ public static async ValueTask WriteAndComplete<T>(
         CancellationToken cancellationToken = default)
     {
         var writer = await channel.GetWriterAsync();
-        await WriteAndComplete<T>(writer, enumerableData, chunkSize, cancellationToken);
+        await WriteAndComplete<T>(writer, enumerableData, chunkSize, cancellationToken).ConfigureAwait(false);
     }
 
     /// <summary>
@@ -58,19 +58,19 @@ public static async ValueTask WriteAndComplete<T>(
 
             foreach (var chunk in dataChunks)
             {
-                await writer.WriteAsync(chunk, cancellationToken);
+                await writer.WriteAsync(chunk, cancellationToken).ConfigureAwait(false);
             }
         }
         else
         {
             foreach (var data in enumerableData)
             {
-                await writer.WriteAsync(data, cancellationToken);
+                await writer.WriteAsync(data, cancellationToken).ConfigureAwait(false);
             }
 
         }
 
-        await writer.CompleteAsync();
+        await writer.CompleteAsync().ConfigureAwait(false);
     }
 
     /// <summary>
@@ -107,8 +107,8 @@ public static async ValueTask<List<T>> ReadUntilComplete<T, TTo>(
         int estimatedSize = 0,
         CancellationToken cancellationToken = default)
     { 
-        var reader = await channel.GetReaderAsync();
-        return await ReadUntilComplete<T>(reader, estimatedSize, cancellationToken);
+        var reader = await channel.GetReaderAsync().ConfigureAwait(false);
+        return await ReadUntilComplete<T>(reader, estimatedSize, cancellationToken).ConfigureAwait(false);
     }
 
     /// <summary>
@@ -153,7 +153,8 @@ public static async ValueTask<List<TTo>> ReadUntilComplete<T, TTo>(
             if (reader.IsComplete && previousBufferLength == 0)
                 break;
 
-            var readResult = await reader.ReadAsync(converter, cancellationToken);
+            var readResult = await reader.ReadAsync(converter, cancellationToken)
+                .ConfigureAwait(false);
             var resultCount = readResult.Count;
             if (reader.IsComplete
                 && resultCount == 0