feat(ws): connect after markets and tickers

gmtech-xyz · Mar 31, 2023 · 4aae18c · 4aae18c
1 parent 6732ca7
commit 4aae18c
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 37 deletions.
diff --git a/src/exchanges/binance/binance.exchange.ts b/src/exchanges/binance/binance.exchange.ts
@@ -100,6 +100,10 @@ export class Binance extends BaseExchange {
     this.store.tickers = tickers;
     this.store.loaded.tickers = true;
 
+    // start websocket streams
+    this.publicWebsocket.connectAndSubscribe();
+    this.privateWebsocket.connectAndSubscribe();
+
     // fetch current position mode (Hedge/One-way)
     this.store.options.isHedged = await this.fetchPositionMode();
 

diff --git a/src/exchanges/binance/binance.ws-private.ts b/src/exchanges/binance/binance.ws-private.ts
@@ -11,11 +11,6 @@ import {
 } from './binance.types';
 
 export class BinancePrivateWebsocket extends BaseWebSocket<Binance> {
-  constructor(parent: Binance) {
-    super(parent);
-    this.connectAndSubscribe();
-  }
-
   connectAndSubscribe = async () => {
     const listenKey = await this.fetchListenKey();
 

diff --git a/src/exchanges/binance/binance.ws-public.ts b/src/exchanges/binance/binance.ws-public.ts
@@ -7,11 +7,6 @@ import type { Binance } from './binance.exchange';
 import { BASE_WS_URL } from './binance.types';
 
 export class BinancePublicWebsocket extends BaseWebSocket<Binance> {
-  constructor(parent: Binance) {
-    super(parent);
-    this.connectAndSubscribe();
-  }
-
   connectAndSubscribe = () => {
     this.ws = new WebSocket(
       BASE_WS_URL.public[this.parent.options.testnet ? 'testnet' : 'livenet']

diff --git a/src/exchanges/bybit/bybit.exchange.ts b/src/exchanges/bybit/bybit.exchange.ts
@@ -105,6 +105,10 @@ export class Bybit extends BaseExchange {
     this.store.tickers = tickers;
     this.store.loaded.tickers = true;
 
+    // start websocket streams
+    this.publicWebsocket.connectAndSubscribe();
+    this.privateWebsocket.connectAndSubscribe();
+
     // start ticking live data
     // balance, tickers, positions
     await this.tick();

diff --git a/src/exchanges/bybit/bybit.ws-private.ts b/src/exchanges/bybit/bybit.ws-private.ts
@@ -8,11 +8,6 @@ import type { Bybit } from './bybit.exchange';
 import { BASE_WS_URL } from './bybit.types';
 
 export class BybitPrivateWebsocket extends BaseWebSocket<Bybit> {
-  constructor(parent: Bybit) {
-    super(parent);
-    this.connectAndSubscribe();
-  }
-
   connectAndSubscribe = () => {
     this.ws = new WebSocket(
       BASE_WS_URL.private[this.parent.options.testnet ? 'testnet' : 'livenet']

diff --git a/src/exchanges/bybit/bybit.ws-public.ts b/src/exchanges/bybit/bybit.ws-public.ts
@@ -1,31 +1,9 @@
-import { subscribe } from 'valtio/vanilla';
-
 import { BaseWebSocket } from '../base.ws';
 
 import type { Bybit } from './bybit.exchange';
 import { BASE_WS_URL } from './bybit.types';
 
 export class BybitPublicWebsocket extends BaseWebSocket<Bybit> {
-  constructor(parent: Bybit) {
-    super(parent);
-
-    // we use this little trick to make sure we connect and subscribe
-    // after loaded the markets and tickers first with xhr API
-    const unsubscribe = subscribe(this.parent.store.loaded, () => {
-      if (
-        this.parent.store.loaded.markets &&
-        this.parent.store.loaded.tickers
-      ) {
-        unsubscribe();
-        this.connectAndSubscribe();
-      }
-    });
-
-    if (this.parent.isDisposed) {
-      unsubscribe();
-    }
-  }
-
   connectAndSubscribe = () => {
     if (!this.parent.isDisposed) {
       this.ws = new WebSocket(