From 3ec17e2d1a206cdddf29b912a20fe702690c0df5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerg=C5=91=20M=C3=B3ricz?= Date: Fri, 23 May 2025 16:50:59 +0200 Subject: [PATCH] fix(v1): avoid overwriting rateLimiterMode with FIRE-1 rate limiter (#1593) --- apps/api/src/routes/v1.ts | 38 ++++++++------------------------------ 1 file changed, 8 insertions(+), 30 deletions(-) diff --git a/apps/api/src/routes/v1.ts b/apps/api/src/routes/v1.ts index c05bf585..686653bc 100644 --- a/apps/api/src/routes/v1.ts +++ b/apps/api/src/routes/v1.ts @@ -90,39 +90,20 @@ function checkCreditsMiddleware( } export function authMiddleware( - rateLimiterMode: RateLimiterMode, - reference?: { - extract: RateLimiterMode, - extractAgentPreview: RateLimiterMode, - } + rateLimiterMode: RateLimiterMode ): (req: RequestWithMaybeAuth, res: Response, next: NextFunction) => void { - const middlewareSpawn = new Error().stack; return (req, res, next) => { (async () => { - if (rateLimiterMode === RateLimiterMode.Extract && isAgentExtractModelValid((req.body as any)?.agent?.model)) { - logger.debug("Picking extract agent preview mode", { - body: req.body, - model: (req.body as any)?.agent?.model, - }); - rateLimiterMode = RateLimiterMode.ExtractAgentPreview; - } else if (rateLimiterMode === RateLimiterMode.ExtractAgentPreview) { - logger.warn("EAP passed into authMiddleware directly?", { - body: req.body, - callStack: new Error().stack, - modes: { - extract: RateLimiterMode.Extract, - extractAgentPreview: RateLimiterMode.ExtractAgentPreview, - }, - middlewareSpawn, - reference, - }); + let currentRateLimiterMode = rateLimiterMode; + if (currentRateLimiterMode === RateLimiterMode.Extract && isAgentExtractModelValid((req.body as any)?.agent?.model)) { + currentRateLimiterMode = RateLimiterMode.ExtractAgentPreview; } - // if (rateLimiterMode === RateLimiterMode.Scrape && isAgentExtractModelValid((req.body as any)?.agent?.model)) { - // rateLimiterMode = RateLimiterMode.ScrapeAgentPreview; + // if (currentRateLimiterMode === RateLimiterMode.Scrape && isAgentExtractModelValid((req.body as any)?.agent?.model)) { + // currentRateLimiterMode = RateLimiterMode.ScrapeAgentPreview; // } - const auth = await authenticateUser(req, res, rateLimiterMode); + const auth = await authenticateUser(req, res, currentRateLimiterMode); if (!auth.success) { if (!res.headersSent) { @@ -273,10 +254,7 @@ v1Router.ws("/crawl/:jobId", crawlStatusWSController); v1Router.post( "/extract", - authMiddleware(RateLimiterMode.Extract, { - extract: RateLimiterMode.Extract, - extractAgentPreview: RateLimiterMode.ExtractAgentPreview, - }), + authMiddleware(RateLimiterMode.Extract), checkCreditsMiddleware(1), wrap(extractController), );