ayiin 2.0.42 → 2.0.44

package/dist/methods/limiter.js

@@ -40,18 +40,47 @@ class MemoryStore {
             entry.expireAt = Date.now() + ttlMs;
         }
     }
+    refresh() {
+        this.store.clear();
+    }
 }
 // 🔹 Class Limiter
 class Limiter extends tools_1.default {
     createRateLimit = (options) => {
         const store = options.store ?? new MemoryStore();
+        if (options.refreshOnStart) {
+            if (typeof store.refresh === "function") {
+                store.refresh();
+                console.log(`[RateLimiter] ${store.constructor.name} refreshed on start.`);
+            }
+            else {
+                console.warn(`[RateLimiter] ${store.constructor.name} does not implement refresh() method.`);
+            }
+        }
         return async (req, res, next) => {
             const now = Date.now();
             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}`;
+            const windowMs = this.toMilliseconds(options.windowMs);
+            const refreshAtMs = this.toMilliseconds(options.refreshAt ?? { hours: 24 });
+            // ambil level sekarang
+            let level = parseInt((await store.get(levelKey)) ?? "0", 10);
+            // tentukan limit sesuai level
+            let currentLimit;
+            if (Array.isArray(options.limit)) {
+                const idx = Math.min(level, options.limit.length - 1);
+                const limit = options.limit[idx];
+                currentLimit = limit;
+            }
+            else {
+                currentLimit = Number(options.limit);
+            }
+            // cek jika user terblock atau tidak
             const blockedUntilStr = await store.get(floodKey);
             if (blockedUntilStr) {
                 const blockedUntil = new Date(blockedUntilStr).getTime();
@@ -62,32 +91,20 @@ class Limiter extends tools_1.default {
                             api: options.keyPrefix,
                             remainMs: remainingMs,
                             remain: this.formatRemainingTime(remainingMs),
-                            limit: Array.isArray(options.limit)
-                                ? options.limit[0]
-                                : options.limit,
+                            limit: currentLimit,
+                            level,
                         })
                         : (options.messageFormat ??
                             `[FloodWait] - Silakan coba lagi dalam ${this.formatRemainingTime(remainingMs)}.`);
                     return res.status(429).json({ success: false, error: msg });
                 }
             }
-            const rateKey = `${options.keyPrefix}:rate:${userId}`;
+            // hitung permintaan sekarang
             const hits = await store.incr(rateKey);
-            const windowMs = this.toMilliseconds(options.windowMs);
-            const refreshAtMs = this.toMilliseconds(options.refreshAt ?? { hours: 24 });
             if (hits === 1) {
                 await store.expire(rateKey, windowMs);
             }
-            // ambil level sekarang
-            let level = parseInt((await store.get(levelKey)) ?? "0", 10);
-            // tentukan limit sesuai level
-            let currentLimit;
-            if (Array.isArray(options.limit)) {
-                currentLimit = options.limit[Math.min(level, options.limit.length - 1)];
-            }
-            else {
-                currentLimit = Number(options.limit);
-            }
+            // cek level jika permintaan melebihi limit
             if (hits > currentLimit) {
                 level += 1;
                 await store.set(levelKey, level.toString(), refreshAtMs);

package/dist/types.d.ts

@@ -4,6 +4,7 @@ export interface RateLimitStore {
     set(key: string, value: string, ttlMs?: number): Promise<void>;
     incr(key: string): Promise<number>;
     expire(key: string, ttlMs: number): Promise<void>;
+    refresh?(): Promise<void> | void;
 }
 export interface DurationInput {
     hours?: number;
@@ -18,6 +19,7 @@ export interface RateLimiterOptions {
     identifyUser?: (req: Request, res: Response) => string | Response<any, Record<string, any>>;
     store?: RateLimitStore;
     refreshAt?: DurationInput;
+    refreshOnStart?: boolean;
     messageFormat?: string | ((ctx: {
         api: string;
         remainMs: number;

package/package.json

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