The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Remove unused workflow helpers and index Job for retry and cleanup.
Kiran K52e499804961
diff --git a/apps/web/app/(ee)/api/e2e/trigger-merge-accounts/route.ts b/apps/web/app/(ee)/api/e2e/trigger-merge-accounts/route.tsindex 5ead74ea13..d71b7b4330 100644--- a/apps/web/app/(ee)/api/e2e/trigger-merge-accounts/route.ts+++ b/apps/web/app/(ee)/api/e2e/trigger-merge-accounts/route.ts@@ -64,6 +64,7 @@ export const POST = withWorkspace(key: userId,parallelism: 1,},+ label: userId,},});diff --git a/apps/web/app/(ee)/api/partner-profile/referrals/route.ts b/apps/web/app/(ee)/api/partner-profile/referrals/route.tsindex 592513b997..832e1a264d 100644--- a/apps/web/app/(ee)/api/partner-profile/referrals/route.ts+++ b/apps/web/app/(ee)/api/partner-profile/referrals/route.ts@@ -64,6 +64,9 @@ export const GET = withPartnerProfile(async ({ partner, searchParams }) => {partnerId: partner.id,userId: NETWORK_USER_ID,},+ options: {+ label: partner.id,+ },});}}),diff --git a/apps/web/lib/actions/partners/merge-partner-accounts.ts b/apps/web/lib/actions/partners/merge-partner-accounts.tsindex 5d1cf7aa6a..51526b3f70 100644--- a/apps/web/lib/actions/partners/merge-partner-accounts.ts+++ b/apps/web/lib/actions/partners/merge-partner-accounts.ts@@ -352,6 +352,7 @@ const mergeAccounts = async ({ userId }: { userId: string }) => {key: userId,parallelism: 1,},+ label: userId,},});};diff --git a/apps/web/lib/cron/qstash-workflow.ts b/apps/web/lib/cron/qstash-workflow.tsdeleted file mode 100644index 1aa1292085..0000000000--- a/apps/web/lib/cron/qstash-workflow.ts+++ /dev/null@@ -1,128 +0,0 @@-// import { logger, toErrorFields } from "@/lib/axiom/server";-// import { APP_DOMAIN, pluralize } from "@dub/utils";-// import { FlowControl } from "@upstash/qstash";-// import { Client } from "@upstash/workflow";--// export const workflow = new Client({-// baseUrl: process.env.QSTASH_URL || "https://qstash-us-east-1.upstash.io",-// token: process.env.QSTASH_TOKEN || "",-// ...(process.env.VERCEL_ENV === "preview" && {-// headers: {-// "x-vercel-protection-bypass":-// process.env.VERCEL_AUTOMATION_BYPASS_SECRET || "",-// },-// }),-// });--// type WorkflowType =-// | "partner-approved"-// | "create-partner-commission"-// | "merge-partner-accounts";--// interface QStashWorkflow {-// workflowType: WorkflowType;-// workflowLabel: string;-// body: Record<string, unknown>;-// flowControl?: FlowControl;-// }--// // Run workflows-// export async function triggerQStashWorkflow(-// input: QStashWorkflow | QStashWorkflow[],-// ) {-// const workflows = Array.isArray(input) ? input : [input];-// const maxRetries = 3;--// for (let attempt = 0; attempt <= maxRetries; attempt++) {-// try {-// const response = await workflow.trigger(-// workflows.map((item) => ({-// url: `${APP_DOMAIN}/api/workflows/${item.workflowType}`,-// body: item.body,-// label: item.workflowLabel,-// retries: 5,-// flowControl: item.flowControl ?? {-// key: item.workflowType,-// parallelism: 15,-// },-// })),-// );--// console.log(-// `${response.length} QStash ${pluralize("workflow", response.length)} triggered`,-// response,-// );--// return response;-// } catch (error) {-// console.error("QStash workflow trigger failed", { error, workflows });--// if (attempt < maxRetries) {-// await new Promise((resolve) =>-// setTimeout(resolve, 1000 * Math.pow(2, attempt)),-// );-// continue;-// }--// for (const workflow of workflows) {-// const { correlation } = getWorkflowConfig(workflow);--// logger.error("workflow.trigger_failed", {-// service: "qstash",-// event: "workflow.trigger_failed",-// workflowType: workflow.workflowType,-// error: toErrorFields(error),-// correlation,-// });-// }--// await logger.flush();--// return null;-// }-// }-// }--// export function getWorkflowConfig({-// workflowType,-// body,-// }: Omit<QStashWorkflow, "workflowLabel">): {-// correlation: Record<string, unknown>;-// } {-// switch (workflowType) {-// case "partner-approved":-// return {-// correlation: {-// programId: body.programId,-// partnerId: body.partnerId,-// userId: body.userId,-// },-// };--// case "create-partner-commission": {-// return {-// correlation: {-// programId: body.programId,-// partnerId: body.partnerId,-// customerId: body.customerId,-// bountySubmissionId: body.bountySubmissionId,-// },-// };-// }--// case "merge-partner-accounts": {-// return {-// correlation: {-// userId: body.userId,-// sourceEmail: body.sourceEmail,-// targetEmail: body.targetEmail,-// },-// };-// }--// default:-// return {-// correlation: {},-// };-// }-// }diff --git a/apps/web/lib/jobs/index.ts b/apps/web/lib/jobs/index.tsindex c0a1efd361..237a41d751 100644--- a/apps/web/lib/jobs/index.ts+++ b/apps/web/lib/jobs/index.ts@@ -7,7 +7,7 @@ import { Prisma } from "@prisma/client";import { PublishRequest } from "@upstash/qstash";import * as z from "zod/v4";-export type JobEnvelope = z.infer<typeof jobEnvelopeSchema>;+type JobEnvelope = z.infer<typeof jobEnvelopeSchema>;type JobPublishOptions = Pick<PublishRequest,@@ -29,11 +29,11 @@ export type JobDefaults = Pick<"retries" | "queue" | "flowControl" | "label">;-export type DispatchResult =+type DispatchResult =| { status: "published"; messageId: string }| { status: "deferred"; backgroundJobId: string };-export type DispatchBatchResult = {+type DispatchBatchResult = {published: number;deferred: number;failed: number;@@ -46,11 +46,6 @@ interface DispatchJobInput {options?: JobDispatchOptions;}-type JobReplayOptions = Pick<- JobDispatchOptions,- "deduplicationId" | "retries" | "queue" | "flowControl" | "label"->;-const JOBS_ENDPOINT_URL = `${APP_DOMAIN_WITH_NGROK}/api/jobs/process`;const QSTASH_PUBLISH_MAX_RETRIES = 3;@@ -64,20 +59,17 @@ export const jobNameSchema = z'Job name must be kebab-case ending in "-job"',);-export function getJobsEndpointUrl(name: string) {+function getJobsEndpointUrl(name: string) {return `${JOBS_ENDPOINT_URL}/${name}`;}// QStash label: user-provided tag first, job name appended for log filtering-export function buildJobLabel(name: string, label?: string) {+function buildJobLabel(name: string, label?: string) {return label ? `${label},${name}` : name;}// QStash deduplicationId: user-provided id first, job name appended for cross-job isolation-export function buildJobDeduplicationId(- name: string,- deduplicationId?: string,-) {+function buildJobDeduplicationId(name: string, deduplicationId?: string) {if (!deduplicationId) {return undefined;}@@ -121,18 +113,15 @@ async function withQStashRetry<T>(fn: () => Promise<T>): Promise<T> {function buildQStashJobRequest({ name, payload, options }: DispatchJobInput,opts?: {- dispatchedAt?: string;batch?: boolean;- notBefore?: number;},) {const envelope: JobEnvelope = {name,payload,- dispatchedAt: opts?.dispatchedAt ?? new Date().toISOString(),+ dispatchedAt: new Date().toISOString(),};- const notBefore = opts?.notBefore ?? options?.notBefore;const deduplicationId = buildJobDeduplicationId(name,options?.deduplicationId,@@ -142,11 +131,8 @@ function buildQStashJobRequest(url: getJobsEndpointUrl(name),body: envelope,label: buildJobLabel(name, options?.label),- ...(options?.delay &&- opts?.notBefore === undefined && {- delay: options.delay,- }),- ...(notBefore && { notBefore }),+ ...(options?.delay && { delay: options.delay }),+ ...(options?.notBefore && { notBefore: options.notBefore }),...(deduplicationId && { deduplicationId }),...(options?.retries !== undefined && { retries: options.retries }),...(options?.flowControl && { flowControl: options.flowControl }),@@ -154,27 +140,6 @@ function buildQStashJobRequest(};}-export function buildReplayRequest(job: {- name: string;- payload: Prisma.JsonValue;- options: Prisma.JsonValue | null;- createdAt: Date;-}) {- const options = (job.options ?? {}) as JobReplayOptions;-- return buildQStashJobRequest(- {- name: job.name,- payload: job.payload,- options,- },- {- dispatchedAt: job.createdAt.toISOString(),- batch: true,- },- );-}-export function isPublishSuccess(response: unknown,): response is { messageId: string } {diff --git a/apps/web/prisma/schema/job.prisma b/apps/web/prisma/schema/job.prismaindex bbfc605729..779b3b5859 100644--- a/apps/web/prisma/schema/job.prisma+++ b/apps/web/prisma/schema/job.prisma@@ -16,5 +16,6 @@ model Job {createdAt DateTime @default(now())updatedAt DateTime @updatedAt- @@index([createdAt])+ @@index([status, scheduledAt, attempts]) // retry cron: due pending/failed jobs+ @@index([status, createdAt]) // daily cleanup by status + age}