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.

Rename deleteLinks to bulkDeleteLinks and defer Redis/Tinybird/R2 cleanup to waitUntil after all batches.

Kiran K29afecbc6653
diff --git a/apps/web/app/(ee)/api/admin/partners/delete-account/route.ts b/apps/web/app/(ee)/api/admin/partners/delete-account/route.ts
index 7da674f169..1d9f29f5be 100644
--- a/apps/web/app/(ee)/api/admin/partners/delete-account/route.ts
+++ b/apps/web/app/(ee)/api/admin/partners/delete-account/route.ts
@@ -1,4 +1,4 @@
-import { deleteLinks } from "@/lib/api/links/delete-links";
+import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
import { withAdmin } from "@/lib/auth";
import { conn } from "@/lib/planetscale";
import { prisma } from "@/lib/prisma";
@@ -108,10 +108,12 @@ export const POST = withAdmin(
if (partner.programs.length > 0) {
for (const { links, groupId } of partner.programs) {
if (links.length > 0) {
- await deleteLinks(
+ await bulkDeleteLinks(
links.map((link) => ({
...link,
- programEnrollment: { groupId },
+ programEnrollment: {
+ groupId,
+ },
})),
);
}
diff --git a/apps/web/app/(ee)/api/cron/cleanup/e2e-tests/route.ts b/apps/web/app/(ee)/api/cron/cleanup/e2e-tests/route.ts
index 29db369e66..098ee774b7 100644
--- a/apps/web/app/(ee)/api/cron/cleanup/e2e-tests/route.ts
+++ b/apps/web/app/(ee)/api/cron/cleanup/e2e-tests/route.ts
@@ -1,6 +1,6 @@
import { markDomainAsDeleted } from "@/lib/api/domains/mark-domain-deleted";
import { handleAndReturnErrorResponse } from "@/lib/api/errors";
-import { deleteLinks } from "@/lib/api/links/delete-links";
+import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";
import { includeTags } from "@/lib/api/links/include-tags";
import { bulkDeletePartners } from "@/lib/api/partners/bulk-delete-partners";
@@ -98,7 +98,7 @@ export async function POST(req: Request) {
// Delete the links
if (links.length > 0) {
- await deleteLinks(links);
+ await bulkDeleteLinks(links);
}
// Delete the domains
diff --git a/apps/web/app/(ee)/api/cron/cleanup/link-retention/route.ts b/apps/web/app/(ee)/api/cron/cleanup/link-retention/route.ts
index 3d5fe1c416..cc33df417c 100644
--- a/apps/web/app/(ee)/api/cron/cleanup/link-retention/route.ts
+++ b/apps/web/app/(ee)/api/cron/cleanup/link-retention/route.ts
@@ -1,5 +1,5 @@
import { handleAndReturnErrorResponse } from "@/lib/api/errors";
-import { deleteLinks } from "@/lib/api/links/delete-links";
+import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
import { qstash } from "@/lib/cron";
import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
import { prisma } from "@/lib/prisma";
@@ -101,7 +101,7 @@ async function deleteOldLinks(
console.table(links, ["shortLink", "createdAt"]);
- await deleteLinks(links);
+ await bulkDeleteLinks(links);
++processedBatches;
diff --git a/apps/web/app/(ee)/api/cron/partners/delete/route.ts b/apps/web/app/(ee)/api/cron/partners/delete/route.ts
index 2a1478a3c3..32155f84c8 100644
--- a/apps/web/app/(ee)/api/cron/partners/delete/route.ts
+++ b/apps/web/app/(ee)/api/cron/partners/delete/route.ts
@@ -1,5 +1,5 @@
import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
-import { deleteLinks } from "@/lib/api/links/delete-links";
+import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
import { includeTags } from "@/lib/api/links/include-tags";
import { withCron } from "@/lib/cron/with-cron";
import { aggregatePartnerLinksStats } from "@/lib/partners/aggregate-partner-links-stats";
@@ -127,7 +127,7 @@ export const POST = withCron(async ({ rawBody }) => {
);
if (links.length > 0) {
- await deleteLinks(
+ await bulkDeleteLinks(
links.map((link) => ({
...link,
programEnrollment: {
diff --git a/apps/web/app/(ee)/api/cron/workspaces/delete/delete-workspace-links.ts b/apps/web/app/(ee)/api/cron/workspaces/delete/delete-workspace-links.ts
index 90ae028427..53a24d60a0 100644
--- a/apps/web/app/(ee)/api/cron/workspaces/delete/delete-workspace-links.ts
+++ b/apps/web/app/(ee)/api/cron/workspaces/delete/delete-workspace-links.ts
@@ -1,4 +1,4 @@
-import { deleteLinks } from "@/lib/api/links/delete-links";
+import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
import { prisma } from "@/lib/prisma";
import {
DeleteWorkspacePayload,
@@ -21,7 +21,7 @@ export async function deleteWorkspaceLinks(payload: DeleteWorkspacePayload) {
});
if (links.length > 0) {
- await deleteLinks(links);
+ await bulkDeleteLinks(links);
}
return await enqueueNextWorkspaceDeleteStep({
diff --git a/apps/web/app/api/links/bulk/route.ts b/apps/web/app/api/links/bulk/route.ts
index 2c647d8dc1..e68e805985 100644
--- a/apps/web/app/api/links/bulk/route.ts
+++ b/apps/web/app/api/links/bulk/route.ts
@@ -5,8 +5,8 @@ import {
checkIfLinksHaveWebhooks,
processLink,
} from "@/lib/api/links";
+import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
import { bulkUpdateLinks } from "@/lib/api/links/bulk-update-links";
-import { deleteLinks } from "@/lib/api/links/delete-links";
import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";
import { includeTags } from "@/lib/api/links/include-tags";
import { throwIfLinksUsageExceeded } from "@/lib/api/links/usage-checks";
@@ -575,11 +575,7 @@ export const DELETE = withWorkspace(
links = links.filter((link) => !isRootDomainLinkKey(link.key));
- const { deletedCount } = await deleteLinks(links, {
- where: {
- projectId: workspace.id,
- },
- });
+ const { deletedCount } = await bulkDeleteLinks(links);
return NextResponse.json(
{
diff --git a/apps/web/lib/actions/partners/delete-program-invite.ts b/apps/web/lib/actions/partners/delete-program-invite.ts
index 232924991e..efc0923569 100644
--- a/apps/web/lib/actions/partners/delete-program-invite.ts
+++ b/apps/web/lib/actions/partners/delete-program-invite.ts
@@ -1,7 +1,7 @@
"use server";
import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
-import { deleteLinks } from "@/lib/api/links/delete-links";
+import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
import { prisma } from "@/lib/prisma";
import { waitUntil } from "@vercel/functions";
@@ -60,7 +60,7 @@ export const deleteProgramInviteAction = authActionClient
);
await Promise.allSettled([
- deleteLinks(
+ bulkDeleteLinks(
linksToDelete.map((link) => ({
...link,
programEnrollment: {
diff --git a/apps/web/lib/api/links/delete-links.ts b/apps/web/lib/api/links/bulk-delete-links.ts
similarity index 68%
rename from apps/web/lib/api/links/delete-links.ts
rename to apps/web/lib/api/links/bulk-delete-links.ts
index 3a3ac1ba53..1db8aa4eeb 100644
--- a/apps/web/lib/api/links/delete-links.ts
+++ b/apps/web/lib/api/links/bulk-delete-links.ts
@@ -3,7 +3,7 @@ import { prisma } from "@/lib/prisma";
import { storage } from "@/lib/storage";
import { recordLink } from "@/lib/tinybird";
import { chunk, R2_URL } from "@dub/utils";
-import { Prisma } from "@prisma/client";
+import { waitUntil } from "@vercel/functions";
import { linkCache } from "./cache";
import { ExpandedLink } from "./utils";
@@ -15,13 +15,10 @@ const DELETE_LINKS_BATCH_SIZE = 100;
* 2. Delete Link rows + decrement totalLinks (transaction)
* 3. Run side effects (Redis / Tinybird / R2)
*
- * Processes links in batches of 100.
+ * Processes links in batches of DELETE_LINKS_BATCH_SIZE.
*/
-export async function deleteLinks(
+export async function bulkDeleteLinks(
links: ExpandedLink[],
- options?: {
- where?: Omit<Prisma.LinkWhereInput, "id">;
- },
): Promise<{ deletedCount: number }> {
if (links.length === 0) {
return {
@@ -31,10 +28,11 @@ export async function deleteLinks(
let deletedCount = 0;
+ // Delete links in batches
const batches = chunk(links, DELETE_LINKS_BATCH_SIZE);
for (const [batchIndex, batch] of batches.entries()) {
- const batchDeletedCount = await deleteLinksBatch(batch, options);
+ const batchDeletedCount = await deleteLinksBatch(batch);
deletedCount += batchDeletedCount;
@@ -43,17 +41,33 @@ export async function deleteLinks(
);
}
+ if (deletedCount > 0) {
+ waitUntil(
+ Promise.allSettled([
+ // Delete the links from Redis
+ linkCache.deleteMany(links),
+
+ // Record the links deletion in Tinybird
+ recordLink(links, { deleted: true }),
+
+ // For links that have an image, delete the image from R2
+ links
+ .filter((link) =>
+ link.image?.startsWith(`${R2_URL}/images/${link.id}`),
+ )
+ .map((link) =>
+ storage.delete({ key: link.image!.replace(`${R2_URL}/`, "") }),
+ ),
+ ]),
+ );
+ }
+
return {
deletedCount,
};
}
-async function deleteLinksBatch(
- links: ExpandedLink[],
- options?: {
- where?: Omit<Prisma.LinkWhereInput, "id">;
- },
-): Promise<number> {
+async function deleteLinksBatch(links: ExpandedLink[]): Promise<number> {
const linkIds = links.map((link) => link.id);
const discountCodes = await prisma.discountCode.findMany({
@@ -81,7 +95,6 @@ async function deleteLinksBatch(
id: {
in: linkIds,
},
- ...options?.where,
},
});
@@ -101,22 +114,5 @@ async function deleteLinksBatch(
return result;
});
- if (deletedCount > 0) {
- await Promise.allSettled([
- // Delete the links from Redis
- linkCache.deleteMany(links),
-
- // Record the links deletion in Tinybird
- recordLink(links, { deleted: true }),
-
- // For links that have an image, delete the image from R2
- links
- .filter((link) => link.image?.startsWith(`${R2_URL}/images/${link.id}`))
- .map((link) =>
- storage.delete({ key: link.image!.replace(`${R2_URL}/`, "") }),
- ),
- ]);
- }
-
return deletedCount;
}
diff --git a/apps/web/lib/api/links/index.ts b/apps/web/lib/api/links/index.ts
index 532f62cbf4..3804703972 100644
--- a/apps/web/lib/api/links/index.ts
+++ b/apps/web/lib/api/links/index.ts
@@ -1,8 +1,8 @@
export * from "./archive-link";
export * from "./bulk-create-links";
+export * from "./bulk-delete-links";
export * from "./create-link";
export * from "./delete-link";
-export * from "./delete-links";
export * from "./get-links-count";
export * from "./get-links-for-workspace";
export * from "./process-link";
diff --git a/apps/web/lib/api/partners/bulk-delete-partners.ts b/apps/web/lib/api/partners/bulk-delete-partners.ts
index 53b83e8ca5..1b25b0c147 100644
--- a/apps/web/lib/api/partners/bulk-delete-partners.ts
+++ b/apps/web/lib/api/partners/bulk-delete-partners.ts
@@ -1,7 +1,7 @@
import { conn } from "@/lib/planetscale";
import { prisma } from "@/lib/prisma";
import { ACME_PROGRAM_ID } from "@dub/utils";
-import { deleteLinks } from "../links/delete-links";
+import { bulkDeleteLinks } from "../links/bulk-delete-links";
const BATCH_SIZE = 250;
@@ -58,7 +58,7 @@ export async function bulkDeletePartners({
console.log(`Deleted ${deletedCustomers.count} customers`);
}
- await deleteLinks(linksToDelete);
+ await bulkDeleteLinks(linksToDelete);
}
if (programEnrollmentIds.length > 0) {
diff --git a/apps/web/lib/jobs/handlers/default-link-deleted-job.ts b/apps/web/lib/jobs/handlers/default-link-deleted-job.ts
index 8a66ac5a2d..ad6753f046 100644
--- a/apps/web/lib/jobs/handlers/default-link-deleted-job.ts
+++ b/apps/web/lib/jobs/handlers/default-link-deleted-job.ts
@@ -1,4 +1,4 @@
-import { deleteLinks } from "@/lib/api/links/delete-links";
+import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";
import { includeTags } from "@/lib/api/links/include-tags";
import { CRON_BATCH_SIZE } from "@/lib/cron";
@@ -59,7 +59,7 @@ export const defaultLinkDeletedJob = defineJob({
// If there are links to delete, delete the discount codes and the links
if (linksToDelete.length > 0) {
- await deleteLinks(linksToDelete);
+ await bulkDeleteLinks(linksToDelete);
}
// More associations remain — queue the next batch.
diff --git a/apps/web/lib/jobs/handlers/domain-deleted-job.ts b/apps/web/lib/jobs/handlers/domain-deleted-job.ts
index eb7a2e9f9e..61e3cfa2a4 100644
--- a/apps/web/lib/jobs/handlers/domain-deleted-job.ts
+++ b/apps/web/lib/jobs/handlers/domain-deleted-job.ts
@@ -1,5 +1,5 @@
import { removeDomainFromVercel } from "@/lib/api/domains/remove-domain-vercel";
-import { deleteLinks } from "@/lib/api/links/delete-links";
+import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";
import { includeTags } from "@/lib/api/links/include-tags";
import { R2_URL } from "@dub/utils";
@@ -61,7 +61,7 @@ export const domainDeletedJob = defineJob({
console.log(`[domainDeletedJob] Found ${links.length} links to delete.`);
if (links.length > 0) {
- await deleteLinks(links);
+ await bulkDeleteLinks(links);
// More links remain — queue the next batch.
if (links.length === CRON_BATCH_SIZE) {
diff --git a/apps/web/lib/tapfiliate/cleanup-partners.ts b/apps/web/lib/tapfiliate/cleanup-partners.ts
index 092e18f4c5..67a2e332e4 100644
--- a/apps/web/lib/tapfiliate/cleanup-partners.ts
+++ b/apps/web/lib/tapfiliate/cleanup-partners.ts
@@ -1,4 +1,4 @@
-import { deleteLinks } from "@/lib/api/links/delete-links";
+import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
import { prisma } from "@/lib/prisma";
import { sendEmail } from "@dub/email";
import ProgramImported from "@dub/email/templates/program-imported";
@@ -55,7 +55,7 @@ export async function cleanupPartners(payload: TapfiliateImportPayload) {
},
});
- await deleteLinks(linksToDelete);
+ await bulkDeleteLinks(linksToDelete);
await prisma.programEnrollment.deleteMany({
where: {
diff --git a/apps/web/lib/tolt/cleanup-partners.ts b/apps/web/lib/tolt/cleanup-partners.ts
index 1093bda859..fa771fe62e 100644
--- a/apps/web/lib/tolt/cleanup-partners.ts
+++ b/apps/web/lib/tolt/cleanup-partners.ts
@@ -1,4 +1,4 @@
-import { deleteLinks } from "@/lib/api/links/delete-links";
+import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
import { prisma } from "@/lib/prisma";
import { toltImporter } from "./importer";
@@ -49,7 +49,7 @@ export async function cleanupPartners({ programId }: { programId: string }) {
},
});
- await deleteLinks(linksToDelete);
+ await bulkDeleteLinks(linksToDelete);
await prisma.programEnrollment.deleteMany({
where: {
diff --git a/apps/web/scripts/partners/delete-partner-profile.ts b/apps/web/scripts/partners/delete-partner-profile.ts
index a48a2e0377..30a7575bb9 100644
--- a/apps/web/scripts/partners/delete-partner-profile.ts
+++ b/apps/web/scripts/partners/delete-partner-profile.ts
@@ -1,4 +1,4 @@
-import { deleteLinks } from "@/lib/api/links/delete-links";
+import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
import { prisma } from "@/lib/prisma";
import "dotenv-flow/config";
import { conn } from "../../lib/planetscale";
@@ -63,7 +63,7 @@ async function main() {
partnerId: partner.id,
},
});
- await deleteLinks(links);
+ await bulkDeleteLinks(links);
const deletedProgramEnrollments = await prisma.programEnrollment.deleteMany({
where: {
diff --git a/apps/web/scripts/partners/delete-partners-for-program.ts b/apps/web/scripts/partners/delete-partners-for-program.ts
index 0fa51e0c4f..e7961a7595 100644
--- a/apps/web/scripts/partners/delete-partners-for-program.ts
+++ b/apps/web/scripts/partners/delete-partners-for-program.ts
@@ -1,4 +1,4 @@
-import { deleteLinks } from "@/lib/api/links/delete-links";
+import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
import { prisma } from "@/lib/prisma";
import "dotenv-flow/config";
@@ -41,7 +41,7 @@ async function main() {
console.log("finalPartnersToDelete", finalPartnersToDelete.length);
- await deleteLinks(finalPartnersToDelete.flatMap((p) => p.links));
+ await bulkDeleteLinks(finalPartnersToDelete.flatMap((p) => p.links));
const deletePartners = await prisma.partner.deleteMany({
where: {
diff --git a/apps/web/scripts/partners/delete-program-enrollment.ts b/apps/web/scripts/partners/delete-program-enrollment.ts
index 33f7f43c61..b365e4d881 100644
--- a/apps/web/scripts/partners/delete-program-enrollment.ts
+++ b/apps/web/scripts/partners/delete-program-enrollment.ts
@@ -1,4 +1,4 @@
-import { deleteLinks } from "@/lib/api/links/delete-links";
+import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
import { prisma } from "@/lib/prisma";
import "dotenv-flow/config";
@@ -15,7 +15,7 @@ async function main() {
},
});
- await deleteLinks(programEnrollment.links);
+ await bulkDeleteLinks(programEnrollment.links);
const deletedFraudEvents = await prisma.fraudEvent.deleteMany({
where: {
diff --git a/apps/web/scripts/programs/delete-network-invites.ts b/apps/web/scripts/programs/delete-network-invites.ts
index 5288c2a269..39f9e4ce27 100644
--- a/apps/web/scripts/programs/delete-network-invites.ts
+++ b/apps/web/scripts/programs/delete-network-invites.ts
@@ -1,4 +1,4 @@
-import { deleteLinks } from "@/lib/api/links/delete-links";
+import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
import { prisma } from "@/lib/prisma";
import "dotenv-flow/config";
@@ -38,7 +38,7 @@ async function main() {
({ programEnrollment }) => programEnrollment?.links ?? [],
);
- await deleteLinks(linksToDelete);
+ await bulkDeleteLinks(linksToDelete);
const res2 = await prisma.$transaction([
prisma.discoveredPartner.deleteMany({
diff --git a/apps/web/scripts/programs/delete-program-enrollments.ts b/apps/web/scripts/programs/delete-program-enrollments.ts
index f86c8fb4ea..34c35628ef 100644
--- a/apps/web/scripts/programs/delete-program-enrollments.ts
+++ b/apps/web/scripts/programs/delete-program-enrollments.ts
@@ -1,4 +1,4 @@
-import { deleteLinks } from "@/lib/api/links/delete-links";
+import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
import { prisma } from "@/lib/prisma";
import "dotenv-flow/config";
@@ -35,7 +35,7 @@ async function main() {
break;
}
- await deleteLinks(linksToDelete);
+ await bulkDeleteLinks(linksToDelete);
const deleteProgramEnrollment = await prisma.programEnrollment.deleteMany({
where: {