CipherLabs
/
ethstats-server
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added socket functionality

Browse Source
pull/5/head
cubedro 10 years ago
parent 8954fbae16
commit dd0dcd00da
9 changed files with 149 additions and 123 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 102
      app.js
  2. 8
      bin/www
  3. 47
      models/collection.js
  4. 29
      models/node.js
  5. 25
      public/js/controllers.js
  6. 6
      public/js/script.js
  7. 43
      public/js/services.js
  8. 10
      views/index.jade
  9. 2
      views/layout.jade

102
app.js
Unescape View File

@ -1,20 +1,18 @@
var express = require('express.io');
var express = require('express');
var app = express();
var path = require('path');
var favicon = require('serve-favicon');
var bodyParser = require('body-parser');
var Node = require('./models/node');
var Primus = require('primus'),
http = require('http'),
server,
api,
client;
var Collection = require('./models/collection');
var Nodes = new Collection();
server = http.createServer();
var server = require('http').createServer(app);
api = new Primus(server, {
transformer: 'websockets',
pathname: '/api',
@ -23,6 +21,14 @@ api = new Primus(server, {
api.use('emit', require('primus-emit'));
var client = new Primus(server, {
transformer: 'websockets',
pathname: '/primus',
parser: 'JSON'
});
client.use('emit', require('primus-emit'));
api.on('connection', function(spark) {
console.log(spark.id);
console.log(spark.address);
@ -31,82 +37,55 @@ api.on('connection', function(spark) {
spark.on('hello', function(data){
console.log('got hello data from ' + spark.id);
console.log(data);
Nodes.add(data);
if(typeof data.id !== 'undefined' && typeof data.info !== 'undefined')
{
data.ip = spark.address.ip;
var info = Nodes.add(data);
spark.emit('ready');
client.emit('new', info);
}
});
spark.on('update', function(data){
console.log('got update from ' + spark.id);
console.log(data);
});
});
var client = new Primus(server, {
transformer: 'websockets',
pathname: '/primus',
parser: 'JSON'
});
if(typeof data.id !== 'undefined' && typeof data.stats !== 'undefined')
{
var stats = Nodes.update(data.id, data.stats);
client.use('emit', require('primus-emit'));
client.emit('updated', stats);
}
});
});
client.on('connection', function(spark) {
console.log(spark);
console.log(spark.id);
console.log(spark.headers);
console.log(spark.address);
console.log(spark.query);
spark.write({give: 'identity'});
});
server.listen(process.env.API_PORT || 3000);
// if(fs.existsSync('./config/nodes.js')){
// config = require('./config/nodes');
// } else {
// config = require('./config/nodes.default');
// }
// var Node = require('./models/node');
spark.on('ready', function(data){
console.log('got hello data from ' + spark.id);
console.log(data);
var app = express();
app.http().io();
spark.emit('init', {nodes: Nodes.all()});
});
});
// view engine setup
app.set('views', path.join(__dirname, 'views'));
app.set('view engine', 'jade');
// uncomment after placing favicon in /public
//app.use(favicon(__dirname + '/public/favicon.ico'));
app.use(bodyParser.json());
app.use(bodyParser.urlencoded({ extended: false }));
app.use(express.static(path.join(__dirname, 'public')));
// var nodes = [],
// nodeStatus = [],
// nodeInterval;
// for(i in config) {
// nodes[i] = new Node(config[i], i);
// console.log(nodes[i]);
// nodeStatus[i] = nodes[i].update();
// }
// nodeInterval = setInterval(function(){
// for(i in nodes){
// app.io.broadcast('update', nodes[i].update());
// }
// }, 10000);
// app.get('/', function(req, res) {
// res.render('index', { title: 'Ethereum Network Status' });
// });
// app.io.route('ready', function(req) {
// req.io.emit('init', {
// nodes: nodeStatus
// });
// console.log('emited');
// });
app.get('/', function(req, res) {
res.render('index', { title: 'Ethereum Network Status' });
});
// catch 404 and forward to error handler
app.use(function(req, res, next) {
@ -116,9 +95,6 @@ app.use(function(req, res, next) {
});
// error handlers
// development error handler
// will print stacktrace
if (app.get('env') === 'development') {
app.use(function(err, req, res, next) {
res.status(err.status || 500);
@ -130,7 +106,6 @@ if (app.get('env') === 'development') {
}
// production error handler
// no stacktraces leaked to user
app.use(function(err, req, res, next) {
res.status(err.status || 500);
res.render('error', {
@ -139,5 +114,6 @@ app.use(function(err, req, res, next) {
});
});
server.listen(process.env.PORT || 3000);
module.exports = app;

8
bin/www
Unescape View File

@ -2,8 +2,8 @@
var debug = require('debug')('eth-netstats');
var app = require('../app');
app.set('port', process.env.PORT || 3000);
// app.set('port', process.env.PORT || 3000);
var server = app.listen(app.get('port'), function() {
debug('Express server listening on port ' + server.address().port);
});
// var server = app.listen(app.get('port'), function() {
// debug('Express server listening on port ' + server.address().port);
// });

47
models/collection.js
Unescape View File

@ -10,44 +10,63 @@ var Collection = function Collection()
Collection.prototype.add = function(data)
{
if(typeof data.id == 'undefined')
return false;
var node = this.getNodeOrNew({ id : data.id });
var node = this.getNodeOrNew({ id : data.id }, data);
node.info = data.info;
return node.getInfo();
}
Collection.prototype.get = function(id)
Collection.prototype.update = function(id, stats)
{
return this.getNode(id);
var node = this.getNode({ id: id });
if(!node)
return false;
node.stats = stats;
console.log(this.all());
return node.getStats();
}
Collection.prototype.getIndex = function(search)
{
return _.findIndex(this._list, search);
return (index >= 0 ? index : false);
}
Collection.prototype.getNode = function(search)
{
var index = this.getIndex(search);
if(index)
if(index >= 0)
return this._list[index];
return false;
}
Collection.prototype.getIndexOrNew = function(search)
Collection.prototype.getNodeByIndex = function(index)
{
if(this._list[index])
return this._list[index];
return false;
}
Collection.prototype.getIndexOrNew = function(search, data)
{
var index = this.getIndex(search);
return (index >= 0 ? index : this._list.push(new Node(data)) - 1);
}
Collection.prototype.getNodeOrNew = function(search, data)
{
var index = this.getIndex(search) || this._list.push(new Node());
return this.getNodeByIndex(this.getIndexOrNew(search, data));
}
Collection.prototype.getNodeOrNew = function(search)
Collection.prototype.all = function()
{
return this.getNode(this.getIndexOrNew(search));
return this._list;
}
module.exports = Collection;

29
models/node.js
Unescape View File

@ -1,6 +1,6 @@
var geoip = require('geoip-lite');
var Node = function Node()
var Node = function Node(data)
{
this.id = null;
this.info = {};
@ -15,20 +15,35 @@ var Node = function Node()
block: {},
blocktimeAvg: 0,
difficulty: [],
uptime: {
down: 0,
inc: 0,
total: 0
},
uptime: 0,
lastUpdate: 0
};
if(typeof data.id !== 'undefined')
this.id = data.id;
if(typeof data.info !== 'undefined')
this.info = data.info;
if(typeof data.ip !== 'undefined')
this.setGeo(data.ip);
return this;
}
Node.prototype.setGeo = function()
Node.prototype.setGeo = function(ip)
{
this.geo = geoip.lookup(ip);
}
Node.prototype.getInfo = function()
{
return {id: this.id, info: this.info, geo: this.geo};
}
Node.prototype.getStats = function()
{
return {id: this.id, stats: this.stats};
}
module.exports = Node;

25
public/js/controllers.js
Unescape View File

@ -18,10 +18,27 @@ function StatsCtrl($scope, $filter, socket, _) {
// Socket listeners
// ----------------
socket.emit('ready');
socket = new Primus();
socket.on('open', function open() {
socket.emit('ready');
console.log('The connection has been opened.');
}).on('end', function end() {
self._socket = false;
}).on('error', function error(err) {
console.log(err);
}).on('reconnecting', function reconnecting(opts) {
console.log('We are scheduling a reconnect operation', opts);
}).on('data', function incoming(data) {
console.log('Received some data', data);
});
// socket.emit('ready', 'test');
socket.on('init', function(data)
{
console.log(data);
$scope.nodes = data.nodes;
updateStats();
@ -29,6 +46,8 @@ function StatsCtrl($scope, $filter, socket, _) {
socket.on('update', function(data)
{
console.log(data);
$scope.nodes[data.id] = data;
updateStats();
@ -51,7 +70,7 @@ function StatsCtrl($scope, $filter, socket, _) {
}).stats.block.timestamp;
$scope.upTimeTotal = _.reduce($scope.nodes, function(total, node) {
return total + node.stats.uptime.total;
return total + node.stats.uptime;
}, 0) / $scope.nodes.length;
$scope.map = _.map($scope.nodes, function(node) {
@ -69,5 +88,7 @@ function StatsCtrl($scope, $filter, socket, _) {
longitude: 0
};
});
$scope.$apply();
}
}

6
public/js/script.js
Unescape View File

@ -1,10 +1,4 @@
(function() {
var socket = io.connect();
socket.on('init', function(data){
console.log(data);
});
$('body').on('mouseenter', '[data-toggle="tooltip"]', function( event ) {
$(this).tooltip('show');
}).on('mouseleave', '[data-toggle="tooltip"]', function( event ) {

43
public/js/services.js
Unescape View File

@ -3,27 +3,28 @@
/* Services */
app.factory('socket', function ($rootScope) {
var socket = io.connect();
return {
on: function (eventName, callback) {
socket.on(eventName, function () {
var args = arguments;
$rootScope.$apply(function () {
callback.apply(socket, args);
});
});
},
emit: function (eventName, data, callback) {
socket.emit(eventName, data, function () {
var args = arguments;
$rootScope.$apply(function () {
if (callback) {
callback.apply(socket, args);
}
});
})
}
};
var socket;// = new Primus();
return socket;
// return {
// on: function (eventName, callback) {
// socket.on(eventName, function () {
// var args = arguments;
// $rootScope.$apply(function () {
// callback.apply(socket, args);
// });
// });
// },
// emit: function (eventName, data, callback) {
// socket.emit(eventName, data, function () {
// var args = arguments;
// $rootScope.$apply(function () {
// if (callback) {
// callback.apply(socket, args);
// }
// });
// })
// }
// };
});
var underscore = angular.module('underscore', []);

10
views/index.jade
Unescape View File

@ -75,10 +75,10 @@ block content
tbody
tr(ng-repeat='node in nodes', class="{{ node.stats | mainClass : bestBlock }}")
td(rel="{{node.id}}")
span(data-toggle="tooltip", data-placement="top", data-original-title="{{node.geo | geoTooltip}}") {{node.name}}
div.small {{node.ip}}
td {{node.type}}
div.small {{node.os}}
span(data-toggle="tooltip", data-placement="top", data-original-title="{{node.geo | geoTooltip}}") {{node.info.name}}
div.small {{node.info.ip}}
td {{node.info.node}}
div.small {{node.info.os}}, {{node.info.os_v}}
td(class="{{ node.stats.peers | peerClass }}") {{node.stats.peers}}
td(class="{{ node.stats.mining | miningClass }}")
i(class="{{ node.stats.mining | miningIconClass }}")
@ -87,4 +87,4 @@ block content
span.small {{node.stats.block.hash}}
div.small Difficulty: {{node.stats.block.difficulty | gasFilter}} | Gas used: {{node.stats.block.gasUsed | gasFilter}} | Min gas price: {{node.stats.block.minGasPrice | gasFilter}} | Gas limit: {{node.stats.block.gasLimit | gasFilter}}
td(am-time-ago="node.stats.block.timestamp", am-preprocess="unix", class="{{ node.stats.block.timestamp | timeClass }}") ∞
td(class="{{ node.stats.uptime.total | upTimeClass }}") {{ node.stats.uptime.total | upTimeFilter }}
td(class="{{ node.stats.uptime | upTimeClass }}") {{ node.stats.uptime | upTimeFilter }}

2
views/layout.jade
Unescape View File

@ -12,7 +12,7 @@ html(ng-app="netStatsApp")
block content
script(src="/js/lib/angular.min.js")
script(src="/socket.io/socket.io.js")
script(src="/primus/primus.js")
script(src="/js/lib/underscore.min.js")
script(src="/js/lib/jquery.min.js")
script(src="/js/lib/d3.v3.min.js")

Write Preview
Loading…
Cancel
Save