Markdown fix + Dockerfile added + Location fix + Responsive design + Bug fixed

.dockerignore

@@ -0,0 +1 @@
+**/.git

.travis.yml

@@ -1,6 +1,7 @@
 language: node_js
-node_js:
-  - "0.12"
-env:
-  global:
-    secure: Qdkmi13nqcXskABBhbuGZmRakh4orOW1dalkSCyUbzGuYf0OdYF8ttNVuJa0WSWI4KhNXhtz2p3I8dM95wL++LCVqXFmIvZtX8Nca36KlNxIPNXPjn0odayh+c4pgrhrbz8TDmDXl9IPuZmNz8HHtN7xmIn6YDcm13wA3gTmfwo=
+sudo: required
+dist: trusty
+node_js: '8'
+install:
+  - npm install
+  - npm run dist

Dockerfile

@@ -0,0 +1,9 @@
+FROM mhart/alpine-node:latest
+
+ADD . /eth-netstats
+WORKDIR /eth-netstats
+
+RUN npm install && npm install -g grunt-cli && grunt
+
+EXPOSE  3000
+CMD ["npm", "start"]

README.md

@@ -1,10 +1,11 @@
-Ethereum Network Stats
+Ethereum Network Stats based off github.com/cubedro/eth-netstats
 ============
 [![Build Status][travis-image]][travis-url] [![dependency status][dep-image]][dep-url]
 
