Enforce rate limiting

glotcode · Jul 24, 2024 · ef8470e · ef8470e
1 parent ca9419a
commit ef8470e
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/glot_cloudflare/functions/api/run.ts b/glot_cloudflare/functions/api/run.ts
@@ -17,14 +17,14 @@ export const onRequestPost: PagesFunction<Env & StringRecord> = async (context)
  try {
  const ip = getRequestIp(context.request);
  const requestStats = await incrementRequestCount(context.env, context.request.clone(), ip);
- if (isRatedLimited(envVars, requestStats)) {
+ if (isRateLimited(envVars, requestStats)) {
  return errorResponse(429, "Rate limit exceeded");
  }
-
- return run(envVars, context.request.body);
  } catch (e) {
- console.error("Failed to increment request count", e);
+ console.error("Failed to increment request count", e.message);
  }
+
+ return run(envVars, context.request.body);
 };
 
 function getRequestIp(request: Request): string {
@@ -42,9 +42,12 @@ async function incrementRequestCount(env: Env, request: Request, ip: string): Pr
  return response.json();
 }
 
-function isRatedLimited(env: EnvVars, stats: RequestStats): boolean {
- // TODO
- return false
+function isRateLimited(env: EnvVars, stats: RequestStats): boolean {
+ return (
+ stats.minutely.count > env.maxRequestsPerMinute ||
+ stats.hourly.count > env.maxRequestsPerHour ||
+ stats.daily.count > env.maxRequestsPerDay
+ );
 }