ayiin 2.0.46 → 2.0.48

package/dist/methods/limiter.js

@@ -63,8 +63,11 @@ class Limiter extends tools_1.default {
             const userId = options.identifyUser
                 ? options.identifyUser(req, res)
                 : (req.ip ?? "unknown");
+            // key storage
             const floodKey = `${options.keyPrefix}:flood:${userId}`;
             const levelKey = `${options.keyPrefix}:level:${userId}`;
+            const rateKey = `${options.keyPrefix}:rate:${userId}`;
+            // cek jika user terblock atau tidak
             const blockedUntilStr = await store.get(floodKey);
             if (blockedUntilStr) {
                 const blockedUntil = new Date(blockedUntilStr).getTime();
@@ -81,28 +84,39 @@ class Limiter extends tools_1.default {
                     return res.status(429).json({ success: false, error: msg });
                 }
             }
-            const rateKey = `${options.keyPrefix}:rate:${userId}`;
-            const hits = await store.incr(rateKey);
-            const windowMs = this.toMilliseconds(options.windowMs);
+            // ambil level sekarang
+            let level = parseInt((await store.get(levelKey)) ?? "0", 10);
             const refreshAtMs = this.toMilliseconds(options.refreshAt ?? { hours: 24 });
+            // tentukan windowMs sesuai level
+            let windowMs;
+            if (Array.isArray(options.windowMs)) {
+                const idx = Math.min(level, options.windowMs.length - 1);
+                const win = options.windowMs[idx];
+                windowMs = this.toMilliseconds(win);
+            }
+            else {
+                windowMs = this.toMilliseconds(options.windowMs);
+            }
+            // hitung permintaan sekarang
+            const hits = await store.incr(rateKey);
             if (hits === 1) {
                 await store.expire(rateKey, windowMs);
             }
-            // ambil level sekarang
-            let level = parseInt((await store.get(levelKey)) ?? "0", 10);
-            // tentukan limit sesuai level
+            // tentukan limit sesuai level (langsung pakai level sebagai index)
             let currentLimit;
             if (Array.isArray(options.limit)) {
                 const limitIdx = Math.min(level, options.limit.length - 1);
-                const limit = options.limit[limitIdx];
-                currentLimit = limit;
+                currentLimit = options.limit[limitIdx];
             }
             else {
                 currentLimit = Number(options.limit);
             }
+            // cek level jika permintaan melebihi limit
             if (hits > currentLimit) {
                 level += 1;
                 await store.set(levelKey, level.toString(), refreshAtMs);
+                // reset hits untuk level baru
+                await store.set(rateKey, "0", windowMs);
                 let floodwaitMs;
                 if (Array.isArray(options.floodwaitMs)) {
                     const idx = Math.min(level - 1, options.floodwaitMs.length - 1);

package/dist/types.d.ts

@@ -14,7 +14,7 @@ export interface DurationInput {
 export interface RateLimiterOptions {
     keyPrefix: string;
     limit: number | readonly [number, ...number[]];
-    windowMs: DurationInput;
+    windowMs: DurationInput | readonly [DurationInput, ...DurationInput[]];
     floodwaitMs: DurationInput | readonly [DurationInput, ...DurationInput[]];
     identifyUser?: (req: Request, res: Response) => string | Response<any, Record<string, any>>;
     store?: RateLimitStore;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ayiin",
-  "version": "2.0.46",
+  "version": "2.0.48",
   "author": {
     "name": "AyiinXd",
     "url": "https://github.com/AyiinXd"