Merge pull request #82 from Adamant-im/chore/update-depends

Chore/update depends

.eslintrc.json

@@ -70,7 +70,7 @@
     "jsdoc/sort-tags": [
       "warn",
       {
-        "tagSequence": [
+        "tagSequence": [{ "tags": [
           "global",
           "typedef",
           "var",
@@ -93,7 +93,7 @@
           "see",
           "todo",
           "ignore"
-        ]
+        ]}]
       }
     ]
   },

.gitignore

@@ -32,6 +32,5 @@ tmp
 
 # npm
 node_modules
-package-lock.json
 npm-debug.log
 nodejs

app.js

@@ -33,7 +33,7 @@ var https = require('https');
 var Logger = require('./logger.js');
 var packageJson = require('./package.json');
 var path = require('path');
-var program = require('commander');
+var Command = require('commander').Command;
 var httpApi = require('./helpers/httpApi.js');
 var Sequence = require('./helpers/sequence.js');
 var util = require('util');
@@ -54,6 +54,8 @@ if (typeof gc !== 'undefined') {
   }, 60000);
 }
 
+const program = new Command();
+
 program
     .version(packageJson.version)
     .option('-c, --config <path>', 'config.json file path')

helpers/checkIpInList.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var _ = require('lodash');
-var ip = require('ip');
+var ip = require('neoip');
 
 /**
  * Checks if ip address is in list (e.g. whitelist, blacklist).

helpers/database.js

@@ -204,6 +204,9 @@ module.exports.connect = function (config, logger, cb) {
   });
 
   config.user = config.user || process.env.USER;
+  config.max = config.poolSize;
+
+  delete config.poolSize;
 
   var db = pgp(config);
   var migrator = new Migrator(pgp, db, logger);

helpers/request-limiter.js

@@ -3,8 +3,16 @@
 var rateLimit = require('express-rate-limit');
 var slowDown = require('express-slow-down');
 
+/**
+ * Allow all requests through
+ * @returns {true}
+ */
+function skip() {
+  return true;
+}
+
 var defaults = {
-  max: 0, // Disabled
+  skip: skip, // Disabled
   delayMs: 0, // Disabled
   delayAfter: 0, // Disabled
   windowMs: 60000 // 1 minute window
@@ -18,12 +26,20 @@ var defaults = {
  */
 function applyLimits (limits) {
   if (typeof limits === 'object') {
-    return {
+    const settings = {
       max: Math.floor(limits.max) || defaults.max,
-      delayMs: Math.floor(limits.delayMs) || defaults.delayMs,
+      delayMs: function(used) {
+        return (used - this.delayAfter) * (Math.floor(limits.delayMs) || defaults.delayMs);
+      },
       delayAfter: Math.floor(limits.delayAfter) || defaults.delayAfter,
       windowMs: Math.floor(limits.windowMs) || defaults.windowMs
     };
+
+    if (!limits.max) {
+      settings.skip = skip;
+    }
+
+    return settings;
   } else {
     return defaults;
   }

helpers/z_schema.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var ip = require('ip');
+var ip = require('neoip');
 /**
  * Uses JSON Schema validator z_schema to register custom formats.
  * - id