Refactor rate limit middleware

NeKzor · Feb 8, 2025 · 0b787fa · 0b787fa
1 parent cc7ef7b
commit 0b787fa
Showing 1 changed file with 15 additions and 16 deletions.
diff --git a/src/server/rate_limits.ts b/src/server/rate_limits.ts
@@ -8,21 +8,10 @@ import { RouterMiddleware, Status, STATUS_TEXT } from '@oak/oak';
 import { RateLimiterAbstract, RateLimiterMemory, RateLimiterRes } from 'rate-limiter-flexible';
 import { AppState } from './app/AppState.ts';
 
-const buckets = {
-  authorize: new RateLimiterMemory({
-    points: 3,
-    duration: 60,
-  }),
-  views: new RateLimiterMemory({
-    points: 1,
-    duration: 30,
-  }),
-};
-
 // deno-lint-ignore no-explicit-any
 type OakRouterMiddleware = RouterMiddleware<any, any, Record<string, any> & AppState>;
 
-const tryConsume: (bucket: RateLimiterAbstract) => OakRouterMiddleware = (bucket) => async (ctx, next) => {
+const rateLimitMiddleware: (bucket: RateLimiterAbstract) => OakRouterMiddleware = (bucket) => async (ctx, next) => {
   let consumed = false;
 
   try {
@@ -45,7 +34,17 @@ const tryConsume: (bucket: RateLimiterAbstract) => OakRouterMiddleware = (bucket
   }
 };
 
-export const rateLimits: Record<keyof typeof buckets, OakRouterMiddleware> = {
-  authorize: tryConsume(buckets.authorize),
-  views: tryConsume(buckets.views),
-};
+export const rateLimits = {
+  authorize: rateLimitMiddleware(
+    new RateLimiterMemory({
+      points: 3,
+      duration: 60,
+    }),
+  ),
+  views: rateLimitMiddleware(
+    new RateLimiterMemory({
+      points: 1,
+      duration: 30,
+    }),
+  ),
+} as const;