Merge branch 'release/0.2.1-beta'

romansemko · romansemko · commit c84ac17502a8 · 2018-02-04T16:23:44.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.4.1] - 2018-02-04
+
+### Changed
+- Fixed api requests overflooding.
+
 ## [0.4.0] - 2018-02-04
 
 ### BREAKING CHANGE
diff --git a/build/asset-manifest.json b/build/asset-manifest.json
@@ -1,6 +1,6 @@
 {
   "main.css": "static/css/main.ef153f8d.css",
   "main.css.map": "static/css/main.ef153f8d.css.map",
-  "main.js": "static/js/main.db092208.js",
-  "main.js.map": "static/js/main.db092208.js.map"
+  "main.js": "static/js/main.c68bff14.js",
+  "main.js.map": "static/js/main.c68bff14.js.map"
 }
diff --git a/build/index.html b/build/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous"><title>Nelson Monitor</title><link href="/static/css/main.ef153f8d.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript" src="/static/js/main.db092208.js"></script></body></html>
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous"><title>Nelson Monitor</title><link href="/static/css/main.ef153f8d.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript" src="/static/js/main.c68bff14.js"></script></body></html>
diff --git a/build/nelson.gui.js b/build/nelson.gui.js
@@ -7,12 +7,18 @@ var request = require('request');
 var md5 = require('md5');
 var crypto = require('crypto');
 var express = require('express');
+var throttle = require("express-throttle");
 var bodyParser = require('body-parser');
 var program = require('commander');
 var path = require('path');
 var app = express();
 var version = require('../package.json').version;
 
+var apiThrottleOptions = {
+    "burst": 5,
+    "rate": "10/min"
+};
+
 var parseNumber = function parseNumber(v) {
     return parseInt(v);
 };
@@ -29,8 +35,8 @@ app.set('port', process.env.NELSON_GUI_PORT || program.port);
 app.use(express.static(path.join(__dirname)));
 app.use(bodyParser.urlencoded({ extended: false }));
 app.use(bodyParser.json());
-app.get('/api', proxy);
-app.get('/api/peers', proxy);
+app.get('/api', throttle(apiThrottleOptions), proxy);
+app.get('/api/peers', throttle(apiThrottleOptions), proxy);
 
 var salt = crypto.randomBytes(48).toString('hex');
 // Listen for requests
@@ -64,7 +70,7 @@ function proxy(req, resp) {
             return;
         }
         if (r.statusCode === 401) {
-            console.log('Remote access denied');
+            console.log('Remote access denied', req.query, opts);
             resp.status(401);
             return;
         }
diff --git a/build/service-worker.js b/build/service-worker.js
diff --git a/build/static/js/main.c68bff14.js b/build/static/js/main.c68bff14.js
diff --git a/build/static/js/main.c68bff14.js.map b/build/static/js/main.c68bff14.js.map
diff --git a/build/static/js/main.db092208.js.map b/build/static/js/main.db092208.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nelson.gui",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/SemkoDev/nelson.gui.git"
@@ -31,6 +31,7 @@
     "body-parser": "^1.18.2",
     "classnames": "^2.2.5",
     "commander": "^2.12.2",
+    "express-throttle": "^2.0.0",
     "lodash": "^4.17.4",
     "material-ui": "^0.20.0",
     "md5": "^2.2.1",
