Update WebSocketSharp and WebSocket4Net clients

Match DefaultWebSocketClient changes.
sonvister · Jan 30, 2018 · 9a4f533 · 9a4f533
1 parent 28fe77d
commit 9a4f533
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 12 deletions.
diff --git a/samples/Binance.WebSocket.WebSocket4Net/Binance.WebSocket.WebSocket4Net.csproj b/samples/Binance.WebSocket.WebSocket4Net/Binance.WebSocket.WebSocket4Net.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>0.1.1</Version>
-    <AssemblyVersion>0.1.1.0</AssemblyVersion>
-    <FileVersion>0.1.1.0</FileVersion>
+    <Version>0.1.2</Version>
+    <AssemblyVersion>0.1.2.0</AssemblyVersion>
+    <FileVersion>0.1.2.0</FileVersion>
     <Authors>sonvister</Authors>
     <Company />
     <Copyright>Copyright © 2018 sonvister</Copyright>

diff --git a/samples/Binance.WebSocket.WebSocket4Net/WebSocket4NetClient.cs b/samples/Binance.WebSocket.WebSocket4Net/WebSocket4NetClient.cs
@@ -9,6 +9,8 @@ namespace Binance.WebSocket
 {
     public class WebSocket4NetClient : WebSocketClient
     {
+        private volatile bool _isOpen;
+
         public WebSocket4NetClient(ILogger<WebSocket4NetClient> logger)
             : base(logger)
         { }
@@ -23,6 +25,11 @@ public override async Task StreamAsync(Uri uri, CancellationToken token)
 
             token.ThrowIfCancellationRequested();
 
+            if (IsStreaming)
+                throw new InvalidOperationException($"{nameof(WebSocket4NetClient)}.{nameof(StreamAsync)}: Already streaming (this method is not reentrant).");
+
+            IsStreaming = true;
+
             Exception exception = null;
 
             var tcs = new TaskCompletionSource<object>();
@@ -32,7 +39,7 @@ public override async Task StreamAsync(Uri uri, CancellationToken token)
 
             webSocket.Opened += (s, e) =>
             {
-                IsStreaming = true;
+                _isOpen = true;
                 RaiseOpenEvent();
             };
 
@@ -107,11 +114,13 @@ await tcs.Task
 
                 webSocket.Dispose();
 
-                if (IsStreaming)
+                if (_isOpen)
                 {
-                    IsStreaming = false;
+                    _isOpen = false;
                     RaiseCloseEvent();
                 }
+
+                IsStreaming = false;
             }
         }
     }

diff --git a/samples/Binance.WebSocket.WebSocketSharp/Binance.WebSocket.WebSocketSharp.csproj b/samples/Binance.WebSocket.WebSocketSharp/Binance.WebSocket.WebSocketSharp.csproj
@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>0.1.1</Version>
+    <Version>0.1.2</Version>
     <Authors>sonvister</Authors>
     <Company />
-    <AssemblyVersion>0.1.1.0</AssemblyVersion>
-    <FileVersion>0.1.1.0</FileVersion>
+    <AssemblyVersion>0.1.2.0</AssemblyVersion>
+    <FileVersion>0.1.2.0</FileVersion>
     <Copyright>Copyright © 2018 sonvister</Copyright>
   </PropertyGroup>
 

diff --git a/samples/Binance.WebSocket.WebSocketSharp/WebSocketSharpClient.cs b/samples/Binance.WebSocket.WebSocketSharp/WebSocketSharpClient.cs
@@ -11,6 +11,8 @@ namespace Binance.WebSocket
 {
     public class WebSocketSharpClient : WebSocketClient
     {
+        private volatile bool _isOpen;
+
         public WebSocketSharpClient(ILogger<WebSocketSharpClient> logger)
             : base(logger)
         { }
@@ -25,6 +27,11 @@ public override async Task StreamAsync(Uri uri, CancellationToken token)
 
             token.ThrowIfCancellationRequested();
 
+            if (IsStreaming)
+                throw new InvalidOperationException($"{nameof(WebSocketSharpClient)}.{nameof(StreamAsync)}: Already streaming (this method is not reentrant).");
+
+            IsStreaming = true;
+
             Exception exception = null;
 
             var tcs = new TaskCompletionSource<object>();
@@ -36,7 +43,7 @@ public override async Task StreamAsync(Uri uri, CancellationToken token)
 
             webSocket.OnOpen += (s, e) =>
             {
-                IsStreaming = true;
+                _isOpen = true;
                 RaiseOpenEvent();
             };
 
@@ -114,11 +121,13 @@ await tcs.Task
 
                 ((IDisposable) webSocket).Dispose();
 
-                if (IsStreaming)
+                if (_isOpen)
                 {
-                    IsStreaming = false;
+                    _isOpen = false;
                     RaiseCloseEvent();
                 }
+
+                IsStreaming = false;
             }
         }
     }