Use timeoutScheduler in webSocket clients

atomex-protocol · Sep 5, 2022 · 6fab5f0 · 6fab5f0
1 parent 6ac6c99
commit 6fab5f0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/clients/webSocket/exchangeWebSocketClient.ts b/src/clients/webSocket/exchangeWebSocketClient.ts
@@ -1,5 +1,5 @@
 import type { AuthorizationManager, AuthToken } from '../../authorization/index';
-import { EventEmitter } from '../../core/index';
+import { EventEmitter, TimeoutScheduler } from '../../core/index';
 import type { WebSocketResponseDto } from '../dtos';
 import { WebSocketClient } from './webSocketClient';
 
@@ -17,6 +17,7 @@ export class ExchangeWebSocketClient {
   protected readonly sockets: Map<string, WebSocketClient> = new Map();
 
   private _isStarted = false;
+  protected reconnectScheduler = new TimeoutScheduler([1000, 5000, 30000, 60000], 60000);
 
   constructor(
     protected readonly webSocketApiBaseUrl: string,
@@ -45,6 +46,8 @@ export class ExchangeWebSocketClient {
       this.removeSocket(userId);
     });
 
+    this.reconnectScheduler.dispose();
+
     this._isStarted = false;
   }
 
@@ -84,8 +87,8 @@ export class ExchangeWebSocketClient {
   };
 
   protected onClosed = (socket: WebSocketClient, _event: CloseEvent) => {
-    setTimeout(() => {
+    this.reconnectScheduler.setTimeout(() => {
       socket.connect();
-    }, 1000);
+    });
   };
 }
diff --git a/src/clients/webSocket/marketDataWebSocketClient.ts b/src/clients/webSocket/marketDataWebSocketClient.ts
@@ -1,4 +1,4 @@
-import { EventEmitter } from '../../core/index';
+import { EventEmitter, TimeoutScheduler } from '../../core/index';
 import type { WebSocketResponseDto } from '../dtos';
 import { WebSocketClient } from './webSocketClient';
 
@@ -7,6 +7,7 @@ export interface MarketDataWebSocketClientEvents {
 }
 
 export class MarketDataWebSocketClient {
+  protected static readonly reconnectTimeouts = [1000, 5000, 3000, 6000];
   protected static readonly MARKET_DATA_URL_PATH = '/ws/marketdata';
   protected static readonly TOP_OF_BOOK_STREAM = 'topOfBook';
   protected static readonly ORDER_BOOK_STREAM = 'orderBook';
@@ -18,6 +19,7 @@ export class MarketDataWebSocketClient {
   protected socket: WebSocketClient;
 
   private _isStarted = false;
+  protected reconnectScheduler = new TimeoutScheduler([1000, 5000, 30000, 60000], 60000);
 
   constructor(
     protected readonly webSocketApiBaseUrl: string
@@ -49,6 +51,7 @@ export class MarketDataWebSocketClient {
     this.socket.events.messageReceived.removeListener(this.onSocketMessageReceived);
     this.socket.events.closed.removeListener(this.onSocketClosed);
     this.socket.disconnect();
+    this.reconnectScheduler.dispose();
 
     this._isStarted = false;
   }
@@ -59,10 +62,10 @@ export class MarketDataWebSocketClient {
   }
 
   protected onSocketClosed = (socket: WebSocketClient, _event: CloseEvent) => {
-    setTimeout(async () => {
+    this.reconnectScheduler.setTimeout(async () => {
       await socket.connect();
       this.subscribeOnStreams(socket);
-    }, 1000);
+    });
   };
 
   protected onSocketMessageReceived = (message: WebSocketResponseDto) => {

diff --git a/src/clients/webSocket/webSocketClient.ts b/src/clients/webSocket/webSocketClient.ts
@@ -29,9 +29,11 @@ export class WebSocketClient {
 
   async connect(): Promise<void> {
     this.disconnect();
+
     return new Promise(resolve => {
       const protocols = this.authToken ? ['access_token', this.authToken] : undefined;
       this._socket = new WebSocket(this.url, protocols);
+
       this.socket.addEventListener('message', this.onMessageReceived);
       this.socket.addEventListener('error', this.onError);
       this.socket.addEventListener('close', this.onClosed);