Use redis in webhook instead of timeout

Author: teimurjan

workspaces/functions/api/deploy-webhook.ts

@@ -1,13 +1,15 @@
 import type { VercelRequest, VercelResponse } from '@vercel/node'
+import { Redis } from '@upstash/redis'
 import crypto from 'crypto'
 
 const HYGRAPH_SECRET = process.env.HYGRAPH_SECRET!
 const GITHUB_WORKFLOW_URL = process.env.GITHUB_WORKFLOW_URL!
 const GITHUB_TOKEN = process.env.GITHUB_TOKEN!
 
-// Global timer to accumulate webhook requests
-let timer: NodeJS.Timeout | null = null
-const TIMEOUT = 30000
+const COOLDOWN_PERIOD = 30000 // seconds
+const DEPLOY_KEY = 'last_deploy_timestamp'
+
+const redis = Redis.fromEnv();
 
 export default async function handler(req: VercelRequest, res: VercelResponse) {
   if (req.method !== 'POST') {
@@ -34,38 +36,39 @@ export default async function handler(req: VercelRequest, res: VercelResponse) {
     return res.status(403).json({ message: 'Invalid signature' })
   }
 
-  if (timer) {
-    return res.status(200).json({ message: 'Deployment already scheduled' })
-  }
+  try {
+    const lastDeployTime = (await redis.get<number>(DEPLOY_KEY)) || 0
+    const now = Date.now()
+    const timeSinceLastDeploy = now - lastDeployTime
 
-  await new Promise<void>((resolve, reject) => {
-    timer = setTimeout(async () => {
-      try {
-        const response = await fetch(GITHUB_WORKFLOW_URL, {
-          method: 'POST',
-          headers: {
-            Authorization: `Bearer ${GITHUB_TOKEN}`,
-            Accept: 'application/vnd.github+json',
-            'X-GitHub-Api-Version': '2022-11-28',
-          },
-          body: JSON.stringify({ ref: 'main' }),
-        })
+    if (timeSinceLastDeploy < COOLDOWN_PERIOD) {
+      return res.status(429).json({
+        message: `Deployment already scheduled. Please wait ${Math.round((COOLDOWN_PERIOD - timeSinceLastDeploy) / 1000)} seconds.`,
+      })
+    }
 
-        if (!response.ok) {
-          console.error(`Failed to trigger workflow: ${response.statusText}`)
-        } else {
-          console.log('Deployment triggered')
-        }
-        resolve()
-      } catch (error) {
-        console.error('Error triggering deployment:', error)
-        reject(error)
-      } finally {
-        // Reset the timer so that future requests can schedule a new dispatch.
-        timer = null
-      }
-    }, TIMEOUT)
-  })
+    await redis.set(DEPLOY_KEY, now)
 
-  return res.status(200).json({ message: 'Deployment scheduled' })
+    const response = await fetch(GITHUB_WORKFLOW_URL, {
+      method: 'POST',
+      headers: {
+        Authorization: `Bearer ${GITHUB_TOKEN}`,
+        Accept: 'application/vnd.github+json',
+        'X-GitHub-Api-Version': '2022-11-28',
+      },
+      body: JSON.stringify({ ref: 'main' }),
+    })
+
+    if (!response.ok) {
+      throw new Error(
+        `Failed to trigger workflow: ${response.statusText} ${await response.text()}`,
+      )
+    }
+
+    console.log('Deployment triggered')
+    return res.status(200).json({ message: 'Deployment triggered' })
+  } catch (error) {
+    console.error('Error:', error)
+    return res.status(500).json({ message: 'Internal server error' })
+  }
 }

workspaces/functions/package.json

@@ -6,6 +6,7 @@
   "author": "Teimur Gasanov",
   "dependencies": {
     "@types/node": "^20",
+    "@upstash/redis": "^1.35.0",
     "@vercel/node": "^5.1.10",
     "typescript": "^5.7.3"
   },

yarn.lock

@@ -5709,6 +5709,7 @@ __metadata:
   resolution: "@teimurjan/functions@workspace:workspaces/functions"
   dependencies:
     "@types/node": "npm:^20"
+    "@upstash/redis": "npm:^1.35.0"
     "@vercel/node": "npm:^5.1.10"
     typescript: "npm:^5.7.3"
   languageName: unknown
@@ -6452,6 +6453,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@upstash/redis@npm:^1.35.0":
+  version: 1.35.0
+  resolution: "@upstash/redis@npm:1.35.0"
+  dependencies:
+    uncrypto: "npm:^0.1.3"
+  checksum: 10c0/9276bd1b093c17c5acb235537f1cb1eccfce7be77d5a9fbb4caaf4dcfb85eda8c9e3dcea93a0bf14d4dc1c5e39d201620eb0ffc4249476a6c19dbcd83be207a2
+  languageName: node
+  linkType: hard
+
 "@use-gesture/core@npm:10.3.1":
   version: 10.3.1
   resolution: "@use-gesture/core@npm:10.3.1"
@@ -18019,6 +18029,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"uncrypto@npm:^0.1.3":
+  version: 0.1.3
+  resolution: "uncrypto@npm:0.1.3"
+  checksum: 10c0/74a29afefd76d5b77bedc983559ceb33f5bbc8dada84ff33755d1e3355da55a4e03a10e7ce717918c436b4dfafde1782e799ebaf2aadd775612b49f7b5b2998e
+  languageName: node
+  linkType: hard
+
 "undici-types@npm:~5.26.4":
   version: 5.26.5
   resolution: "undici-types@npm:5.26.5"