diff --git a/src/lib/rateLimit.ts b/src/lib/rateLimit.ts index 477dc22..cbd5d17 100644 --- a/src/lib/rateLimit.ts +++ b/src/lib/rateLimit.ts @@ -33,8 +33,8 @@ export interface RateLimitResult { * @param env Environment bindings containing proxy configuration * @returns Object containing calculated rate limits */ -function getDynamicRateLimits(env: Env) { - const proxyEndpoints = getProxyEndpoints(env); +async function getDynamicRateLimits(env: Env) { + const proxyEndpoints = await getProxyEndpoints(env); return calculateDynamicRateLimits(proxyEndpoints.length); } @@ -81,7 +81,7 @@ async function checkRateLimit(clientIP: string, env: Env): Promise { const now = Date.now(); try { - const rateLimits = getDynamicRateLimits(env); + const rateLimits = await getDynamicRateLimits(env); const maxTokens = rateLimits.TOKENS_PER_MINUTE; // Check in-memory cache @@ -167,19 +167,8 @@ async function checkRateLimit(clientIP: string, env: Env): Promise { * @returns Promise that resolves after the specified delay */ export async function delayRequest(seconds: number): Promise { - return new Promise((resolve) => { - // Use a simple delay implementation for Workers environment - const start = Date.now(); - const checkTime = () => { - if (Date.now() - start >= seconds * 1000) { - resolve(); - } else { - // Use minimal delay to prevent blocking - Promise.resolve().then(checkTime); - } - }; - checkTime(); - }); + const delayMs = Math.max(0, Math.round(seconds * 1000)); + await new Promise((resolve) => setTimeout(resolve, delayMs)); } /**