Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

♻️ Replace waitUntil with after from next/server (#2276)

Luke Vellaeb4b7e900ebb
diff --git a/apps/web/src/app/api/private/[...route]/route.test.ts b/apps/web/src/app/api/private/[...route]/route.test.ts
index fb3e17b11..0c4b0ec83 100644
--- a/apps/web/src/app/api/private/[...route]/route.test.ts
+++ b/apps/web/src/app/api/private/[...route]/route.test.ts
@@ -47,8 +47,8 @@ vi.mock("@rallly/utils/nanoid", () => ({
nanoid: () => "test-poll-id",
}));
-vi.mock("@vercel/functions", () => ({
- waitUntil: vi.fn(),
+vi.mock("next/server", () => ({
+ after: vi.fn(),
}));
vi.mock("@/lib/kv", () => ({
diff --git a/apps/web/src/app/api/private/utils/api-key.ts b/apps/web/src/app/api/private/utils/api-key.ts
index 23bfb5fbb..2efc0fe3a 100644
--- a/apps/web/src/app/api/private/utils/api-key.ts
+++ b/apps/web/src/app/api/private/utils/api-key.ts
@@ -1,7 +1,7 @@
import crypto from "node:crypto";
import { prisma } from "@rallly/database";
-import { waitUntil } from "@vercel/functions";
import { bearerAuth } from "hono/bearer-auth";
+import { after } from "next/server";
import { extractApiKeyPrefix, verifyApiKey } from "@/features/developer/utils";
export const spaceApiKeyAuth = bearerAuth({
@@ -65,7 +65,7 @@ export const spaceApiKeyAuth = bearerAuth({
apiKeyId,
});
- waitUntil(
+ after(() =>
prisma.spaceApiKey.update({
where: { id: apiKeyId },
data: { lastUsedAt: new Date() },
diff --git a/apps/web/src/features/moderation/index.ts b/apps/web/src/features/moderation/index.ts
index 654c658b9..624421e6f 100644
--- a/apps/web/src/features/moderation/index.ts
+++ b/apps/web/src/features/moderation/index.ts
@@ -1,6 +1,6 @@
import { prisma } from "@rallly/database";
import { createLogger } from "@rallly/logger";
-import { waitUntil } from "@vercel/functions";
+import { after } from "next/server";
import { env } from "@/env";
import { getEmailClient } from "@/utils/emails";
import type { ModerationResult, ModerationVerdict } from "./libs/ai-moderation";
@@ -70,7 +70,7 @@ export async function moderateContent({
// Check for banned domains — auto-ban the user immediately
if (containsBannedDomain(textToModerate)) {
logger.warn({ userId }, "Banned domain detected, banning user");
- waitUntil(
+ after(() =>
prisma.user.update({
where: { id: userId },
data: {
@@ -101,7 +101,7 @@ export async function moderateContent({
`Content ${result.verdict} by AI moderation`,
);
const emailClient = await getEmailClient();
- waitUntil(
+ after(() =>
emailClient.sendEmail({
to: env.SUPPORT_EMAIL,
subject: `Content ${result.verdict} by moderation`,
diff --git a/apps/web/src/lib/auth.ts b/apps/web/src/lib/auth.ts
index fd611c854..34cf8939f 100644
--- a/apps/web/src/lib/auth.ts
+++ b/apps/web/src/lib/auth.ts
@@ -1,7 +1,6 @@
import { prisma } from "@rallly/database";
import { createLogger } from "@rallly/logger";
import { absoluteUrl } from "@rallly/utils/absolute-url";
-import { waitUntil } from "@vercel/functions";
import type { BetterAuthPlugin } from "better-auth";
import { APIError, betterAuth } from "better-auth";
import { prismaAdapter } from "better-auth/adapters/prisma";
@@ -16,6 +15,7 @@ import {
} from "better-auth/plugins";
import { headers } from "next/headers";
import { redirect } from "next/navigation";
+import { after } from "next/server";
import { cache } from "react";
import { isEmailBlocked } from "@/auth/helpers/is-email-blocked";
import { linkAnonymousUser } from "@/auth/helpers/merge-user";
@@ -144,7 +144,7 @@ export const authLib = betterAuth({
// We're not actually using the sign-in type anymore since we just we have `autoSignInAfterVerification` enabled.
// This lets us keep things a bit simpler since we share the same verification flow for both login and registration.
case "sign-in":
- waitUntil(
+ after(() =>
emailClient.sendTemplate("RegisterEmail", {
to: email,
props: {
@@ -154,7 +154,7 @@ export const authLib = betterAuth({
);
break;
case "email-verification":
- waitUntil(
+ after(() =>
emailClient.sendTemplate("RegisterEmail", {
to: email,
props: { code: otp },
diff --git a/apps/web/src/trpc/routers/events.ts b/apps/web/src/trpc/routers/events.ts
index b60074820..41335106f 100644
--- a/apps/web/src/trpc/routers/events.ts
+++ b/apps/web/src/trpc/routers/events.ts
@@ -1,6 +1,7 @@
import { subject } from "@casl/ability";
import { prisma } from "@rallly/database";
import { TRPCError } from "@trpc/server";
+import { after } from "next/server";
import * as z from "zod";
import { getEventsChronological } from "@/features/scheduled-event/data";
import { formatEventDateTime } from "@/features/scheduled-event/utils";
@@ -142,22 +143,24 @@ export const events = router({
});
const emailClient = await getEmailClient();
- emailClient.queueTemplate("EventCanceledEmail", {
- to: invite.inviteeEmail,
- props: {
- title: updatedEvent.title,
- hostName: ctx.user.name,
- day,
- dow,
- date,
- time,
- },
- icalEvent: {
- filename: "cancel.ics",
- method: "cancel",
- content: cancelEvent.value,
- },
- });
+ after(() =>
+ emailClient.sendTemplate("EventCanceledEmail", {
+ to: invite.inviteeEmail,
+ props: {
+ title: updatedEvent.title,
+ hostName: ctx.user.name,
+ day,
+ dow,
+ date,
+ time,
+ },
+ icalEvent: {
+ filename: "cancel.ics",
+ method: "cancel",
+ content: cancelEvent.value,
+ },
+ }),
+ );
}
}
}),
diff --git a/apps/web/src/trpc/routers/polls.ts b/apps/web/src/trpc/routers/polls.ts
index af4721ed8..eb4057ee9 100644
--- a/apps/web/src/trpc/routers/polls.ts
+++ b/apps/web/src/trpc/routers/polls.ts
@@ -3,6 +3,7 @@ import { prisma } from "@rallly/database";
import { absoluteUrl, shortUrl } from "@rallly/utils/absolute-url";
import { nanoid } from "@rallly/utils/nanoid";
import { TRPCError } from "@trpc/server";
+import { after } from "next/server";
import * as z from "zod";
import { posthog } from "@/features/analytics/posthog";
import { moderateContent } from "@/features/moderation";
@@ -230,15 +231,17 @@ export const polls = router({
const emailClient = await getEmailClient(
ctx.user.locale ?? undefined,
);
- emailClient.queueTemplate("NewPollEmail", {
- to: user.email,
- props: {
- title: poll.title,
- name: user.name,
- adminLink: pollLink,
- participantLink,
- },
- });
+ after(() =>
+ emailClient.sendTemplate("NewPollEmail", {
+ to: user.email,
+ props: {
+ title: poll.title,
+ name: user.name,
+ adminLink: pollLink,
+ participantLink,
+ },
+ }),
+ );
}
}
@@ -924,48 +927,24 @@ export const polls = router({
timeZone: scheduledEvent.timeZone,
});
+ const hostEmail = poll.user.email;
+ const hostName = poll.user.name;
const emailClient = await getEmailClient(poll.user.locale ?? undefined);
- emailClient.queueTemplate("FinalizeHostEmail", {
- to: poll.user.email,
- props: {
- name: poll.user.name,
- pollUrl: absoluteUrl(`/poll/${poll.id}`),
- location: poll.location,
- title: poll.title,
- attendees: poll.participants
- .filter((p) =>
- p.votes.some(
- (v) => v.optionId === input.optionId && v.type !== "no",
- ),
- )
- .map((p) => p.name),
- date,
- day,
- dow,
- time,
- },
- icalEvent: {
- filename: "invite.ics",
- method: "request",
- content: event.value,
- },
- });
-
- for (const p of participantsToEmail) {
- const { date, day, dow, time } = formatEventDateTime({
- start: scheduledEvent.start,
- end: scheduledEvent.end,
- allDay: scheduledEvent.allDay,
- timeZone: scheduledEvent.timeZone,
- inviteeTimeZone: p.timeZone,
- });
- const emailClient = await getEmailClient(p.locale ?? undefined);
- emailClient.queueTemplate("FinalizeParticipantEmail", {
- to: p.email,
+ after(() =>
+ emailClient.sendTemplate("FinalizeHostEmail", {
+ to: hostEmail,
props: {
- pollUrl: absoluteUrl(`/invite/${poll.id}`),
+ name: hostName,
+ pollUrl: absoluteUrl(`/poll/${poll.id}`),
+ location: poll.location,
title: poll.title,
- hostName: poll.user?.name ?? "",
+ attendees: poll.participants
+ .filter((p) =>
+ p.votes.some(
+ (v) => v.optionId === input.optionId && v.type !== "no",
+ ),
+ )
+ .map((p) => p.name),
date,
day,
dow,
@@ -976,7 +955,37 @@ export const polls = router({
method: "request",
content: event.value,
},
+ }),
+ );
+
+ for (const p of participantsToEmail) {
+ const { date, day, dow, time } = formatEventDateTime({
+ start: scheduledEvent.start,
+ end: scheduledEvent.end,
+ allDay: scheduledEvent.allDay,
+ timeZone: scheduledEvent.timeZone,
+ inviteeTimeZone: p.timeZone,
});
+ const emailClient = await getEmailClient(p.locale ?? undefined);
+ after(() =>
+ emailClient.sendTemplate("FinalizeParticipantEmail", {
+ to: p.email,
+ props: {
+ pollUrl: absoluteUrl(`/invite/${poll.id}`),
+ title: poll.title,
+ hostName: poll.user?.name ?? "",
+ date,
+ day,
+ dow,
+ time,
+ },
+ icalEvent: {
+ filename: "invite.ics",
+ method: "request",
+ content: event.value,
+ },
+ }),
+ );
}
posthog()?.capture({
diff --git a/apps/web/src/trpc/routers/polls/comments.ts b/apps/web/src/trpc/routers/polls/comments.ts
index affe765ac..2afb3f0e0 100644
--- a/apps/web/src/trpc/routers/polls/comments.ts
+++ b/apps/web/src/trpc/routers/polls/comments.ts
@@ -2,6 +2,7 @@ import { prisma } from "@rallly/database";
import { createLogger } from "@rallly/logger";
import { absoluteUrl } from "@rallly/utils/absolute-url";
import { TRPCError } from "@trpc/server";
+import { after } from "next/server";
import * as z from "zod";
import { posthog } from "@/features/analytics/posthog";
import { getNotificationRecipient } from "@/features/notifications/queries";
@@ -139,15 +140,17 @@ export const comments = router({
const emailClient = await getEmailClient(
recipient.locale ?? undefined,
);
- emailClient.queueTemplate("NewCommentEmail", {
- to: recipient.email,
- props: {
- authorName,
- pollUrl: absoluteUrl(`/poll/${poll.id}`),
- disableNotificationsUrl: absoluteUrl("/settings/notifications"),
- title: poll.title,
- },
- });
+ after(() =>
+ emailClient.sendTemplate("NewCommentEmail", {
+ to: recipient.email,
+ props: {
+ authorName,
+ pollUrl: absoluteUrl(`/poll/${poll.id}`),
+ disableNotificationsUrl: absoluteUrl("/settings/notifications"),
+ title: poll.title,
+ },
+ }),
+ );
}
} catch (err) {
logger.error(
diff --git a/apps/web/src/trpc/routers/polls/participants.ts b/apps/web/src/trpc/routers/polls/participants.ts
index 42f017b56..ba8a6fe54 100644
--- a/apps/web/src/trpc/routers/polls/participants.ts
+++ b/apps/web/src/trpc/routers/polls/participants.ts
@@ -2,7 +2,7 @@ import { prisma } from "@rallly/database";
import { createLogger } from "@rallly/logger";
import { absoluteUrl } from "@rallly/utils/absolute-url";
import { TRPCError } from "@trpc/server";
-import { waitUntil } from "@vercel/functions";
+import { after } from "next/server";
import * as z from "zod";
import { posthog } from "@/features/analytics/posthog";
import { getNotificationRecipient } from "@/features/notifications/queries";
@@ -267,18 +267,20 @@ export const participants = router({
ctx.user.locale ?? undefined,
);
- emailClient.queueTemplate("NewParticipantConfirmationEmail", {
- to: email,
- props: {
- title: participant.poll.title,
- editSubmissionUrl: absoluteUrl(
- `/invite/${participant.poll.id}?token=${token}`,
- ),
- },
- });
+ after(() =>
+ emailClient.sendTemplate("NewParticipantConfirmationEmail", {
+ to: email,
+ props: {
+ title: participant.poll.title,
+ editSubmissionUrl: absoluteUrl(
+ `/invite/${participant.poll.id}?token=${token}`,
+ ),
+ },
+ }),
+ );
}
- waitUntil(
+ after(() =>
sendNewResponseNotificationEmail({
pollId,
pollTitle: participant.poll.title,
diff --git a/apps/web/src/trpc/routers/spaces.ts b/apps/web/src/trpc/routers/spaces.ts
index d5f224f87..818078c0e 100644
--- a/apps/web/src/trpc/routers/spaces.ts
+++ b/apps/web/src/trpc/routers/spaces.ts
@@ -3,7 +3,7 @@ import { prisma } from "@rallly/database";
import { createLogger } from "@rallly/logger";
import { absoluteUrl } from "@rallly/utils/absolute-url";
import { TRPCError } from "@trpc/server";
-import { waitUntil } from "@vercel/functions";
+import { after } from "next/server";
import * as z from "zod";
import { posthog } from "@/features/analytics/posthog";
import { defineAbilityForSpace } from "@/features/space/ability";
@@ -815,7 +815,7 @@ export const spaces = router({
});
if (oldImageKey) {
- waitUntil(deleteImageFromS3(oldImageKey));
+ after(() => deleteImageFromS3(oldImageKey));
}
}),
diff --git a/apps/web/src/utils/posthog.ts b/apps/web/src/utils/posthog.ts
index 5b3d11394..f19c5ea74 100644
--- a/apps/web/src/utils/posthog.ts
+++ b/apps/web/src/utils/posthog.ts
@@ -1,5 +1,5 @@
-import { waitUntil } from "@vercel/functions";
import type { NextRequest } from "next/server";
+import { after } from "next/server";
import { posthog } from "@/features/analytics/posthog";
export function withPostHog(
@@ -11,7 +11,7 @@ export function withPostHog(
} finally {
const ph = posthog();
if (ph) {
- waitUntil(ph.flush());
+ after(() => ph.flush());
}
}
};
diff --git a/packages/emails/package.json b/packages/emails/package.json
index e8866ba29..4ebab9486 100644
--- a/packages/emails/package.json
+++ b/packages/emails/package.json
@@ -16,7 +16,6 @@
"@aws-sdk/credential-provider-node": "^3.501.0",
"@react-email/components": "^0.0.36",
"@react-email/render": "^1.0.6",
- "@vercel/functions": "^3.3.6",
"i18next": "^24.2.2",
"i18next-icu": "^2.3.0",
"i18next-resources-to-backend": "^1.2.1",
diff --git a/packages/emails/src/send-email.tsx b/packages/emails/src/send-email.tsx
index 1af8a40bc..be0ecbfdc 100644
--- a/packages/emails/src/send-email.tsx
+++ b/packages/emails/src/send-email.tsx
@@ -1,7 +1,6 @@
import * as aws from "@aws-sdk/client-ses";
import { defaultProvider } from "@aws-sdk/credential-provider-node";
import { render } from "@react-email/render";
-import { waitUntil } from "@vercel/functions";
import type { Transporter } from "nodemailer";
import { createTransport } from "nodemailer";
import type Mail from "nodemailer/lib/mailer";
@@ -72,14 +71,6 @@ export class EmailClient {
this.config = config;
}
- queueTemplate<T extends TemplateName>(
- templateName: T,
- options: SendEmailOptions<T>,
- ) {
- const promise = this.sendTemplate(templateName, options);
- waitUntil(promise);
- }
-
async sendTemplate<T extends TemplateName>(
templateName: T,
options: SendEmailOptions<T>,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a24e3188e..b349d23b7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -597,9 +597,6 @@ importers:
'@react-email/render':
specifier: ^1.0.6
- '@vercel/functions':
- specifier: ^3.3.6
- version: 3.4.1(@aws-sdk/[email protected])
i18next:
specifier: ^24.2.2
version: 24.2.3([email protected])
@@ -13151,8 +13148,8 @@ snapshots:
front-matter: 4.0.2
fs-extra: 11.1.0
got: 13.0.0
is-online: 10.0.0
js-yaml: 4.1.0
openapi-types: 12.1.3
@@ -18419,7 +18416,7 @@ snapshots:
dependencies:
cli-spinners: 2.9.2