ayiin 2.0.44 → 2.0.46

package/dist/methods/limiter.js

@@ -50,8 +50,9 @@ class Limiter extends tools_1.default {
         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.`);
+                Promise.resolve(store.refresh()).then(() => {
+                    console.log(`[RateLimiter] ${store.constructor.name} refreshed on start.`);
+                });
             }
             else {
                 console.warn(`[RateLimiter] ${store.constructor.name} does not implement refresh() method.`);
@@ -62,25 +63,8 @@ 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}`;
-            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();
@@ -91,20 +75,31 @@ class Limiter extends tools_1.default {
                             api: options.keyPrefix,
                             remainMs: remainingMs,
                             remain: this.formatRemainingTime(remainingMs),
-                            limit: currentLimit,
-                            level,
                         })
                         : (options.messageFormat ??
                             `[FloodWait] - Silakan coba lagi dalam ${this.formatRemainingTime(remainingMs)}.`);
                     return res.status(429).json({ success: false, error: msg });
                 }
             }
-            // hitung permintaan sekarang
+            const rateKey = `${options.keyPrefix}:rate:${userId}`;
             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);
             }
-            // cek level jika permintaan melebihi limit
+            // ambil level sekarang
+            let level = parseInt((await store.get(levelKey)) ?? "0", 10);
+            // tentukan limit sesuai level
+            let currentLimit;
+            if (Array.isArray(options.limit)) {
+                const limitIdx = Math.min(level, options.limit.length - 1);
+                const limit = options.limit[limitIdx];
+                currentLimit = limit;
+            }
+            else {
+                currentLimit = Number(options.limit);
+            }
             if (hits > currentLimit) {
                 level += 1;
                 await store.set(levelKey, level.toString(), refreshAtMs);
@@ -124,8 +119,6 @@ class Limiter extends tools_1.default {
                         api: options.keyPrefix,
                         remainMs: floodwaitMs,
                         remain: this.formatRemainingTime(floodwaitMs),
-                        level,
-                        limit: currentLimit,
                     })
                     : (options.messageFormat ??
                         `[FloodWait] - Terlalu banyak permintaan. Silakan coba lagi dalam ${this.formatRemainingTime(floodwaitMs)}.`);

package/dist/types.d.ts

@@ -24,7 +24,5 @@ export interface RateLimiterOptions {
         api: string;
         remainMs: number;
         remain: string;
-        level?: number;
-        limit?: number;
     }) => string);
 }

package/package.json

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