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.

Move staging workspace creation to a background job

Kiran K6dfc26cf0aae
diff --git a/apps/web/app/(ee)/api/cron/workspaces/create-staging/route.ts b/apps/web/app/(ee)/api/cron/workspaces/create-staging/route.ts
deleted file mode 100644
index cc48fb2593..0000000000
--- a/apps/web/app/(ee)/api/cron/workspaces/create-staging/route.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { withCron } from "@/lib/cron/with-cron";
-import { createStagingProgram } from "@/lib/sandbox/create-staging-program";
-import { createStagingWorkspace } from "@/lib/sandbox/create-staging-workspace";
-import * as z from "zod/v4";
-import { logAndRespond } from "../../utils";
-
-export const dynamic = "force-dynamic";
-
-const inputSchema = z.object({
- workspaceId: z.string(),
-});
-
-// POST /api/cron/workspaces/create-staging
-export const POST = withCron(async ({ rawBody }) => {
- const { workspaceId } = inputSchema.parse(JSON.parse(rawBody));
-
- await createStagingWorkspace(workspaceId);
- await createStagingProgram(workspaceId);
-
- return logAndRespond(
- `Staging workspace and program created for workspace ${workspaceId}`,
- );
-});
diff --git a/apps/web/dotenv-flow-config.d.ts b/apps/web/dotenv-flow-config.d.ts
new file mode 100644
index 0000000000..e2e85d5490
--- /dev/null
+++ b/apps/web/dotenv-flow-config.d.ts
@@ -0,0 +1 @@
+declare module "dotenv-flow/config";
diff --git a/apps/web/lib/jobs/handlers/create-staging-workspace-job.ts b/apps/web/lib/jobs/handlers/create-staging-workspace-job.ts
new file mode 100644
index 0000000000..10a3ac957f
--- /dev/null
+++ b/apps/web/lib/jobs/handlers/create-staging-workspace-job.ts
@@ -0,0 +1,17 @@
+import { createStagingProgram } from "@/lib/sandbox/create-staging-program";
+import { createStagingWorkspace } from "@/lib/sandbox/create-staging-workspace";
+import * as z from "zod/v4";
+import { defineJob } from "../index";
+
+const inputSchema = z.object({
+ workspaceId: z.string(),
+});
+
+export const createStagingWorkspaceJob = defineJob({
+ name: "create-staging-workspace-job",
+ schema: inputSchema,
+ async handle({ workspaceId }) {
+ await createStagingWorkspace(workspaceId);
+ await createStagingProgram(workspaceId);
+ },
+});
diff --git a/apps/web/lib/jobs/registry.ts b/apps/web/lib/jobs/registry.ts
index a93e0a52d1..3cc5049bc4 100644
--- a/apps/web/lib/jobs/registry.ts
+++ b/apps/web/lib/jobs/registry.ts
@@ -29,6 +29,11 @@ const jobLoaders = {
import("./handlers/create-tremendous-campaign-job").then(
(m) => m.createTremendousCampaignJob,
),
+
+ "create-staging-workspace-job": () =>
+ import("./handlers/create-staging-workspace-job").then(
+ (m) => m.createStagingWorkspaceJob,
+ ),
} as const satisfies Record<string, () => Promise<JobDefinition>>;
const jobCache = new Map<string, JobDefinition>();
diff --git a/apps/web/lib/sandbox/create-staging-workspace.ts b/apps/web/lib/sandbox/create-staging-workspace.ts
index de337348a2..7a0dfa95d2 100644
--- a/apps/web/lib/sandbox/create-staging-workspace.ts
+++ b/apps/web/lib/sandbox/create-staging-workspace.ts
@@ -1,10 +1,9 @@
import { getPlanCapabilities } from "@/lib/plan-capabilities";
import { prisma } from "@/lib/prisma";
-import { APP_DOMAIN_WITH_NGROK, TRIAL_LIMITS } from "@dub/utils";
+import { TRIAL_LIMITS } from "@dub/utils";
import { Project, WorkspaceEnvironment } from "@prisma/client";
import { generateRandomString } from "../api/utils/generate-random-string";
import { createWorkspaceId } from "../api/workspaces/create-workspace-id";
-import { qstash } from "../cron";
import { isProductionEnvironment } from "./workspace-guards";
export async function createStagingWorkspace(workspaceId: string) {
@@ -151,18 +150,24 @@ export async function createStagingWorkspace(workspaceId: string) {
export async function queueCreateStagingWorkspace({
id,
plan,
-}: Pick<Project, "id" | "plan">) {
+ defaultProgramId,
+}: Pick<Project, "id" | "plan" | "defaultProgramId">) {
+ if (!defaultProgramId) {
+ return;
+ }
+
const { canUseStagingWorkspace } = getPlanCapabilities(plan);
if (!canUseStagingWorkspace) {
return;
}
- await qstash.publishJSON({
- url: `${APP_DOMAIN_WITH_NGROK}/api/cron/workspaces/create-staging`,
- deduplicationId: `create-staging-workspace-${id}`,
- body: {
- workspaceId: id,
- },
- });
+ const { createStagingWorkspaceJob } = await import(
+ "../jobs/handlers/create-staging-workspace-job"
+ );
+
+ await createStagingWorkspaceJob.dispatch(
+ { workspaceId: id },
+ { deduplicationId: `create-staging-workspace-${id}` },
+ );
}
diff --git a/apps/web/scripts/migrations/backfill-staging-workspaces.ts b/apps/web/scripts/migrations/backfill-staging-workspaces.ts
index eb0a7bb8cf..82c546f854 100644
--- a/apps/web/scripts/migrations/backfill-staging-workspaces.ts
+++ b/apps/web/scripts/migrations/backfill-staging-workspaces.ts
@@ -1,6 +1,5 @@
+import { createStagingWorkspaceJob } from "@/lib/jobs/handlers/create-staging-workspace-job";
import { prisma } from "@/lib/prisma";
-import { createStagingProgram } from "@/lib/sandbox/create-staging-program";
-import { createStagingWorkspace } from "@/lib/sandbox/create-staging-workspace";
import { WorkspaceEnvironment } from "@prisma/client";
import "dotenv-flow/config";
@@ -8,8 +7,9 @@ const BATCH_SIZE = 10;
async function main() {
let totalProcessed = 0;
- let totalCreated = 0;
+ let totalPublished = 0;
let totalFailed = 0;
+ let cursor: string | undefined;
// TODO:
// We should skip workspaces where the staging workspace was created manually.
@@ -31,6 +31,13 @@ async function main() {
endsWith: "-staging",
},
},
+ ...(cursor
+ ? {
+ id: {
+ gt: cursor,
+ },
+ }
+ : {}),
},
select: {
id: true,
@@ -40,7 +47,7 @@ async function main() {
},
take: BATCH_SIZE,
orderBy: {
- createdAt: "asc",
+ id: "asc",
},
});
@@ -48,33 +55,30 @@ async function main() {
break;
}
- for (const workspace of workspaces) {
- try {
- await createStagingWorkspace(workspace.id);
- await createStagingProgram(workspace.id);
+ cursor = workspaces[workspaces.length - 1].id;
- totalCreated++;
- console.log(`Created staging workspace for ${workspace.slug}`);
- } catch (error) {
- totalFailed++;
- console.error(
- `Failed to create staging workspace for ${workspace.slug} (${workspace.id}):`,
- error,
- );
- }
-
- await new Promise((resolve) => setTimeout(resolve, 1000));
- }
+ const { published, deferred, failed } =
+ await createStagingWorkspaceJob.dispatchBatch(
+ workspaces.map((workspace) => ({
+ workspaceId: workspace.id,
+ })),
+ ({ workspaceId }) => ({
+ deduplicationId: `create-staging-workspace-${workspaceId}`,
+ label: workspaceId,
+ }),
+ );
totalProcessed += workspaces.length;
+ totalPublished += published + deferred;
+ totalFailed += failed;
console.log(
- `Processed batch of ${workspaces.length} workspaces (processed=${totalProcessed}, created=${totalCreated}, failed=${totalFailed})`,
+ `Dispatched batch of ${workspaces.length} workspaces (processed=${totalProcessed}, published=${totalPublished}, failed=${totalFailed})`,
);
}
console.log(
- `Done creating staging workspaces (processed=${totalProcessed}, created=${totalCreated}, failed=${totalFailed})`,
+ `Done queueing staging workspace jobs (processed=${totalProcessed}, published=${totalPublished}, failed=${totalFailed})`,
);
}