code/bybit-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix ws subscribe/unsubscribe workflows, which were repeating requests to each active ws connection unintentionally

Browse Source
This commit is contained in:
tiagosiebler
2022-10-09 19:21:46 +01:00
parent 6a925f18e1
commit 9c3a37e7b0
2 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "bybit-api", "name": "bybit-api",
"version": "3.0.2", "version": "3.1.0",
"description": "Complete & robust node.js SDK for Bybit's REST APIs and WebSockets, with TypeScript & integration tests.", "description": "Complete & robust node.js SDK for Bybit's REST APIs and WebSockets, with TypeScript & integration tests.",
"main": "lib/index.js", "main": "lib/index.js",
"types": "lib/index.d.ts", "types": "lib/index.d.ts",

37
src/websocket-client.ts
View File

@@ -116,22 +116,21 @@ export class WebsocketClient extends EventEmitter {
public subscribe(wsTopics: WsTopic[] | WsTopic, isPrivateTopic?: boolean) { public subscribe(wsTopics: WsTopic[] | WsTopic, isPrivateTopic?: boolean) {
const topics = Array.isArray(wsTopics) ? wsTopics : [wsTopics]; const topics = Array.isArray(wsTopics) ? wsTopics : [wsTopics];
topics.forEach((topic) => topics.forEach((topic) => {
this.wsStore.addTopic( const wsKey = getWsKeyForTopic(
getWsKeyForTopic(this.options.market, topic, isPrivateTopic), this.options.market,
topic topic,
) isPrivateTopic
); );
// attempt to send subscription topic per websocket // Persist topic for reconnects
this.wsStore.getKeys().forEach((wsKey: WsKey) => { this.wsStore.addTopic(wsKey, topic);
// if connected, send subscription request // if connected, send subscription request
if ( if (
this.wsStore.isConnectionState(wsKey, WsConnectionStateEnum.CONNECTED) this.wsStore.isConnectionState(wsKey, WsConnectionStateEnum.CONNECTED)
) { ) {
return this.requestSubscribeTopics(wsKey, [ return this.requestSubscribeTopics(wsKey, [topic]);
...this.wsStore.getTopics(wsKey),
]);
} }
// start connection process if it hasn't yet begun. Topics are automatically subscribed to on-connect // start connection process if it hasn't yet begun. Topics are automatically subscribed to on-connect
@@ -157,21 +156,21 @@ export class WebsocketClient extends EventEmitter {
*/ */
public unsubscribe(wsTopics: WsTopic[] | WsTopic, isPrivateTopic?: boolean) { public unsubscribe(wsTopics: WsTopic[] | WsTopic, isPrivateTopic?: boolean) {
const topics = Array.isArray(wsTopics) ? wsTopics : [wsTopics]; const topics = Array.isArray(wsTopics) ? wsTopics : [wsTopics];
topics.forEach((topic) => topics.forEach((topic) => {
this.wsStore.deleteTopic( const wsKey = getWsKeyForTopic(
getWsKeyForTopic(this.options.market, topic, isPrivateTopic), this.options.market,
topic topic,
) isPrivateTopic
); );
this.wsStore.getKeys().forEach((wsKey: WsKey) => { // Remove topic from persistence for reconnects
this.wsStore.deleteTopic(wsKey, topic);
// unsubscribe request only necessary if active connection exists // unsubscribe request only necessary if active connection exists
if ( if (
this.wsStore.isConnectionState(wsKey, WsConnectionStateEnum.CONNECTED) this.wsStore.isConnectionState(wsKey, WsConnectionStateEnum.CONNECTED)
) { ) {
this.requestUnsubscribeTopics(wsKey, [ this.requestUnsubscribeTopics(wsKey, [topic]);
...this.wsStore.getTopics(wsKey),
]);
} }
}); });
} }