@canmertinyo/rate-limit-express 1.2.3 → 1.2.6

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

@@ -2,7 +2,7 @@ import { IRateLimiter, IRateLimitRecord } from "./rate.limiter";
 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;
+    createRateLimitRecord(record: IRateLimitRecord): IRateLimitRecord;
+    updateRateLimitRecord(key: string, timestamp: number, count: number): IRateLimitRecord;
+    increment(key: string): IRateLimitRecord;
 }

package/dist/in-memory-storage.js

@@ -9,16 +9,19 @@ class InMemoryStorage {
         return this.store.find((x) => x.key === key);
     }
     createRateLimitRecord(record) {
-        this.store.push(record);
+        var index = this.store.push(record);
+        return this.store[index];
     }
     updateRateLimitRecord(key, timestamp, count) {
         var index = this.store.findIndex((x) => x.key === key);
         this.store[index].count = count;
         this.store[index].timestamp = timestamp;
+        return this.store[index];
     }
     increment(key) {
         var index = this.store.findIndex((x) => x.key === key);
         this.store[index].count += 1;
+        return this.store[index];
     }
 }
 exports.InMemoryStorage = InMemoryStorage;

package/dist/rate.limiter.d.ts

@@ -8,7 +8,7 @@ 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;
+    createRateLimitRecord(record: IRateLimitRecord): IRateLimitRecord;
+    updateRateLimitRecord(key: string, timestamp: number, count: number): IRateLimitRecord;
+    increment(key: string): IRateLimitRecord;
 }

package/dist/rate.limiter.js

@@ -11,19 +11,20 @@ function rateLimiter(options = rate_limiter_options_interface_1.defaultOptions)
         var storage = options.storage;
         var record = storage.getRateLimitRecord(ip);
         if (!record) {
-            record = { key: ip, count: 1, timestamp: currentTime };
-            storage.createRateLimitRecord(record);
+            record = storage.createRateLimitRecord({
+                key: ip,
+                count: 1,
+                timestamp: currentTime,
+            });
             console.log("create", record);
         }
         if (startTime > record.timestamp) {
-            record = { key: ip, count: 1, timestamp: currentTime };
-            storage.updateRateLimitRecord(ip, currentTime, 1);
+            record = storage.updateRateLimitRecord(ip, currentTime, 1);
             console.log("update", record);
         }
         if (record.count < options.maxRequest) {
             console.log("inc before", record.count);
-            record.count += 1;
-            storage.increment(record.key);
+            record = storage.increment(record.key);
             console.log("inc after", record.count);
             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.2.3",
+  "version": "1.2.6",
   "main": "dist/index.js",
   "license": "MIT",
   "types": "dist/index.d.ts",

package/src/in-memory-storage.ts

@@ -7,18 +7,27 @@ export class InMemoryStorage implements IRateLimiter {
     return this.store.find((x) => x.key === key);
   }
 
-  createRateLimitRecord(record: IRateLimitRecord): void {
-    this.store.push(record);
+  createRateLimitRecord(record: IRateLimitRecord): IRateLimitRecord {
+    var index = this.store.push(record);
+    return this.store[index];
   }
 
-  updateRateLimitRecord(key: string, timestamp: number, count: number): void {
+  updateRateLimitRecord(
+    key: string,
+    timestamp: number,
+    count: number
+  ): IRateLimitRecord {
     var index = this.store.findIndex((x) => x.key === key);
     this.store[index].count = count;
     this.store[index].timestamp = timestamp;
+
+    return this.store[index];
   }
 
-  increment(key: string): void {
+  increment(key: string): IRateLimitRecord {
     var index = this.store.findIndex((x) => x.key === key);
     this.store[index].count += 1;
+
+    return this.store[index];
   }
 }

package/src/rate.limiter.ts

@@ -15,21 +15,22 @@ export function rateLimiter(options: RateLimiterOptions = defaultOptions) {
     var record = storage.getRateLimitRecord(ip);
 
     if (!record) {
-      record = { key: ip, count: 1, timestamp: currentTime };
-      storage.createRateLimitRecord(record);
+      record = storage.createRateLimitRecord({
+        key: ip,
+        count: 1,
+        timestamp: currentTime,
+      });
       console.log("create", record);
     }
 
     if (startTime > record.timestamp) {
-      record = { key: ip, count: 1, timestamp: currentTime };
-      storage.updateRateLimitRecord(ip, currentTime, 1);
+      record = storage.updateRateLimitRecord(ip, currentTime, 1);
       console.log("update", record);
     }
 
     if (record.count < options.maxRequest) {
       console.log("inc before", record.count);
-      record.count += 1;
-      storage.increment(record.key);
+      record = storage.increment(record.key);
       console.log("inc after", record.count);
 
       return next();
@@ -49,7 +50,11 @@ 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;
+  createRateLimitRecord(record: IRateLimitRecord): IRateLimitRecord;
+  updateRateLimitRecord(
+    key: string,
+    timestamp: number,
+    count: number
+  ): IRateLimitRecord;
+  increment(key: string): IRateLimitRecord;
 }