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

Merge pull request #298 from jesuscript/default-colors 

Fixed client-side error spam when a node has non-standard node info; updated ws deps
This commit is contained in:
Marian OANCΞA 2016-11-09 02:34:31 +02:00 committed by GitHub
parent 55a9721f68 289008b2a7
commit e172a25058
6 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -10,4 +10,5 @@ config/nodes.js
*.swp
*.pem
.node-xmlhttprequest-*
ws_secret.json
ws_secret.json
stats.json

16
Gruntfile.js
View File

@ -185,7 +185,7 @@ module.exports = function(grunt) {
concat: {
vendor: {
options: {
sourceMap: true,
souceMap: false,
sourceMapIncludeSources: true,
sourceMapIn: ['dist/js/lib/*.map']
},
@ -201,13 +201,13 @@ module.exports = function(grunt) {
},
netstats: {
options: {
sourceMap: true,
sourceMap: false,
sourceMapIncludeSources: true,
sourceMapIn: ['dist/js/vendor.min.js.map', 'dist/js/app.min.js.map']
},
src: ['<%= concat.vendor.dest %>', '<%= uglify.app.dest %>'],
dest: 'dist/js/netstats.min.js',
nonull: true,
nonull: true
},
css: {
src: ['dist/css/*.min.css', 'dist/css/*.css'],
@ -215,7 +215,7 @@ module.exports = function(grunt) {
},
vendor_lite: {
options: {
sourceMap: true,
sourceMap: false,
sourceMapIncludeSources: true,
sourceMapIn: ['dist-lite/js/lib/*.map']
},
@ -231,7 +231,7 @@ module.exports = function(grunt) {
},
netstats_lite: {
options: {
sourceMap: true,
sourceMap: false,
sourceMapIncludeSources: true,
sourceMapIn: ['dist-lite/js/vendor.min.js.map', 'dist-lite/js/app.min.js.map']
},
@ -248,7 +248,7 @@ module.exports = function(grunt) {
app: {
options: {
mangle: false,
sourceMap: true,
sourceMap: false,
sourceMapIncludeSources: true
},
dest: 'dist/js/app.min.js',
@ -257,7 +257,7 @@ module.exports = function(grunt) {
app_lite: {
options: {
mangle: false,
sourceMap: true,
sourceMap: false,
sourceMapIncludeSources: true
},
dest: 'dist-lite/js/app.min.js',
@ -277,4 +277,4 @@ module.exports = function(grunt) {
grunt.registerTask('lite', ['clean:build_lite', 'clean:cleanup_js_lite', 'clean:cleanup_css_lite', 'jade:build_lite', 'copy:build_lite', 'cssmin:build_lite', 'concat:vendor_lite', 'concat:scripts_lite', 'uglify:app_lite', 'concat:netstats_lite', 'concat:css_lite', 'clean:cleanup_js_lite', 'clean:cleanup_css_lite']);
grunt.registerTask('build', 'default');
grunt.registerTask('all', ['default', 'lite']);
};
};

8
app.js
View File

@ -54,8 +54,8 @@ api = new Primus(server, {
parser: 'JSON'
});
api.use('emit', require('primus-emit'));
api.use('spark-latency', require('primus-spark-latency'));
api.plugin('emit', require('primus-emit'));
api.plugin('spark-latency', require('primus-spark-latency'));
// Init Client Socket connection
@ -65,7 +65,7 @@ client = new Primus(server, {
parser: 'JSON'
});
client.use('emit', require('primus-emit'));
client.plugin('emit', require('primus-emit'));
// Init external API
@ -75,7 +75,7 @@ external = new Primus(server, {
parser: 'JSON'
});
external.use('emit', require('primus-emit'));
external.plugin('emit', require('primus-emit'));
// Init collections
var Collection = require('./lib/collection');

2
lib/utils/logger.js
View File

@ -162,4 +162,4 @@ var ENV_VERBOSITY = process.env.VERBOSITY || 2;
return fn.apply( this, item.formatter(sign, message) );
}
});
});

25
package.json
View File

@ -17,12 +17,19 @@
"debug": "2.2.0",
"express": "4.13.3",
"geoip-lite": "1.1.6",
"grunt": "^0.4.5",
"grunt-contrib-clean": "^0.6.0",
"grunt-contrib-concat": "^0.5.1",
"grunt-contrib-copy": "^0.8.0",
"grunt-contrib-cssmin": "^0.12.3",
"grunt-contrib-jade": "^0.14.1",
"grunt-contrib-uglify": "^0.9.1",
"jade": "1.11.0",
"lodash": "3.10.1",
"primus": "3.2.1",
"primus-emit": "0.1.2",
"primus-spark-latency": "0.1.1",
"ws": "0.8.0"
"primus": "^6.0.5",
"primus-emit": "^1.0.0",
"primus-spark-latency": "^0.1.1",
"ws": "^1.1.1"
},
"repository": {
"type": "git",
@ -40,13 +47,5 @@
}
],
"license": "LGPL-3.0",
"devDependencies": {
"grunt": "^0.4.5",
"grunt-contrib-clean": "^0.6.0",
"grunt-contrib-concat": "^0.5.1",
"grunt-contrib-copy": "^0.8.0",
"grunt-contrib-cssmin": "^0.12.3",
"grunt-contrib-jade": "^0.14.1",
"grunt-contrib-uglify": "^0.9.1"
}
"devDependencies": {}
}

32
src/js/filters.js
View File

@ -128,7 +128,7 @@ angular.module('netStatsApp.filters', [])
})
.filter('nodeVersion', function($sce) {
return function(version) {
if(typeof version !== 'undefined')
if(version)
{
var tmp = version.split('/');
@ -139,19 +139,19 @@ angular.module('netStatsApp.filters', [])
tmp[0] = 'pyeth';
}
if(tmp[1][0] !== 'v' && tmp[1][2] !== '.')
if(tmp[1] && tmp[1][0] !== 'v' && tmp[1][2] !== '.')
{
tmp.splice(1,1);
}
if(tmp[2] === 'Release'){
if(tmp[2] && tmp[2] === 'Release'){
tmp.splice(2,1);
}
if(tmp[2].indexOf('Linux') === 0)
if(tmp[2] && tmp[2].indexOf('Linux') === 0)
tmp[2] = 'linux';
if(tmp[2].indexOf('Darwin') === 0)
if(tmp[2] && tmp[2].indexOf('Darwin') === 0)
tmp[2] = 'darwin';
return $sce.trustAsHtml(tmp.join('/'));
@ -463,19 +463,21 @@ angular.module('netStatsApp.filters', [])
var tooltip = [];
var string = '';
if(node.info.node !== '' && typeof node.info.node !== 'undefined') {
if(node.info.node) {
var eth_version = node.info.node.split('/');
if(eth_version[1][0] !== 'v' && eth_version[1][2] !== '.')
{
eth_version.splice(1,1);
}
if(eth_version[1]){
if(eth_version[1][0] !== 'v' && eth_version[1][2] !== '.')
{
eth_version.splice(1,1);
}
string = "<b>" + node.info.node + "</b>";
tooltip.push(string);
string = "<b>" + node.info.node + "</b>";
tooltip.push(string);
string = "Version: <b>" + (eth_version[1]) + "</b>";
tooltip.push(string);
string = "Version: <b>" + (eth_version[1]) + "</b>";
tooltip.push(string);
}
}
if(node.info.net !== '') {
@ -668,4 +670,4 @@ function blockTimeClass(diff)
return 'text-orange';
return 'text-danger'
}
}