refactoring ReceiverAsync and CloseConnectionAsync to reduce cognitiv…

…e complexity.
tinodo · Oct 30, 2023 · d2aef41 · d2aef41
1 parent bc8bf42
commit d2aef41
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/OBSClient/ObsClient.cs b/OBSClient/ObsClient.cs
@@ -663,9 +663,14 @@ private async Task ReceiverAsync(CancellationToken ct)
                 }
             }
 
+            await this.CloseConnectionAsync(ct.IsCancellationRequested);
+        }
+
+        private async Task CloseConnectionAsync(bool closeRequested)
+        {
             WebSocketCloseCode closeCode;
             string closeDescription;
-            if (ct.IsCancellationRequested)
+            if (closeRequested)
             {
                 // Closed the connection because you called Disconnect().
                 closeCode = WebSocketCloseCode.NormalClosure;
@@ -678,11 +683,6 @@ private async Task ReceiverAsync(CancellationToken ct)
                 closeDescription = this._client.CloseStatusDescription ?? "Unknown";
             }
 
-            await this.CloseConnectionAsync(closeCode, closeDescription);
-        }
-
-        private async Task CloseConnectionAsync(WebSocketCloseCode closeCode, string closeDescription)
-        {
             if (this._client.State == WebSocketState.Open || this._client.State == WebSocketState.CloseReceived)
             {
                 this.ConnectionState = ConnectionState.Disconnecting;
@@ -699,7 +699,6 @@ private async Task CloseConnectionAsync(WebSocketCloseCode closeCode, string clo
             {
                 this._authenticationComplete.SetResult(false);
             }
-
         }
 
         private async Task<IMessage> SendAndWaitAsync(dynamic request)