diff --git a/src/App.js b/src/App.js
@@ -36,14 +36,14 @@ class App extends Component {
     }
 
     componentDidMount () {
-        this.props.getNelsonData();
+        this.startPoll();
         if (this.props.match.params.auth) {
             this.props.changeConnection(this.props.match.params);
         }
     }
 
     componentWillUnmount() {
-        clearTimeout(this.timeout);
+        this.timeout && clearInterval(this.timeout);
     }
 
     componentWillReceiveProps(nextProps) {
@@ -101,8 +101,7 @@ class App extends Component {
     }
 
     startPoll () {
-        this.props.getNelsonData().then(this.props.getNelsonPeers())
-        this.timeout = setTimeout(() => {
+        this.timeout = setInterval(() => {
             this.props.getNelsonData().then(this.props.getNelsonPeers())
         }, this.props.updateInterval);
     }
diff --git a/src/nelson.gui.js b/src/nelson.gui.js
@@ -3,12 +3,18 @@ const request = require('request');
 const md5 = require('md5');
 const crypto = require('crypto');
 const express = require('express');
+const throttle = require("express-throttle");
 const bodyParser = require('body-parser');
 const program = require('commander');
 const path = require('path');
 const app = express();
 const version = require('../package.json').version;
 
+const apiThrottleOptions = {
+    "burst": 5,
+    "rate": "10/min"
+};
+
 const parseNumber = (v) => parseInt(v);
 
 process.on('unhandledRejection', (reason, p) => {
@@ -28,8 +34,8 @@ app.set('port', process.env.NELSON_GUI_PORT || program.port);
 app.use(express.static(path.join(__dirname)));
 app.use(bodyParser.urlencoded({ extended: false }));
 app.use(bodyParser.json());
-app.get('/api', proxy);
-app.get('/api/peers', proxy);
+app.get('/api', throttle(apiThrottleOptions), proxy);
+app.get('/api/peers', throttle(apiThrottleOptions), proxy);
 
 const salt = crypto.randomBytes(48).toString('hex');
 // Listen for requests
@@ -62,7 +68,7 @@ function proxy (req, resp) {
             return;
         }
         if (r.statusCode === 401) {
-            console.log('Remote access denied');
+            console.log('Remote access denied', req.query, opts);
             resp.status(401);
             return;
         }
diff --git a/yarn.lock b/yarn.lock
@@ -2564,6 +2564,12 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
+express-throttle@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/express-throttle/-/express-throttle-2.0.0.tgz#371cca348a82ccf2b924379119df7e73c05f6acf"
+  dependencies:
+    lru-cache "^4.0.1"
+
 express@^4.13.3:
   version "4.16.2"
   resolved "https://registry.yarnpkg.com/express/-/express-4.16.2.tgz#e35c6dfe2d64b7dca0a5cd4f21781be3299e076c"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"main.css": "static/css/main.ef153f8d.css",`
`3`	`3`	`"main.css.map": "static/css/main.ef153f8d.css.map",`
`4`		`- "main.js": "static/js/main.db092208.js",`
`5`		`- "main.js.map": "static/js/main.db092208.js.map"`
	`4`	`+ "main.js": "static/js/main.c68bff14.js",`
	`5`	`+ "main.js.map": "static/js/main.c68bff14.js.map"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous"><title>Nelson Monitor</title><link href="/static/css/main.ef153f8d.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript" src="/static/js/main.db092208.js"></script></body></html>
	`1`	+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous"><title>Nelson Monitor</title><link href="/static/css/main.ef153f8d.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript" src="/static/js/main.c68bff14.js"></script></body></html>
Original file line number	Diff line number	Diff line change
`@@ -36,14 +36,14 @@ class App extends Component {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`componentDidMount () {`
`39`		`- this.props.getNelsonData();`
	`39`	`+ this.startPoll();`
`40`	`40`	`if (this.props.match.params.auth) {`
`41`	`41`	`this.props.changeConnection(this.props.match.params);`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`componentWillUnmount() {`
`46`		`- clearTimeout(this.timeout);`
	`46`	`+ this.timeout && clearInterval(this.timeout);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`componentWillReceiveProps(nextProps) {`
`@@ -101,8 +101,7 @@ class App extends Component {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`startPoll () {`
`104`		`- this.props.getNelsonData().then(this.props.getNelsonPeers())`
`105`		`- this.timeout = setTimeout(() => {`
	`104`	`+ this.timeout = setInterval(() => {`
`106`	`105`	`this.props.getNelsonData().then(this.props.getNelsonPeers())`
`107`	`106`	`}, this.props.updateInterval);`
`108`	`107`	`}`