@canmertinyo/rate-limit-express 1.2.4 → 1.2.8

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 - 1];
     }
     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

@@ -1,6 +1,6 @@
 import { Request, Response, NextFunction } from "express";
 import { RateLimiterOptions } from "./interfaces/rate-limiter-options.interface";
-export declare function rateLimiter(options?: RateLimiterOptions): (req: Request, res: Response, next: NextFunction) => void;
+export declare function rateLimiter(options: RateLimiterOptions): (req: Request, res: Response, next: NextFunction) => void;
 export interface IRateLimitRecord {
     key: string;
     count: number;
@@ -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

@@ -2,29 +2,29 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rateLimiter = rateLimiter;
 const utils_1 = require("./utils");
-const rate_limiter_options_interface_1 = require("./interfaces/rate-limiter-options.interface");
-function rateLimiter(options = rate_limiter_options_interface_1.defaultOptions) {
+const in_memory_storage_1 = require("./in-memory-storage");
+const inMemoryStorage = new in_memory_storage_1.InMemoryStorage();
+function rateLimiter(options) {
     return (req, res, next) => {
+        var _a;
         const ip = (0, utils_1.getIp)(req);
         const currentTime = (0, utils_1.getTimestamp)();
         const startTime = currentTime - options.ms;
-        var storage = options.storage;
+        var storage = (_a = options.storage) !== null && _a !== void 0 ? _a : inMemoryStorage;
         var record = storage.getRateLimitRecord(ip);
         if (!record) {
-            record = { key: ip, count: 1, timestamp: currentTime };
-            storage.createRateLimitRecord(record);
-            console.log("create", record);
+            record = storage.createRateLimitRecord({
+                key: ip,
+                count: 0,
+                timestamp: currentTime,
+            });
         }
         if (startTime > record.timestamp) {
-            record = { key: ip, count: 1, timestamp: currentTime };
-            storage.updateRateLimitRecord(ip, currentTime, 1);
-            console.log("update", record);
+            record = storage.updateRateLimitRecord(ip, currentTime, 1);
+            return next();
         }
         if (record.count < options.maxRequest) {
-            console.log("inc before", record.count);
-            record.count += 1;
-            storage.increment(record.key);
-            console.log("inc after", record.count);
+            record = storage.increment(record.key);
             return next();
         }
         res

package/package.json

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

package/src/in-memory-storage.ts

@@ -7,18 +7,26 @@ 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 - 1];
   }
 
-  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

@@ -1,37 +1,34 @@
 import { Request, Response, NextFunction } from "express";
 import { getIp, getTimestamp } from "./utils";
-import {
-  defaultOptions,
-  RateLimiterOptions,
-} from "./interfaces/rate-limiter-options.interface";
+import { RateLimiterOptions } from "./interfaces/rate-limiter-options.interface";
+import { InMemoryStorage } from "./in-memory-storage";
 
-export function rateLimiter(options: RateLimiterOptions = defaultOptions) {
+const inMemoryStorage = new InMemoryStorage();
+
+export function rateLimiter(options: RateLimiterOptions) {
   return (req: Request, res: Response, next: NextFunction) => {
     const ip = getIp(req);
     const currentTime = getTimestamp();
     const startTime = currentTime - options.ms;
-    var storage = options.storage!;
+    var storage = options.storage ?? inMemoryStorage;
 
     var record = storage.getRateLimitRecord(ip);
 
     if (!record) {
-      record = { key: ip, count: 1, timestamp: currentTime };
-      storage.createRateLimitRecord(record);
-      console.log("create", record);
+      record = storage.createRateLimitRecord({
+        key: ip,
+        count: 0,
+        timestamp: currentTime,
+      });
     }
 
     if (startTime > record.timestamp) {
-      record = { key: ip, count: 1, timestamp: currentTime };
-      storage.updateRateLimitRecord(ip, currentTime, 1);
-      console.log("update", record);
+      record = storage.updateRateLimitRecord(ip, currentTime, 1);
+      return next();
     }
 
     if (record.count < options.maxRequest) {
-      console.log("inc before", record.count);
-      record.count += 1;
-      storage.increment(record.key);
-      console.log("inc after", record.count);
-
+      record = storage.increment(record.key);
       return next();
     }
 
@@ -49,7 +46,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;
 }