[Bug] Create new IWebSocketFeed when reconnecting (#117)

dougdellolio · Apr 29, 2018 · 5c402c4 · 5c402c4
1 parent 2f98ee0
commit 5c402c4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/GDAXSharp/GDAXClient.cs b/GDAXSharp/GDAXClient.cs
@@ -1,4 +1,5 @@
 using GDAXSharp.Network.Authentication;
+using System;
 using GDAXSharp.Network.HttpClient;
 using GDAXSharp.Network.HttpRequest;
 using GDAXSharp.Services.Accounts;
@@ -36,7 +37,7 @@ public GDAXClient(
         {
             var clock = new Clock();
             var httpRequestMessageService = new HttpRequestMessageService(authenticator, clock, sandBox);
-            var webSocketFeed = new WebSocketFeed(sandBox);
+            var createWebSocketFeed = (Func<IWebSocketFeed>)(() => new WebSocketFeed(sandBox));
             var queryBuilder = new QueryBuilder();
 
             AccountsService = new AccountsService(httpClient, httpRequestMessageService);
@@ -51,7 +52,7 @@ public GDAXClient(
             FundingsService = new FundingsService(httpClient, httpRequestMessageService, queryBuilder);
             ReportsService = new ReportsService(httpClient, httpRequestMessageService);
             UserAccountService = new UserAccountService(httpClient, httpRequestMessageService);
-            WebSocket = new WebSocket.WebSocket(webSocketFeed, authenticator, clock);
+            WebSocket = new WebSocket.WebSocket(createWebSocketFeed, authenticator, clock);
         }
 
         public AccountsService AccountsService { get; }

diff --git a/GDAXSharp/WebSocket/WebSocket.cs b/GDAXSharp/WebSocket/WebSocket.cs
@@ -18,7 +18,7 @@ namespace GDAXSharp.WebSocket
 {
     public class WebSocket
     {
-        private readonly IWebSocketFeed webSocketFeed;
+        private readonly Func<IWebSocketFeed> createWebSocketFeed;
 
         private readonly IAuthenticator authenticator;
 
@@ -30,14 +30,16 @@ public class WebSocket
 
         private List<ChannelType> channelTypes;
 
+        private IWebSocketFeed webSocketFeed;
+
         public WebSocketState State => webSocketFeed.State;
 
         public WebSocket(
-            IWebSocketFeed webSocketFeed,
+            Func<IWebSocketFeed> createWebSocketFeed,
             IAuthenticator authenticator,
             IClock clock)
         {
-            this.webSocketFeed = webSocketFeed;
+            this.createWebSocketFeed = createWebSocketFeed;
             this.authenticator = authenticator;
             this.clock = clock;
         }
@@ -62,6 +64,7 @@ public void Start(
             productTypes = providedProductTypes;
             channelTypes = providedChannelTypes;
 
+            webSocketFeed = createWebSocketFeed();
             webSocketFeed.Closed += WebSocket_Closed;
             webSocketFeed.Error += WebSocket_Error;
             webSocketFeed.MessageReceived += WebSocket_MessageReceived;