-This is a visual interface for tracking ethereum network status. It uses WebSockets to receive stats from running nodes and output them through an angular interface. It is the front-end implementation for [eth-net-intelligence-api](https://github.com/cubedro/eth-net-intelligence-api).
+This is a visual interface for tracking ethereum network status. It uses WebSockets to receive stats from running nodes and output them through an angular interface. It is the front-end implementation for [eth-net-intelligence-api](https://github.com/eosclab/eth-net-intelligence-api).
 
-![Screenshot](https://raw.githubusercontent.com/cubedro/eth-netstats/master/src/images/screenshot.jpg?v=0.0.6 "Screenshot")
+
+![Screenshot](https://raw.githubusercontent.com/eosclab/eth-netstats/master/src/images/screenshot.jpg?v=0.0.6 "Screenshot")
 
 ## Prerequisite
 * node
@@ -16,40 +17,53 @@ Make sure you have node.js and npm installed.
 Clone the repository and install the dependencies
 
 ```bash
-git clone https://github.com/cubedro/eth-netstats
+git clone https://github.com/eosclab/eth-netstats
 cd eth-netstats
 npm install
-sudo npm install -g grunt-cli
 ```
 
-##Build the resources
-NetStats features two versions: the full version and the lite version. In order to build the static files you have to run grunt tasks which will generate dist or dist-lite directories containing the js and css files, fonts and images.
-
+## Build the resources
 
-To build the full version run
+To build run
 ```bash
-grunt
+npm run dist
 ```
 
-To build the lite version run
-```bash
-grunt lite
-```
-
-If you want to build both versions run
-```bash
-grunt all
-```
-
-##Run
+## Run
 
 ```bash
 npm start
 ```
 
 see the interface at http://localhost:3000
 
-[travis-image]: https://travis-ci.org/cubedro/eth-netstats.svg
-[travis-url]: https://travis-ci.org/cubedro/eth-netstats
-[dep-image]: https://david-dm.org/cubedro/eth-netstats.svg
-[dep-url]: https://david-dm.org/cubedro/eth-netstats
+## Add nodes to site
+
+For now, the site should be looking blank. For instruction on adding new nodes to the site, refer to [eth-net-intelligence-api](https://github.com/eosclab/eth-net-intelligence-api).
+
+## Updates since original cubedro/eth-netstats base:
+
++ Fixed block history if chain is shorted than MAX_HISTORY
+
++ Fixed broken headings in Markdown files
+
++ Docker support added (compatible with puppeth)
+
++ Updated geoip-lite package to latest version (fixed location info)
+
++ Responsive design patch added for mobile view
+
++ Bug fixed with charts and formats
+
+## To-do list
+
++ Update npm libraries for vulnerability patch & performance increase
+
++ Add average TPS calculation
+
++ More features with DPOS / POA!
+
+[travis-image]: https://travis-ci.org/eosclab/eth-netstats.svg
+[travis-url]: https://travis-ci.org/eosclab/eth-netstats
+[dep-image]: https://david-dm.org/eosclab/eth-netstats.svg
+[dep-url]: https://david-dm.org/eosclab/eth-netstats

app.js

@@ -29,7 +29,8 @@ else
 	}
 }
 
-var banned = require('./lib/utils/config').banned;
+var banned   = require('./lib/utils/config').banned;
+var reserved = require('./lib/utils/config').reserved;
 
 // Init http server
 if( process.env.NODE_ENV !== 'production' )
@@ -106,7 +107,7 @@ api.on('connection', function (spark)
 	{
 		console.info('API', 'CON', 'Hello', data['id']);
 
-		if( _.isUndefined(data.secret) || WS_SECRET.indexOf(data.secret) === -1 || banned.indexOf(spark.address.ip) >= 0 )
+		if( _.isUndefined(data.secret) || WS_SECRET.indexOf(data.secret) === -1 || banned.indexOf(spark.address.ip) >= 0 || _.isUndefined(data.id) || reserved.indexOf(data.id) >= 0 )
 		{
 			spark.end(undefined, { reconnect: false });
 			console.error('API', 'CON', 'Closed - wrong auth', data);
@@ -196,7 +197,7 @@ api.on('connection', function (spark)
 							data: stats
 						});
 
-						console.success('API', 'BLK', 'Block:', data.block['number'], 'from:', data.id);
+						console.success('API', 'BLK', 'Block:', data.block['number'], 'td:', data.block['totalDifficulty'], 'from:', data.id, 'ip:', spark.address.ip);
 
 						Nodes.getCharts();
 					}

lib/history.js

@@ -169,7 +169,7 @@ History.prototype.add = function(block, id, trusted, addingHistory)
 				propagTimes: []
 			}
 
-			if( this._items.length === 0 || (this._items.length === MAX_HISTORY && block.number > this.worstBlockNumber()) || (this._items.length < MAX_HISTORY && block.number < this.bestBlockNumber() && addingHistory) )
+			if( this._items.length === 0 || (this._items.length > 0 && block.number > this.worstBlockNumber()) || (this._items.length < MAX_HISTORY && block.number < this.bestBlockNumber() && addingHistory) )
 			{
 				item.propagTimes.push({
 					node: id,

lib/node.js

@@ -102,6 +102,9 @@ Node.prototype.setInfo = function(data, callback)
 
 Node.prototype.setGeo = function(ip)
 {
+	if (ip.substr(0, 7) == "::ffff:") {
+		ip = ip.substr(7)
+        }
 	this.info.ip = ip;
 	this.geo = geoip.lookup(ip);
 }

lib/utils/config.js

@@ -1,31 +1,9 @@
-var trusted = [
-	'52.16.188.185',
-	'54.94.239.50',
-	'54.174.74.156',
-	'54.172.25.93',
-	'54.174.75.126',
-	'54.173.232.137',
-	'52.7.205.180',
-	'52.7.218.44',
-	'52.7.205.152',
-	'52.7.224.174',
-	'92.51.165.126',
-	'84.117.82.122',
-	'73.40.58.88',
-	'178.19.221.38',
-	'185.37.145.18',
-	'172.31.39.87',
-	'86.120.171.69',
-	'86.123.155.6',
-	'188.24.81.133',
-	'::ffff:127.0.0.1',
-];
+var trusted = [];
 
-var banned = [
-	// '198.48.150.206'
-];
+var banned = [];
 
 module.exports = {
-	trusted: trusted,
-	banned: banned
-};
+	trusted:  trusted,
+	banned:   banned,
+	reserved: []
+};