Merge pull request #177 from coinapi/SDKConsoleApp

Sdk console app

Author: kgrudzien

data-api/csharp-ws/CoinAPI.WebSocket.V1/CoinApiWsClient.cs

@@ -19,7 +19,7 @@ public class CoinApiWsClient : ICoinApiWsClient, IDisposable
         private const string UrlProduction = "wss://ws.coinapi.io/";
 
         private readonly string _url = UrlProduction;
-        
+
         private readonly CancellationTokenSource _cts = new CancellationTokenSource();
         private readonly QueueThread<MessageData> _queueThread = null;
 
@@ -39,7 +39,7 @@ public class CoinApiWsClient : ICoinApiWsClient, IDisposable
         public long UnprocessedMessagesQueueSize => _queueThread.QueueSize;
         public event EventHandler<Exception> Error;
         public AutoResetEvent ConnectedEvent { get; } = new AutoResetEvent(false);
-        public bool IsConnected => _client?.State == WebSocketState.Open;   
+        public bool IsConnected => _client?.State == WebSocketState.Open;
         public DateTime? ConnectedTime { get; private set; }
         public ulong TotalBytesReceived { get; private set; }
         public TimeSpan TotalWaitTime => _waitStopwatch.Elapsed;
@@ -99,7 +99,7 @@ private void _queueThread_ItemDequeuedEvent(object sender, MessageData item)
                 return;
             }
 
-            switch(messageType)
+            switch (messageType)
             {
                 case MessageType.book:
                     HandleBookItem(sender, item);
@@ -259,7 +259,7 @@ private async Task Connect()
                 using (var connectionCts = CancellationTokenSource.CreateLinkedTokenSource(_cts.Token))
                 {
                     await HandleConnection(connectionCts);
-                    
+
                     ConnectedTime = null;
                     TotalBytesReceived = 0;
                     _waitStopwatch.Reset();
@@ -284,8 +284,8 @@ private async Task HeartbeatWatcher(ClientWebSocket client, CancellationTokenSou
                 if (Interlocked.Increment(ref _hbLastAction) >= _hbLastActionMaxCount)
                 {
                     connectionCts.Cancel();
-                    await client.CloseAsync(WebSocketCloseStatus.NormalClosure, 
-                        nameof(HeartbeatWatcher), 
+                    await client.CloseAsync(WebSocketCloseStatus.NormalClosure,
+                        nameof(HeartbeatWatcher),
                         CancellationToken.None);
                     continue;
                 }
@@ -338,9 +338,22 @@ private async Task HandleConnection(CancellationTokenSource connectionCts)
                         _queueThread.Enqueue(messageData);
                     }
                 }
-                catch (TaskCanceledException) 
+                catch (TaskCanceledException)
                 {
-                    await _client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Normal", CancellationToken.None);
+                    try
+                    {
+                        if (_client.State == WebSocketState.Open)
+                        {
+                            await _client.CloseAsync(WebSocketCloseStatus.NormalClosure, "Normal", CancellationToken.None);
+
+                        }
+
+                    }
+                    catch (Exception ex)
+                    {
+
+                        OnError(ex);
+                    }
                 }
                 catch (Exception ex)
                 {