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

Resubscribe to subscriptions after reconnecting

Browse Source
This commit is contained in:
Stefan Aebischer
2019-09-16 15:04:02 +02:00
parent 5caa65fedf
commit 26a1354ec5
3 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -48,9 +48,11 @@ const PRIVATE_KEY = 'yyy';
const ws = new WebsocketClient({key: API_KEY, secret: PRIVATE_KEY}); const ws = new WebsocketClient({key: API_KEY, secret: PRIVATE_KEY});
ws.on('open', function() {
ws.subscribe(['position', 'execution', 'trade']); ws.subscribe(['position', 'execution', 'trade']);
ws.subscribe('kline.BTCUSD.1m'); ws.subscribe('kline.BTCUSD.1m');
ws.on('open', function() {
console.log('connection open');
}); });
ws.on('update', function(message) { ws.on('update', function(message) {

4
doc/websocket-client.md
View File

@@ -164,9 +164,11 @@ const PRIVATE_KEY = 'yyy';
const ws = new WebsocketClient({key: API_KEY, secret: PRIVATE_KEY}); const ws = new WebsocketClient({key: API_KEY, secret: PRIVATE_KEY});
ws.on('open', function() {
ws.subscribe(['position', 'execution', 'trade']); ws.subscribe(['position', 'execution', 'trade']);
ws.subscribe('kline.BTCUSD.1m'); ws.subscribe('kline.BTCUSD.1m');
ws.on('open', function() {
console.log('connection open');
}); });
ws.on('update', function(message) { ws.on('update', function(message) {

40
lib/websocket-client.js
View File

@@ -15,6 +15,7 @@ const READY_STATE_INITIAL = 0;
const READY_STATE_CONNECTING = 1; const READY_STATE_CONNECTING = 1;
const READY_STATE_CONNECTED = 2; const READY_STATE_CONNECTED = 2;
const READY_STATE_CLOSING = 3; const READY_STATE_CLOSING = 3;
const READY_STATE_RECONNECTING = 4;
module.exports = class WebsocketClient extends EventEmitter { module.exports = class WebsocketClient extends EventEmitter {
constructor(options, logger) { constructor(options, logger) {
@@ -35,6 +36,7 @@ module.exports = class WebsocketClient extends EventEmitter {
} }
this.client = new RestClient(null, null, this.options.livenet); this.client = new RestClient(null, null, this.options.livenet);
this._subscriptions = new Set();
this._connect(); this._connect();
} }
@@ -42,23 +44,19 @@ module.exports = class WebsocketClient extends EventEmitter {
subscribe(topics) { subscribe(topics) {
if(!Array.isArray(topics)) topics = [topics]; if(!Array.isArray(topics)) topics = [topics];
const msgStr = JSON.stringify({ topics.forEach(topic => this._subscriptions.add(topic));
op: 'subscribe',
'args': topics
});
this.ws.send(msgStr); // subscribe not necessary if not yet connected (will subscribe onOpen)
if(this.readyState === READY_STATE_CONNECTED) this._subscribe(topics);
} }
unsubscribe(topics) { unsubscribe(topics) {
if(!Array.isArray(topics)) topics = [topics]; if(!Array.isArray(topics)) topics = [topics];
const msgStr = JSON.stringify({ topics.forEach(topic => this._subscriptions.delete(topic));
op: 'unsubscribe',
'args': topics
});
this.ws.send(msgStr); // unsubscribe not necessary if not yet connected
if(this.readyState === READY_STATE_CONNECTED) this._unsubscribe(topics);
} }
close() { close() {
@@ -110,6 +108,7 @@ module.exports = class WebsocketClient extends EventEmitter {
_reconnect(timeout) { _reconnect(timeout) {
this._teardown(); this._teardown();
this.readyState = READY_STATE_RECONNECTING;
setTimeout(() => { setTimeout(() => {
this.logger.info('Reconnecting to server', {category: 'bybit-ws'}); this.logger.info('Reconnecting to server', {category: 'bybit-ws'});
@@ -147,6 +146,8 @@ module.exports = class WebsocketClient extends EventEmitter {
} }
this.readyState = READY_STATE_CONNECTED; this.readyState = READY_STATE_CONNECTED;
this._subscribe([...this._subscriptions]);
this.pingInterval = setInterval(this._ping.bind(this), this.options.pingInterval); this.pingInterval = setInterval(this._ping.bind(this), this.options.pingInterval);
} }
@@ -192,4 +193,23 @@ module.exports = class WebsocketClient extends EventEmitter {
_handleUpdate(message) { _handleUpdate(message) {
this.emit('update', message); this.emit('update', message);
} }
_subscribe(topics) {
console.log(topics);
const msgStr = JSON.stringify({
op: 'subscribe',
'args': topics
});
this.ws.send(msgStr);
}
_unsubscribe(topics) {
const msgStr = JSON.stringify({
op: 'unsubscribe',
'args': topics
});
this.ws.send(msgStr);
}
} }