Merge pull request #811 from filipedeschamps/upstash-timeout

feat(rate-limit): added 4s upstash service timeout

infra/rate-limit.js

@@ -25,14 +25,21 @@ async function check(request) {
   const method = request.method;
   const path = request.nextUrl.pathname;
   const limit = getLimit(method, path, ip);
+  let timeout;
 
   try {
     const generalRateLimit = new Ratelimit({
       redis: Redis.fromEnv(),
       limiter: Ratelimit.slidingWindow(limit.requests, limit.window),
     });
 
-    return await generalRateLimit.limit(limit.identifier);
+    const timeoutPromise = new Promise((_, reject) => {
+      timeout = setTimeout(() => {
+        reject({ message: 'Upstash não respondeu dentro de 4s.' });
+      }, 4000);
+    });
+
+    return await Promise.race([generalRateLimit.limit(limit.identifier), timeoutPromise]);
   } catch (error) {
     throw new ServiceError({
       message: error.message,
@@ -45,6 +52,8 @@ async function check(request) {
       },
       errorLocationCode: 'MIDDLEWARE:RATE_LIMIT:CHECK',
     });
+  } finally {
+    clearTimeout(timeout);
   }
 }
 

middleware.public.js

@@ -2,14 +2,6 @@ import { NextResponse } from 'next/server';
 import rateLimit from 'infra/rate-limit.js';
 import snakeize from 'snakeize';
 
-// TODO: Next.js still didn't fix this bug:
-// https://github.com/vercel/next.js/issues/39262
-// But this bug doesn't affect Preview and Production environments.
-// So it's time enable the middleware on all routes, but then
-// we need to skip these two tests for now as a collateral effect:
-// https://github.com/filipedeschamps/tabnews.com.br/blob/35bd984db122f30ae3ed7a3b5d7baf830669a345/tests/integration/api/v1/contents/post.test.js#L268
-// https://github.com/filipedeschamps/tabnews.com.br/blob/35bd984db122f30ae3ed7a3b5d7baf830669a345/tests/integration/api/v1/contents/%5Busername%5D/%5Bslug%5D/patch.test.js#L500
-
 export const config = {
   matcher: ['/api/:path*'],
 };