@canmertinyo/rate-limit-express 1.2.6 → 1.2.8

package/dist/in-memory-storage.js

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

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;

package/dist/rate.limiter.js

@@ -2,30 +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 = storage.createRateLimitRecord({
                 key: ip,
-                count: 1,
+                count: 0,
                 timestamp: currentTime,
             });
-            console.log("create", record);
         }
         if (startTime > record.timestamp) {
             record = storage.updateRateLimitRecord(ip, currentTime, 1);
-            console.log("update", record);
+            return next();
         }
         if (record.count < options.maxRequest) {
-            console.log("inc before", record.count);
             record = storage.increment(record.key);
-            console.log("inc after", record.count);
             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.6",
+  "version": "1.2.8",
   "main": "dist/index.js",
   "license": "MIT",
   "types": "dist/index.d.ts",

package/src/in-memory-storage.ts

@@ -9,7 +9,7 @@ export class InMemoryStorage implements IRateLimiter {
 
   createRateLimitRecord(record: IRateLimitRecord): IRateLimitRecord {
     var index = this.store.push(record);
-    return this.store[index];
+    return this.store[index - 1];
   }
 
   updateRateLimitRecord(
@@ -27,7 +27,6 @@ export class InMemoryStorage implements IRateLimiter {
   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,38 +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 = storage.createRateLimitRecord({
         key: ip,
-        count: 1,
+        count: 0,
         timestamp: currentTime,
       });
-      console.log("create", record);
     }
 
     if (startTime > record.timestamp) {
       record = storage.updateRateLimitRecord(ip, currentTime, 1);
-      console.log("update", record);
+      return next();
     }
 
     if (record.count < options.maxRequest) {
-      console.log("inc before", record.count);
       record = storage.increment(record.key);
-      console.log("inc after", record.count);
-
       return next();
     }