Skip to content
This repository was archived by the owner on May 1, 2018. It is now read-only.

Getting entire orderbook data upon new connection #125

Open
jd4ever wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Getting entire orderbook data upon new connection #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4aa9ebd
Getting entire orderbook data upon new connection
jd4ever1 Jan 4, 2018
57951e4
Merge branch 'master' of https://github.com/dparlevliet/node.bittrex.api
jd4ever1 Feb 1, 2018
7096141
Updating saved npm packages to newer versions
jd4ever1 Jun 12, 2018
5b0e539
Added QueryExchangeState endpoint to get entire orderbook
jd4ever1 Jun 12, 2018
deb4404
add package-lock file
jd4ever1 May 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions examples/bittrex.websockets.subscribe.example.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,19 @@ bittrex.options({
'verbose' : true,
});

<<<<<<< HEAD
console.log('Connecting ....');
bittrex.websockets.subscribe(['BTC-ETH','BTC-SC','BTC-ZEN'], function(data, client) {
if (data.M === 'entireOrderbook') {
console.log('Bittrex orderbook received for ', data.market);
console.log('Entire orderbook: ', data.result)
}
if (data.M === 'updateExchangeState') {
data.A.forEach(function(data_for) {
console.log('Market Update for '+ data_for.MarketName, data_for);
});
}
=======
bittrex.options({
verbose: true,
websockets: {
Expand All @@ -28,6 +41,7 @@ bittrex.options({
});
},
},
>>>>>>> 754a0840786d800e7b560298fe6103d467dadd4e
});

console.log('Connecting ....');
Expand Down
73 changes: 48 additions & 25 deletions node.bittrex.api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,31 +183,32 @@ var NodeBittrexApi = function() {
try { wsclient.end(); } catch (e) {}
}

if (!websocketWatchDog) {
websocketWatchDog = setInterval(function() {
if (!wsclient) {
return;
}

if (
opts.websockets &&
(
opts.websockets.autoReconnect === true ||
typeof(opts.websockets.autoReconnect) === 'undefined'
)
) {
var now = (new Date()).getTime();
var diff = now - websocketLastMessage;
// if (!websocketWatchDog) {
// websocketWatchDog = setInterval(function() {
// if (!wsclient) {
// return;
// }

// if (
// opts.websockets &&
// (
// opts.websockets.autoReconnect === true ||
// typeof(opts.websockets.autoReconnect) === 'undefined'
// )
// ) {
// var now = (new Date()).getTime();
// var diff = now - websocketLastMessage;

if (diff > 60 * 1000) {
((opts.verbose) ? console.log('Websocket Watch Dog: Websocket has not received communication for over 1 minute. Forcing reconnection. Ruff!') : '');
connectws(callback, true);
} else {
((opts.verbose) ? console.log('Websocket Watch Dog: Last message received '+diff+'ms ago. Ruff!') : '');
}
}
}, 5 * 1000);
}
// if (diff > 60 * 1000) {
// ((opts.verbose) ? console.log('Websocket Watch Dog: Websocket has not received communication for over 1 minute. Forcing reconnection. Ruff!') : '');
// wsclient.end();
// connectws(callback, true);
// } else {
// ((opts.verbose) ? console.log('Websocket Watch Dog: Last message received '+diff+'ms ago. Ruff!') : '');
// }
// }
// }, 5 * 1000);
// }

cloudscraper.get('https://bittrex.com/', function(error, response, body) {
if (error) {
Expand Down Expand Up @@ -264,6 +265,7 @@ var NodeBittrexApi = function() {
},
onerror: function(error) {
((opts.verbose) ? console.log('Websocket onerror: ', error) : '');
connectws(callback, true);
},
bindingError: function(error) {
((opts.verbose) ? console.log('Websocket bindingError: ', error) : '');
Expand Down Expand Up @@ -299,6 +301,27 @@ var NodeBittrexApi = function() {
if (result === true) {
((opts.verbose) ? console.log('Subscribed to ' + market) : '');
}

//////// Get entire orderbook to start //////
wsclient.call('CoreHub', 'QueryExchangeState', market).done(function(err, result) {
if (err) {
return console.error(err);
}

var data = {
M: 'entireOrderbook',
market: market,
result: result
}
if (websocketMarketsCallbacks.length > 0) {
websocketMarketsCallbacks.forEach(function(callback) {
callback(data, wsclient);
});
}
});
////////////////////////////////////////////


});
});
}
Expand Down Expand Up @@ -466,4 +489,4 @@ var NodeBittrexApi = function() {
};
}();

module.exports = NodeBittrexApi;
module.exports = NodeBittrexApi;
Loading