Merge pull request #3 from Rocketseat/feat/retry-webhooks

feat: show how many retries have been made to an webhook log
Rocketseat · Mar 3, 2024 · 2889583 · 2889583
2 parents 743f972 + f6f21a3
commit 2889583
Show file tree

Hide file tree

Showing 11 changed files with 2,188 additions and 1 deletion.
diff --git a/apps/web/src/app/(app)/settings/developers/logs/[logId]/loading.tsx b/apps/web/src/app/(app)/settings/developers/logs/[logId]/loading.tsx
@@ -30,6 +30,12 @@ export default async function WebhookLogsDetailsLoading() {
                 <Skeleton className="h-5 w-32" />
               </TableCell>
             </TableRow>
+            <TableRow>
+              <TableCell>Number of retries</TableCell>
+              <TableCell>
+                <Skeleton className="h-5 w-20" />
+              </TableCell>
+            </TableRow>
             <TableRow>
               <TableCell>HTTP Status</TableCell>
               <TableCell>

diff --git a/apps/web/src/app/(app)/settings/developers/logs/[logId]/page.tsx b/apps/web/src/app/(app)/settings/developers/logs/[logId]/page.tsx
@@ -67,6 +67,23 @@ export default async function WebhookLogsDetails({
       })
     : null
 
+  const nextRetryDelay = Math.round(
+    Math.min(86400, Math.exp(2.5 * webhookLog.numberOfRetries)),
+  )
+
+  const nextRetryDate = dayjs(webhookLog.finishedAt).add(
+    nextRetryDelay,
+    'second',
+  )
+
+  const isNextRetryDateInFuture = nextRetryDate.isAfter(dayjs())
+
+  const formattedNextRetryDate = isNextRetryDateInFuture
+    ? dayjs().to(nextRetryDate, true)
+    : ''
+
+  const nextRetryDateFormatted = `(Next retry in ${formattedNextRetryDate.trim()})`
+
   return (
     <div className="space-y-4 p-6">
       <div className="flex items-center gap-2">
@@ -112,6 +129,16 @@ export default async function WebhookLogsDetails({
               <TableCell>Error reason</TableCell>
               <TableCell>{webhookLog.errorReason || '-'}</TableCell>
             </TableRow>
+            <TableRow>
+              <TableCell>Number of retries</TableCell>
+              <TableCell>
+                {webhookLog.status === 'ERROR'
+                  ? `${webhookLog.numberOfRetries} ${
+                      isNextRetryDateInFuture ? nextRetryDateFormatted : ''
+                    }`
+                  : '-'}
+              </TableCell>
+            </TableRow>
             <TableRow>
               <TableCell>HTTP Status</TableCell>
               <TableCell>

diff --git a/apps/web/src/app/api/webhooks/external/route.ts b/apps/web/src/app/api/webhooks/external/route.ts
@@ -9,8 +9,14 @@ export const runtime = 'edge'
 
 async function handler(request: NextRequest) {
   const requestBody = await request.json()
+  const numberOfRetries = Number(request.headers.get('Upstash-Retried')) || 0
 
-  const webhookEvent = webhookEventSchema.parse(requestBody)
+  const webhookData = {
+    ...requestBody,
+    numberOfRetries,
+  }
+
+  const webhookEvent = webhookEventSchema.parse(webhookData)
 
   const { success } = await handleWebhookEvent(webhookEvent)
 

diff --git a/packages/drizzle/migrations/0012_unique_black_tom.sql b/packages/drizzle/migrations/0012_unique_black_tom.sql
@@ -0,0 +1 @@
+ALTER TABLE "company_webhook_logs" ADD COLUMN "number_of_retries" integer DEFAULT 0;
diff --git a/packages/drizzle/migrations/0013_nervous_abomination.sql b/packages/drizzle/migrations/0013_nervous_abomination.sql
@@ -0,0 +1 @@
+ALTER TABLE "company_webhook_logs" ALTER COLUMN "number_of_retries" SET NOT NULL;