Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

final changes, renamed webhookClickWorkspaces → linkClickedWebhookWorkspaces

Steven Teyf7ec3f468c81
diff --git a/apps/web/app/(ee)/api/cron/webhooks/sync-click-workspaces/route.ts b/apps/web/app/(ee)/api/cron/webhooks/sync-click-workspaces/route.ts
index acdf767723..fcf462e3df 100644
--- a/apps/web/app/(ee)/api/cron/webhooks/sync-click-workspaces/route.ts
+++ b/apps/web/app/(ee)/api/cron/webhooks/sync-click-workspaces/route.ts
@@ -9,7 +9,7 @@ export const dynamic = "force-dynamic";
// GET /api/cron/webhooks/sync-click-workspaces
// Rebuild the Redis set of workspaces with active link.clicked webhooks.
-// Runs every minute (* * * * *)
+// Runs every 15 minutes (*/15 * * * *)
export const GET = withCron(async () => {
const synced = await syncClickWebhookWorkspaceSet();
const deleted = await cleanupRedundantLinkWebhookEntries();
diff --git a/apps/web/app/(ee)/api/cron/webhooks/sync-click-workspaces/utils.ts b/apps/web/app/(ee)/api/cron/webhooks/sync-click-workspaces/utils.ts
index d8cdb2c26a..29aab520e1 100644
--- a/apps/web/app/(ee)/api/cron/webhooks/sync-click-workspaces/utils.ts
+++ b/apps/web/app/(ee)/api/cron/webhooks/sync-click-workspaces/utils.ts
@@ -1,9 +1,9 @@
import { prisma } from "@/lib/prisma";
import { redis } from "@/lib/upstash";
-import { REDIS_KEY } from "@/lib/webhook/click-webhook-workspaces";
+import { LINK_CLICKED_WEBHOOK_WORKSPACES_REDIS_KEY } from "@/lib/webhook/click-webhook-workspaces";
import { LINK_CLICK_WEBHOOK_TRIGGER } from "@/lib/webhook/constants";
-const TMP_REDIS_KEY = `${REDIS_KEY}:tmp`;
+const TMP_REDIS_KEY = `${LINK_CLICKED_WEBHOOK_WORKSPACES_REDIS_KEY}:tmp`;
// Rebuild the Redis set of workspaces with active link.clicked webhooks
export const syncClickWebhookWorkspaceSet = async () => {
@@ -28,13 +28,13 @@ export const syncClickWebhookWorkspaceSet = async () => {
const workspaceIds = webhooks.map((webhook) => webhook.projectId);
if (workspaceIds.length === 0) {
- await redis.del(REDIS_KEY);
+ await redis.del(LINK_CLICKED_WEBHOOK_WORKSPACES_REDIS_KEY);
return 0;
}
await redis.del(TMP_REDIS_KEY);
await redis.sadd(TMP_REDIS_KEY, ...(workspaceIds as [string, ...string[]]));
- await redis.rename(TMP_REDIS_KEY, REDIS_KEY);
+ await redis.rename(TMP_REDIS_KEY, LINK_CLICKED_WEBHOOK_WORKSPACES_REDIS_KEY);
return workspaceIds.length;
};
diff --git a/apps/web/lib/upstash/redis-streams/workspace-click-events.ts b/apps/web/lib/upstash/redis-streams/workspace-click-events.ts
index e139f38906..2868bd9847 100644
--- a/apps/web/lib/upstash/redis-streams/workspace-click-events.ts
+++ b/apps/web/lib/upstash/redis-streams/workspace-click-events.ts
@@ -16,11 +16,11 @@ export const publishWorkspaceClickEvent = async (event) => {
bot: Number(event.bot),
});
- const hasWebhooks = await clickWebhookWorkspaces.has(
+ const hasLinkClickedWebhooks = await clickWebhookWorkspaces.has(
parsedEvent.workspace_id,
);
- if (!hasWebhooks) {
+ if (!hasLinkClickedWebhooks) {
return;
}
diff --git a/apps/web/lib/webhook/click-webhook-workspaces.ts b/apps/web/lib/webhook/click-webhook-workspaces.ts
index 07dd3ce512..4d8e4b1d54 100644
--- a/apps/web/lib/webhook/click-webhook-workspaces.ts
+++ b/apps/web/lib/webhook/click-webhook-workspaces.ts
@@ -3,19 +3,29 @@ import { redis } from "@/lib/upstash";
import { LINK_CLICK_WEBHOOK_TRIGGER } from "./constants";
import type { WebhookTrigger } from "./types";
-export const REDIS_KEY = "webhookClickWorkspaces";
+export const LINK_CLICKED_WEBHOOK_WORKSPACES_REDIS_KEY =
+ "linkClickedWebhookWorkspaces";
class ClickWebhookWorkspaces {
async add(workspaceId: string) {
- return await redis.sadd(REDIS_KEY, workspaceId);
+ return await redis.sadd(
+ LINK_CLICKED_WEBHOOK_WORKSPACES_REDIS_KEY,
+ workspaceId,
+ );
}
async remove(workspaceId: string) {
- return await redis.srem(REDIS_KEY, workspaceId);
+ return await redis.srem(
+ LINK_CLICKED_WEBHOOK_WORKSPACES_REDIS_KEY,
+ workspaceId,
+ );
}
async has(workspaceId: string) {
- return await redis.sismember(REDIS_KEY, workspaceId);
+ return await redis.sismember(
+ LINK_CLICKED_WEBHOOK_WORKSPACES_REDIS_KEY,
+ workspaceId,
+ );
}
}
diff --git a/apps/web/vercel.json b/apps/web/vercel.json
index a8a818477e..22ff1d8a99 100644
--- a/apps/web/vercel.json
+++ b/apps/web/vercel.json
@@ -17,11 +17,11 @@
"schedule": "0 8 * * *"
},
{
- "path": "/api/cron/streams/update-workspace-clicks",
+ "path": "/api/cron/streams/send-link-clicked-webhooks",
"schedule": "* * * * *"
},
{
- "path": "/api/cron/streams/send-link-clicked-webhooks",
+ "path": "/api/cron/streams/update-workspace-clicks",
"schedule": "* * * * *"
},
{
@@ -82,7 +82,7 @@
},
{
"path": "/api/cron/webhooks/sync-click-workspaces",
- "schedule": "* * * * *"
+ "schedule": "*/15 * * * *"
}
],
"functions": {