@kanjijs/throttler 0.2.0-beta.12 → 0.2.0-beta.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kanjijs/throttler",
-  "version": "0.2.0-beta.12",
+  "version": "0.2.0-beta.13",
   "type": "module",
   "main": "./src/index.ts",
   "dependencies": {
@@ -8,7 +8,7 @@
     "reflect-metadata": "^0.2.0"
   },
   "peerDependencies": {
-    "@kanjijs/core": "^0.2.0-beta.12"
+    "@kanjijs/core": "^0.2.0-beta.13"
   },
   "scripts": {
     "build": "bun build ./src/index.ts --outdir ./dist --target bun"

package/src/throttler.decorator.ts

@@ -10,7 +10,7 @@ export interface ThrottlerOptions {
 export function Throttle(options: ThrottlerOptions) {
   return Use(async (c: Context, next: Next) => {
     // Resolve singleton
-    const throttler = KanjijsIoC.resolve(ThrottlerService);
+    const throttler = KanjijsIoC.resolve(ThrottlerService) as ThrottlerService | undefined;
     
     if (throttler) {
       // Use specific options from decorator

package/src/throttler.guard.ts

@@ -1,85 +1,25 @@
 import { Inject, Injectable, GLOBAL_MIDDLEWARE_TOKEN } from "@kanjijs/core";
-import { type Context, type Next } from "hono";
-import { ThrottlerInMemoryStorage, type ThrottlerStorage } from "./throttler.storage";
-import { THROTTLER_LIMIT, THROTTLER_TTL } from "./throttler.decorator";
-
-export interface ThrottlerModuleOptions {
-  limit?: number;
-  ttl?: number;
-  storage?: ThrottlerStorage;
-}
-
-export const THROTTLER_OPTIONS = "THROTTLER_OPTIONS";
+import { type Context, type Handler, type Next } from "hono";
+import { type ThrottlerModuleOptions, THROTTLER_OPTIONS, ThrottlerService } from "./throttler.service";
 
 @Injectable()
 export class ThrottlerGuard {
-  private storage: ThrottlerStorage;
-  private defaultLimit: number;
-  private defaultTtl: number;
-
-  constructor(@Inject(THROTTLER_OPTIONS) private options: ThrottlerModuleOptions) {
-    this.storage = options.storage || new ThrottlerInMemoryStorage();
-    this.defaultLimit = options.limit || 10;
-    this.defaultTtl = options.ttl || 60;
-  }
+  constructor(
+    @Inject(ThrottlerService) private throttler: ThrottlerService
+  ) {}
 
   // This will be registered as a Global Middleware in KanjijsAdapter if provided
   async handle(c: Context, next: Next) {
-    // 1. Identify Client (IP)
-    // Hono "conn" info or header
-    /* 
-       NOTE: In Bun/Hono, getting IP can be platform specific.
-       We will trust X-Forwarded-For or use a fallback.
-    */
-    const ip = c.req.header("x-forwarded-for") || "unknown";
-    const key = `throttler:${ip}:${c.req.path}`; // Limit by IP + Path (or just IP?) -> Usually just IP for global
-
-    // 2. Resolve Metadata (Limit/TTL)
-    // KanjijsAdapter doesn't expose the "Current Handler" to global middleware easily yet in the context.
-    // LIMITATION: Global Middleware runs BEFORE routing in Hono standard app.use('*').
-    // To support @Throttle decorators, we need to run THIS check inside the route handler wrapper OR 
-    // we need to access the route handler metadata here.
-    
-    // CURRENT STRATEGY: 
-    // Global Config applies to ALL routes globally (Middleware style).
-    // @Throttle decorator support requires Per-Route logic.
-    // Since KanjijsAdapter registers routes, we should probably implement this as a specific middleware wrapper there,
-    // OR we rely on Hono context to pass handler info? No standard way.
-    
-    // REVISED PLAN:
-    // We will implement `ThrottlerGuard` but we cannot easily use it as a simple `app.use('*')` 
-    // IF we want to support @Throttle decorators overriding it properly *per route* efficiently without finding the route match twice.
-    
-    // HOWEVER, for MVP:
-    // 1. Global Throttling: Runs on `*`, uses default limit.
-    // 2. Decorator Throttling: The adapter needs to know about it.
-    
-    // BUT the user asked for: "rate limit haz que tambien se pueda configurar desde main y no solo usando el decorador"
-    
-    // Let's stick to the plan:
-    // If we use Global Middleware, we enforce global limit.
-    // If we want specific limits, we need `KanjijsAdapter` to help us OR we attach `ThrottlerGuard` to the route in the Adapter.
-    
-    // DECISION: 
-    // This `handle` method will apply the DEFAULT global limit if installed globally.
-    // For Decorator support, `KanjijsAdapter` needs to look for `@Throttle` metadata and add THIS middleware (configured differently) to that route.
-    
-    const limit = this.defaultLimit;
-    const ttl = this.defaultTtl;
+    // Override global options? For now, simply use global defaults.
+    const { limit, ttl } = this.throttler.getGlobalOptions();
 
-    const { total, timeToExpire } = await this.storage.increment(key, ttl);
+    const allowed = await this.throttler.handleRequest(c, limit, ttl);
 
-    if (total > limit) {
-      return c.text(`Too Many Requests`, 429, {
-        "Retry-After": timeToExpire.toString()
-      });
+    if (!allowed) {
+        // Response is already handled by service (429)
+        return; 
     }
 
-    // Headers
-    c.header("X-RateLimit-Limit", limit.toString());
-    c.header("X-RateLimit-Remaining", Math.max(0, limit - total).toString());
-    c.header("X-RateLimit-Reset", timeToExpire.toString());
-
     await next();
   }
 }

package/src/throttler.module.ts

@@ -17,7 +17,7 @@ export class ThrottlerModule {
           provide: GLOBAL_MIDDLEWARE_TOKEN,
           useValue: async (c: Context, next: Next) => {
              // console.log("Throttler Middleware Executing via Global Token");
-             const throttler = KanjijsIoC.resolve(ThrottlerService);
+             const throttler = KanjijsIoC.resolve(ThrottlerService) as ThrottlerService | undefined;
              if (throttler) {
                  const { limit, ttl } = throttler.getGlobalOptions();
                  const allowed = await throttler.handleRequest(c, limit, ttl);

package/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./dist",
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "noEmit": false
+  },
+  "include": ["src/**/*"]
+}