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.

Identify in-flight broadcasts by QStash message id instead of retry count.

Kiran K5153b7668e69
diff --git a/apps/web/app/(ee)/api/cron/campaigns/broadcast/route.ts b/apps/web/app/(ee)/api/cron/campaigns/broadcast/route.ts
index c2540b84fd..fdc7a75cb3 100644
--- a/apps/web/app/(ee)/api/cron/campaigns/broadcast/route.ts
+++ b/apps/web/app/(ee)/api/cron/campaigns/broadcast/route.ts
@@ -109,9 +109,11 @@ export async function POST(req: Request) {
const program = campaign.program;
// Claim the first run so leftover delayed messages / scanner retries
- // cannot start a second broadcast. A QStash retry of the message that
- // already claimed (Upstash-Retried > 0) is allowed to continue.
+ // cannot start a second broadcast. A QStash retry of the claiming
+ // message (matching qstashMessageId) is allowed to continue.
if (!startingAfter) {
+ const messageId = req.headers.get("Upstash-Message-Id");
+
const claimed = await prisma.campaign.updateMany({
where: {
id: campaignId,
@@ -119,16 +121,12 @@ export async function POST(req: Request) {
},
data: {
status: CampaignStatus.sending,
+ qstashMessageId: messageId,
},
});
if (claimed.count === 0) {
- const retried = Number.parseInt(
- req.headers.get("Upstash-Retried") ?? "0",
- 10,
- );
-
- if (!Number.isFinite(retried) || retried < 1) {
+ if (!messageId || campaign.qstashMessageId !== messageId) {
return logAndRespond(
`Campaign ${campaignId} broadcast already initiated. Skipping...`,
);
diff --git a/apps/web/prisma/schema/campaign.prisma b/apps/web/prisma/schema/campaign.prisma
index 92cc6907c1..5b61f7c49a 100644
--- a/apps/web/prisma/schema/campaign.prisma
+++ b/apps/web/prisma/schema/campaign.prisma
@@ -22,7 +22,7 @@ model Campaign {
programId String
workflowId String? @unique
userId String
- qstashMessageId String? @unique // TODO: remove this column
+ qstashMessageId String? @unique // Claiming QStash message id for the in-flight broadcast
type CampaignType
status CampaignStatus @default(draft)
name String