Skip to content

Open-source status page, incident response and uptime monitoring

fix: dashboard subscribers notification runtime (#2316)

Maximilian Kaskeaeaa75134cd4
diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/maintenances/page.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/maintenances/page.tsx
index 62d01edd4..250b4514d 100644
--- a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/maintenances/page.tsx
+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/maintenances/page.tsx
@@ -32,7 +32,7 @@ export default function Page() {
}),
);
const sendMaintenanceUpdateMutation = useMutation(
- trpc.maintenance.notify.mutationOptions(),
+ trpc.subscriberNotification.maintenance.mutationOptions(),
);
const createMaintenanceMutation = useMutation(
trpc.maintenance.new.mutationOptions({
diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/[reportId]/page.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/[reportId]/page.tsx
index 8bd095251..3e24d35b1 100644
--- a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/[reportId]/page.tsx
+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/[reportId]/page.tsx
@@ -42,7 +42,7 @@ export default function Page() {
);
const sendStatusReportUpdateMutation = useMutation(
- trpc.statusReport.notify.mutationOptions(),
+ trpc.subscriberNotification.statusReport.mutationOptions(),
);
const createStatusReportUpdateMutation = useMutation(
diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/page.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/page.tsx
index b860305f3..a9608cd86 100644
--- a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/page.tsx
+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/page.tsx
@@ -34,7 +34,7 @@ export default function Page() {
trpc.statusReport.list.queryOptions({ pageId: Number.parseInt(id) }),
);
const sendStatusReportUpdateMutation = useMutation(
- trpc.statusReport.notify.mutationOptions(),
+ trpc.subscriberNotification.statusReport.mutationOptions(),
);
const createStatusReportMutation = useMutation(
trpc.statusReport.create.mutationOptions({
diff --git a/apps/dashboard/src/components/data-table/status-report-updates/data-table.tsx b/apps/dashboard/src/components/data-table/status-report-updates/data-table.tsx
index 1d452e029..01b908ccf 100644
--- a/apps/dashboard/src/components/data-table/status-report-updates/data-table.tsx
+++ b/apps/dashboard/src/components/data-table/status-report-updates/data-table.tsx
@@ -49,7 +49,7 @@ export function DataTable({
const { id } = useParams<{ id: string }>();
const queryClient = useQueryClient();
const sendStatusReportUpdateMutation = useMutation(
- trpc.statusReport.notify.mutationOptions(),
+ trpc.subscriberNotification.statusReport.mutationOptions(),
);
const createStatusReportUpdateMutation = useMutation(
trpc.statusReport.createStatusReportUpdate.mutationOptions({
diff --git a/apps/dashboard/src/components/data-table/status-reports/data-table-row-actions.tsx b/apps/dashboard/src/components/data-table/status-reports/data-table-row-actions.tsx
index 50f586dfd..b449ac833 100644
--- a/apps/dashboard/src/components/data-table/status-reports/data-table-row-actions.tsx
+++ b/apps/dashboard/src/components/data-table/status-reports/data-table-row-actions.tsx
@@ -55,7 +55,7 @@ export function DataTableRowActions({ row }: DataTableRowActionsProps) {
const currentImpacts = currentImpactsFromUpdates(row.original.updates);
const nextStatus = getNextStatus(row.original.status);
const sendStatusReportUpdateMutation = useMutation(
- trpc.statusReport.notify.mutationOptions(),
+ trpc.subscriberNotification.statusReport.mutationOptions(),
);
const updateStatusReportMutation = useMutation(
trpc.statusReport.updateStatus.mutationOptions({
diff --git a/apps/dashboard/src/lib/trpc/shared.ts b/apps/dashboard/src/lib/trpc/shared.ts
index 7d94f8fee..23187324e 100644
--- a/apps/dashboard/src/lib/trpc/shared.ts
+++ b/apps/dashboard/src/lib/trpc/shared.ts
@@ -40,6 +40,7 @@ const lambdas = [
"apiKeyRouter",
"integrationRouter",
"blob",
+ "subscriberNotification",
];
export const endingLink = (opts?: {
diff --git a/packages/api/src/lambda.ts b/packages/api/src/lambda.ts
index 6b993f2d0..5a48f3dc3 100644
--- a/packages/api/src/lambda.ts
+++ b/packages/api/src/lambda.ts
@@ -3,6 +3,7 @@ import { blobRouter } from "./router/blob";
import { emailRouter } from "./router/email";
import { integrationRouter } from "./router/integration";
import { stripeRouter } from "./router/stripe";
+import { subscriberNotificationRouter } from "./router/subscriber-notification";
import { createTRPCRouter } from "./trpc";
// Deployed to /trpc/lambda/**
export const lambdaRouter = createTRPCRouter({
@@ -11,6 +12,7 @@ export const lambdaRouter = createTRPCRouter({
apiKeyRouter: apiKeyRouter,
integrationRouter: integrationRouter,
blob: blobRouter,
+ subscriberNotification: subscriberNotificationRouter,
});
export { stripe } from "./router/stripe/shared";
diff --git a/packages/api/src/router/maintenance.ts b/packages/api/src/router/maintenance.ts
index 697d523ff..12b46da7c 100644
--- a/packages/api/src/router/maintenance.ts
+++ b/packages/api/src/router/maintenance.ts
@@ -4,7 +4,6 @@ import {
createMaintenance,
deleteMaintenance,
listMaintenances,
- notifyMaintenance,
updateMaintenance,
} from "@openstatus/services/maintenance";
import { z } from "zod";
@@ -66,21 +65,6 @@ export const maintenanceRouter = createTRPCRouter({
}
}),
- notify: protectedProcedure
- .meta({ track: Events.NotifyMaintenance })
- .input(z.object({ id: z.number() }))
- .mutation(async ({ ctx, input }) => {
- try {
- await notifyMaintenance({
- ctx: toServiceCtx(ctx),
- input: { maintenanceId: input.id },
- });
- return { success: true };
- } catch (err) {
- toTRPCError(err);
- }
- }),
-
new: protectedProcedure
.meta({ track: Events.CreateMaintenance })
.input(
diff --git a/packages/api/src/router/statusReport.ts b/packages/api/src/router/statusReport.ts
index 8074282cc..480e5101b 100644
--- a/packages/api/src/router/statusReport.ts
+++ b/packages/api/src/router/statusReport.ts
@@ -10,7 +10,6 @@ import {
deleteStatusReportUpdate,
getStatusReport,
listStatusReports,
- notifyStatusReport,
updateStatusReport,
updateStatusReportUpdate,
} from "@openstatus/services/status-report";
@@ -80,8 +79,9 @@ export const statusReportRouter = createTRPCRouter({
message: input.message,
},
});
- // Notification is a separate, client-driven step (statusReport.notify)
- // so creation and dispatch stay split.
+ // Notification is a separate, client-driven step
+ // (subscriberNotification.statusReport) so creation and dispatch stay
+ // split — dispatch must run on lambda, this router is Edge-served.
return { ...initialUpdate, notifySubscribers: input.notifySubscribers };
} catch (err) {
toTRPCError(err);
@@ -113,21 +113,6 @@ export const statusReportRouter = createTRPCRouter({
}
}),
- notify: protectedProcedure
- .meta({ track: Events.NotifyReport })
- .input(z.object({ id: z.number() }))
- .mutation(async ({ ctx, input }) => {
- try {
- await notifyStatusReport({
- ctx: toServiceCtx(ctx),
- input: { statusReportUpdateId: input.id },
- });
- return { success: true };
- } catch (err) {
- toTRPCError(err);
- }
- }),
-
updateStatusReportUpdate: protectedProcedure
.meta({ track: Events.UpdateReportUpdate })
.input(updateStatusReportUpdateTRPCInput)
diff --git a/packages/api/src/router/subscriber-notification.ts b/packages/api/src/router/subscriber-notification.ts
new file mode 100644
index 000000000..2f2cffaa4
--- /dev/null
+++ b/packages/api/src/router/subscriber-notification.ts
@@ -0,0 +1,44 @@
+import { Events } from "@openstatus/analytics";
+import { notifyMaintenance } from "@openstatus/services/maintenance";
+import { notifyStatusReport } from "@openstatus/services/status-report";
+import { z } from "zod";
+
+import { toServiceCtx, toTRPCError } from "../service-adapter";
+import { createTRPCRouter, protectedProcedure } from "../trpc";
+
+// Subscriber dispatch fans out across every channel (email + webhook), so it
+// must run on the lambda runtime: the email channel (Resend + react-email
+// render) can't run on Edge and would silently drop emails while webhooks
+// still go out. Kept off the statusReport/maintenance routers, which are
+// Edge-served — see the `lambdas` list in the dashboard tRPC client.
+export const subscriberNotificationRouter = createTRPCRouter({
+ statusReport: protectedProcedure
+ .meta({ track: Events.NotifyReport })
+ .input(z.object({ id: z.number() }))
+ .mutation(async ({ ctx, input }) => {
+ try {
+ await notifyStatusReport({
+ ctx: toServiceCtx(ctx),
+ input: { statusReportUpdateId: input.id },
+ });
+ return { success: true };
+ } catch (err) {
+ toTRPCError(err);
+ }
+ }),
+
+ maintenance: protectedProcedure
+ .meta({ track: Events.NotifyMaintenance })
+ .input(z.object({ id: z.number() }))
+ .mutation(async ({ ctx, input }) => {
+ try {
+ await notifyMaintenance({
+ ctx: toServiceCtx(ctx),
+ input: { maintenanceId: input.id },
+ });
+ return { success: true };
+ } catch (err) {
+ toTRPCError(err);
+ }
+ }),
+});
diff --git a/packages/subscriptions/src/payload.ts b/packages/subscriptions/src/payload.ts
index df509aeef..d5c43338f 100644
--- a/packages/subscriptions/src/payload.ts
+++ b/packages/subscriptions/src/payload.ts
@@ -8,7 +8,7 @@ export const WEBHOOK_PAYLOAD_VERSION = "1" as const;
const componentSchema = z.object({
id: z.number().int(),
name: z.string(),
- impact: pageComponentImpactSchema,
+ impact: pageComponentImpactSchema.nullish(),
});
const pageSchema = z.object({
@@ -19,8 +19,8 @@ const pageSchema = z.object({
});
const subscriptionSchema = z.object({
- manage_url: z.string().nullable(),
- unsubscribe_url: z.string().nullable(),
+ manage_url: z.string().nullish(),
+ unsubscribe_url: z.string().nullish(),
});
export const statusReportWebhookSchema = z.object({