express-rate-limit 6.6.0 → 6.7.0

package/changelog.md

@@ -6,21 +6,50 @@ 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.5.0](https://github.com/nfriedly/express-rate-limit/releases/tag/v6.5.0)
+## [6.7.0](https://github.com/express-rate-limit/express-rate-limit/releases/tag/v6.7.0)
 
-## Changed
+### Changed
+
+- Updated links to point to new express-rate-limit organization on GitHub.
+- Added advertisement to Readme for project sponsor
+  [Zuplo](https://zuplo.link/express-rate-limit).
+- Updated TypeScript version and other dev dependencies
+- Changed CI test suite: dropped node.js 12, added node.js 19
+
+No functional changes.
+
+## [6.6.0](https://github.com/nfriedly/express-rate-limit/releases/tag/v6.6.0)
+
+### Added
+
+- Added `shutdown` method to the Store interface and the MemoryStore.
+
+## [6.5.2](https://github.com/nfriedly/express-rate-limit/releases/tag/v6.5.2)
+
+### Fixed
+
+- Fixed an issue with missing types in ESM monorepos.
+
+## [6.5.1](https://github.com/nfriedly/express-rate-limit/releases/tag/v6.5.1)
+
+### Added
 
 - The message option can now be a (sync/asynx) function that returns a value
   (#311)
+
+### Changed
+
 - Updated all dependencies
 
+Note: 6.5.0 was not released due to CI automation issues.
+
 ## [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
+### Changed
 
 - Tests are now run on Node 12, 14, 16 and 18 on CI (#305)
 - Updated all development dependencies (#306)

package/dist/index.cjs

@@ -79,11 +79,14 @@ var promisifyStore = (passedStore) => {
   class PromisifiedStore {
     async increment(key) {
       return new Promise((resolve, reject) => {
-        legacyStore.incr(key, (error, totalHits, resetTime) => {
-          if (error)
-            reject(error);
-          resolve({ totalHits, resetTime });
-        });
+        legacyStore.incr(
+          key,
+          (error, totalHits, resetTime) => {
+            if (error)
+              reject(error);
+            resolve({ totalHits, resetTime });
+          }
+        );
       });
     }
     async decrement(key) {
@@ -116,13 +119,18 @@ var parseOptions = (passedOptions) => {
     skip: (_request, _response) => false,
     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.");
+        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;
     },
     async handler(request, response, _next, _optionsUsed) {
       response.status(config.statusCode);
-      const message = typeof config.message === "function" ? await config.message(request, response) : config.message;
+      const message = typeof config.message === "function" ? await config.message(
+        request,
+        response
+      ) : config.message;
       if (!response.writableEnded) {
         response.send(message != null ? message : "Too many requests, please try again later.");
       }
@@ -133,7 +141,9 @@ var parseOptions = (passedOptions) => {
     store: promisifyStore((_c = notUndefinedOptions.store) != null ? _c : new MemoryStore())
   };
   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.");
+    throw new TypeError(
+      "An invalid store was passed. Please ensure that the store is a class that implements the `Store` interface."
+    );
   }
   return config;
 };
@@ -148,79 +158,92 @@ var rateLimit = (passedOptions) => {
   const options = parseOptions(passedOptions != null ? passedOptions : {});
   if (typeof options.store.init === "function")
     options.store.init(options);
-  const middleware = handleAsyncErrors(async (request, response, next) => {
-    const skip = await options.skip(request, response);
-    if (skip) {
-      next();
-      return;
-    }
-    const augmentedRequest = request;
-    const key = await options.keyGenerator(request, response);
-    const { totalHits, resetTime } = await options.store.increment(key);
-    const retrieveQuota = typeof options.max === "function" ? options.max(request, response) : options.max;
-    const maxHits = await retrieveQuota;
-    augmentedRequest[options.requestPropertyName] = {
-      limit: maxHits,
-      current: totalHits,
-      remaining: Math.max(maxHits - totalHits, 0),
-      resetTime
-    };
-    if (options.legacyHeaders && !response.headersSent) {
-      response.setHeader("X-RateLimit-Limit", maxHits);
-      response.setHeader("X-RateLimit-Remaining", augmentedRequest[options.requestPropertyName].remaining);
-      if (resetTime instanceof Date) {
-        response.setHeader("Date", new Date().toUTCString());
-        response.setHeader("X-RateLimit-Reset", Math.ceil(resetTime.getTime() / 1e3));
+  const middleware = handleAsyncErrors(
+    async (request, response, next) => {
+      const skip = await options.skip(request, response);
+      if (skip) {
+        next();
+        return;
       }
-    }
-    if (options.standardHeaders && !response.headersSent) {
-      response.setHeader("RateLimit-Limit", maxHits);
-      response.setHeader("RateLimit-Remaining", augmentedRequest[options.requestPropertyName].remaining);
-      if (resetTime) {
-        const deltaSeconds = Math.ceil((resetTime.getTime() - Date.now()) / 1e3);
-        response.setHeader("RateLimit-Reset", Math.max(0, deltaSeconds));
+      const augmentedRequest = request;
+      const key = await options.keyGenerator(request, response);
+      const { totalHits, resetTime } = await options.store.increment(key);
+      const retrieveQuota = typeof options.max === "function" ? options.max(request, response) : options.max;
+      const maxHits = await retrieveQuota;
+      augmentedRequest[options.requestPropertyName] = {
+        limit: maxHits,
+        current: totalHits,
+        remaining: Math.max(maxHits - totalHits, 0),
+        resetTime
+      };
+      if (options.legacyHeaders && !response.headersSent) {
+        response.setHeader("X-RateLimit-Limit", maxHits);
+        response.setHeader(
+          "X-RateLimit-Remaining",
+          augmentedRequest[options.requestPropertyName].remaining
+        );
+        if (resetTime instanceof Date) {
+          response.setHeader("Date", new Date().toUTCString());
+          response.setHeader(
+            "X-RateLimit-Reset",
+            Math.ceil(resetTime.getTime() / 1e3)
+          );
+        }
       }
-    }
-    if (options.skipFailedRequests || options.skipSuccessfulRequests) {
-      let decremented = false;
-      const decrementKey = async () => {
-        if (!decremented) {
-          await options.store.decrement(key);
-          decremented = true;
+      if (options.standardHeaders && !response.headersSent) {
+        response.setHeader("RateLimit-Limit", maxHits);
+        response.setHeader(
+          "RateLimit-Remaining",
+          augmentedRequest[options.requestPropertyName].remaining
+        );
+        if (resetTime) {
+          const deltaSeconds = Math.ceil(
+            (resetTime.getTime() - Date.now()) / 1e3
+          );
+          response.setHeader("RateLimit-Reset", Math.max(0, deltaSeconds));
         }
-      };
-      if (options.skipFailedRequests) {
-        response.on("finish", async () => {
-          if (!options.requestWasSuccessful(request, response))
-            await decrementKey();
-        });
-        response.on("close", async () => {
-          if (!response.writableEnded)
-            await decrementKey();
-        });
-        response.on("error", async () => {
-          await decrementKey();
-        });
       }
-      if (options.skipSuccessfulRequests) {
-        response.on("finish", async () => {
-          if (options.requestWasSuccessful(request, response))
+      if (options.skipFailedRequests || options.skipSuccessfulRequests) {
+        let decremented = false;
+        const decrementKey = async () => {
+          if (!decremented) {
+            await options.store.decrement(key);
+            decremented = true;
+          }
+        };
+        if (options.skipFailedRequests) {
+          response.on("finish", async () => {
+            if (!options.requestWasSuccessful(request, response))
+              await decrementKey();
+          });
+          response.on("close", async () => {
+            if (!response.writableEnded)
+              await decrementKey();
+          });
+          response.on("error", async () => {
             await decrementKey();
-        });
+          });
+        }
+        if (options.skipSuccessfulRequests) {
+          response.on("finish", async () => {
+            if (options.requestWasSuccessful(request, response))
+              await decrementKey();
+          });
+        }
       }
-    }
-    if (maxHits && totalHits === maxHits + 1) {
-      options.onLimitReached(request, response, options);
-    }
-    if (maxHits && totalHits > maxHits) {
-      if ((options.legacyHeaders || options.standardHeaders) && !response.headersSent) {
-        response.setHeader("Retry-After", Math.ceil(options.windowMs / 1e3));
+      if (maxHits && totalHits === maxHits + 1) {
+        options.onLimitReached(request, response, options);
+      }
+      if (maxHits && totalHits > maxHits) {
+        if ((options.legacyHeaders || options.standardHeaders) && !response.headersSent) {
+          response.setHeader("Retry-After", Math.ceil(options.windowMs / 1e3));
+        }
+        options.handler(request, response, next, options);
+        return;
       }
-      options.handler(request, response, next, options);
-      return;
+      next();
     }
-    next();
-  });
+  );
   middleware.resetKey = options.store.resetKey.bind(options.store);
   return middleware;
 };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-// Generated by dts-bundle-generator v6.12.0
+// Generated by dts-bundle-generator v7.0.0
 
 import { NextFunction, Request, RequestHandler, Response } from 'express';
 
@@ -66,7 +66,7 @@ export declare type RateLimitRequestHandler = RequestHandler & {
  *
  * @deprecated 6.x - Implement the `Store` interface instead.
  */
-export interface LegacyStore {
+export declare type LegacyStore = {
 	/**
 	 * Method to increment a client's hit counter.
 	 *
@@ -90,11 +90,11 @@ export interface LegacyStore {
 	 * Method to reset everyone's hit counter.
 	 */
 	resetAll?: () => void;
-}
+};
 /**
  * An interface that all hit counter stores must implement.
  */
-export interface Store {
+export declare type Store = {
 	/**
 	 * Method that initializes the store, and has access to the options passed to
 	 * the middleware too.
@@ -130,11 +130,11 @@ export interface Store {
 	 * Method to shutdown the store, stop timers, and release all resources.
 	 */
 	shutdown?: () => Promise<void> | void;
-}
+};
 /**
  * The configuration options for the rate limiter.
  */
-export interface Options {
+export declare type Options = {
 	/**
 	 * How long we should remember the requests.
 	 *
@@ -252,7 +252,7 @@ export interface Options {
 	 * @deprecated 6.x - This option was renamed to `standardHeaders`.
 	 */
 	draft_polli_ratelimit_headers?: boolean;
-}
+};
 /**
  * The extended request object that includes information about the client's
  * rate limit.
@@ -264,12 +264,12 @@ export declare type AugmentedRequest = Request & {
  * The rate limit related information for each client included in the
  * Express request object.
  */
-export interface RateLimitInfo {
+export declare type RateLimitInfo = {
 	readonly limit: number;
 	readonly current: number;
 	readonly remaining: number;
 	readonly resetTime: Date | undefined;
-}
+};
 /**
  *
  * Create an instance of IP rate-limiting middleware for Express.

package/dist/index.mjs

@@ -51,11 +51,14 @@ var promisifyStore = (passedStore) => {
   class PromisifiedStore {
     async increment(key) {
       return new Promise((resolve, reject) => {
-        legacyStore.incr(key, (error, totalHits, resetTime) => {
-          if (error)
-            reject(error);
-          resolve({ totalHits, resetTime });
-        });
+        legacyStore.incr(
+          key,
+          (error, totalHits, resetTime) => {
+            if (error)
+              reject(error);
+            resolve({ totalHits, resetTime });
+          }
+        );
       });
     }
     async decrement(key) {
@@ -88,13 +91,18 @@ var parseOptions = (passedOptions) => {
     skip: (_request, _response) => false,
     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.");
+        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;
     },
     async handler(request, response, _next, _optionsUsed) {
       response.status(config.statusCode);
-      const message = typeof config.message === "function" ? await config.message(request, response) : config.message;
+      const message = typeof config.message === "function" ? await config.message(
+        request,
+        response
+      ) : config.message;
       if (!response.writableEnded) {
         response.send(message != null ? message : "Too many requests, please try again later.");
       }
@@ -105,7 +113,9 @@ var parseOptions = (passedOptions) => {
     store: promisifyStore((_c = notUndefinedOptions.store) != null ? _c : new MemoryStore())
   };
   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.");
+    throw new TypeError(
+      "An invalid store was passed. Please ensure that the store is a class that implements the `Store` interface."
+    );
   }
   return config;
 };
@@ -120,79 +130,92 @@ var rateLimit = (passedOptions) => {
   const options = parseOptions(passedOptions != null ? passedOptions : {});
   if (typeof options.store.init === "function")
     options.store.init(options);
-  const middleware = handleAsyncErrors(async (request, response, next) => {
-    const skip = await options.skip(request, response);
-    if (skip) {
-      next();
-      return;
-    }
-    const augmentedRequest = request;
-    const key = await options.keyGenerator(request, response);
-    const { totalHits, resetTime } = await options.store.increment(key);
-    const retrieveQuota = typeof options.max === "function" ? options.max(request, response) : options.max;
-    const maxHits = await retrieveQuota;
-    augmentedRequest[options.requestPropertyName] = {
-      limit: maxHits,
-      current: totalHits,
-      remaining: Math.max(maxHits - totalHits, 0),
-      resetTime
-    };
-    if (options.legacyHeaders && !response.headersSent) {
-      response.setHeader("X-RateLimit-Limit", maxHits);
-      response.setHeader("X-RateLimit-Remaining", augmentedRequest[options.requestPropertyName].remaining);
-      if (resetTime instanceof Date) {
-        response.setHeader("Date", new Date().toUTCString());
-        response.setHeader("X-RateLimit-Reset", Math.ceil(resetTime.getTime() / 1e3));
+  const middleware = handleAsyncErrors(
+    async (request, response, next) => {
+      const skip = await options.skip(request, response);
+      if (skip) {
+        next();
+        return;
       }
-    }
-    if (options.standardHeaders && !response.headersSent) {
-      response.setHeader("RateLimit-Limit", maxHits);
-      response.setHeader("RateLimit-Remaining", augmentedRequest[options.requestPropertyName].remaining);
-      if (resetTime) {
-        const deltaSeconds = Math.ceil((resetTime.getTime() - Date.now()) / 1e3);
-        response.setHeader("RateLimit-Reset", Math.max(0, deltaSeconds));
+      const augmentedRequest = request;
+      const key = await options.keyGenerator(request, response);
+      const { totalHits, resetTime } = await options.store.increment(key);
+      const retrieveQuota = typeof options.max === "function" ? options.max(request, response) : options.max;
+      const maxHits = await retrieveQuota;
+      augmentedRequest[options.requestPropertyName] = {
+        limit: maxHits,
+        current: totalHits,
+        remaining: Math.max(maxHits - totalHits, 0),
+        resetTime
+      };
+      if (options.legacyHeaders && !response.headersSent) {
+        response.setHeader("X-RateLimit-Limit", maxHits);
+        response.setHeader(
+          "X-RateLimit-Remaining",
+          augmentedRequest[options.requestPropertyName].remaining
+        );
+        if (resetTime instanceof Date) {
+          response.setHeader("Date", new Date().toUTCString());
+          response.setHeader(
+            "X-RateLimit-Reset",
+            Math.ceil(resetTime.getTime() / 1e3)
+          );
+        }
       }
-    }
-    if (options.skipFailedRequests || options.skipSuccessfulRequests) {
-      let decremented = false;
-      const decrementKey = async () => {
-        if (!decremented) {
-          await options.store.decrement(key);
-          decremented = true;
+      if (options.standardHeaders && !response.headersSent) {
+        response.setHeader("RateLimit-Limit", maxHits);
+        response.setHeader(
+          "RateLimit-Remaining",
+          augmentedRequest[options.requestPropertyName].remaining
+        );
+        if (resetTime) {
+          const deltaSeconds = Math.ceil(
+            (resetTime.getTime() - Date.now()) / 1e3
+          );
+          response.setHeader("RateLimit-Reset", Math.max(0, deltaSeconds));
         }
-      };
-      if (options.skipFailedRequests) {
-        response.on("finish", async () => {
-          if (!options.requestWasSuccessful(request, response))
-            await decrementKey();
-        });
-        response.on("close", async () => {
-          if (!response.writableEnded)
-            await decrementKey();
-        });
-        response.on("error", async () => {
-          await decrementKey();
-        });
       }
-      if (options.skipSuccessfulRequests) {
-        response.on("finish", async () => {
-          if (options.requestWasSuccessful(request, response))
+      if (options.skipFailedRequests || options.skipSuccessfulRequests) {
+        let decremented = false;
+        const decrementKey = async () => {
+          if (!decremented) {
+            await options.store.decrement(key);
+            decremented = true;
+          }
+        };
+        if (options.skipFailedRequests) {
+          response.on("finish", async () => {
+            if (!options.requestWasSuccessful(request, response))
+              await decrementKey();
+          });
+          response.on("close", async () => {
+            if (!response.writableEnded)
+              await decrementKey();
+          });
+          response.on("error", async () => {
             await decrementKey();
-        });
+          });
+        }
+        if (options.skipSuccessfulRequests) {
+          response.on("finish", async () => {
+            if (options.requestWasSuccessful(request, response))
+              await decrementKey();
+          });
+        }
       }
-    }
-    if (maxHits && totalHits === maxHits + 1) {
-      options.onLimitReached(request, response, options);
-    }
-    if (maxHits && totalHits > maxHits) {
-      if ((options.legacyHeaders || options.standardHeaders) && !response.headersSent) {
-        response.setHeader("Retry-After", Math.ceil(options.windowMs / 1e3));
+      if (maxHits && totalHits === maxHits + 1) {
+        options.onLimitReached(request, response, options);
+      }
+      if (maxHits && totalHits > maxHits) {
+        if ((options.legacyHeaders || options.standardHeaders) && !response.headersSent) {
+          response.setHeader("Retry-After", Math.ceil(options.windowMs / 1e3));
+        }
+        options.handler(request, response, next, options);
+        return;
       }
-      options.handler(request, response, next, options);
-      return;
+      next();
     }
-    next();
-  });
+  );
   middleware.resetKey = options.store.resetKey.bind(options.store);
   return middleware;
 };

package/package.json

@@ -1,14 +1,14 @@
 {
 	"name": "express-rate-limit",
-	"version": "6.6.0",
+	"version": "6.7.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",
 		"url": "http://nfriedly.com/"
 	},
 	"license": "MIT",
-	"homepage": "https://github.com/nfriedly/express-rate-limit",
-	"repository": "https://github.com/nfriedly/express-rate-limit",
+	"homepage": "https://github.com/express-rate-limit/express-rate-limit",
+	"repository": "https://github.com/express-rate-limit/express-rate-limit",
 	"keywords": [
 		"express-rate-limit",
 		"express",
@@ -71,24 +71,24 @@
 		"express": "^4 || ^5"
 	},
 	"devDependencies": {
-		"@jest/globals": "28.1.3",
-		"@types/express": "4.17.13",
-		"@types/jest": "28.1.6",
-		"@types/node": "18.0.6",
+		"@jest/globals": "29.3.1",
+		"@types/express": "4.17.14",
+		"@types/jest": "29.2.3",
+		"@types/node": "18.11.9",
 		"@types/supertest": "2.0.12",
 		"cross-env": "7.0.3",
-		"del-cli": "4.0.1",
-		"dts-bundle-generator": "6.12.0",
-		"esbuild": "0.14.49",
-		"express": "4.18.1",
-		"husky": "8.0.1",
-		"jest": "28.1.3",
+		"del-cli": "5.0.0",
+		"dts-bundle-generator": "7.0.0",
+		"esbuild": "0.15.14",
+		"express": "4.18.2",
+		"husky": "8.0.2",
+		"jest": "29.3.1",
 		"lint-staged": "13.0.3",
 		"npm-run-all": "4.1.5",
-		"supertest": "6.2.4",
-		"ts-jest": "28.0.7",
+		"supertest": "6.3.1",
+		"ts-jest": "29.0.3",
 		"ts-node": "10.9.1",
-		"typescript": "4.7.4",
+		"typescript": "4.8.4",
 		"xo": "0.49.0"
 	},
 	"xo": {
@@ -100,7 +100,8 @@
 			"@typescript-eslint/consistent-indexed-object-style": [
 				"error",
 				"index-signature"
-			]
+			],
+			"n/no-unsupported-features/es-syntax": 0
 		}
 	},
 	"prettier": {

package/readme.md

@@ -1,8 +1,18 @@
 # <div align="center"> Express Rate Limit </div>
 
+---
+
+Sponsored by [Zuplo](https://zuplo.link/express-rate-limit) a fully-managed API
+Gateway for developers. Add
+[dynamic rate-limiting](https://zuplo.link/dynamic-rate-limiting),
+authentication and more to any API in minutes. Learn more at
+[zuplo.com](https://zuplo.link/express-rate-limit)
+
+---
+
 <div align="center">
 
-[![Tests](https://github.com/nfriedly/express-rate-limit/workflows/Test/badge.svg)](https://github.com/nfriedly/express-rate-limit/actions)
+[![Tests](https://github.com/express-rate-limit/express-rate-limit/workflows/Test/badge.svg)](https://github.com/express-rate-limit/express-rate-limit/actions)
 [![npm version](https://img.shields.io/npm/v/express-rate-limit.svg)](https://npmjs.org/package/express-rate-limit 'View this project on NPM')
 [![npm downloads](https://img.shields.io/npm/dm/express-rate-limit)](https://www.npmjs.com/package/express-rate-limit)
 
@@ -41,9 +51,9 @@ From Github Releases:
 
 ```sh
 # Using npm
-> npm install https://github.com/nfriedly/express-rate-limit/releases/download/v{version}/express-rate-limit.tgz
+> npm install https://github.com/express-rate-limit/express-rate-limit/releases/download/v{version}/express-rate-limit.tgz
 # Using yarn or pnpm
-> yarn/pnpm add https://github.com/nfriedly/express-rate-limit/releases/download/v{version}/express-rate-limit.tgz
+> yarn/pnpm add https://github.com/express-rate-limit/express-rate-limit/releases/download/v{version}/express-rate-limit.tgz
 ```
 
 Replace `{version}` with the version of the package that you want to your, e.g.:
@@ -180,10 +190,9 @@ app.get('/ip', (request, response) => response.send(request.ip))
 ```
 
 Go to `/ip` and see the IP address returned in the response. If it matches your
-IP address (which you can get by going to http://ip.nfriedly.com/ or
-https://api.ipify.org/), then the number of proxies is correct and the rate
-limiter should now work correctly. If not, then keep increasing the number until
-it does.
+public IP address, then the number of proxies is correct and the rate limiter
+should now work correctly. If not, then keep increasing the number until it
+does.
 
 For more information about the `trust proxy` setting, take a look at the
 [official Express documentation](https://expressjs.com/en/guide/behind-proxies.html).
@@ -387,7 +396,7 @@ objects that is called when a client has reached their rate limit, and will be
 rate limited on their next request.
 
 This method was
-[deprecated in v6](https://github.com/nfriedly/express-rate-limit/releases/v6.0.0) -
+[deprecated in v6](https://github.com/express-rate-limit/express-rate-limit/releases/v6.0.0) -
 Please use a custom `handler` that checks the number of hits instead.
 
 ### `skip`
@@ -456,7 +465,7 @@ Here is a list of external stores:
 | [`precise-memory-rate-limit`](https://www.npmjs.com/package/precise-memory-rate-limit) | A memory store similar to the built-in one, except that it stores a distinct timestamp for each key.  | Legacy              |
 
 Take a look at
-[this guide](https://github.com/nfriedly/express-rate-limit/wiki/Creating-Your-Own-Store)
+[this guide](https://github.com/express-rate-limit/express-rate-limit/wiki/Creating-Your-Own-Store)
 if you wish to create your own store.
 
 ## Request API
@@ -480,9 +489,10 @@ method.
 ## Issues and Contributing
 
 If you encounter a bug or want to see something added/changed, please go ahead
-and [open an issue](https://github.com/nfriedly/express-rate-limit/issues/new)!
+and
+[open an issue](https://github.com/nfriexpress-rate-limitedly/express-rate-limit/issues/new)!
 If you need help with something, feel free to
-[start a discussion](https://github.com/nfriedly/express-rate-limit/discussions/new)!
+[start a discussion](https://github.com/express-rate-limit/express-rate-limit/discussions/new)!
 
 If you wish to contribute to the library, thanks! First, please read
 [the contributing guide](contributing.md). Then you can pick up any issue and