Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
refactor: schema (#407)
Maximilian Kaske541b77081c5e
diff --git a/apps/web/src/app/api/checker/regions/_checker.ts b/apps/web/src/app/api/checker/regions/_checker.tsindex 394fb1ae4..fac60f084 100644--- a/apps/web/src/app/api/checker/regions/_checker.ts+++ b/apps/web/src/app/api/checker/regions/_checker.ts@@ -1,9 +1,12 @@import { Receiver } from "@upstash/qstash";import { nanoid } from "nanoid";-import type { z } from "zod";import { db, eq, schema } from "@openstatus/db";-import { selectNotificationSchema } from "@openstatus/db/src/schema";+import type { MonitorStatus } from "@openstatus/db/src/schema";+import {+ selectMonitorSchema,+ selectNotificationSchema,+} from "@openstatus/db/src/schema";import {publishPingResponse,tbIngestPingResponse,@@ -145,7 +148,7 @@ const triggerAlerting = async ({ monitorId }: { monitorId: string }) => {.all();for (const notif of notifications) {await providerToFunction[notif.notification.provider]({- monitor: notif.monitor,+ monitor: selectMonitorSchema.parse(notif.monitor),notification: selectNotificationSchema.parse(notif.notification),});}@@ -156,7 +159,7 @@ const updateMonitorStatus = async ({status,}: {monitorId: string;- status: z.infer<typeof schema.statusSchema>;+ status: MonitorStatus;}) => {await db.update(schema.monitor)diff --git a/apps/web/src/app/api/checker/schema.ts b/apps/web/src/app/api/checker/schema.tsindex 9b85dedde..90009a375 100644--- a/apps/web/src/app/api/checker/schema.ts+++ b/apps/web/src/app/api/checker/schema.ts@@ -1,17 +1,17 @@import { z } from "zod";-import { methods, status } from "@openstatus/db/src/schema";+import { monitorMethods, monitorStatus } from "@openstatus/db/src/schema";export const payloadSchema = z.object({workspaceId: z.string(),monitorId: z.string(),- method: z.enum(methods),+ method: z.enum(monitorMethods),body: z.string().optional(),headers: z.array(z.object({ key: z.string(), value: z.string() })).optional(),url: z.string(),cronTimestamp: z.number(),pageIds: z.array(z.string()),- status: z.enum(status),+ status: z.enum(monitorStatus),});export type Payload = z.infer<typeof payloadSchema>;diff --git a/apps/web/src/app/api/checker/utils.ts b/apps/web/src/app/api/checker/utils.tsindex 4b073c146..2d8f611ab 100644--- a/apps/web/src/app/api/checker/utils.ts+++ b/apps/web/src/app/api/checker/utils.ts@@ -1,20 +1,16 @@-import type { z } from "zod";-import type {- basicMonitorSchema,- providerName,- selectNotificationSchema,+ Monitor,+ Notification,+ NotificationProvider,} from "@openstatus/db/src/schema";import { send as sendEmail } from "@openstatus/notification-emails";-type ProviderName = (typeof providerName)[number];-type sendNotificationType = ({monitor,notification,}: {- monitor: z.infer<typeof basicMonitorSchema>;- notification: z.infer<typeof selectNotificationSchema>;+ monitor: Monitor;+ notification: Notification;}) => Promise<void>;export const providerToFunction = {@@ -37,4 +33,4 @@ export const providerToFunction = {}) => {/* TODO: implement */},-} satisfies Record<ProviderName, sendNotificationType>;+} satisfies Record<NotificationProvider, sendNotificationType>;diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/incidents/edit/page.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/incidents/edit/page.tsxindex 7a397e811..c1eca509d 100644--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/incidents/edit/page.tsx+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/incidents/edit/page.tsx@@ -57,6 +57,7 @@ export default async function EditPage({({ monitorId }) => monitorId,),pages: incident?.pagesToIncidents.map(({ pageId }) => pageId),+ message: "",}: undefined}diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/_components/billing/plan.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/_components/billing/plan.tsxindex 75de11fb9..99d8e8e01 100644--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/_components/billing/plan.tsx+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/settings/_components/billing/plan.tsx@@ -4,7 +4,7 @@ import { useTransition } from "react";import { useRouter } from "next/navigation";import type { z } from "zod";-import type { selectWorkspaceSchema } from "@openstatus/db/src/schema/workspace";+import type { Workspace } from "@openstatus/db/src/schema";import { Shell } from "@/components/dashboard/shell";import { Plan } from "@/components/marketing/plans";@@ -18,7 +18,7 @@ export const SettingsPlan = ({workspaceData,}: {workspaceSlug: string;- workspaceData: z.infer<typeof selectWorkspaceSchema>;+ workspaceData: Workspace;}) => {const router = useRouter();const [isPending, startTransition] = useTransition();diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/_components/action-button.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/_components/action-button.tsxindex b1849fe0d..9b1bf2a00 100644--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/_components/action-button.tsx+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/_components/action-button.tsx@@ -4,9 +4,8 @@ import * as React from "react";import Link from "next/link";import { useRouter } from "next/navigation";import { MoreVertical } from "lucide-react";-import type * as z from "zod";-import type { insertPageSchemaWithMonitors } from "@openstatus/db/src/schema";+import type { Page } from "@openstatus/db/src/schema";import {AlertDialog,AlertDialogAction,@@ -28,10 +27,8 @@ import { LoadingAnimation } from "@/components/loading-animation";import { useToastAction } from "@/hooks/use-toast-action";import { api } from "@/trpc/client";-type PageSchema = z.infer<typeof insertPageSchemaWithMonitors>;-interface ActionButtonProps {- page: PageSchema;+ page: Page;}export function ActionButton({ page }: ActionButtonProps) {diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/_components/empty-state.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/_components/empty-state.tsxindex 0deac5664..c64ea52f3 100644--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/_components/empty-state.tsx+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/_components/empty-state.tsx@@ -1,17 +1,11 @@import Link from "next/link";-import type * as z from "zod";-import type { allMonitorsExtendedSchema } from "@openstatus/db/src/schema";+import type { Monitor } from "@openstatus/db/src/schema";import { Button } from "@openstatus/ui";import { EmptyState as DefaultEmptyState } from "@/components/dashboard/empty-state";-export function EmptyState({- allMonitors,-}: {- allMonitors?: z.infer<typeof allMonitorsExtendedSchema>;-}) {- // Navigate user to monitor if they don't have one+export function EmptyState({ allMonitors }: { allMonitors?: Monitor[] }) {if (!Boolean(allMonitors?.length)) {return (<DefaultEmptyStatediff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/edit/page.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/edit/page.tsxindex 7f99c45b7..86f1f0124 100644--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/edit/page.tsx+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/edit/page.tsx@@ -30,14 +30,15 @@ export default async function EditPage({}const { id } = search.data;+ const { workspaceSlug } = params;// TODO: too many requests to dbconst page = id && (await api.page.getPageByID.query({ id }));const monitors = await api.monitor.getMonitorsByWorkspace.query({- workspaceSlug: params.workspaceSlug,+ workspaceSlug,});const workspace = await api.workspace.getWorkspace.query({- slug: params.workspaceSlug,+ slug: workspaceSlug,});const isProPlan = workspace?.plan === "pro";@@ -71,6 +72,7 @@ export default async function EditPage({page? {...page,+ workspaceSlug: params.workspaceSlug,monitors: page.monitorsToPages.map(({ monitor }) => monitor.id,),diff --git a/apps/web/src/components/data-table/monitor/columns.tsx b/apps/web/src/components/data-table/monitor/columns.tsxindex 680f92aaa..a7320fd58 100644--- a/apps/web/src/components/data-table/monitor/columns.tsx+++ b/apps/web/src/components/data-table/monitor/columns.tsx@@ -4,15 +4,13 @@ import Link from "next/link";import type { ColumnDef } from "@tanstack/react-table";import * as z from "zod";-import type { ExtendedMonitor } from "@openstatus/db/src/schema";+import type { Monitor } from "@openstatus/db/src/schema";import { Badge } from "@openstatus/ui";import { DataTableStatusBadge } from "../data-table-status-badge";import { DataTableRowActions } from "./data-table-row-actions";-export const columns: ColumnDef<- ExtendedMonitor & { lastStatusCode?: number }->[] = [+export const columns: ColumnDef<Monitor & { lastStatusCode?: number }>[] = [{accessorKey: "name",header: "Name",diff --git a/apps/web/src/components/data-table/monitor/data-table-row-actions.tsx b/apps/web/src/components/data-table/monitor/data-table-row-actions.tsxindex 69d4949ba..577e2a139 100644--- a/apps/web/src/components/data-table/monitor/data-table-row-actions.tsx+++ b/apps/web/src/components/data-table/monitor/data-table-row-actions.tsx@@ -6,7 +6,7 @@ import { useRouter } from "next/navigation";import type { Row } from "@tanstack/react-table";import { MoreHorizontal } from "lucide-react";-import { selectMonitorExtendedSchema } from "@openstatus/db/src/schema";+import { insertMonitorSchema } from "@openstatus/db/src/schema";import {AlertDialog,AlertDialogAction,@@ -36,7 +36,7 @@ interface DataTableRowActionsProps<TData> {export function DataTableRowActions<TData>({row,}: DataTableRowActionsProps<TData>) {- const monitor = selectMonitorExtendedSchema.parse(row.original);+ const monitor = insertMonitorSchema.parse(row.original);const router = useRouter();const { toast } = useToastAction();const [alertOpen, setAlertOpen] = React.useState(false);diff --git a/apps/web/src/components/forms/custom-domain-form.tsx b/apps/web/src/components/forms/custom-domain-form.tsxindex 7ae43228b..0d1c7b9e6 100644--- a/apps/web/src/components/forms/custom-domain-form.tsx+++ b/apps/web/src/components/forms/custom-domain-form.tsx@@ -6,7 +6,7 @@ import { zodResolver } from "@hookform/resolvers/zod";import { useForm } from "react-hook-form";import type * as z from "zod";-import { insertPageSchemaWithMonitors } from "@openstatus/db/src/schema";+import { insertPageSchema } from "@openstatus/db/src/schema";import {Button,Form,@@ -26,13 +26,15 @@ import DomainConfiguration from "../domains/domain-configuration";import DomainStatusIcon from "../domains/domain-status-icon";import { LoadingAnimation } from "../loading-animation";-const customDomain = insertPageSchemaWithMonitors.pick({+const customDomain = insertPageSchema.pick({customDomain: true,id: true,});type Schema = z.infer<typeof customDomain>;+// TODO: check+export function CustomDomainForm({ defaultValues }: { defaultValues: Schema }) {const form = useForm<Schema>({resolver: zodResolver(customDomain),diff --git a/apps/web/src/components/forms/incident-form.tsx b/apps/web/src/components/forms/incident-form.tsxindex b590fddb3..2126f35fd 100644--- a/apps/web/src/components/forms/incident-form.tsx+++ b/apps/web/src/components/forms/incident-form.tsx@@ -4,16 +4,12 @@ import * as React from "react";import { useRouter } from "next/navigation";import { zodResolver } from "@hookform/resolvers/zod";import { useForm } from "react-hook-form";-import * as z from "zod";-import type {- allMonitorsExtendedSchema,- Page,-} from "@openstatus/db/src/schema";+import type { InsertIncident, Monitor, Page } from "@openstatus/db/src/schema";import {- availableStatus,+ incidentStatus,+ incidentStatusSchema,insertIncidentSchema,- StatusEnum,} from "@openstatus/db/src/schema";import {Accordion,@@ -48,19 +44,10 @@ import { useToastAction } from "@/hooks/use-toast-action";import { cn } from "@/lib/utils";import { api } from "@/trpc/client";-// include update on creation-const insertSchema = insertIncidentSchema.extend({- message: z.string().optional(),- date: z.date().optional().default(new Date()),-});--type IncidentProps = z.infer<typeof insertSchema>;-type MonitorsProps = z.infer<typeof allMonitorsExtendedSchema>;-interface Props {- defaultValues?: IncidentProps;- monitors?: MonitorsProps;- pages?: Page[]; //+ defaultValues?: InsertIncident;+ monitors?: Monitor[];+ pages?: Page[];workspaceSlug: string;}@@ -70,25 +57,31 @@ export function IncidentForm({pages,workspaceSlug,}: Props) {- const form = useForm<IncidentProps>({- resolver: zodResolver(insertSchema),- defaultValues: {- id: defaultValues?.id || 0,- title: defaultValues?.title || "",- status: defaultValues?.status || "investigating",- monitors: defaultValues?.monitors || [],- pages: defaultValues?.pages || [],- workspaceSlug,- // include update on creation- message: "",- date: defaultValues?.date || new Date(),- },+ const form = useForm<InsertIncident>({+ resolver: zodResolver(insertIncidentSchema),+ defaultValues: defaultValues+ ? {+ id: defaultValues.id,+ title: defaultValues.title,+ status: defaultValues.status,+ monitors: defaultValues.monitors,+ pages: defaultValues.pages,+ workspaceSlug,+ // include update on creation+ message: defaultValues.message,+ date: defaultValues.date,+ }+ : {+ status: "investigating",+ date: new Date(),+ workspaceSlug,+ },});const router = useRouter();const [isPending, startTransition] = React.useTransition();const { toast } = useToastAction();- const onSubmit = ({ ...props }: IncidentProps) => {+ const onSubmit = ({ ...props }: InsertIncident) => {startTransition(async () => {try {if (defaultValues) {@@ -99,6 +92,7 @@ export function IncidentForm({const incident = await api.incident.createIncident.mutate({workspaceSlug,status,+ message,...rest,});// include update on creation@@ -119,6 +113,8 @@ export function IncidentForm({}});};++ console.log(form.formState.errors);return (<Form {...form}><form@@ -160,12 +156,12 @@ export function IncidentForm({<FormMessage /><RadioGrouponValueChange={(value) =>- field.onChange(StatusEnum.parse(value))+ field.onChange(incidentStatusSchema.parse(value))} // value is a stringdefaultValue={field.value}className="grid grid-cols-2 gap-4 sm:grid-cols-4">- {availableStatus.map((status) => {+ {incidentStatus.map((status) => {const { value, label, icon } = statusDict[status];const Icon = Icons[icon];return (diff --git a/apps/web/src/components/forms/incident-update-form.tsx b/apps/web/src/components/forms/incident-update-form.tsxindex 486a2427b..6ef533455 100644--- a/apps/web/src/components/forms/incident-update-form.tsx+++ b/apps/web/src/components/forms/incident-update-form.tsx@@ -4,12 +4,12 @@ import * as React from "react";import { useRouter } from "next/navigation";import { zodResolver } from "@hookform/resolvers/zod";import { useForm } from "react-hook-form";-import type * as z from "zod";+import type { InsertIncidentUpdate } from "@openstatus/db/src/schema";import {- availableStatus,+ incidentStatus,+ incidentStatusSchema,insertIncidentUpdateSchema,- StatusEnum,} from "@openstatus/db/src/schema";import {Button,@@ -37,12 +37,8 @@ import { statusDict } from "@/data/incidents-dictionary";import { useToastAction } from "@/hooks/use-toast-action";import { api } from "@/trpc/client";-// TODO: for UX, using the form inside of a Dialog feels more suitable--type IncidentUpdateProps = z.infer<typeof insertIncidentUpdateSchema>;-interface Props {- defaultValues?: IncidentUpdateProps;+ defaultValues?: InsertIncidentUpdate;workspaceSlug: string;incidentId: number;}@@ -52,12 +48,12 @@ export function IncidentUpdateForm({workspaceSlug,incidentId,}: Props) {- const form = useForm<IncidentUpdateProps>({+ const form = useForm<InsertIncidentUpdate>({resolver: zodResolver(insertIncidentUpdateSchema),defaultValues: {id: defaultValues?.id || 0,status: defaultValues?.status || "investigating",- message: defaultValues?.message || "",+ message: defaultValues?.message,date: defaultValues?.date || new Date(),incidentId,workspaceSlug,@@ -67,7 +63,7 @@ export function IncidentUpdateForm({const [isPending, startTransition] = React.useTransition();const { toast } = useToastAction();- const onSubmit = ({ ...props }: IncidentUpdateProps) => {+ const onSubmit = ({ ...props }: InsertIncidentUpdate) => {startTransition(async () => {try {if (defaultValues) {@@ -110,12 +106,12 @@ export function IncidentUpdateForm({<FormMessage /><RadioGrouponValueChange={(value) =>- field.onChange(StatusEnum.parse(value))+ field.onChange(incidentStatusSchema.parse(value))} // value is a stringdefaultValue={field.value}className="grid grid-cols-2 gap-4 sm:grid-cols-4">- {availableStatus.map((status) => {+ {incidentStatus.map((status) => {const { value, label, icon } = statusDict[status];const Icon = Icons[icon];return (diff --git a/apps/web/src/components/forms/monitor-form.tsx b/apps/web/src/components/forms/monitor-form.tsxindex d7fd8c3ce..04ca73188 100644--- a/apps/web/src/components/forms/monitor-form.tsx+++ b/apps/web/src/components/forms/monitor-form.tsx@@ -5,15 +5,18 @@ import { useRouter } from "next/navigation";import { zodResolver } from "@hookform/resolvers/zod";import { Check, ChevronsUpDown, Wand2, X } from "lucide-react";import { useFieldArray, useForm } from "react-hook-form";-import * as z from "zod";-import type { selectNotificationSchema } from "@openstatus/db/src/schema";+import type {+ InsertMonitor,+ Notification,+ WorkspacePlan,+} from "@openstatus/db/src/schema";import {flyRegions,insertMonitorSchema,- methods,- methodsSchema,- periodicityEnum,+ monitorMethods,+ monitorMethodsSchema,+ monitorPeriodicitySchema,} from "@openstatus/db/src/schema";import { allPlans } from "@openstatus/plans";import {@@ -76,25 +79,11 @@ const cronJobs = [{ value: "1h", label: "1 hour" },] as const;-const headersSchema = z- .array(z.object({ key: z.string(), value: z.string() }))- .optional();--const advancedSchema = z.object({- method: methodsSchema,- body: z.string().optional(),- headers: headersSchema,-});--const mergedSchema = insertMonitorSchema.merge(advancedSchema);--export type MonitorProps = z.infer<typeof mergedSchema>;-interface Props {- defaultValues?: MonitorProps;+ defaultValues?: InsertMonitor;workspaceSlug: string;- plan?: "free" | "pro";- notifications?: z.infer<typeof selectNotificationSchema>[]; // HOTFIX - We can think of returning `workspace` instead of `workspaceSlug`+ plan?: WorkspacePlan;+ notifications?: Notification[];}export function MonitorForm({@@ -103,8 +92,8 @@ export function MonitorForm({plan = "free",notifications,}: Props) {- const form = useForm<MonitorProps>({- resolver: zodResolver(mergedSchema), // too much - we should only validate the values we ask inside of the form!+ const form = useForm<InsertMonitor>({+ resolver: zodResolver(insertMonitorSchema),defaultValues: {url: defaultValues?.url || "",name: defaultValues?.name || "",@@ -136,7 +125,7 @@ export function MonitorForm({control: form.control,});- const handleDataUpdateOrInsertion = async (props: MonitorProps) => {+ const handleDataUpdateOrInsertion = async (props: InsertMonitor) => {try {if (defaultValues) {await api.monitor.updateMonitor.mutate(props);@@ -155,7 +144,7 @@ export function MonitorForm({}};- const onSubmit = ({ ...props }: MonitorProps) => {+ const onSubmit = ({ ...props }: InsertMonitor) => {startTransition(async () => {const pingResult = await pingEndpoint();if (!pingResult) {@@ -296,7 +285,7 @@ export function MonitorForm({<FormLabel>Method</FormLabel><SelectonValueChange={(value) => {- field.onChange(methodsSchema.parse(value));+ field.onChange(monitorMethodsSchema.parse(value));form.resetField("body", { defaultValue: "" });}}defaultValue={field.value}@@ -307,7 +296,7 @@ export function MonitorForm({</SelectTrigger></FormControl><SelectContent>- {methods.map((method) => (+ {monitorMethods.map((method) => (<SelectItem key={method} value={method}>{method}</SelectItem>@@ -435,7 +424,9 @@ export function MonitorForm({<FormLabel>Frequency</FormLabel><SelectonValueChange={(value) =>- field.onChange(periodicityEnum.parse(value))+ field.onChange(+ monitorPeriodicitySchema.parse(value),+ )}defaultValue={field.value}>diff --git a/apps/web/src/components/forms/notification-form.tsx b/apps/web/src/components/forms/notification-form.tsxindex 854667e4c..34c5ef4b6 100644--- a/apps/web/src/components/forms/notification-form.tsx+++ b/apps/web/src/components/forms/notification-form.tsx@@ -5,11 +5,11 @@ import { useRouter } from "next/navigation";import { zodResolver } from "@hookform/resolvers/zod";import { useForm } from "react-hook-form";-import type { Notification } from "@openstatus/db/src/schema";+import type { InsertNotification } from "@openstatus/db/src/schema";import {insertNotificationSchema,- providerEnum,- providerName,+ notificationProvider,+ notificationProviderSchema,} from "@openstatus/db/src/schema";import {Button,@@ -41,7 +41,7 @@ import { api } from "@/trpc/client";*/interface Props {- defaultValues?: Notification;+ defaultValues?: InsertNotification;workspaceSlug: string;onSubmit?: () => void;}@@ -54,10 +54,11 @@ export function NotificationForm({const [isPending, startTransition] = useTransition();const { toast } = useToastAction();const router = useRouter();- const form = useForm<Notification>({+ const form = useForm<InsertNotification>({resolver: zodResolver(insertNotificationSchema),defaultValues: {...defaultValues,+ name: defaultValues?.name || "",data:defaultValues?.provider === "email"? JSON.parse(defaultValues?.data).email@@ -65,7 +66,7 @@ export function NotificationForm({},});- async function onSubmit({ provider, data, ...rest }: Notification) {+ async function onSubmit({ provider, data, ...rest }: InsertNotification) {startTransition(async () => {try {if (defaultValues) {@@ -114,7 +115,7 @@ export function NotificationForm({<FormLabel>Provider</FormLabel><SelectonValueChange={(value) =>- field.onChange(providerEnum.parse(value))+ field.onChange(notificationProviderSchema.parse(value))}defaultValue={field.value}>@@ -124,7 +125,7 @@ export function NotificationForm({</SelectTrigger></FormControl><SelectContent>- {providerName.map((provider) => (+ {notificationProvider.map((provider) => (<SelectItemkey={provider}value={provider}@@ -168,6 +169,7 @@ export function NotificationForm({<FormControl><Inputtype="email"+ requiredplaceholder="[email protected]"{...field}/>diff --git a/apps/web/src/components/forms/status-page-form.tsx b/apps/web/src/components/forms/status-page-form.tsxindex 79e2516c8..4d7e3b868 100644--- a/apps/web/src/components/forms/status-page-form.tsx+++ b/apps/web/src/components/forms/status-page-form.tsx@@ -7,10 +7,9 @@ import { useRouter } from "next/navigation";import { zodResolver } from "@hookform/resolvers/zod";import type { PutBlobResult } from "@vercel/blob";import { useForm } from "react-hook-form";-import type * as z from "zod";-import type { allMonitorsExtendedSchema } from "@openstatus/db/src/schema";-import { insertPageSchemaWithMonitors } from "@openstatus/db/src/schema";+import { insertPageSchema } from "@openstatus/db/src/schema";+import type { InsertPage, Monitor } from "@openstatus/db/src/schema";import {Accordion,AccordionContent,@@ -39,12 +38,10 @@ import { LoadingAnimation } from "../loading-animation";// REMINDER: only use the props you need!-type Schema = z.infer<typeof insertPageSchemaWithMonitors>;-interface Props {- defaultValues?: Schema;+ defaultValues?: InsertPage;workspaceSlug: string;- allMonitors?: z.infer<typeof allMonitorsExtendedSchema>;+ allMonitors?: Monitor[];/*** gives the possibility to check all the monitors*/@@ -62,10 +59,11 @@ export function StatusPageForm({checkAllMonitors,nextUrl,}: Props) {- const form = useForm<Schema>({- resolver: zodResolver(insertPageSchemaWithMonitors),+ console.log({ defaultValues });+ const form = useForm<InsertPage>({+ resolver: zodResolver(insertPageSchema),defaultValues: {- title: defaultValues?.title || "",+ title: defaultValues?.title || "", // FIXME: you can save a page without title, causing unexpected slug behaviorslug: defaultValues?.slug || "",description: defaultValues?.description || "",workspaceId: defaultValues?.workspaceId || 0,@@ -121,9 +119,7 @@ export function StatusPageForm({}}, [watchTitle, form, defaultValues?.title]);- const onSubmit = async ({- ...props- }: z.infer<typeof insertPageSchemaWithMonitors>) => {+ const onSubmit = async ({ ...props }: InsertPage) => {startTransition(async () => {// TODO: we could use an upsertPage function instead - insert if not exist otherwise updatetry {diff --git a/apps/web/src/components/modals/failed-ping-alert-confirmation.tsx b/apps/web/src/components/modals/failed-ping-alert-confirmation.tsxindex cc0b4b843..3ed7b092d 100644--- a/apps/web/src/components/modals/failed-ping-alert-confirmation.tsx+++ b/apps/web/src/components/modals/failed-ping-alert-confirmation.tsx@@ -1,5 +1,6 @@import React from "react";+import type { InsertMonitor } from "@openstatus/db/src/schema";import {AlertDialog,AlertDialogAction,@@ -12,13 +13,12 @@ import {} from "@openstatus/ui";import { LoadingAnimation } from "@/components/loading-animation";-import type { MonitorProps } from "../forms/monitor-form";type FailedPingAlertConfirmationProps = {- monitor: MonitorProps;+ monitor: InsertMonitor;pingFailed: boolean;setPingFailed: React.Dispatch<React.SetStateAction<boolean>>;- onConfirm: (props: MonitorProps) => Promise<void>;+ onConfirm: (props: InsertMonitor) => Promise<void>;};export const FailedPingAlertConfirmation = ({diff --git a/packages/api/src/router/incident.ts b/packages/api/src/router/incident.tsindex 9d4da4e3d..664f65092 100644--- a/packages/api/src/router/incident.ts+++ b/packages/api/src/router/incident.ts@@ -3,16 +3,15 @@ import { z } from "zod";import { and, eq, inArray } from "@openstatus/db";import {incident,+ incidentStatusSchema,incidentUpdate,insertIncidentSchema,- insertIncidentSchemaWithMonitors,insertIncidentUpdateSchema,monitorsToIncidents,pagesToIncidents,selectIncidentSchema,selectIncidentUpdateSchema,selectMonitorSchema,- StatusEnum,user,usersToWorkspaces,workspace,@@ -31,8 +30,15 @@ export const incidentRouter = createTRPCRouter({});if (!result) return;- const { id, workspaceSlug, monitors, pages, date, ...incidentInput } =- opts.input;+ const {+ id,+ workspaceSlug,+ monitors,+ pages,+ date,+ message,+ ...incidentInput+ } = opts.input;const newIncident = await opts.ctx.db.insert(incident)@@ -111,7 +117,7 @@ export const incidentRouter = createTRPCRouter({}),updateIncident: protectedProcedure- .input(insertIncidentSchemaWithMonitors)+ .input(insertIncidentSchema).mutation(async (opts) => {const data = await hasUserAccessToWorkspace({workspaceSlug: opts.input.workspaceSlug,@@ -323,7 +329,7 @@ export const incidentRouter = createTRPCRouter({.input(z.object({ id: z.number() })).query(async (opts) => {const selectIncidentSchemaWithRelation = selectIncidentSchema.extend({- status: StatusEnum.default("investigating"), // TODO: remove!+ status: incidentStatusSchema.default("investigating"), // TODO: remove!monitorsToIncidents: z.array(z.object({ incidentId: z.number(), monitorId: z.number() })).default([]),@@ -369,7 +375,7 @@ export const incidentRouter = createTRPCRouter({if (!data) return;const selectIncidentSchemaWithRelation = selectIncidentSchema.extend({- status: StatusEnum.default("investigating"), // TODO: remove!+ status: incidentStatusSchema.default("investigating"), // TODO: remove!monitorsToIncidents: z.array(z.object({diff --git a/packages/api/src/router/monitor.ts b/packages/api/src/router/monitor.tsindex d480f76ea..101698eb7 100644--- a/packages/api/src/router/monitor.ts+++ b/packages/api/src/router/monitor.ts@@ -4,15 +4,14 @@ import { z } from "zod";import { analytics, trackAnalytics } from "@openstatus/analytics";import { and, eq, inArray, sql } from "@openstatus/db";import {- allMonitorsExtendedSchema,insertMonitorSchema,- methods,monitor,+ monitorMethodsSchema,+ monitorPeriodicitySchema,monitorsToPages,notification,notificationsToMonitors,- periodicityEnum,- selectMonitorExtendedSchema,+ selectMonitorSchema,selectNotificationSchema,} from "@openstatus/db/src/schema";import { allPlans } from "@openstatus/plans";@@ -107,7 +106,7 @@ export const monitorRouter = createTRPCRouter({});if (!result) return;- const _monitor = selectMonitorExtendedSchema.parse(result.monitor);+ const _monitor = selectMonitorSchema.parse(result.monitor);return _monitor;}),@@ -225,7 +224,7 @@ export const monitorRouter = createTRPCRouter({// const selectMonitorsArray = selectMonitorSchema.array();try {- return allMonitorsExtendedSchema.parse(monitors);+ return z.array(selectMonitorSchema).parse(monitors);} catch (e) {console.log(e);}@@ -236,7 +235,7 @@ export const monitorRouter = createTRPCRouter({.input(z.object({id: z.number(),- method: z.enum(methods).default("GET"),+ method: monitorMethodsSchema.default("GET"),body: z.string().default("").optional(),headers: z.array(z.object({ key: z.string(), value: z.string() }))@@ -263,7 +262,7 @@ export const monitorRouter = createTRPCRouter({}),getMonitorsForPeriodicity: protectedProcedure- .input(z.object({ periodicity: periodicityEnum }))+ .input(z.object({ periodicity: monitorPeriodicitySchema })).query(async (opts) => {const result = await opts.ctx.db.select()@@ -275,7 +274,7 @@ export const monitorRouter = createTRPCRouter({),).all();- return allMonitorsExtendedSchema.parse(result);+ return z.array(selectMonitorSchema).parse(result);}),getAllPagesForMonitor: protectedProcedurediff --git a/packages/api/src/router/notification.ts b/packages/api/src/router/notification.tsindex 131263060..2acb0d77d 100644--- a/packages/api/src/router/notification.ts+++ b/packages/api/src/router/notification.ts@@ -1,12 +1,10 @@import { z } from "zod";import { analytics, trackAnalytics } from "@openstatus/analytics";-import { and, eq } from "@openstatus/db";+import { eq } from "@openstatus/db";import {- allNotifications,insertNotificationSchema,notification,- notificationsToMonitors,selectNotificationSchema,} from "@openstatus/db/src/schema";@@ -119,7 +117,7 @@ export const notificationRouter = createTRPCRouter({.all();try {- return allNotifications.parse(notifications);+ return z.array(selectNotificationSchema).parse(notifications);} catch (e) {console.log(e);}diff --git a/packages/api/src/router/page.ts b/packages/api/src/router/page.tsindex fc56321b8..c8131f658 100644--- a/packages/api/src/router/page.ts+++ b/packages/api/src/router/page.ts@@ -2,10 +2,10 @@ import { TRPCError } from "@trpc/server";import { z } from "zod";import { analytics, trackAnalytics } from "@openstatus/analytics";-import { and, eq, inArray, not, or, sql } from "@openstatus/db";+import { and, eq, inArray, or, sql } from "@openstatus/db";import {incident,- insertPageSchemaWithMonitors,+ insertPageSchema,monitor,monitorsToIncidents,monitorsToPages,@@ -16,7 +16,6 @@ import {usersToWorkspaces,workspace,} from "@openstatus/db/src/schema";-import { allPlans } from "@openstatus/plans";import { createTRPCRouter, protectedProcedure, publicProcedure } from "../trpc";import { hasUserAccessToWorkspace } from "./utils";@@ -24,7 +23,7 @@ import { hasUserAccessToWorkspace } from "./utils";// TODO: deletePageById - updatePageByIdexport const pageRouter = createTRPCRouter({createPage: protectedProcedure- .input(insertPageSchemaWithMonitors)+ .input(insertPageSchema).mutation(async (opts) => {if (!opts.input.workspaceSlug) return;const data = await hasUserAccessToWorkspace({@@ -110,7 +109,7 @@ export const pageRouter = createTRPCRouter({});}),updatePage: protectedProcedure- .input(insertPageSchemaWithMonitors)+ .input(insertPageSchema).mutation(async (opts) => {if (!opts.input.id) return;diff --git a/packages/api/src/router/stripe/webhook.ts b/packages/api/src/router/stripe/webhook.tsindex 38223dc24..8837ee58d 100644--- a/packages/api/src/router/stripe/webhook.ts+++ b/packages/api/src/router/stripe/webhook.ts@@ -91,7 +91,7 @@ export const webhookRouter = createTRPCRouter({.update(workspace).set({subscriptionId: null,- plan: "FREE",+ plan: "free",paidUntil: null,}).where(eq(workspace.stripeId, customerId))diff --git a/packages/db/src/schema/incident.ts b/packages/db/src/schema/incidents/incident.tssimilarity index 64%rename from packages/db/src/schema/incident.tsrename to packages/db/src/schema/incidents/incident.tsindex 1f6edc664..c02c8c28e 100644--- a/packages/db/src/schema/incident.ts+++ b/packages/db/src/schema/incidents/incident.ts@@ -5,26 +5,21 @@ import {sqliteTable,text,} from "drizzle-orm/sqlite-core";-import { createInsertSchema, createSelectSchema } from "drizzle-zod";-import * as z from "zod";-import { monitor } from "./monitor";-import { page } from "./page";-import { workspace } from "./workspace";+import { monitor } from "../monitors";+import { page } from "../pages";+import { workspace } from "../workspaces";-export const availableStatus = [+export const incidentStatus = ["investigating","identified","monitoring","resolved",] as const;-export const StatusEnum = z.enum(availableStatus);--// We should have a self relation. Such that we show the parent.export const incident = sqliteTable("incident", {id: integer("id").primaryKey(),- status: text("status", availableStatus).notNull(), // FIXME: delete from table!+ status: text("status", { enum: incidentStatus }).notNull(),title: text("title", { length: 256 }).notNull(),workspaceId: integer("workspace_id").references(() => workspace.id),@@ -35,13 +30,12 @@ export const incident = sqliteTable("incident", {updatedAt: integer("updated_at", { mode: "timestamp" }).default(sql`(strftime('%s', 'now'))`,),- // createdBy});export const incidentUpdate = sqliteTable("incident_update", {id: integer("id").primaryKey(),- status: text("status", availableStatus).notNull(),+ status: text("status", incidentStatus).notNull(),date: integer("date", { mode: "timestamp" }).notNull(),message: text("message").notNull(),@@ -130,44 +124,3 @@ export const pagesToIncidentsRelations = relations(}),}),);--// Schema for inserting a Incident - can be used to validate API requests-export const insertIncidentSchema = createInsertSchema(incident).extend({- title: z.string().default(""),- // message: z.string().optional().default(""),- status: StatusEnum,- date: z.date().optional().default(new Date()),- // date: z.number().optional().default(new Date().getTime()),- workspaceSlug: z.string(),- monitors: z.number().array(),- pages: z.number().array(),-});--export const insertIncidentUpdateSchema = createInsertSchema(- incidentUpdate,-).extend({- status: StatusEnum,- message: z.string().optional().default(""),- // date: z.number().optional().default(new Date().getTime()),- workspaceSlug: z.string(),-});--export const insertIncidentSchemaWithIncidentUpdates =- insertIncidentSchema.extend({- incidentUpdates: insertIncidentUpdateSchema.array(),- });--// TODO: remove!!!-export const insertIncidentSchemaWithMonitors = insertIncidentSchema.extend({- monitors: z.number().array(),-});--export const selectIncidentSchema = createSelectSchema(incident).extend({- status: StatusEnum,-});--export const selectIncidentUpdateSchema = createSelectSchema(- incidentUpdate,-).extend({- status: StatusEnum,-});diff --git a/packages/db/src/schema/incidents/index.ts b/packages/db/src/schema/incidents/index.tsnew file mode 100644index 000000000..079c283be--- /dev/null+++ b/packages/db/src/schema/incidents/index.ts@@ -0,0 +1,3 @@+export * from "./incident";+export * from "./validation";+export type * from "./validation";diff --git a/packages/db/src/schema/incidents/validation.ts b/packages/db/src/schema/incidents/validation.tsnew file mode 100644index 000000000..0a2d5fead--- /dev/null+++ b/packages/db/src/schema/incidents/validation.ts@@ -0,0 +1,44 @@+import { createInsertSchema, createSelectSchema } from "drizzle-zod";+import * as z from "zod";++import { incident, incidentStatus, incidentUpdate } from "./incident";++export const incidentStatusSchema = z.enum(incidentStatus);++export const insertIncidentUpdateSchema = createInsertSchema(incidentUpdate, {+ status: incidentStatusSchema,+}).extend({+ workspaceSlug: z.string(), // FIXME: we should do it differently!+});++export const insertIncidentSchema = createInsertSchema(incident, {+ status: incidentStatusSchema,+})+ .extend({+ date: z.date().optional().default(new Date()),+ workspaceSlug: z.string(),+ /**+ * relationship to monitors and pages+ */+ monitors: z.number().array().optional().default([]),+ pages: z.number().array().optional().default([]),+ })+ .extend({+ /**+ * message for the `InsertIncidentUpdate`+ */+ message: z.string(),+ });++export const selectIncidentSchema = createSelectSchema(incident, {+ status: incidentStatusSchema,+});++export const selectIncidentUpdateSchema = createSelectSchema(incidentUpdate, {+ status: incidentStatusSchema,+});++export type InsertIncident = z.infer<typeof insertIncidentSchema>;+export type Incident = z.infer<typeof selectIncidentSchema>;+export type InsertIncidentUpdate = z.infer<typeof insertIncidentUpdateSchema>;+export type IncidentUpdate = z.infer<typeof selectIncidentUpdateSchema>;diff --git a/packages/db/src/schema/index.ts b/packages/db/src/schema/index.tsindex 353af0fd4..f693f352b 100644--- a/packages/db/src/schema/index.ts+++ b/packages/db/src/schema/index.ts@@ -1,8 +1,8 @@-export * from "./incident";+export * from "./incidents";export * from "./integration";-export * from "./page";-export * from "./monitor";-export * from "./user";-export * from "./workspace";+export * from "./pages";+export * from "./monitors";+export * from "./users";+export * from "./workspaces";export * from "./shared";-export * from "./notification";+export * from "./notifications";diff --git a/packages/db/src/schema/integration.ts b/packages/db/src/schema/integration.tsindex e8109ade3..3c3eacda5 100644--- a/packages/db/src/schema/integration.ts+++ b/packages/db/src/schema/integration.ts@@ -1,8 +1,8 @@import { sql } from "drizzle-orm";import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core";-import { createInsertSchema, createSelectSchema } from "drizzle-zod";+import { createInsertSchema } from "drizzle-zod";-import { workspace } from "./workspace";+import { workspace } from "./workspaces";export const integration = sqliteTable("integration", {id: integer("id").primaryKey(),diff --git a/packages/db/src/schema/monitor.ts b/packages/db/src/schema/monitor.tsdeleted file mode 100644index 16bc6dffc..000000000--- a/packages/db/src/schema/monitor.ts+++ /dev/null@@ -1,180 +0,0 @@-import { relations, sql } from "drizzle-orm";-import {- integer,- primaryKey,- sqliteTable,- text,-} from "drizzle-orm/sqlite-core";-import { createInsertSchema, createSelectSchema } from "drizzle-zod";-import { z } from "zod";--import { monitorsToIncidents } from "./incident";-import { notificationsToMonitors } from "./notification";-import { page } from "./page";-import { workspace } from "./workspace";--export const vercelRegions = [- "arn1",- "bom1",- "cdg1",- "cle1",- "cpt1",- "dub1",- "fra1",- "gru1",- "hkg1",- "hnd1",- "iad1",- "icn1",- "kix1",- "lhr1",- "pdx1",- "sfo1",- "sin1",- "syd1",-] as const;--export const flyRegions = ["ams", "iad", "hkg", "jnb", "syd", "gru"] as const;--export const periodicity = ["1m", "5m", "10m", "30m", "1h", "other"] as const;-export const periodicityEnum = z.enum(periodicity);-export const methods = ["GET", "POST", "HEAD"] as const;-export const methodsSchema = z.enum(methods);-export const status = ["active", "error"] as const;-export const statusSchema = z.enum(status);-export const RegionEnum = z.enum([...flyRegions, ...vercelRegions, "auto"]);--export const monitor = sqliteTable("monitor", {- id: integer("id").primaryKey(),- jobType: text("job_type", ["website", "cron", "other"])- .default("other")- .notNull(),- periodicity: text("periodicity", ["1m", "5m", "10m", "30m", "1h", "other"])- .default("other")- .notNull(),- status: text("status", status).default("active").notNull(),- active: integer("active", { mode: "boolean" }).default(false),-- regions: text("regions").default("").notNull(),-- url: text("url", { length: 2048 }).notNull(),-- name: text("name", { length: 256 }).default("").notNull(),- description: text("description").default("").notNull(),-- headers: text("headers").default(""),- body: text("body").default(""),- method: text("method", methods).default("GET"),- workspaceId: integer("workspace_id").references(() => workspace.id),-- createdAt: integer("created_at", { mode: "timestamp" }).default(- sql`(strftime('%s', 'now'))`,- ),- updatedAt: integer("updated_at", { mode: "timestamp" }).default(- sql`(strftime('%s', 'now'))`,- ),-});--export const monitorRelation = relations(monitor, ({ one, many }) => ({- monitorsToPages: many(monitorsToPages),- monitorsToIncidents: many(monitorsToIncidents),- workspace: one(workspace, {- fields: [monitor.workspaceId],- references: [workspace.id],- }),- monitorsToNotifications: many(notificationsToMonitors),-}));--export const monitorsToPages = sqliteTable(- "monitors_to_pages",- {- monitorId: integer("monitor_id")- .notNull()- .references(() => monitor.id, { onDelete: "cascade" }),- pageId: integer("page_id")- .notNull()- .references(() => page.id, { onDelete: "cascade" }),- },- (t) => ({- pk: primaryKey(t.monitorId, t.pageId),- }),-);--export const monitorsToPagesRelation = relations(- monitorsToPages,- ({ one }) => ({- monitor: one(monitor, {- fields: [monitorsToPages.monitorId],- references: [monitor.id],- }),- page: one(page, {- fields: [monitorsToPages.pageId],- references: [page.id],- }),- }),-);--// Schema for inserting a Monitor - can be used to validate API requests-export const insertMonitorSchema = createInsertSchema(monitor, {- periodicity: periodicityEnum,- url: z.string().url(),- status: z.enum(status).default("active"),- active: z.boolean().default(false),- regions: z.array(RegionEnum).default([]).optional(),- method: z.enum(methods).default("GET"),- body: z.string().default("").optional(),- headers: z- .array(z.object({ key: z.string(), value: z.string() }))- .default([]),-}).extend({- notifications: z.array(z.number()).optional(),-});--export const basicMonitorSchema = createSelectSchema(monitor);--// Schema for selecting a Monitor - can be used to validate API responses-export const selectMonitorSchema = createSelectSchema(monitor, {- periodicity: periodicityEnum,- status: z.enum(status).default("active"),- jobType: z.enum(["website", "cron", "other"]).default("other"),- active: z.boolean().default(false),- regions: z- .preprocess((val) => {- if (String(val).length > 0) {- return String(val).split(",");- } else {- return [];- }- }, z.array(RegionEnum))- .default([]),- method: z.enum(methods).default("GET"),-});--// FIXME: can be removed as we do not use the advanced tab anymore-export const selectMonitorExtendedSchema = selectMonitorSchema.extend({- method: z.enum(methods).default("GET"),- body: z- .preprocess((val) => {- return String(val);- }, z.string())- .default(""),- headers: z.preprocess(- (val) => {- // early return in case the header is already an array- if (Array.isArray(val)) {- return val;- }- if (String(val).length > 0) {- return JSON.parse(String(val));- } else {- return [];- }- },- z.array(z.object({ key: z.string(), value: z.string() })).default([]),- ),-});--// FIXME: ExtendedMonitor can be renamed to Monitor-export const allMonitorsExtendedSchema = z.array(selectMonitorExtendedSchema);-export type ExtendedMonitor = z.infer<typeof selectMonitorExtendedSchema>;-export type ExtendedMonitors = z.infer<typeof allMonitorsExtendedSchema>;diff --git a/packages/db/src/schema/monitors/constants.ts b/packages/db/src/schema/monitors/constants.tsnew file mode 100644index 000000000..fb22c7265--- /dev/null+++ b/packages/db/src/schema/monitors/constants.ts@@ -0,0 +1,43 @@+/**+ * @deprecated+ */+export const vercelRegions = [+ "arn1",+ "bom1",+ "cdg1",+ "cle1",+ "cpt1",+ "dub1",+ "fra1",+ "gru1",+ "hkg1",+ "hnd1",+ "iad1",+ "icn1",+ "kix1",+ "lhr1",+ "pdx1",+ "sfo1",+ "sin1",+ "syd1",+] as const;++export const flyRegions = ["ams", "iad", "hkg", "jnb", "syd", "gru"] as const;++export const monitorPeriodicity = [+ "1m",+ "5m",+ "10m",+ "30m",+ "1h",+ "other",+] as const;+export const monitorMethods = ["GET", "POST", "HEAD"] as const;+export const monitorStatus = ["active", "error"] as const;+export const monitorRegions = [+ ...flyRegions,+ ...vercelRegions,+ "auto",+] as const;++export const monitorJobTypes = ["website", "cron", "other"] as const;diff --git a/packages/db/src/schema/monitors/index.ts b/packages/db/src/schema/monitors/index.tsnew file mode 100644index 000000000..3651b0c0d--- /dev/null+++ b/packages/db/src/schema/monitors/index.ts@@ -0,0 +1,4 @@+export * from "./constants";+export * from "./monitor";+export * from "./validation";+export type * from "./validation";diff --git a/packages/db/src/schema/monitors/monitor.ts b/packages/db/src/schema/monitors/monitor.tsnew file mode 100644index 000000000..d9e54073a--- /dev/null+++ b/packages/db/src/schema/monitors/monitor.ts@@ -0,0 +1,88 @@+import { relations, sql } from "drizzle-orm";+import {+ integer,+ primaryKey,+ sqliteTable,+ text,+} from "drizzle-orm/sqlite-core";++import { monitorsToIncidents } from "../incidents";+import { notificationsToMonitors } from "../notifications";+import { page } from "../pages";+import { workspace } from "../workspaces";+import {+ monitorJobTypes,+ monitorMethods,+ monitorPeriodicity,+ monitorStatus,+} from "./constants";++export const monitor = sqliteTable("monitor", {+ id: integer("id").primaryKey(),+ jobType: text("job_type", { enum: monitorJobTypes })+ .default("other")+ .notNull(),+ periodicity: text("periodicity", { enum: monitorPeriodicity })+ .default("other")+ .notNull(),+ status: text("status", { enum: monitorStatus }).default("active").notNull(),+ active: integer("active", { mode: "boolean" }).default(false),++ regions: text("regions").default("").notNull(),++ url: text("url", { length: 2048 }).notNull(),++ name: text("name", { length: 256 }).default("").notNull(),+ description: text("description").default("").notNull(),++ headers: text("headers").default(""),+ body: text("body").default(""),+ method: text("method", { enum: monitorMethods }).default("GET"),+ workspaceId: integer("workspace_id").references(() => workspace.id),++ createdAt: integer("created_at", { mode: "timestamp" }).default(+ sql`(strftime('%s', 'now'))`,+ ),+ updatedAt: integer("updated_at", { mode: "timestamp" }).default(+ sql`(strftime('%s', 'now'))`,+ ),+});++export const monitorRelation = relations(monitor, ({ one, many }) => ({+ monitorsToPages: many(monitorsToPages),+ monitorsToIncidents: many(monitorsToIncidents),+ workspace: one(workspace, {+ fields: [monitor.workspaceId],+ references: [workspace.id],+ }),+ monitorsToNotifications: many(notificationsToMonitors),+}));++export const monitorsToPages = sqliteTable(+ "monitors_to_pages",+ {+ monitorId: integer("monitor_id")+ .notNull()+ .references(() => monitor.id, { onDelete: "cascade" }),+ pageId: integer("page_id")+ .notNull()+ .references(() => page.id, { onDelete: "cascade" }),+ },+ (t) => ({+ pk: primaryKey(t.monitorId, t.pageId),+ }),+);++export const monitorsToPagesRelation = relations(+ monitorsToPages,+ ({ one }) => ({+ monitor: one(monitor, {+ fields: [monitorsToPages.monitorId],+ references: [monitor.id],+ }),+ page: one(page, {+ fields: [monitorsToPages.pageId],+ references: [page.id],+ }),+ }),+);diff --git a/packages/db/src/schema/monitors/validation.ts b/packages/db/src/schema/monitors/validation.tsnew file mode 100644index 000000000..63dc018c2--- /dev/null+++ b/packages/db/src/schema/monitors/validation.ts@@ -0,0 +1,82 @@+import { createInsertSchema, createSelectSchema } from "drizzle-zod";+import { z } from "zod";++import {+ monitorJobTypes,+ monitorMethods,+ monitorPeriodicity,+ monitorRegions,+ monitorStatus,+} from "./constants";+import { monitor } from "./monitor";++export const monitorPeriodicitySchema = z.enum(monitorPeriodicity);+export const monitorMethodsSchema = z.enum(monitorMethods);+export const monitorStatusSchema = z.enum(monitorStatus);+export const monitorRegionSchema = z.enum(monitorRegions);+export const monitorJobTypesSchema = z.enum(monitorJobTypes);++// TODO: shared function+function stringToArrayProcess<T>(string: T) {}++const regionsToArraySchema = z.preprocess((val) => {+ if (String(val).length > 0) {+ return String(val).split(",");+ } else {+ return [];+ }+}, z.array(monitorRegionSchema));++const bodyToStringSchema = z.preprocess((val) => {+ return String(val);+}, z.string());++const headersToArraySchema = z.preprocess(+ (val) => {+ // early return in case the header is already an array+ if (Array.isArray(val)) {+ return val;+ }+ if (String(val).length > 0) {+ return JSON.parse(String(val));+ } else {+ return [];+ }+ },+ z.array(z.object({ key: z.string(), value: z.string() })).default([]),+);++export const selectMonitorSchema = createSelectSchema(monitor, {+ periodicity: monitorPeriodicitySchema.default("10m"),+ status: monitorStatusSchema.default("active"),+ jobType: monitorJobTypesSchema.default("other"),+ regions: regionsToArraySchema.default([]),+}).extend({+ headers: headersToArraySchema.default([]),+ body: bodyToStringSchema.default(""),+ method: monitorMethodsSchema.default("GET"),+});++const headersSchema = z+ .array(z.object({ key: z.string(), value: z.string() }))+ .optional();++export const insertMonitorSchema = createInsertSchema(monitor, {+ periodicity: monitorPeriodicitySchema.default("10m"),+ url: z.string().url(), // find a better way to not always start with "https://" including the `InputWithAddons`+ status: monitorStatusSchema.default("active"),+ regions: z.array(monitorRegionSchema).default([]).optional(),+ headers: headersSchema.default([]),+}).extend({+ method: monitorMethodsSchema.default("GET"),+ notifications: z.array(z.number()).optional(),+ body: z.string().default("").optional(),+});++export type InsertMonitor = z.infer<typeof insertMonitorSchema>;+export type Monitor = z.infer<typeof selectMonitorSchema>;+export type MonitorStatus = z.infer<typeof monitorStatusSchema>;+export type MonitorPeriodicity = z.infer<typeof monitorPeriodicitySchema>;+export type MonitorMethod = z.infer<typeof monitorMethodsSchema>;+export type MonitorRegion = z.infer<typeof monitorRegionSchema>;+export type MonitorJobType = z.infer<typeof monitorJobTypesSchema>;diff --git a/packages/db/src/schema/notifications/constants.ts b/packages/db/src/schema/notifications/constants.tsnew file mode 100644index 000000000..5803c5583--- /dev/null+++ b/packages/db/src/schema/notifications/constants.ts@@ -0,0 +1 @@+export const notificationProvider = ["email", "discord", "slack"] as const;diff --git a/packages/db/src/schema/notifications/index.ts b/packages/db/src/schema/notifications/index.tsnew file mode 100644index 000000000..fadeb49ae--- /dev/null+++ b/packages/db/src/schema/notifications/index.ts@@ -0,0 +1,4 @@+export * from "./constants";+export * from "./notification";+export * from "./validation";+export type * from "./validation";diff --git a/packages/db/src/schema/notification.ts b/packages/db/src/schema/notifications/notification.tssimilarity index 69%rename from packages/db/src/schema/notification.tsrename to packages/db/src/schema/notifications/notification.tsindex 75bef345b..d0bf7e178 100644--- a/packages/db/src/schema/notification.ts+++ b/packages/db/src/schema/notifications/notification.ts@@ -8,15 +8,14 @@ import {import { createInsertSchema, createSelectSchema } from "drizzle-zod";import * as z from "zod";-import { monitor } from "./monitor";-import { workspace } from "./workspace";--export const providerName = ["email", "discord", "slack"] as const;+import { monitor } from "../monitors";+import { workspace } from "../workspaces";+import { notificationProvider } from "./constants";export const notification = sqliteTable("notification", {id: integer("id").primaryKey(),name: text("name").notNull(),- provider: text("provider", { enum: providerName }).notNull(),+ provider: text("provider", { enum: notificationProvider }).notNull(),data: text("data").default("{}"),workspaceId: integer("workspace_id").references(() => workspace.id),createdAt: integer("created_at", { mode: "timestamp" }).default(@@ -66,25 +65,3 @@ export const notificationRelations = relations(monitor: many(notificationsToMonitors),}),);--export const providerEnum = z.enum(providerName);--export const selectNotificationSchema = createSelectSchema(notification).extend(- {- data: z- .preprocess((val) => {- return String(val);- }, z.string())- .default(""),- },-);--export const insertNotificationSchema = createInsertSchema(notification).extend(- {- data: z.string().default("").optional(),- },-);--export const allNotifications = z.array(selectNotificationSchema);--export type Notification = z.infer<typeof selectNotificationSchema>;diff --git a/packages/db/src/schema/notifications/validation.ts b/packages/db/src/schema/notifications/validation.tsnew file mode 100644index 000000000..16a741dfd--- /dev/null+++ b/packages/db/src/schema/notifications/validation.ts@@ -0,0 +1,28 @@+import { createInsertSchema, createSelectSchema } from "drizzle-zod";+import * as z from "zod";++import { notificationProvider } from "./constants";+import { notification } from "./notification";++export const notificationProviderSchema = z.enum(notificationProvider);++export const selectNotificationSchema = createSelectSchema(notification).extend(+ {+ data: z+ .preprocess((val) => {+ return String(val);+ }, z.string())+ .default("{}"),+ },+);++// we need to extend, otherwise data can be `null` or `undefined` - default is not+export const insertNotificationSchema = createInsertSchema(notification).extend(+ {+ data: z.string().default("{}"),+ },+);++export type InsertNotification = z.infer<typeof insertNotificationSchema>;+export type Notification = z.infer<typeof selectNotificationSchema>;+export type NotificationProvider = z.infer<typeof notificationProviderSchema>;diff --git a/packages/db/src/schema/page.ts b/packages/db/src/schema/page.tsdeleted file mode 100644index c34247a05..000000000--- a/packages/db/src/schema/page.ts+++ /dev/null@@ -1,74 +0,0 @@-import { relations, sql } from "drizzle-orm";-import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core";-import { createInsertSchema, createSelectSchema } from "drizzle-zod";-import { z } from "zod";--import { pagesToIncidents } from "./incident";-import { monitorsToPages } from "./monitor";-import { workspace } from "./workspace";--export const page = sqliteTable("page", {- id: integer("id").primaryKey(),-- workspaceId: integer("workspace_id")- .notNull()- .references(() => workspace.id, { onDelete: "cascade" }),-- title: text("title").notNull(), // title of the page- description: text("description").notNull(), // description of the page- icon: text("icon", { length: 256 }).default(""), // icon of the page- slug: text("slug", { length: 256 }).notNull().unique(), // which is used for https://slug.openstatus.dev- customDomain: text("custom_domain", { length: 256 }).notNull(),- published: integer("published", { mode: "boolean" }).default(false),-- createdAt: integer("created_at", { mode: "timestamp" }).default(- sql`(strftime('%s', 'now'))`,- ),- updatedAt: integer("updated_at", { mode: "timestamp" }).default(- sql`(strftime('%s', 'now'))`,- ),-});--export const pageRelations = relations(page, ({ many, one }) => ({- monitorsToPages: many(monitorsToPages),- pagesToIncidents: many(pagesToIncidents),- workspace: one(workspace, {- fields: [page.workspaceId],- references: [workspace.id],- }),-}));--const slugSchema = z- .string()- .regex(- new RegExp("^[A-Za-z0-9-]+$"),- "Only use digits (0-9), hyphen (-) or characters (A-Z, a-z).",- )- .min(3)- .toLowerCase();--const customDomainSchema = z- .string()- .regex(- new RegExp("^(?!https?://|www.)([a-zA-Z0-9]+(.[a-zA-Z0-9]+)+.*)$"),- "Should not start with http://, https:// or www.",- )- .or(z.enum([""]));--// Schema for inserting a Page - can be used to validate API requests-export const insertPageSchema = createInsertSchema(page, {- customDomain: customDomainSchema.optional(),- icon: z.string().optional(),- slug: slugSchema,-});--export const insertPageSchemaWithMonitors = insertPageSchema.extend({- customDomain: customDomainSchema.optional().default(""),- monitors: z.array(z.number()).optional(),- workspaceSlug: z.string().optional(),- slug: slugSchema,-});--// Schema for selecting a Page - can be used to validate API responses-export const selectPageSchema = createSelectSchema(page);-export type Page = z.infer<typeof selectPageSchema>;diff --git a/packages/db/src/schema/pages/index.ts b/packages/db/src/schema/pages/index.tsnew file mode 100644index 000000000..455e18d1e--- /dev/null+++ b/packages/db/src/schema/pages/index.ts@@ -0,0 +1,3 @@+export * from "./page";+export * from "./validation";+export type * from "./validation";diff --git a/packages/db/src/schema/pages/page.ts b/packages/db/src/schema/pages/page.tsnew file mode 100644index 000000000..333593992--- /dev/null+++ b/packages/db/src/schema/pages/page.ts@@ -0,0 +1,37 @@+import { relations, sql } from "drizzle-orm";+import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core";++import { pagesToIncidents } from "../incidents";+import { monitorsToPages } from "../monitors";+import { workspace } from "../workspaces";++export const page = sqliteTable("page", {+ id: integer("id").primaryKey(),++ workspaceId: integer("workspace_id")+ .notNull()+ .references(() => workspace.id, { onDelete: "cascade" }),++ title: text("title").notNull(), // title of the page+ description: text("description").notNull(), // description of the page+ icon: text("icon", { length: 256 }).default(""), // icon of the page+ slug: text("slug", { length: 256 }).notNull().unique(), // which is used for https://slug.openstatus.dev+ customDomain: text("custom_domain", { length: 256 }).notNull(),+ published: integer("published", { mode: "boolean" }).default(false),++ createdAt: integer("created_at", { mode: "timestamp" }).default(+ sql`(strftime('%s', 'now'))`,+ ),+ updatedAt: integer("updated_at", { mode: "timestamp" }).default(+ sql`(strftime('%s', 'now'))`,+ ),+});++export const pageRelations = relations(page, ({ many, one }) => ({+ monitorsToPages: many(monitorsToPages),+ pagesToIncidents: many(pagesToIncidents),+ workspace: one(workspace, {+ fields: [page.workspaceId],+ references: [workspace.id],+ }),+}));diff --git a/packages/db/src/schema/pages/validation.ts b/packages/db/src/schema/pages/validation.tsnew file mode 100644index 000000000..aa9804990--- /dev/null+++ b/packages/db/src/schema/pages/validation.ts@@ -0,0 +1,35 @@+import { createInsertSchema, createSelectSchema } from "drizzle-zod";+import { z } from "zod";++import { page } from "./page";++const slugSchema = z+ .string()+ .regex(+ new RegExp("^[A-Za-z0-9-]+$"),+ "Only use digits (0-9), hyphen (-) or characters (A-Z, a-z).",+ )+ .min(3)+ .toLowerCase();++const customDomainSchema = z+ .string()+ .regex(+ new RegExp("^(?!https?://|www.)([a-zA-Z0-9]+(.[a-zA-Z0-9]+)+.*)$"),+ "Should not start with http://, https:// or www.",+ )+ .or(z.enum([""]));++export const insertPageSchema = createInsertSchema(page, {+ customDomain: customDomainSchema.default(""),+ icon: z.string().optional(),+ slug: slugSchema,+}).extend({+ monitors: z.array(z.number()).optional().default([]),+ workspaceSlug: z.string(),+});++export const selectPageSchema = createSelectSchema(page);++export type InsertPage = z.infer<typeof insertPageSchema>;+export type Page = z.infer<typeof selectPageSchema>;diff --git a/packages/db/src/schema/shared.ts b/packages/db/src/schema/shared.tsindex 095e75ba8..2af6d4353 100644--- a/packages/db/src/schema/shared.ts+++ b/packages/db/src/schema/shared.ts@@ -1,8 +1,8 @@import { z } from "zod";-import { selectIncidentSchema, selectIncidentUpdateSchema } from "./incident";-import { selectMonitorSchema } from "./monitor";-import { selectPageSchema } from "./page";+import { selectIncidentSchema, selectIncidentUpdateSchema } from "./incidents";+import { selectMonitorSchema } from "./monitors";+import { selectPageSchema } from "./pages";export const selectIncidentsPageSchema = z.array(selectIncidentSchema.extend({diff --git a/packages/db/src/schema/users/index.ts b/packages/db/src/schema/users/index.tsnew file mode 100644index 000000000..7616f9e53--- /dev/null+++ b/packages/db/src/schema/users/index.ts@@ -0,0 +1 @@+export * from "./user";diff --git a/packages/db/src/schema/user.ts b/packages/db/src/schema/users/user.tssimilarity index 97%rename from packages/db/src/schema/user.tsrename to packages/db/src/schema/users/user.tsindex 6aa3c8e48..5b10f39e2 100644--- a/packages/db/src/schema/user.ts+++ b/packages/db/src/schema/users/user.ts@@ -6,7 +6,7 @@ import {text,} from "drizzle-orm/sqlite-core";-import { workspace } from "./workspace";+import { workspace } from "../workspaces";export const user = sqliteTable("user", {id: integer("id").primaryKey(),diff --git a/packages/db/src/schema/workspaces/constants.ts b/packages/db/src/schema/workspaces/constants.tsnew file mode 100644index 000000000..650c6c9b5--- /dev/null+++ b/packages/db/src/schema/workspaces/constants.ts@@ -0,0 +1 @@+export const workspacePlans = ["free", "pro"] as const;diff --git a/packages/db/src/schema/workspaces/index.ts b/packages/db/src/schema/workspaces/index.tsnew file mode 100644index 000000000..4a40d9955--- /dev/null+++ b/packages/db/src/schema/workspaces/index.ts@@ -0,0 +1,4 @@+export * from "./constants";+export * from "./workspace";+export * from "./validation";+export type * from "./validation";diff --git a/packages/db/src/schema/workspaces/validation.ts b/packages/db/src/schema/workspaces/validation.tsnew file mode 100644index 000000000..a102ac8de--- /dev/null+++ b/packages/db/src/schema/workspaces/validation.ts@@ -0,0 +1,20 @@+import { createSelectSchema } from "drizzle-zod";+import { z } from "zod";++import { workspacePlans } from "./constants";+import { workspace } from "./workspace";++export const workspacePlanSchema = z.enum(workspacePlans);++export const selectWorkspaceSchema = createSelectSchema(workspace).extend({+ plan: z+ .enum(workspacePlans)+ .nullable()+ .default("free")+ .transform((val) => val ?? "free"),+});++export const insertWorkspaceSchema = createSelectSchema(workspace);++export type Workspace = z.infer<typeof selectWorkspaceSchema>;+export type WorkspacePlan = z.infer<typeof workspacePlanSchema>;diff --git a/packages/db/src/schema/workspace.ts b/packages/db/src/schema/workspaces/workspace.tssimilarity index 68%rename from packages/db/src/schema/workspace.tsrename to packages/db/src/schema/workspaces/workspace.tsindex 5e9f0f866..31b1e5ca9 100644--- a/packages/db/src/schema/workspace.ts+++ b/packages/db/src/schema/workspaces/workspace.ts@@ -1,12 +1,9 @@import { relations, sql } from "drizzle-orm";import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core";-import { createSelectSchema } from "drizzle-zod";-import { z } from "zod";-import { page } from "./page";-import { usersToWorkspaces } from "./user";--const plan = ["free", "pro"] as const;+import { page } from "../pages";+import { usersToWorkspaces } from "../users";+import { workspacePlans } from "./constants";export const workspace = sqliteTable("workspace", {id: integer("id").primaryKey(),@@ -15,7 +12,7 @@ export const workspace = sqliteTable("workspace", {stripeId: text("stripe_id", { length: 256 }).unique(),subscriptionId: text("subscription_id"),- plan: text("plan", plan),+ plan: text("plan", { enum: workspacePlans }),endsAt: integer("ends_at", { mode: "timestamp" }),paidUntil: integer("paid_until", { mode: "timestamp" }),@@ -31,11 +28,3 @@ export const workspaceRelations = relations(workspace, ({ many }) => ({usersToWorkspaces: many(usersToWorkspaces),pages: many(page),}));--export const selectWorkspaceSchema = createSelectSchema(workspace).extend({- plan: z- .enum(plan)- .nullable()- .default("free")- .transform((val) => val ?? "free"),-});diff --git a/packages/notifications/email/src/index.ts b/packages/notifications/email/src/index.tsindex 06a3a1b51..426c48033 100644--- a/packages/notifications/email/src/index.ts+++ b/packages/notifications/email/src/index.ts@@ -1,9 +1,4 @@-import type { z } from "zod";--import type {- basicMonitorSchema,- selectNotificationSchema,-} from "@openstatus/db/src/schema";+import type { Monitor, Notification } from "@openstatus/db/src/schema";import { env } from "../env";import { EmailConfigurationSchema } from "./schema/config";@@ -12,9 +7,10 @@ export const send = async ({monitor,notification,}: {- monitor: z.infer<typeof basicMonitorSchema>;- notification: z.infer<typeof selectNotificationSchema>;+ monitor: Monitor;+ notification: Notification;}) => {+ // FIXME:const config = EmailConfigurationSchema.parse(JSON.parse(notification.data));const { email } = config;diff --git a/packages/plans/index.ts b/packages/plans/index.tsindex 91432d530..c70800cba 100644--- a/packages/plans/index.ts+++ b/packages/plans/index.ts@@ -1,12 +1,10 @@-import type * as z from "zod";--import type { periodicityEnum } from "@openstatus/db/src/schema";+import type { MonitorPeriodicity } from "@openstatus/db/src/schema";export type Plan = {limits: {monitors: number;"status-pages": number;- periodicity: Partial<z.infer<typeof periodicityEnum>>[];+ periodicity: Partial<MonitorPeriodicity>[];};};