Disposed ClientWebSocket properly

Author: DominiqueBlomsma

src/XUMM.NET.SDK/WebSocket/XummWebSocket.cs

@@ -5,37 +5,37 @@
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 
 namespace XUMM.NET.SDK.WebSocket;
 
-public class XummWebSocket : IXummWebSocket, IAsyncDisposable
+public class XummWebSocket : IXummWebSocket
 {
     private readonly ILogger<XummWebSocket> _logger;
-    private readonly ClientWebSocket _webSocket = new();
     private string _payloadUuid = default!;
 
     public XummWebSocket(ILogger<XummWebSocket> logger)
     {
         _logger = logger;
     }
 
-    public async IAsyncEnumerable<string> SubscribeAsync(string payloadUuid, [EnumeratorCancellation] CancellationToken cancellationToken)
+    public async IAsyncEnumerable<string> SubscribeAsync(string payloadUuid,
+        [EnumeratorCancellation] CancellationToken cancellationToken)
     {
         cancellationToken.ThrowIfCancellationRequested();
 
         _payloadUuid = payloadUuid;
 
-        await _webSocket.ConnectAsync(new Uri($"wss://xumm.app/sign/{_payloadUuid}"), CancellationToken.None);
+        using var webSocket = new ClientWebSocket();
+        await webSocket.ConnectAsync(new Uri($"wss://xumm.app/sign/{_payloadUuid}"), CancellationToken.None);
 
-        if (_webSocket.State == WebSocketState.Open)
+        if (webSocket.State == WebSocketState.Open)
         {
-            var buffer = new ArraySegment<byte>(new byte[1024]);
+            _logger.LogInformation("Payload {0}: Subscription active (WebSocket opened).", _payloadUuid);
 
-            WriteLog("Subscription active (WebSocket opened).");
+            var buffer = new ArraySegment<byte>(new byte[1024]);
 
-            while (_webSocket.State == WebSocketState.Open)
+            while (webSocket.State == WebSocketState.Open)
             {
                 await using var ms = new MemoryStream();
                 WebSocketReceiveResult? result;
@@ -44,13 +44,13 @@ public async IAsyncEnumerable<string> SubscribeAsync(string payloadUuid, [Enumer
                 {
                     do
                     {
-                        result = await _webSocket.ReceiveAsync(buffer, cancellationToken);
+                        result = await webSocket.ReceiveAsync(buffer, cancellationToken);
                         ms.Write(buffer.Array!, buffer.Offset, result.Count);
                     } while (!result.EndOfMessage && !cancellationToken.IsCancellationRequested);
                 }
                 catch (OperationCanceledException)
                 {
-                    WriteLog("Subscription ended (WebSocket closed).");
+                    _logger.LogInformation("Payload {0}: Subscription ended (WebSocket closed).", _payloadUuid);
                     yield break;
                 }
 
@@ -59,15 +59,4 @@ public async IAsyncEnumerable<string> SubscribeAsync(string payloadUuid, [Enumer
             }
         }
     }
-
-    private void WriteLog(string logMessage)
-    {
-        _logger?.LogInformation("Payload {0}: {1}", _payloadUuid, logMessage);
-    }
-
-    public async ValueTask DisposeAsync()
-    {
-        await _webSocket.CloseAsync(WebSocketCloseStatus.Empty, string.Empty, CancellationToken.None);
-        WriteLog("Subscription ended (WebSocket closed).");
-    }
 }