express-rate-limit 5.1.1 → 5.1.3

package/README.md

@@ -115,7 +115,7 @@ Defaults to `5`. Set to `0` to disable.
 
 ### windowMs
 
-Timeframe for which requests are checked/remebered. Also used in the Retry-After header when the limit is reached.
+Timeframe for which requests are checked/remembered. Also used in the Retry-After header when the limit is reached.
 
 Note: with non-default stores, you may need to configure this value twice, once here and once on the store. In some cases the units also differ (e.g. seconds vs miliseconds)
 

package/lib/express-rate-limit.js

@@ -13,16 +13,16 @@ function RateLimit(options) {
       skipFailedRequests: false, // Do not count failed requests (status >= 400)
       skipSuccessfulRequests: false, // Do not count successful requests (status < 400)
       // allows to create custom keys (by default user IP is used)
-      keyGenerator: function(req /*, res*/) {
+      keyGenerator: function (req /*, res*/) {
         return req.ip;
       },
-      skip: function(/*req, res*/) {
+      skip: function (/*req, res*/) {
         return false;
       },
-      handler: function(req, res /*, next*/) {
+      handler: function (req, res /*, next*/) {
         res.status(options.statusCode).send(options.message);
       },
-      onLimitReached: function(/*req, res, optionsUsed*/) {}
+      onLimitReached: function (/*req, res, optionsUsed*/) {},
     },
     options
   );
@@ -40,7 +40,7 @@ function RateLimit(options) {
     throw new Error("The store is not valid.");
   }
 
-  ["global", "delayMs", "delayAfter"].forEach(key => {
+  ["global", "delayMs", "delayAfter"].forEach((key) => {
     // note: this doesn't trigger if delayMs or delayAfter are set to 0, because that essentially disables them
     if (options[key]) {
       throw new Error(
@@ -56,7 +56,7 @@ function RateLimit(options) {
 
     const key = options.keyGenerator(req, res);
 
-    options.store.incr(key, function(err, current, resetTime) {
+    options.store.incr(key, function (err, current, resetTime) {
       if (err) {
         return next(err);
       }
@@ -65,13 +65,12 @@ function RateLimit(options) {
         typeof options.max === "function" ? options.max(req, res) : options.max;
 
       Promise.resolve(maxResult)
-        .catch(next)
-        .then(max => {
+        .then((max) => {
           req.rateLimit = {
             limit: max,
             current: current,
             remaining: Math.max(max - current, 0),
-            resetTime: resetTime
+            resetTime: resetTime,
           };
 
           if (options.headers && !res.headersSent) {
@@ -107,7 +106,7 @@ function RateLimit(options) {
             };
 
             if (options.skipFailedRequests) {
-              res.on("finish", function() {
+              res.on("finish", function () {
                 if (res.statusCode >= 400) {
                   decrementKey();
                 }
@@ -123,7 +122,7 @@ function RateLimit(options) {
             }
 
             if (options.skipSuccessfulRequests) {
-              res.on("finish", function() {
+              res.on("finish", function () {
                 if (res.statusCode < 400) {
                   options.store.decrement(key);
                 }
@@ -143,7 +142,8 @@ function RateLimit(options) {
           }
 
           next();
-        });
+        })
+        .catch(next);
     });
   }
 

package/lib/memory-store.js

@@ -10,7 +10,7 @@ function MemoryStore(windowMs) {
   let hits = {};
   let resetTime = calculateNextResetTime(windowMs);
 
-  this.incr = function(key, cb) {
+  this.incr = function (key, cb) {
     if (hits[key]) {
       hits[key]++;
     } else {
@@ -20,22 +20,21 @@ function MemoryStore(windowMs) {
     cb(null, hits[key], resetTime);
   };
 
-  this.decrement = function(key) {
+  this.decrement = function (key) {
     if (hits[key]) {
       hits[key]--;
     }
   };
 
   // export an API to allow hits all IPs to be reset
-  this.resetAll = function() {
+  this.resetAll = function () {
     hits = {};
     resetTime = calculateNextResetTime(windowMs);
   };
 
   // export an API to allow hits from one IP to be reset
-  this.resetKey = function(key) {
+  this.resetKey = function (key) {
     delete hits[key];
-    delete resetTime[key];
   };
 
   // simply reset ALL hits every windowMs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-rate-limit",
-  "version": "5.1.1",
+  "version": "5.1.3",
   "description": "Basic IP rate-limiting middleware for Express. Use to limit repeated requests to public APIs and/or endpoints such as password reset.",
   "homepage": "https://github.com/nfriedly/express-rate-limit",
   "author": {
@@ -34,17 +34,19 @@
   "dependencies": {},
   "devDependencies": {
     "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.10.0",
+    "eslint-config-prettier": "^6.10.1",
     "eslint-plugin-prettier": "^3.1.2",
     "express": "^4.17.1",
     "husky": "^4.2.3",
-    "mocha": "^7.0.1",
-    "prettier": "^1.19.1",
+    "mocha": "^7.1.1",
+    "prettier": "^2.0.4",
     "pretty-quick": "^2.0.1",
     "supertest": "^4.0.2"
   },
   "scripts": {
-    "test": "eslint . && mocha",
+    "lint": "eslint .",
+    "autofix": "npm run lint -- --fix",
+    "test": "npm run lint && mocha",
     "precommit": "pretty-quick --staged"
   }
 }