ayiin 2.0.40 → 2.0.42

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import Methods from "./methods";
-export type { DurationInput, FloodwaitPlaceholder, RateLimitStore, RateLimiterOptions, } from "./types";
+export type { DurationInput, RateLimitStore, RateLimiterOptions, } from "./types";
 export default class Ayiin extends Methods {
     version: string;
     constructor();

package/dist/methods/limiter.d.ts

@@ -3,5 +3,4 @@ import { RateLimiterOptions } from "../types";
 import Tools from "./tools";
 export declare class Limiter extends Tools {
     createRateLimit: (options: RateLimiterOptions) => RequestHandler;
-    private formatMessage;
 }

package/dist/methods/limiter.js

@@ -44,7 +44,7 @@ class MemoryStore {
 // 🔹 Class Limiter
 class Limiter extends tools_1.default {
     createRateLimit = (options) => {
-        const store = options.store ?? new MemoryStore(); // default ke MemoryStore
+        const store = options.store ?? new MemoryStore();
         return async (req, res, next) => {
             const now = Date.now();
             const userId = options.identifyUser
@@ -57,14 +57,17 @@ class Limiter extends tools_1.default {
                 const blockedUntil = new Date(blockedUntilStr).getTime();
                 const remainingMs = blockedUntil - now;
                 if (remainingMs > 0) {
-                    const msg = options.messageFormat
-                        ? this.formatMessage(options.messageFormat, {
+                    const msg = typeof options.messageFormat === "function"
+                        ? options.messageFormat({
                             api: options.keyPrefix,
                             remainMs: remainingMs,
                             remain: this.formatRemainingTime(remainingMs),
-                            limit: options.limit,
+                            limit: Array.isArray(options.limit)
+                                ? options.limit[0]
+                                : options.limit,
                         })
-                        : `[FloodWait] - Silakan coba lagi dalam ${this.formatRemainingTime(remainingMs)}.`;
+                        : (options.messageFormat ??
+                            `[FloodWait] - Silakan coba lagi dalam ${this.formatRemainingTime(remainingMs)}.`);
                     return res.status(429).json({ success: false, error: msg });
                 }
             }
@@ -75,45 +78,44 @@ class Limiter extends tools_1.default {
             if (hits === 1) {
                 await store.expire(rateKey, windowMs);
             }
-            if (hits > options.limit) {
+            // 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);
+            }
+            if (hits > currentLimit) {
+                level += 1;
+                await store.set(levelKey, level.toString(), refreshAtMs);
                 let floodwaitMs;
-                let level;
                 if (Array.isArray(options.floodwaitMs)) {
-                    // escalation mode
-                    level = parseInt((await store.get(levelKey)) ?? "0", 10) + 1;
-                    await store.set(levelKey, level.toString(), refreshAtMs);
                     const idx = Math.min(level - 1, options.floodwaitMs.length - 1);
                     const floodwait = options.floodwaitMs[idx];
                     floodwaitMs = this.toMilliseconds(floodwait ?? options.floodwaitMs[0]);
                 }
                 else {
-                    // fixed mode
                     floodwaitMs = this.toMilliseconds(options.floodwaitMs);
                 }
                 const untilDate = new Date(now + floodwaitMs).toISOString();
                 await store.set(floodKey, untilDate, floodwaitMs);
-                const msg = options.messageFormat
-                    ? this.formatMessage(options.messageFormat, {
+                const msg = typeof options.messageFormat === "function"
+                    ? options.messageFormat({
                         api: options.keyPrefix,
                         remainMs: floodwaitMs,
                         remain: this.formatRemainingTime(floodwaitMs),
                         level,
-                        limit: options.limit,
+                        limit: currentLimit,
                     })
-                    : `[FloodWait] - Terlalu banyak permintaan. Silakan coba lagi dalam ${this.formatRemainingTime(floodwaitMs)}.`;
+                    : (options.messageFormat ??
+                        `[FloodWait] - Terlalu banyak permintaan. Silakan coba lagi dalam ${this.formatRemainingTime(floodwaitMs)}.`);
                 return res.status(429).json({ success: false, error: msg });
             }
             next();
         };
     };
-    // internal formatter
-    formatMessage(template, ctx) {
-        return template
-            .replace("%(api)s", ctx.api)
-            .replace("%(remainMs)s", ctx.remainMs.toString())
-            .replace("%(remain)s", ctx.remain)
-            .replace("%(level)s", ctx.level?.toString() ?? "1")
-            .replace("%(limit)s", ctx.limit?.toString() ?? "");
-    }
 }
 exports.Limiter = Limiter;

package/dist/types.d.ts

@@ -12,12 +12,17 @@ export interface DurationInput {
 }
 export interface RateLimiterOptions {
     keyPrefix: string;
-    limit: number;
+    limit: number | readonly [number, ...number[]];
     windowMs: DurationInput;
-    floodwaitMs: DurationInput | DurationInput[];
+    floodwaitMs: DurationInput | readonly [DurationInput, ...DurationInput[]];
     identifyUser?: (req: Request, res: Response) => string | Response<any, Record<string, any>>;
     store?: RateLimitStore;
     refreshAt?: DurationInput;
-    messageFormat?: string extends FloodwaitPlaceholder ? string : never;
+    messageFormat?: string | ((ctx: {
+        api: string;
+        remainMs: number;
+        remain: string;
+        level?: number;
+        limit?: number;
+    }) => string);
 }
-export type FloodwaitPlaceholder = "%(api)s" | "%(remainMs)s" | "%(remain)s" | "%(level)s" | "%(limit)s";

package/package.json

@@ -1,30 +1,30 @@
 {
   "name": "ayiin",
-  "version": "2.0.40",
-  "description": "Library Pribadi Yang Gak Ada Isinya",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "bin": {
-    "axd": "./dist/bin/cli.js"
-  },
-  "scripts": {
-    "build": "tsc"
+  "version": "2.0.42",
+  "author": {
+    "name": "AyiinXd",
+    "url": "https://github.com/AyiinXd"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/AyiinXd/ayiin.git"
   },
-  "author": {
-    "name": "AyiinXd",
-    "url": "https://github.com/AyiinXd"
+  "main": "./dist/index.js",
+  "devDependencies": {
+    "@types/express": "^5.0.6",
+    "@types/node": "^26.3.0",
+    "typescript": "^7"
   },
+  "bin": {
+    "axd": "./dist/bin/cli.js"
+  },
+  "description": "Library Pribadi Yang Gak Ada Isinya",
   "keywords": [
     "ayiin"
   ],
   "license": "GPL-3.0-only",
-  "devDependencies": {
-    "@types/express": "^5.0.6",
-    "@types/node": "^26.3.0",
-    "typescript": "^7"
-  }
+  "scripts": {
+    "build": "tsc"
+  },
+  "types": "./dist/index.d.ts"
 }