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.

Default QStash deduplication to the job id so publish retries cannot double-deliver.

Kiran K63fd3ebc127a
diff --git a/apps/web/app/(ee)/api/workflows/create-partner-commission/route.ts b/apps/web/app/(ee)/api/workflows/create-partner-commission/route.ts
index fc09fae06a..234db2521c 100644
--- a/apps/web/app/(ee)/api/workflows/create-partner-commission/route.ts
+++ b/apps/web/app/(ee)/api/workflows/create-partner-commission/route.ts
@@ -10,7 +10,6 @@ import { getRewardSpendLimitWindow } from "@/lib/api/rewards/reward-spend-limit-
import { calculateSaleEarnings } from "@/lib/api/sales/calculate-sale-earnings";
import { executeWorkflows } from "@/lib/api/workflows/execute-workflows";
import { logger } from "@/lib/axiom/server";
-import { getWorkflowConfig } from "@/lib/cron/qstash-workflow";
import { constructWebhookPartner } from "@/lib/partners/constuct-webhook-partner";
import { determinePartnerRewards } from "@/lib/partners/determine-partner-reward";
import { getRewardAmount } from "@/lib/partners/get-reward-amount";
@@ -153,11 +152,6 @@ export const { POST } = serve<Input>(
failResponse,
failHeaders,
}) => {
- const { correlation } = getWorkflowConfig({
- workflowType: "create-partner-commission",
- body: context.requestPayload,
- });
-
logger.error("workflow.failed", {
service: "qstash",
event: "workflow.failed",
@@ -166,7 +160,6 @@ export const { POST } = serve<Input>(
failStatus,
failResponse,
failHeaders,
- correlation,
});
await logger.flush();
diff --git a/apps/web/app/(ee)/api/workflows/merge-partner-accounts/route.ts b/apps/web/app/(ee)/api/workflows/merge-partner-accounts/route.ts
index a67d8cd004..087b684fdc 100644
--- a/apps/web/app/(ee)/api/workflows/merge-partner-accounts/route.ts
+++ b/apps/web/app/(ee)/api/workflows/merge-partner-accounts/route.ts
@@ -5,7 +5,6 @@ import { includeTags } from "@/lib/api/links/include-tags";
import { syncTotalCommissions } from "@/lib/api/partners/sync-total-commissions";
import { logger } from "@/lib/axiom/server";
import { PRISMA_UPDATEMANY_LIMIT } from "@/lib/cron";
-import { getWorkflowConfig } from "@/lib/cron/qstash-workflow";
import { conn } from "@/lib/planetscale";
import { prisma } from "@/lib/prisma";
import { storage } from "@/lib/storage";
@@ -15,7 +14,7 @@ import { sendWorkspaceWebhook } from "@/lib/webhook/publish";
import { partnerMergedWebhookSchema } from "@/lib/zod/schemas/partners";
import { sendBatchEmail } from "@dub/email";
import PartnerAccountMerged from "@dub/email/templates/partner-account-merged";
-import { log, prettyPrint, R2_URL } from "@dub/utils";
+import { prettyPrint, R2_URL } from "@dub/utils";
import { FraudRuleType } from "@prisma/client";
import { serve } from "@upstash/workflow/nextjs";
import * as z from "zod/v4";
@@ -204,17 +203,6 @@ export const { POST } = serve<Input>(
// Clear the verification cache so the partner can retry from the start
await redis.del(`${CACHE_KEY_PREFIX}:${userId}`);
- const { correlation } = getWorkflowConfig({
- workflowType: "merge-partner-accounts",
- body: context.requestPayload,
- });
-
- await log({
- message: `Error merging partner accounts: ${JSON.stringify(correlation)}, workflowRunId=${context.workflowRunId}, failStatus=${failStatus}, failResponse=${failResponse}. Some enrollments may already be merged (see workflow run for completed steps) - manual cleanup may be required.`,
- type: "alerts",
- mention: true,
- });
-
logger.error("workflow.failed", {
service: "qstash",
event: "workflow.failed",
@@ -223,7 +211,6 @@ export const { POST } = serve<Input>(
failStatus,
failResponse,
failHeaders,
- correlation,
});
await logger.flush();
diff --git a/apps/web/app/(ee)/api/workflows/partner-approved/route.ts b/apps/web/app/(ee)/api/workflows/partner-approved/route.ts
index 746ad26447..fef888446f 100644
--- a/apps/web/app/(ee)/api/workflows/partner-approved/route.ts
+++ b/apps/web/app/(ee)/api/workflows/partner-approved/route.ts
@@ -4,7 +4,6 @@ import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enro
import { executeWorkflows } from "@/lib/api/workflows/execute-workflows";
import { logger } from "@/lib/axiom/server";
import { triggerDraftBountySubmissionCreation } from "@/lib/bounty/api/trigger-draft-bounty-submissions";
-import { getWorkflowConfig } from "@/lib/cron/qstash-workflow";
import { generateDiscountCodeForPartner } from "@/lib/discounts/generate-discount-code-for-partner";
import { createReferralCommission } from "@/lib/partner-referrals/create-referral-commission";
import { prisma } from "@/lib/prisma";
@@ -351,11 +350,6 @@ export const { POST } = serve<Input>(
failResponse,
failHeaders,
}) => {
- const { correlation } = getWorkflowConfig({
- workflowType: "partner-approved",
- body: context.requestPayload,
- });
-
logger.error("workflow.failed", {
service: "qstash",
event: "workflow.failed",
@@ -364,7 +358,6 @@ export const { POST } = serve<Input>(
failStatus,
failResponse,
failHeaders,
- correlation,
});
await logger.flush();
diff --git a/apps/web/lib/jobs/publish-jobs.ts b/apps/web/lib/jobs/publish-jobs.ts
index 85c9c1df66..b006c44993 100644
--- a/apps/web/lib/jobs/publish-jobs.ts
+++ b/apps/web/lib/jobs/publish-jobs.ts
@@ -34,15 +34,22 @@ export async function dispatchJobs(
return;
}
- const data = jobs.map((job) => ({
- id: createId({ prefix: "job_" }),
- name: job.name,
- scheduledAt: new Date(),
- payload: job.payload as Prisma.InputJsonValue,
- ...(job.options && {
- options: job.options as Prisma.InputJsonValue,
- }),
- }));
+ const data = jobs.map((job) => {
+ const id = createId({ prefix: "job_" });
+
+ return {
+ id,
+ name: job.name,
+ scheduledAt: new Date(),
+ payload: job.payload as Prisma.InputJsonValue,
+ // Default deduplicationId to the job id so best-effort publish and the
+ // retry cron cannot deliver the same job twice via QStash
+ options: {
+ ...job.options,
+ deduplicationId: job.options?.deduplicationId ?? id,
+ } as Prisma.InputJsonValue,
+ };
+ });
// Durably persist the jobs in the database
await prisma.job.createMany({
diff --git a/apps/web/lib/jobs/publishers/qstash-job-publisher.ts b/apps/web/lib/jobs/publishers/qstash-job-publisher.ts
index b6497913a5..0c4b8d3374 100644
--- a/apps/web/lib/jobs/publishers/qstash-job-publisher.ts
+++ b/apps/web/lib/jobs/publishers/qstash-job-publisher.ts
@@ -68,10 +68,8 @@ export class QStashJobPublisher implements JobPublisher {
return {
url: `${APP_DOMAIN_WITH_NGROK}${jobPath}`,
body: job.payload,
+ deduplicationId: options.deduplicationId ?? job.id,
...(options.label && { label: options.label }),
- ...(options.deduplicationId && {
- deduplicationId: options.deduplicationId,
- }),
...(options.retries !== undefined && { retries: options.retries }),
...(options.flowControl && { flowControl: options.flowControl }),
...(options.queue && { queueName: options.queue }),
diff --git a/apps/web/lib/jobs/publishers/qstash-workflow-publisher.ts b/apps/web/lib/jobs/publishers/qstash-workflow-publisher.ts
index 49a646bec2..3f83fea730 100644
--- a/apps/web/lib/jobs/publishers/qstash-workflow-publisher.ts
+++ b/apps/web/lib/jobs/publishers/qstash-workflow-publisher.ts
@@ -83,6 +83,7 @@ export class QStashWorkflowPublisher implements JobPublisher {
return {
url: `${APP_DOMAIN_WITH_NGROK}${workflowPath}`,
body: job.payload,
+ workflowRunId: options.deduplicationId ?? job.id,
retries: options.retries ?? 5,
flowControl: options.flowControl ?? {
key: workflowKey,