express-rate-limit 6.2.0 → 6.4.0

package/changelog.md

@@ -6,6 +6,32 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [6.4.0](https://github.com/nfriedly/express-rate-limit/releases/tag/v6.3.0)
+
+### Added
+
+- Adds Express 5 (`5.0.0-beta.1`) as a supported peer dependency (#304)
+
+## Changed
+
+- Tests are now run on Node 12, 14, 16 and 18 on CI (#305)
+- Updated all development dependencies (#306)
+
+## [6.3.0](https://github.com/nfriedly/express-rate-limit/releases/tag/v6.3.0)
+
+### Changed
+
+- Changes the build target to es2019 so that ESBuild outputs code that can run
+  with Node 12.
+- Changes the minimum required Node version to 12.9.0.
+
+## [6.2.1](https://github.com/nfriedly/express-rate-limit/releases/tag/v6.2.1)
+
+### Fixed
+
+- Use the default value for an option when `undefined` is passed to the rate
+  limiter.
+
 ## [6.2.0](https://github.com/nfriedly/express-rate-limit/releases/tag/v6.2.0)
 
 ### Added

package/dist/index.cjs

@@ -2,24 +2,19 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __reExport = (target, module2, copyDefault, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && (copyDefault || key !== "default"))
-        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return target;
+  return to;
 };
-var __toCommonJS = /* @__PURE__ */ ((cache) => {
-  return (module2, temp) => {
-    return cache && cache.get(module2) || (temp = __reExport(__markAsModule({}), module2, 1), cache && cache.set(module2, temp), temp);
-  };
-})(typeof WeakMap !== "undefined" ? /* @__PURE__ */ new WeakMap() : 0);
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // source/index.ts
 var source_exports = {};
@@ -28,6 +23,7 @@ __export(source_exports, {
   default: () => lib_default,
   rateLimit: () => lib_default
 });
+module.exports = __toCommonJS(source_exports);
 
 // source/memory-store.ts
 var calculateNextResetTime = (windowMs) => {
@@ -48,7 +44,8 @@ var MemoryStore = class {
     }
   }
   async increment(key) {
-    const totalHits = (this.hits[key] ?? 0) + 1;
+    var _a;
+    const totalHits = ((_a = this.hits[key]) != null ? _a : 0) + 1;
     this.hits[key] = totalHits;
     return {
       totalHits,
@@ -88,50 +85,51 @@ var promisifyStore = (passedStore) => {
       });
     }
     async decrement(key) {
-      return Promise.resolve(legacyStore.decrement(key));
+      return legacyStore.decrement(key);
     }
     async resetKey(key) {
-      return Promise.resolve(legacyStore.resetKey(key));
+      return legacyStore.resetKey(key);
     }
     async resetAll() {
       if (typeof legacyStore.resetAll === "function")
-        return Promise.resolve(legacyStore.resetAll());
+        return legacyStore.resetAll();
     }
   }
   return new PromisifiedStore();
 };
 var parseOptions = (passedOptions) => {
-  const options = {
+  var _a, _b, _c;
+  const notUndefinedOptions = omitUndefinedOptions(passedOptions);
+  const config = {
     windowMs: 60 * 1e3,
-    store: new MemoryStore(),
     max: 5,
     message: "Too many requests, please try again later.",
     statusCode: 429,
-    legacyHeaders: passedOptions.headers ?? true,
-    standardHeaders: passedOptions.draft_polli_ratelimit_headers ?? false,
+    legacyHeaders: (_a = passedOptions.headers) != null ? _a : true,
+    standardHeaders: (_b = passedOptions.draft_polli_ratelimit_headers) != null ? _b : false,
     requestPropertyName: "rateLimit",
     skipFailedRequests: false,
     skipSuccessfulRequests: false,
     requestWasSuccessful: (_request, response) => response.statusCode < 400,
     skip: (_request, _response) => false,
-    keyGenerator: (request, _response) => {
+    keyGenerator(request, _response) {
       if (!request.ip) {
         console.error("WARN | `express-rate-limit` | `request.ip` is undefined. You can avoid this by providing a custom `keyGenerator` function, but it may be indicative of a larger issue.");
       }
       return request.ip;
     },
-    handler: (_request, response, _next, _optionsUsed) => {
-      response.status(options.statusCode).send(options.message);
+    handler(_request, response, _next, _optionsUsed) {
+      response.status(config.statusCode).send(config.message);
     },
-    onLimitReached: (_request, _response, _optionsUsed) => {
+    onLimitReached(_request, _response, _optionsUsed) {
     },
-    ...passedOptions
+    ...notUndefinedOptions,
+    store: promisifyStore((_c = notUndefinedOptions.store) != null ? _c : new MemoryStore())
   };
-  if (typeof options.store.incr !== "function" && typeof options.store.increment !== "function" || typeof options.store.decrement !== "function" || typeof options.store.resetKey !== "function" || typeof options.store.resetAll !== "undefined" && typeof options.store.resetAll !== "function" || typeof options.store.init !== "undefined" && typeof options.store.init !== "function") {
+  if (typeof config.store.increment !== "function" || typeof config.store.decrement !== "function" || typeof config.store.resetKey !== "function" || typeof config.store.resetAll !== "undefined" && typeof config.store.resetAll !== "function" || typeof config.store.init !== "undefined" && typeof config.store.init !== "function") {
     throw new TypeError("An invalid store was passed. Please ensure that the store is a class that implements the `Store` interface.");
   }
-  options.store = promisifyStore(options.store);
-  return options;
+  return config;
 };
 var handleAsyncErrors = (fn) => async (request, response, next) => {
   try {
@@ -141,7 +139,7 @@ var handleAsyncErrors = (fn) => async (request, response, next) => {
   }
 };
 var rateLimit = (passedOptions) => {
-  const options = parseOptions(passedOptions ?? {});
+  const options = parseOptions(passedOptions != null ? passedOptions : {});
   if (typeof options.store.init === "function")
     options.store.init(options);
   const middleware = handleAsyncErrors(async (request, response, next) => {
@@ -220,6 +218,15 @@ var rateLimit = (passedOptions) => {
   middleware.resetKey = options.store.resetKey.bind(options.store);
   return middleware;
 };
+var omitUndefinedOptions = (passedOptions) => {
+  const omittedOptions = {};
+  for (const k of Object.keys(passedOptions)) {
+    const key = k;
+    if (passedOptions[key] !== void 0) {
+      omittedOptions[key] = passedOptions[key];
+    }
+  }
+  return omittedOptions;
+};
 var lib_default = rateLimit;
-module.exports = __toCommonJS(source_exports);
 module.exports = rateLimit; module.exports.default = rateLimit; module.exports.rateLimit = rateLimit; module.exports.MemoryStore = MemoryStore;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-// Generated by dts-bundle-generator v6.4.0
+// Generated by dts-bundle-generator v6.8.0
 
 import { NextFunction, Request, RequestHandler, Response } from 'express';
 
@@ -233,7 +233,7 @@ export interface Options {
 	 *
 	 * By default, the built-in `MemoryStore` will be used.
 	 */
-	store: Store;
+	store: Store | LegacyStore;
 	/**
 	 * Whether to send `X-RateLimit-*` headers with the rate limit and the number
 	 * of requests.
@@ -276,9 +276,7 @@ export interface RateLimitInfo {
  *
  * @public
  */
-export declare const rateLimit: (passedOptions?: (Omit<Partial<Options>, "store"> & {
-	store?: LegacyStore | Store | undefined;
-}) | undefined) => RateLimitRequestHandler;
+export declare const rateLimit: (passedOptions?: Partial<Options> | undefined) => RateLimitRequestHandler;
 /**
  * A `Store` that stores the hit count for each client in memory.
  *

package/dist/index.mjs

@@ -17,7 +17,8 @@ var MemoryStore = class {
     }
   }
   async increment(key) {
-    const totalHits = (this.hits[key] ?? 0) + 1;
+    var _a;
+    const totalHits = ((_a = this.hits[key]) != null ? _a : 0) + 1;
     this.hits[key] = totalHits;
     return {
       totalHits,
@@ -57,50 +58,51 @@ var promisifyStore = (passedStore) => {
       });
     }
     async decrement(key) {
-      return Promise.resolve(legacyStore.decrement(key));
+      return legacyStore.decrement(key);
     }
     async resetKey(key) {
-      return Promise.resolve(legacyStore.resetKey(key));
+      return legacyStore.resetKey(key);
     }
     async resetAll() {
       if (typeof legacyStore.resetAll === "function")
-        return Promise.resolve(legacyStore.resetAll());
+        return legacyStore.resetAll();
     }
   }
   return new PromisifiedStore();
 };
 var parseOptions = (passedOptions) => {
-  const options = {
+  var _a, _b, _c;
+  const notUndefinedOptions = omitUndefinedOptions(passedOptions);
+  const config = {
     windowMs: 60 * 1e3,
-    store: new MemoryStore(),
     max: 5,
     message: "Too many requests, please try again later.",
     statusCode: 429,
-    legacyHeaders: passedOptions.headers ?? true,
-    standardHeaders: passedOptions.draft_polli_ratelimit_headers ?? false,
+    legacyHeaders: (_a = passedOptions.headers) != null ? _a : true,
+    standardHeaders: (_b = passedOptions.draft_polli_ratelimit_headers) != null ? _b : false,
     requestPropertyName: "rateLimit",
     skipFailedRequests: false,
     skipSuccessfulRequests: false,
     requestWasSuccessful: (_request, response) => response.statusCode < 400,
     skip: (_request, _response) => false,
-    keyGenerator: (request, _response) => {
+    keyGenerator(request, _response) {
       if (!request.ip) {
         console.error("WARN | `express-rate-limit` | `request.ip` is undefined. You can avoid this by providing a custom `keyGenerator` function, but it may be indicative of a larger issue.");
       }
       return request.ip;
     },
-    handler: (_request, response, _next, _optionsUsed) => {
-      response.status(options.statusCode).send(options.message);
+    handler(_request, response, _next, _optionsUsed) {
+      response.status(config.statusCode).send(config.message);
     },
-    onLimitReached: (_request, _response, _optionsUsed) => {
+    onLimitReached(_request, _response, _optionsUsed) {
     },
-    ...passedOptions
+    ...notUndefinedOptions,
+    store: promisifyStore((_c = notUndefinedOptions.store) != null ? _c : new MemoryStore())
   };
-  if (typeof options.store.incr !== "function" && typeof options.store.increment !== "function" || typeof options.store.decrement !== "function" || typeof options.store.resetKey !== "function" || typeof options.store.resetAll !== "undefined" && typeof options.store.resetAll !== "function" || typeof options.store.init !== "undefined" && typeof options.store.init !== "function") {
+  if (typeof config.store.increment !== "function" || typeof config.store.decrement !== "function" || typeof config.store.resetKey !== "function" || typeof config.store.resetAll !== "undefined" && typeof config.store.resetAll !== "function" || typeof config.store.init !== "undefined" && typeof config.store.init !== "function") {
     throw new TypeError("An invalid store was passed. Please ensure that the store is a class that implements the `Store` interface.");
   }
-  options.store = promisifyStore(options.store);
-  return options;
+  return config;
 };
 var handleAsyncErrors = (fn) => async (request, response, next) => {
   try {
@@ -110,7 +112,7 @@ var handleAsyncErrors = (fn) => async (request, response, next) => {
   }
 };
 var rateLimit = (passedOptions) => {
-  const options = parseOptions(passedOptions ?? {});
+  const options = parseOptions(passedOptions != null ? passedOptions : {});
   if (typeof options.store.init === "function")
     options.store.init(options);
   const middleware = handleAsyncErrors(async (request, response, next) => {
@@ -189,6 +191,16 @@ var rateLimit = (passedOptions) => {
   middleware.resetKey = options.store.resetKey.bind(options.store);
   return middleware;
 };
+var omitUndefinedOptions = (passedOptions) => {
+  const omittedOptions = {};
+  for (const k of Object.keys(passedOptions)) {
+    const key = k;
+    if (passedOptions[key] !== void 0) {
+      omittedOptions[key] = passedOptions[key];
+    }
+  }
+  return omittedOptions;
+};
 var lib_default = rateLimit;
 export {
   MemoryStore,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "express-rate-limit",
-	"version": "6.2.0",
+	"version": "6.4.0",
 	"description": "Basic IP rate-limiting middleware for Express. Use to limit repeated requests to public APIs and/or endpoints such as password reset.",
 	"author": {
 		"name": "Nathan Friedly",
@@ -46,12 +46,12 @@
 		"changelog.md"
 	],
 	"engines": {
-		"node": ">= 14.5.0"
+		"node": ">= 12.9.0"
 	},
 	"scripts": {
 		"clean": "del-cli dist/ coverage/ *.log *.tmp *.bak *.tgz",
-		"build:cjs": "esbuild --bundle --format=cjs --outfile=dist/index.cjs --footer:js=\"module.exports = rateLimit; module.exports.default = rateLimit; module.exports.rateLimit = rateLimit; module.exports.MemoryStore = MemoryStore;\" source/index.ts",
-		"build:esm": "esbuild --bundle --format=esm --outfile=dist/index.mjs source/index.ts",
+		"build:cjs": "esbuild --bundle --target=es2019 --format=cjs --outfile=dist/index.cjs --footer:js=\"module.exports = rateLimit; module.exports.default = rateLimit; module.exports.rateLimit = rateLimit; module.exports.MemoryStore = MemoryStore;\" source/index.ts",
+		"build:esm": "esbuild --bundle --target=es2019 --format=esm --outfile=dist/index.mjs source/index.ts",
 		"build:types": "dts-bundle-generator --out-file=dist/index.d.ts source/index.ts",
 		"compile": "run-s clean build:*",
 		"lint:code": "xo --ignore test/external/",
@@ -67,28 +67,28 @@
 		"prepare": "run-s compile && husky install config/husky"
 	},
 	"peerDependencies": {
-		"express": "^4"
+		"express": "^4 || ^5"
 	},
 	"devDependencies": {
-		"@jest/globals": "^27.4.6",
-		"@types/express": "^4.17.13",
-		"@types/jest": "^27.4.0",
-		"@types/node": "^16.11.21",
-		"@types/supertest": "^2.0.11",
-		"cross-env": "^7.0.3",
-		"del-cli": "^4.0.1",
-		"dts-bundle-generator": "^6.4.0",
-		"esbuild": "^0.14.12",
-		"express": "^4.17.1",
-		"husky": "^7.0.4",
-		"jest": "^27.4.7",
-		"lint-staged": "^12.2.2",
-		"npm-run-all": "^4.1.5",
-		"supertest": "^6.2.2",
-		"ts-jest": "^27.1.3",
-		"ts-node": "^10.4.0",
-		"typescript": "^4.5.5",
-		"xo": "^0.47.0"
+		"@jest/globals": "27.4.6",
+		"@types/express": "4.17.13",
+		"@types/jest": "27.4.1",
+		"@types/node": "16.11.27",
+		"@types/supertest": "2.0.12",
+		"cross-env": "7.0.3",
+		"del-cli": "4.0.1",
+		"dts-bundle-generator": "6.8.0",
+		"esbuild": "0.14.38",
+		"express": "4.17.3",
+		"husky": "7.0.4",
+		"jest": "27.5.1",
+		"lint-staged": "12.4.0",
+		"npm-run-all": "4.1.5",
+		"supertest": "6.2.2",
+		"ts-jest": "27.1.4",
+		"ts-node": "10.7.0",
+		"typescript": "4.6.3",
+		"xo": "0.48.0"
 	},
 	"xo": {
 		"prettier": true,