@canmertinyo/rate-limit-express 1.1.1 → 1.1.3

package/dist/in-memory-storage.d.ts

@@ -3,5 +3,6 @@ export declare class InMemoryStorage implements IRateLimiter {
     private store;
     getRateLimitRecord(key: string): IRateLimitRecord | undefined;
     createRateLimitRecord(record: IRateLimitRecord): void;
+    updateRateLimitRecord(key: string, timestamp: number, count: number): void;
     increment(key: string): void;
 }

package/dist/in-memory-storage.js

@@ -11,6 +11,11 @@ class InMemoryStorage {
     createRateLimitRecord(record) {
         this.store.push(record);
     }
+    updateRateLimitRecord(key, timestamp, count) {
+        var index = this.store.findIndex((x) => x.key === key);
+        this.store[index].count = count;
+        this.store[index].timestamp = timestamp;
+    }
     increment(key) {
         var index = this.store.findIndex((x) => x.key === key);
         this.store[index].count += 1;

package/dist/rate.limiter.d.ts

@@ -9,5 +9,6 @@ export interface IRateLimitRecord {
 export interface IRateLimiter {
     getRateLimitRecord(key: string): IRateLimitRecord | undefined;
     createRateLimitRecord(record: IRateLimitRecord): void;
+    updateRateLimitRecord(key: string, timestamp: number, count: number): void;
     increment(key: string): void;
 }

package/dist/rate.limiter.js

@@ -11,17 +11,17 @@ function rateLimiter(options = rate_limiter_options_interface_1.defaultOptions)
         var storage = options.storage;
         var record = storage.getRateLimitRecord(ip);
         if (!record) {
-            record = { count: 0, timestamp: currentTime, key: ip };
+            record = { count: 1, timestamp: currentTime, key: ip };
             storage.createRateLimitRecord(record);
+            return next();
         }
-        if (record.count < options.maxRequest && record.timestamp >= startTime) {
-            storage.increment(ip);
-            next();
+        if (record.timestamp < startTime) {
+            storage.updateRateLimitRecord(record.key, currentTime, 1);
+            return next();
         }
-        else {
-            res
-                .status(420)
-                .json({ message: "Too many requests, please try again later." });
+        if (record.count < options.maxRequest) {
+            storage.increment(ip);
+            return next();
         }
     };
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@canmertinyo/rate-limit-express",
   "description": "A simple rate-limiting middleware for Express.js",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "main": "dist/index.js",
   "license": "MIT",
   "types": "dist/index.d.ts",

package/src/in-memory-storage.ts

@@ -11,6 +11,12 @@ export class InMemoryStorage implements IRateLimiter {
     this.store.push(record);
   }
 
+  updateRateLimitRecord(key: string, timestamp: number, count: number): void {
+    var index = this.store.findIndex((x) => x.key === key);
+    this.store[index].count = count;
+    this.store[index].timestamp = timestamp;
+  }
+
   increment(key: string): void {
     var index = this.store.findIndex((x) => x.key === key);
     this.store[index].count += 1;

package/src/rate.limiter.ts

@@ -15,17 +15,19 @@ export function rateLimiter(options: RateLimiterOptions = defaultOptions) {
     var record = storage.getRateLimitRecord(ip);
 
     if (!record) {
-      record = { count: 0, timestamp: currentTime, key: ip };
+      record = { count: 1, timestamp: currentTime, key: ip };
       storage.createRateLimitRecord(record);
+      return next();
     }
 
-    if (record.count < options.maxRequest && record.timestamp >= startTime) {
+    if (record.timestamp < startTime) {
+      storage.updateRateLimitRecord(record.key, currentTime, 1);
+      return next();
+    }
+
+    if (record.count < options.maxRequest) {
       storage.increment(ip);
-      next();
-    } else {
-      res
-        .status(420)
-        .json({ message: "Too many requests, please try again later." });
+      return next();
     }
   };
 }
@@ -39,5 +41,6 @@ export interface IRateLimitRecord {
 export interface IRateLimiter {
   getRateLimitRecord(key: string): IRateLimitRecord | undefined;
   createRateLimitRecord(record: IRateLimitRecord): void;
+  updateRateLimitRecord(key: string, timestamp: number, count: number): void;
   increment(key: string): void;
 }