ayiin 2.0.41 → 2.0.42

package/dist/index.d.ts

@@ -1,8 +1,6 @@
-import Redis from "ioredis";
 import Methods from "./methods";
 export type { DurationInput, RateLimitStore, RateLimiterOptions, } from "./types";
 export default class Ayiin extends Methods {
     version: string;
-    cache: Redis | undefined;
-    constructor(databaseUrl?: string);
+    constructor();
 }

package/dist/index.js

@@ -3,20 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const ioredis_1 = __importDefault(require("ioredis"));
 const package_json_1 = __importDefault(require("../package.json"));
 const methods_1 = __importDefault(require("./methods"));
 class Ayiin extends methods_1.default {
     version = package_json_1.default.version;
-    cache;
-    constructor(databaseUrl) {
+    constructor() {
         super();
-        if (databaseUrl) {
-            this.cache = new ioredis_1.default(databaseUrl);
-        }
-        else {
-            this.cache = undefined;
-        }
     }
 }
 exports.default = Ayiin;

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
@@ -62,7 +62,9 @@ class Limiter extends tools_1.default {
                             api: options.keyPrefix,
                             remainMs: remainingMs,
                             remain: this.formatRemainingTime(remainingMs),
-                            limit: options.limit,
+                            limit: Array.isArray(options.limit)
+                                ? options.limit[0]
+                                : options.limit,
                         })
                         : (options.messageFormat ??
                             `[FloodWait] - Silakan coba lagi dalam ${this.formatRemainingTime(remainingMs)}.`);
@@ -76,19 +78,26 @@ 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();
@@ -99,7 +108,7 @@ class Limiter extends tools_1.default {
                         remainMs: floodwaitMs,
                         remain: this.formatRemainingTime(floodwaitMs),
                         level,
-                        limit: options.limit,
+                        limit: currentLimit,
                     })
                     : (options.messageFormat ??
                         `[FloodWait] - Terlalu banyak permintaan. Silakan coba lagi dalam ${this.formatRemainingTime(floodwaitMs)}.`);

package/dist/types.d.ts

@@ -12,9 +12,9 @@ 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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ayiin",
-  "version": "2.0.41",
+  "version": "2.0.42",
   "author": {
     "name": "AyiinXd",
     "url": "https://github.com/AyiinXd"
@@ -26,8 +26,5 @@
   "scripts": {
     "build": "tsc"
   },
-  "types": "./dist/index.d.ts",
-  "dependencies": {
-    "ioredis": "^6.0.0"
-  }
+  "types": "./dist/index.d.ts"
 }