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.

Isolate campaign queueing failures and cancel invalid-from broadcasts.

Kiran Kd5c1ca0b6cab
diff --git a/apps/web/app/(ee)/api/campaigns/[campaignId]/route.ts b/apps/web/app/(ee)/api/campaigns/[campaignId]/route.ts
index d4714d2fe2..a5d6d3302d 100644
--- a/apps/web/app/(ee)/api/campaigns/[campaignId]/route.ts
+++ b/apps/web/app/(ee)/api/campaigns/[campaignId]/route.ts
@@ -200,7 +200,7 @@ export const PATCH = withWorkspace(
url: `${APP_DOMAIN_WITH_NGROK}/api/cron/campaigns/broadcast`,
deduplicationId: campaignId,
flowControl: {
- key: "broadcast-marketing-campaign",
+ key: `broadcast-marketing-campaign-${campaignId}`,
parallelism: 1,
},
body: {
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 e23a490458..c2540b84fd 100644
--- a/apps/web/app/(ee)/api/cron/campaigns/broadcast/route.ts
+++ b/apps/web/app/(ee)/api/cron/campaigns/broadcast/route.ts
@@ -3,7 +3,7 @@ import { renderCampaignEmailHTML } from "@/lib/api/campaigns/render-campaign-ema
import { campaignEligibilityIncludes } from "@/lib/api/campaigns/transform-campaign";
import { validateCampaignFromAddress } from "@/lib/api/campaigns/validate-campaign";
import { createId } from "@/lib/api/create-id";
-import { handleAndReturnErrorResponse } from "@/lib/api/errors";
+import { DubApiError, handleAndReturnErrorResponse } from "@/lib/api/errors";
import { qstash } from "@/lib/cron";
import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
import { resolveCampaignFromAddress } from "@/lib/email/parse-campaign-from-address";
@@ -13,7 +13,12 @@ import { ACTIVE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";
import { sendBatchEmail } from "@dub/email";
import CampaignEmail from "@dub/email/templates/campaign-email";
import { APP_DOMAIN_WITH_NGROK, chunk, log, pluck } from "@dub/utils";
-import { CampaignStatus, NotificationEmailType } from "@prisma/client";
+import {
+ Campaign,
+ CampaignStatus,
+ EmailDomain,
+ NotificationEmailType,
+} from "@prisma/client";
import { differenceInMinutes } from "date-fns";
import * as z from "zod/v4";
import { logAndRespond } from "../../utils";
@@ -103,14 +108,6 @@ export async function POST(req: Request) {
const program = campaign.program;
- // TODO: We should make the from address required. There are existing campaign without from address
- if (campaign.from) {
- validateCampaignFromAddress({
- campaign,
- emailDomains: program.emailDomains,
- });
- }
-
// 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.
@@ -139,6 +136,15 @@ export async function POST(req: Request) {
}
}
+ const invalidFromResponse = await cancelCampaignIfInvalidFromAddress({
+ campaign,
+ emailDomains: program.emailDomains,
+ });
+
+ if (invalidFromResponse) {
+ return invalidFromResponse;
+ }
+
const campaignGroupIds = pluck(campaign.groups, "groupId");
const campaignPartnerTagIds = pluck(campaign.partnerTags, "partnerTagId");
@@ -373,3 +379,47 @@ export async function POST(req: Request) {
return handleAndReturnErrorResponse(error);
}
}
+
+async function cancelCampaignIfInvalidFromAddress({
+ campaign,
+ emailDomains,
+}: {
+ campaign: Pick<Campaign, "id" | "from" | "programId">;
+ emailDomains: Pick<EmailDomain, "slug" | "status">[];
+}) {
+ if (!campaign.from) {
+ return;
+ }
+
+ try {
+ validateCampaignFromAddress({
+ campaign,
+ emailDomains,
+ });
+ } catch (error) {
+ if (!(error instanceof DubApiError)) {
+ throw error;
+ }
+
+ await prisma.campaign.updateMany({
+ where: {
+ id: campaign.id,
+ status: {
+ in: [CampaignStatus.scheduled, CampaignStatus.sending],
+ },
+ },
+ data: {
+ status: CampaignStatus.canceled,
+ },
+ });
+
+ await log({
+ type: "errors",
+ message: `Campaign ${campaign.id} canceled: ${error.message}`,
+ });
+
+ return logAndRespond(
+ `Campaign ${campaign.id} canceled: invalid from address.`,
+ );
+ }
+}
diff --git a/apps/web/app/(ee)/api/cron/campaigns/queue-scheduled/route.ts b/apps/web/app/(ee)/api/cron/campaigns/queue-scheduled/route.ts
index 9008e80021..6f3d4ebf06 100644
--- a/apps/web/app/(ee)/api/cron/campaigns/queue-scheduled/route.ts
+++ b/apps/web/app/(ee)/api/cron/campaigns/queue-scheduled/route.ts
@@ -1,8 +1,14 @@
import { isScheduledWorkflow } from "@/lib/api/workflows/utils";
-import { CRON_BATCH_SIZE, qstash } from "@/lib/cron";
+import { CRON_BATCH_SIZE } from "@/lib/cron";
+import { enqueueBatchJobs } from "@/lib/cron/enqueue-batch-jobs";
import { withCron } from "@/lib/cron/with-cron";
import { prisma } from "@/lib/prisma";
-import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
+import {
+ APP_DOMAIN_WITH_NGROK,
+ isRejected,
+ log,
+ serializeError,
+} from "@dub/utils";
import { CampaignStatus, CampaignType } from "@prisma/client";
import { logAndRespond } from "../../utils";
@@ -14,19 +20,46 @@ export const maxDuration = 600;
export const GET = withCron(async () => {
const now = new Date();
- await Promise.all([
+ const [transactional, marketing] = await Promise.allSettled([
queueTransactionalCampaigns(now),
queueMarketingCampaigns(now),
]);
- return logAndRespond("Finished the campaigns queueing process.");
+ const failures: string[] = [];
+
+ if (isRejected(transactional)) {
+ failures.push(`transactional: ${serializeError(transactional.reason)}`);
+ }
+
+ if (isRejected(marketing)) {
+ failures.push(`marketing: ${serializeError(marketing.reason)}`);
+ }
+
+ if (failures.length > 0) {
+ const message = `Campaign queueing partially failed: ${failures.join("; ")}`;
+ await log({ type: "errors", message });
+ return logAndRespond(message, { logLevel: "error" });
+ }
+
+ const transactionalQueued =
+ transactional.status === "fulfilled" ? transactional.value : 0;
+ const marketingQueued =
+ marketing.status === "fulfilled" ? marketing.value : 0;
+
+ if (transactionalQueued + marketingQueued === 0) {
+ return logAndRespond("No campaigns to queue.");
+ }
+
+ return logAndRespond(
+ `Queued ${marketingQueued} marketing and ${transactionalQueued} transactional campaigns.`,
+ );
});
async function queueTransactionalCampaigns(now: Date) {
// Matches the 12h enrollment window in executeSendCampaignWorkflow.
- if (now.getUTCMinutes() !== 0 || now.getUTCHours() % 12 !== 0) {
- console.log("[Transactional] Not the 12h tick, skipping campaigns.");
- return;
+ // 5-minute window absorbs Vercel cron jitter; QStash dedup (10 min) collapses extra publishes.
+ if (!isTransactionalTick(now)) {
+ return 0;
}
let queued = 0;
@@ -58,7 +91,6 @@ async function queueTransactionalCampaigns(now: Date) {
});
if (campaigns.length === 0) {
- console.log("[Transactional] No more campaigns to queue.");
break;
}
@@ -69,10 +101,11 @@ async function queueTransactionalCampaigns(now: Date) {
);
if (scheduledWorkflows.length > 0) {
- await qstash.batchJSON(
+ await enqueueBatchJobs(
scheduledWorkflows.map((workflow) => ({
url: `${APP_DOMAIN_WITH_NGROK}/api/cron/workflows/${workflow.id}`,
deduplicationId: workflow.id,
+ label: "execute-scheduled-workflow",
flowControl: {
key: "execute-scheduled-workflow",
parallelism: 10,
@@ -87,41 +120,42 @@ async function queueTransactionalCampaigns(now: Date) {
page++;
}
- console.log(`[Transactional] Queued ${queued} campaigns.`);
+ return queued;
}
async function queueMarketingCampaigns(now: Date) {
let queued = 0;
- let page = 0;
+ let lastCampaignId: string | undefined;
while (true) {
const campaigns = await prisma.campaign.findMany({
where: {
type: CampaignType.marketing,
+ // Do not reclaim `sending` campaigns; failures Slack-alert and we resume them manually.
status: CampaignStatus.scheduled,
OR: [{ scheduledAt: null }, { scheduledAt: { lte: now } }],
+ ...(lastCampaignId && { id: { gt: lastCampaignId } }),
},
select: {
id: true,
},
take: CRON_BATCH_SIZE,
- skip: page * CRON_BATCH_SIZE,
orderBy: {
id: "asc",
},
});
if (campaigns.length === 0) {
- console.log("[Marketing] No more campaigns to queue.");
break;
}
- await qstash.batchJSON(
+ await enqueueBatchJobs(
campaigns.map((campaign) => ({
url: `${APP_DOMAIN_WITH_NGROK}/api/cron/campaigns/broadcast`,
deduplicationId: campaign.id,
+ label: "broadcast-marketing-campaign",
flowControl: {
- key: "broadcast-marketing-campaign",
+ key: `broadcast-marketing-campaign-${campaign.id}`,
parallelism: 1,
},
body: {
@@ -131,8 +165,8 @@ async function queueMarketingCampaigns(now: Date) {
);
queued += campaigns.length;
- page++;
+ lastCampaignId = campaigns[campaigns.length - 1].id;
}
- console.log(`[Marketing] Queued ${queued} campaigns.`);
+ return queued;
}
diff --git a/apps/web/lib/api/campaigns/pause-campaigns-on-plan-downgrade.ts b/apps/web/lib/api/campaigns/pause-campaigns-on-plan-downgrade.ts
index 89cf02a91e..889988229d 100644
--- a/apps/web/lib/api/campaigns/pause-campaigns-on-plan-downgrade.ts
+++ b/apps/web/lib/api/campaigns/pause-campaigns-on-plan-downgrade.ts
@@ -6,6 +6,7 @@ export async function pauseOrCancelCampaignsForProgramOnPlanDowngrade({
}: {
programId: string;
}): Promise<void> {
+ // Cancel marketing campaigns
await prisma.campaign.updateMany({
where: {
programId,
@@ -25,28 +26,39 @@ export async function pauseOrCancelCampaignsForProgramOnPlanDowngrade({
type: CampaignType.transactional,
status: CampaignStatus.active,
},
+ select: {
+ workflowId: true,
+ },
});
- for (const campaign of transactionalCampaigns) {
- try {
- await prisma.$transaction(async (tx) => {
- if (campaign.workflowId) {
- await tx.workflow.update({
- where: { id: campaign.workflowId },
- data: { disabledAt: new Date() },
- });
- }
+ const workflowIds = transactionalCampaigns.flatMap((campaign) =>
+ campaign.workflowId ? [campaign.workflowId] : [],
+ );
- await tx.campaign.update({
- where: { id: campaign.id },
- data: { status: CampaignStatus.paused },
- });
+ await prisma.$transaction(async (tx) => {
+ if (workflowIds.length > 0) {
+ await tx.workflow.updateMany({
+ where: {
+ id: {
+ in: workflowIds,
+ },
+ disabledAt: null,
+ },
+ data: {
+ disabledAt: new Date(),
+ },
});
- } catch (error) {
- console.warn(
- `Failed to pause transactional campaign ${campaign.id} on plan downgrade:`,
- error,
- );
}
- }
+
+ await tx.campaign.updateMany({
+ where: {
+ programId,
+ type: CampaignType.transactional,
+ status: CampaignStatus.active,
+ },
+ data: {
+ status: CampaignStatus.paused,
+ },
+ });
+ });
}
diff --git a/apps/web/lib/cron/enqueue-batch-jobs.ts b/apps/web/lib/cron/enqueue-batch-jobs.ts
index 00c69a6555..f6c8a8e259 100644
--- a/apps/web/lib/cron/enqueue-batch-jobs.ts
+++ b/apps/web/lib/cron/enqueue-batch-jobs.ts
@@ -3,7 +3,7 @@ import type { PublishBatchRequest } from "@upstash/qstash";
import { qstash } from ".";
type EnqueueBatchJobsProps = PublishBatchRequest<unknown> & {
- queueName:
+ queueName?:
| "ban-partner"
| "send-partner-summary"
| "create-discount-code"
diff --git a/packages/utils/src/functions/promises.ts b/packages/utils/src/functions/promises.ts
index adf3842c64..91799818ef 100644
--- a/packages/utils/src/functions/promises.ts
+++ b/packages/utils/src/functions/promises.ts
@@ -6,6 +6,10 @@ export const isRejected = <T>(
p: PromiseSettledResult<T>,
): p is PromiseRejectedResult => p.status === "rejected";
+export function serializeError(error: unknown) {
+ return error instanceof Error ? error.message : String(error);
+}
+
export function logPromiseResults<T>(
results: PromiseSettledResult<T>[],
options?: {
@@ -26,11 +30,7 @@ export function logPromiseResults<T>(
console.log(`${label}${id} succeeded.`);
} else {
failureCount++;
- const reason =
- result.reason instanceof Error
- ? result.reason.message
- : String(result.reason);
- console.error(`${label}${id} failed: ${reason}`);
+ console.error(`${label}${id} failed: ${serializeError(result.reason)}`);
}
}