grassrootseconomics
/
ethstats-client
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #90 from cubedro/develop 

Reduced update lag
This commit is contained in:
Marian OANCΞA 2015-04-28 08:40:06 +03:00
parent 633159d053 2ac7cba9f4
commit 918e2919a2
1 changed files with 45 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
lib/node.js
View File

@ -40,7 +40,7 @@ var socket = new Socket(process.env.WS_SERVER || 'ws://localhost:3000');
var WS_SECRET = process.env.WS_SECRET || "eth-net-stats-has-a-secret";
var PENDING_WORKS = true;
var MAX_BLOCKS_HISTORY = 36;
var MAX_BLOCKS_HISTORY = 40;
var UPDATE_INTERVAL = 5000;
var PING_INTERVAL = 2000;
var MINERS_LIMIT = 5;
@ -113,6 +113,9 @@ function Node()
this.updateInterval = false;
this.pingInterval = false;
this._lastLatestLog = 0;
this._lastPendingLog = 0;
socket.on('open', function open() {
socket.emit('hello', { id: self.id, info: self.info, secret: WS_SECRET });
console.info('The connection has been opened.');
@ -487,9 +490,21 @@ Node.prototype.setWatches = function()
this.pendingFilter = web3.eth.filter('pending');
this.pendingFilter.watch( function(log) {
if(PENDING_WORKS) {
debounce(function() {
self.updatePending();
}, 50);
var now = (new Date()).getTime();
var time = now - self._lastPendingLog;
if(time > 50)
{
self.update();
}
else
{
debounce(function() {
self.updatePending();
}, 50);
}
self._lastPendingLog = now;
}
});
}
@ -499,19 +514,32 @@ Node.prototype.setWatches = function()
console.error(err);
}
try {
this.chainFilter = web3.eth.filter('latest');
this.chainFilter.watch(function(log) {
debounce(function() {
self.update();
}, 50);
});
}
catch (err)
{
console.error("Couldn't set up chain filter");
console.error(err);
}
// try {
// this.chainFilter = web3.eth.filter('latest');
// this.chainFilter.watch(function(log)
// {
// var now = (new Date()).getTime();
// var time = now - self._lastLatestLog;
// if(time > 50)
// {
// self.update();
// }
// else
// {
// debounce(function() {
// self.update();
// }, 50);
// }
// self._lastLatestLog = now;
// });
// }
// catch (err)
// {
// console.error("Couldn't set up chain filter");
// console.error(err);
// }
this.updateInterval = setInterval(function(){
self.update();