Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
feat: advanced monitor form (#210)
Maximilian Kaske7d0a5b0cc335
diff --git a/apps/web/.env.example b/apps/web/.env.exampleindex 166463b34..cf93119b9 100644--- a/apps/web/.env.example+++ b/apps/web/.env.example@@ -29,7 +29,7 @@ DATABASE_AUTH_TOKEN=any-token# JITSU - no need to touch on local developmentJITSU_HOST="https://your-jitsu-domain.com"-JITSU_WRITE_KEY="your-jitsu-write-key"+JITSU_WRITE_KEY="jitsu-key:jitsu-secret"# Solves 'UNABLE_TO_GET_ISSUER_CERT_LOCALLY', see https://github.com/nextauthjs/next-auth/issues/3580# NODE_TLS_REJECT_UNAUTHORIZED="0"diff --git a/apps/web/src/app/api/checker/cron/10m/route.ts b/apps/web/src/app/api/checker/cron/10m/route.tsindex 4130ea557..c1be6702e 100644--- a/apps/web/src/app/api/checker/cron/10m/route.ts+++ b/apps/web/src/app/api/checker/cron/10m/route.ts@@ -8,7 +8,7 @@ export const dynamic = "force-dynamic";export async function GET(req: Request) {if (isAuthorizedDomain(req.url)) {- await cron({ periodicity: "10m" });+ await cron({ periodicity: "10m", req });}return NextResponse.json({ success: true });}diff --git a/apps/web/src/app/api/checker/cron/1h/route.ts b/apps/web/src/app/api/checker/cron/1h/route.tsindex 47c67e649..d27445d8c 100644--- a/apps/web/src/app/api/checker/cron/1h/route.ts+++ b/apps/web/src/app/api/checker/cron/1h/route.ts@@ -8,7 +8,7 @@ export const dynamic = "force-dynamic";export async function GET(req: Request) {if (isAuthorizedDomain(req.url)) {- await cron({ periodicity: "1h" });+ await cron({ periodicity: "1h", req });}return NextResponse.json({ success: true });}diff --git a/apps/web/src/app/api/checker/cron/1m/route.ts b/apps/web/src/app/api/checker/cron/1m/route.tsindex 8e7accacd..1dfa7d735 100644--- a/apps/web/src/app/api/checker/cron/1m/route.ts+++ b/apps/web/src/app/api/checker/cron/1m/route.ts@@ -8,7 +8,7 @@ export const dynamic = "force-dynamic";export async function GET(req: Request) {if (isAuthorizedDomain(req.url)) {- await cron({ periodicity: "1m" });+ await cron({ periodicity: "1m", req });}return NextResponse.json({ success: true });}diff --git a/apps/web/src/app/api/checker/cron/30m/route.ts b/apps/web/src/app/api/checker/cron/30m/route.tsindex 2607befab..731107b75 100644--- a/apps/web/src/app/api/checker/cron/30m/route.ts+++ b/apps/web/src/app/api/checker/cron/30m/route.ts@@ -8,7 +8,7 @@ export const dynamic = "force-dynamic";export async function GET(req: Request) {if (isAuthorizedDomain(req.url)) {- await cron({ periodicity: "30m" });+ await cron({ periodicity: "30m", req });}return NextResponse.json({ success: true });}diff --git a/apps/web/src/app/api/checker/cron/5m/route.ts b/apps/web/src/app/api/checker/cron/5m/route.tsindex f717ab2e4..72762dc50 100644--- a/apps/web/src/app/api/checker/cron/5m/route.ts+++ b/apps/web/src/app/api/checker/cron/5m/route.ts@@ -8,7 +8,7 @@ export const dynamic = "force-dynamic";export async function GET(req: Request) {if (isAuthorizedDomain(req.url)) {- await cron({ periodicity: "5m" });+ await cron({ periodicity: "5m", req });}return NextResponse.json({ success: true });}diff --git a/apps/web/src/app/api/checker/cron/_cron.ts b/apps/web/src/app/api/checker/cron/_cron.tsindex a0f169d6b..db4f313ef 100644--- a/apps/web/src/app/api/checker/cron/_cron.ts+++ b/apps/web/src/app/api/checker/cron/_cron.ts@@ -1,12 +1,10 @@+import type { SignedInAuthObject } from "@clerk/nextjs/api";import { Client } from "@upstash/qstash/cloudflare";-import { z } from "zod";+import type { z } from "zod";-import { and, db, eq } from "@openstatus/db";-import {- monitor,- monitorsToPages,- selectMonitorSchema,-} from "@openstatus/db/src/schema";+import { createTRPCContext } from "@openstatus/api";+import { edgeRouter } from "@openstatus/api/src/edge";+import { selectMonitorSchema } from "@openstatus/db/src/schema";import { availableRegions } from "@openstatus/tinybird";import { env } from "@/env";@@ -15,7 +13,6 @@ import type { payloadSchema } from "../schema";const periodicityAvailable = selectMonitorSchema.pick({ periodicity: true });// FIXME: do coerce in zod instead-const currentRegions = z.string().transform((val) => val.split(","));const DEFAULT_URL = process.env.VERCEL_URL? `https://${process.env.VERCEL_URL}`@@ -28,34 +25,37 @@ export const isAuthorizedDomain = (url: string) => {export const cron = async ({periodicity,-}: z.infer<typeof periodicityAvailable>) => {+ req,+}: z.infer<typeof periodicityAvailable> & { req: Request }) => {const c = new Client({token: env.QSTASH_TOKEN,});- console.info(`Start cron for ${periodicity}`);+ console.log(`Start cron for ${periodicity}`);const timestamp = Date.now();- // FIXME: Wait until db is ready- const result = await db- .select()- .from(monitor)- .where(and(eq(monitor.periodicity, periodicity), eq(monitor.active, true)))- .all();++ const ctx = createTRPCContext({ req, serverSideCall: true });+ ctx.auth = { userId: "cron" } as SignedInAuthObject;+ const caller = edgeRouter.createCaller(ctx);++ const monitors = await caller.monitor.getMonitorsForPeriodicity({+ periodicity: periodicity,+ });const allResult = [];- for (const row of result) {- // could be improved with a single query- const allPages = await db- .select()- .from(monitorsToPages)- .where(eq(monitorsToPages.monitorId, row.id))- .all();+ for (const row of monitors) {+ const allPages = await caller.monitor.getAllPagesForMonitor({+ monitorId: row.id,+ });if (row.regions.length === 0) {const payload: z.infer<typeof payloadSchema> = {workspaceId: String(row.workspaceId),+ method: row.method || "GET",monitorId: String(row.id),url: row.url,+ headers: row.headers,+ body: row.body,cronTimestamp: timestamp,pageIds: allPages.map((p) => String(p.pageId)),};@@ -68,13 +68,16 @@ export const cron = async ({});allResult.push(result);} else {- const allMonitorsRegions = currentRegions.parse(row.regions);+ const allMonitorsRegions = row.regions;for (const region of allMonitorsRegions) {const payload: z.infer<typeof payloadSchema> = {workspaceId: String(row.workspaceId),monitorId: String(row.id),url: row.url,+ method: row.method || "GET",cronTimestamp: timestamp,+ body: row.body,+ headers: row.headers,pageIds: allPages.map((p) => String(p.pageId)),};@@ -95,6 +98,7 @@ export const cron = async ({monitorId: "openstatusPing",url: `${DEFAULT_URL}/api/ping`,cronTimestamp: timestamp,+ method: "GET",pageIds: ["openstatus"],};@@ -108,5 +112,5 @@ export const cron = async ({}}await Promise.all(allResult);- console.info(`End cron for ${periodicity} with ${allResult.length} jobs`);+ console.log(`End cron for ${periodicity} with ${allResult.length} jobs`);};diff --git a/apps/web/src/app/api/checker/regions/_checker.ts b/apps/web/src/app/api/checker/regions/_checker.tsindex c7938e9d6..6a9b9f735 100644--- a/apps/web/src/app/api/checker/regions/_checker.ts+++ b/apps/web/src/app/api/checker/regions/_checker.ts@@ -74,12 +74,22 @@ export const checker = async (request: Request, region: string) => {const result = payloadSchema.safeParse(jsonData);if (!result.success) {+ console.error(result.error);throw new Error("Invalid response body");}+ const headers =+ result.data?.headers?.reduce((o, v) => ({ ...o, [v.key]: v.value }), {}) ||+ {};+try {const startTime = Date.now();- const res = await fetch(result.data.url, { cache: "no-store" });+ const res = await fetch(result.data?.url, {+ method: result.data?.method,+ cache: "no-store",+ headers: { ...headers },+ body: result.data?.body,+ });const endTime = Date.now();const latency = endTime - startTime;diff --git a/apps/web/src/app/api/checker/schema.ts b/apps/web/src/app/api/checker/schema.tsindex 08ba18a7d..e568f9ede 100644--- a/apps/web/src/app/api/checker/schema.ts+++ b/apps/web/src/app/api/checker/schema.ts@@ -1,8 +1,13 @@import { z } from "zod";+import { METHODS } from "@openstatus/db/src/schema";+export const payloadSchema = z.object({workspaceId: z.string(),monitorId: z.string(),+ method: z.enum(METHODS),+ 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()),diff --git a/apps/web/src/app/api/ping/route.ts b/apps/web/src/app/api/ping/route.tsindex 8e217ad76..0bd5d4d60 100644--- a/apps/web/src/app/api/ping/route.ts+++ b/apps/web/src/app/api/ping/route.ts@@ -5,3 +5,8 @@ export const dynamic = "force-dynamic";export async function GET() {return NextResponse.json({ ping: "pong" }, { status: 200 });}++export async function POST(req: Request) {+ const body = await req.json();+ return NextResponse.json({ ping: body }, { status: 200 });+}diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/edit/page.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/edit/page.tsxindex 6c225e66d..6b6a75c6f 100644--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/edit/page.tsx+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/edit/page.tsx@@ -2,7 +2,9 @@ import { notFound } from "next/navigation";import * as z from "zod";import { Header } from "@/components/dashboard/header";+import { AdvancedMonitorForm } from "@/components/forms/advanced-monitor-form";import { MonitorForm } from "@/components/forms/montitor-form";+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";import { api } from "@/trpc/server";/**@@ -28,7 +30,6 @@ export default async function EditPage({const { id } = search.data;const monitor = id && (await api.monitor.getMonitorByID.query({ id }));-const workspace = await api.workspace.getWorkspace.query({slug: params.workspaceSlug,});@@ -37,11 +38,36 @@ export default async function EditPage({<div className="grid gap-6 md:grid-cols-2 md:gap-8"><Header title="Monitor" description="Upsert your monitor." /><div className="col-span-full">- <MonitorForm- workspaceSlug={params.workspaceSlug}- defaultValues={monitor || undefined}- plan={workspace?.plan}- />+ <Tabs defaultValue="settings" className="relative mr-auto w-full">+ <TabsList className="h-9 w-full justify-start rounded-none border-b bg-transparent p-0">+ <TabsTrigger+ className="text-muted-foreground data-[state=active]:border-b-primary data-[state=active]:text-foreground relative h-9 rounded-none border-b-2 border-b-transparent bg-transparent px-4 pb-3 pt-2 font-semibold shadow-none transition-none data-[state=active]:shadow-none"+ value="settings"+ >+ Settings+ </TabsTrigger>+ <TabsTrigger+ className="text-muted-foreground data-[state=active]:border-b-primary data-[state=active]:text-foreground relative h-9 rounded-none border-b-2 border-b-transparent bg-transparent px-4 pb-3 pt-2 font-semibold shadow-none transition-none data-[state=active]:shadow-none"+ value="advanced"+ disabled={!monitor}+ >+ Advanced+ </TabsTrigger>+ </TabsList>+ <TabsContent value="settings" className="pt-3">+ <MonitorForm+ workspaceSlug={params.workspaceSlug}+ defaultValues={monitor || undefined}+ plan={workspace?.plan}+ />+ </TabsContent>+ <TabsContent value="advanced" className="pt-3">+ <AdvancedMonitorForm+ workspaceSlug={params.workspaceSlug}+ defaultValues={monitor || undefined}+ />+ </TabsContent>+ </Tabs></div></div>);diff --git a/apps/web/src/components/forms/advanced-monitor-form.tsx b/apps/web/src/components/forms/advanced-monitor-form.tsxnew file mode 100644index 000000000..dc29c16e2--- /dev/null+++ b/apps/web/src/components/forms/advanced-monitor-form.tsx@@ -0,0 +1,251 @@+"use client";++import * as React from "react";+import { useRouter, useSearchParams } from "next/navigation";+import { zodResolver } from "@hookform/resolvers/zod";+import { Wand2, X } from "lucide-react";+import { useFieldArray, useForm } from "react-hook-form";+import * as z from "zod";++import { Button } from "@/components/ui/button";+import {+ Form,+ FormControl,+ FormDescription,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+} from "@/components/ui/form";+import { Input } from "@/components/ui/input";+import {+ Select,+ SelectContent,+ SelectItem,+ SelectTrigger,+ SelectValue,+} from "@/components/ui/select";+import { Textarea } from "@/components/ui/textarea";+import {+ Tooltip,+ TooltipContent,+ TooltipProvider,+ TooltipTrigger,+} from "@/components/ui/tooltip";+import { api } from "@/trpc/client";+import { LoadingAnimation } from "../loading-animation";++/**+ * GET requests don't need a body, we could think of using a z.discriminatedUnion?+ * https://github.com/colinhacks/zod#discriminated-unions+ */++const methods = ["POST", "GET"] as const;+const methodsEnum = z.enum(methods);++const advancedSchema = z.object({+ headers: z.array(z.object({ key: z.string(), value: z.string() })).optional(),+ body: z.string().optional(),+ method: methodsEnum.default("GET"),+}); // insertMonitorSchema.pick()++type AdvancedMonitorProps = z.infer<typeof advancedSchema>;++interface Props {+ defaultValues?: AdvancedMonitorProps;+ workspaceSlug: string;+}++export function AdvancedMonitorForm({ defaultValues, workspaceSlug }: Props) {+ const form = useForm<AdvancedMonitorProps>({+ resolver: zodResolver(advancedSchema),+ defaultValues: {+ headers: defaultValues?.headers ?? [{ key: "", value: "" }],+ body: defaultValues?.body ?? "",+ method: defaultValues?.method ?? "GET",+ },+ });+ const router = useRouter();+ const searchParams = useSearchParams();+ const monitorId = searchParams.get("id");+ console.log(defaultValues);+ const [isPending, startTransition] = React.useTransition();++ const { fields, append, remove } = useFieldArray({+ name: "headers",+ control: form.control,+ });++ const onSubmit = ({ ...props }: AdvancedMonitorProps) => {+ startTransition(async () => {+ console.log(props);+ if (!monitorId) return;+ if (validateJSON(props.body) === false) return;+ await api.monitor.updateMonitorAdvanced.mutate({+ id: Number(monitorId),+ ...props,+ });+ router.refresh();+ // router.push("./"); // TODO: we need a better UX flow here.+ });+ };++ const validateJSON = (value?: string) => {+ if (!value) return;+ try {+ const obj = JSON.parse(value) as Record<string, unknown>;+ form.clearErrors("body");+ return obj;+ } catch (e) {+ form.setError("body", {+ message: "Not a valid JSON object",+ });+ return false;+ }+ };++ const onPrettifyJSON = () => {+ const body = form.getValues("body");+ const obj = validateJSON(body);+ if (obj) {+ const pretty = JSON.stringify(obj, undefined, 4);+ form.setValue("body", pretty);+ }+ };++ console.log(form.formState.errors);++ return (+ <Form {...form}>+ <form+ onSubmit={form.handleSubmit(onSubmit)}+ className="grid w-full grid-cols-1 items-center gap-6 sm:grid-cols-6"+ >+ <div className="space-y-2 sm:col-span-full">+ <FormLabel>Request Header</FormLabel>+ {/* TODO: add FormDescription for latest key/value */}+ {fields.map((field, index) => (+ <div key={field.id} className="grid grid-cols-6 gap-6">+ <FormField+ control={form.control}+ name={`headers.${index}.key`}+ render={({ field }) => (+ <FormItem className="col-span-2">+ <FormControl>+ <Input placeholder="key" {...field} />+ </FormControl>+ </FormItem>+ )}+ />+ <div className="col-span-4 flex items-center space-x-2">+ <FormField+ control={form.control}+ name={`headers.${index}.value`}+ render={({ field }) => (+ <FormItem className="w-full">+ <FormControl>+ <Input placeholder="value" {...field} />+ </FormControl>+ </FormItem>+ )}+ />+ <Button+ size="icon"+ variant="ghost"+ type="button"+ onClick={() => remove(Number(field.id))}+ >+ <X className="h-4 w-4" />+ </Button>+ </div>+ </div>+ ))}+ <div>+ <Button+ type="button"+ variant="outline"+ size="sm"+ onClick={() => append({ key: "", value: "" })}+ >+ Add Custom Header+ </Button>+ </div>+ </div>+ <FormField+ control={form.control}+ name="method"+ render={({ field }) => (+ <FormItem className="sm:col-span-2 sm:col-start-1 sm:self-baseline">+ <FormLabel>Method</FormLabel>+ <Select+ onValueChange={(value) =>+ field.onChange(methodsEnum.parse(value))+ }+ defaultValue={field.value}+ >+ <FormControl>+ <SelectTrigger>+ <SelectValue placeholder="Select" />+ </SelectTrigger>+ </FormControl>+ <SelectContent>+ {methods.map((method) => (+ <SelectItem key={method} value={method}>+ {method}+ </SelectItem>+ ))}+ </SelectContent>+ </Select>+ <FormDescription>What method to use?</FormDescription>+ <FormMessage />+ </FormItem>+ )}+ />+ <div className="sm:col-span-4 sm:col-start-1">+ <FormField+ control={form.control}+ name="body"+ render={({ field }) => (+ <FormItem>+ <div className="flex items-end justify-between">+ <FormLabel>Body</FormLabel>+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <Button+ type="button"+ variant="ghost"+ size="icon"+ onClick={onPrettifyJSON}+ >+ <Wand2 className="h-4 w-4" />+ </Button>+ </TooltipTrigger>+ <TooltipContent>+ <p>Prettify JSON</p>+ </TooltipContent>+ </Tooltip>+ </TooltipProvider>+ </div>+ <FormControl>+ <Textarea+ rows={8}+ placeholder='{ "hello": "world" }'+ {...field}+ />+ </FormControl>+ <FormDescription>Write your json payload.</FormDescription>+ <FormMessage />+ </FormItem>+ )}+ />+ </div>+ <div className="sm:col-span-full">+ <Button className="w-full sm:w-auto">+ {!isPending ? "Confirm" : <LoadingAnimation />}+ </Button>+ </div>+ </form>+ </Form>+ );+}diff --git a/apps/web/src/components/forms/incident-form.tsx b/apps/web/src/components/forms/incident-form.tsxindex 49e89c215..31179f41f 100644--- a/apps/web/src/components/forms/incident-form.tsx+++ b/apps/web/src/components/forms/incident-form.tsx@@ -6,7 +6,7 @@ import { zodResolver } from "@hookform/resolvers/zod";import { useForm } from "react-hook-form";import * as z from "zod";-import type { allMonitorsSchema } from "@openstatus/db/src/schema";+import type { allMonitorsExtendedSchema } from "@openstatus/db/src/schema";import {availableStatus,insertIncidentSchema,@@ -43,7 +43,7 @@ const insertSchema = insertIncidentSchema.extend({});type IncidentProps = z.infer<typeof insertSchema>;-type MonitorsProps = z.infer<typeof allMonitorsSchema>;+type MonitorsProps = z.infer<typeof allMonitorsExtendedSchema>;interface Props {defaultValues?: IncidentProps;diff --git a/apps/web/src/components/forms/status-page-form.tsx b/apps/web/src/components/forms/status-page-form.tsxindex 6df3a948e..9d9ebd271 100644--- a/apps/web/src/components/forms/status-page-form.tsx+++ b/apps/web/src/components/forms/status-page-form.tsx@@ -9,7 +9,7 @@ import type { PutBlobResult } from "@vercel/blob";import { useForm } from "react-hook-form";import type * as z from "zod";-import type { allMonitorsSchema } from "@openstatus/db/src/schema";+import type { allMonitorsExtendedSchema } from "@openstatus/db/src/schema";import { insertPageSchemaWithMonitors } from "@openstatus/db/src/schema";import { Button } from "@/components/ui/button";@@ -37,7 +37,7 @@ type Schema = z.infer<typeof insertPageSchemaWithMonitors>;interface Props {defaultValues?: Schema;workspaceSlug: string;- allMonitors?: z.infer<typeof allMonitorsSchema>;+ allMonitors?: z.infer<typeof allMonitorsExtendedSchema>;}export function StatusPageForm({diff --git a/packages/analytics/.env.example b/packages/analytics/.env.exampleindex 1ca4f0d4e..c7ccae640 100644--- a/packages/analytics/.env.example+++ b/packages/analytics/.env.example@@ -1,2 +1,2 @@JITSU_HOST="https://your-jitsu-domain.com"-JITSU_WRITE_KEY="your-jitsu-write-key"+JITSU_WRITE_KEY="jitsu-key:jitsu-secret"diff --git a/packages/api/src/router/monitor.ts b/packages/api/src/router/monitor.tsindex 9df6b911d..b7e6f986c 100644--- a/packages/api/src/router/monitor.ts+++ b/packages/api/src/router/monitor.ts@@ -2,20 +2,22 @@ import { TRPCError } from "@trpc/server";import { z } from "zod";import { analytics, trackAnalytics } from "@openstatus/analytics";-import { eq } from "@openstatus/db";+import { and, eq } from "@openstatus/db";import {+ allMonitorsExtendedSchema,allMonitorsSchema,insertMonitorSchema,+ METHODS,monitor,+ monitorsToPages,+ periodicityEnum,+ selectMonitorExtendedSchema,selectMonitorSchema,- user,- usersToWorkspaces,- workspace,} from "@openstatus/db/src/schema";import { allPlans } from "@openstatus/plans";import { createTRPCRouter, protectedProcedure } from "../trpc";-import { hasUserAccessToWorkspace } from "./utils";+import { hasUserAccessToMonitor, hasUserAccessToWorkspace } from "./utils";export const monitorRouter = createTRPCRouter({createMonitor: protectedProcedure@@ -55,7 +57,8 @@ export const monitorRouter = createTRPCRouter({message: "You reached your cron job limits.",});}- const { regions, ...data } = opts.input.data;+ // FIXME: this is a hotfix+ const { regions, headers, ...data } = opts.input.data;const newMonitor = await opts.ctx.db.insert(monitor)@@ -79,27 +82,17 @@ export const monitorRouter = createTRPCRouter({getMonitorByID: protectedProcedure.input(z.object({ id: z.number() }))+ // .output(selectMonitorSchema).query(async (opts) => {- const currentMonitor = await opts.ctx.db.query.monitor.findFirst({- where: eq(monitor.id, opts.input.id),+ if (!opts.input.id) return;+ const result = await hasUserAccessToMonitor({+ monitorId: opts.input.id,+ ctx: opts.ctx,});+ if (!result) return;- if (!currentMonitor || !currentMonitor.workspaceId) return;- // We make sure user as access to this workspace- const currentUser = opts.ctx.db- .select()- .from(user)- .where(eq(user.tenantId, opts.ctx.auth.userId))- .as("currentUser");- const result = await opts.ctx.db- .select()- .from(usersToWorkspaces)- .where(eq(usersToWorkspaces.workspaceId, currentMonitor.workspaceId))- .innerJoin(currentUser, eq(usersToWorkspaces.userId, currentUser.id))- .get();-- if (!result || !result.users_to_workspaces) return;- const _monitor = selectMonitorSchema.parse(currentMonitor);+ const _monitor = selectMonitorExtendedSchema.parse(result.monitor);+ _monitor.headers;return _monitor;}),@@ -113,27 +106,12 @@ export const monitorRouter = createTRPCRouter({).mutation(async (opts) => {// We make sure user as access to this workspace and the monitor- const currentMonitor = await opts.ctx.db- .select()- .from(monitor)- .where(eq(monitor.id, opts.input.id))- .get();-- if (!currentMonitor || !currentMonitor.workspaceId) return;-- const currentUser = opts.ctx.db- .select()- .from(user)- .where(eq(user.tenantId, opts.ctx.auth.userId))- .as("currentUser");- const result = await opts.ctx.db- .select()- .from(usersToWorkspaces)- .where(eq(usersToWorkspaces.workspaceId, currentMonitor.workspaceId))- .innerJoin(currentUser, eq(usersToWorkspaces.userId, currentUser.id))- .get();-- if (!result || !result.users_to_workspaces) return;+ if (!opts.input.id) return;+ const result = await hasUserAccessToMonitor({+ monitorId: opts.input.id,+ ctx: opts.ctx,+ });+ if (!result) return;await opts.ctx.db.update(monitor)@@ -145,36 +123,13 @@ export const monitorRouter = createTRPCRouter({.input(insertMonitorSchema).mutation(async (opts) => {if (!opts.input.id) return;- const currentMonitor = await opts.ctx.db- .select()- .from(monitor)- .where(eq(monitor.id, opts.input.id))- .get();- if (!currentMonitor || !currentMonitor.workspaceId) return;-- // TODO: we should use hasUserAccess and pass `workspaceId` instead of `workspaceSlug`- const currentUser = opts.ctx.db- .select()- .from(user)- .where(eq(user.tenantId, opts.ctx.auth.userId))- .as("currentUser");-- const result = await opts.ctx.db- .select()- .from(usersToWorkspaces)- .where(eq(usersToWorkspaces.workspaceId, currentMonitor.workspaceId))- .innerJoin(currentUser, eq(usersToWorkspaces.userId, currentUser.id))- .get();-- if (!result || !result.users_to_workspaces) return;-- const currentWorkspace = await opts.ctx.db.query.workspace.findFirst({- where: eq(workspace.id, result.users_to_workspaces.workspaceId),+ const result = await hasUserAccessToMonitor({+ monitorId: opts.input.id,+ ctx: opts.ctx,});+ if (!result) return;- if (!currentWorkspace) return;-- const plan = (currentWorkspace?.plan || "free") as "free" | "pro";+ const plan = (result.workspace?.plan || "free") as "free" | "pro";const periodicityLimit = allPlans[plan].limits.periodicity;@@ -188,8 +143,7 @@ export const monitorRouter = createTRPCRouter({message: "You reached your cron job limits.",});}- console.log(opts.input.regions?.join(","));- const { regions, ...data } = opts.input;+ const { regions, headers, ...data } = opts.input;await opts.ctx.db.update(monitor).set({ ...data, regions: regions?.join(","), updatedAt: new Date() })@@ -206,26 +160,11 @@ export const monitorRouter = createTRPCRouter({}),).mutation(async (opts) => {- const currentMonitor = await opts.ctx.db- .select()- .from(monitor)- .where(eq(monitor.id, opts.input.id))- .get();- if (!currentMonitor || !currentMonitor.workspaceId) return;-- const currentUser = opts.ctx.db- .select()- .from(user)- .where(eq(user.tenantId, opts.ctx.auth.userId))- .as("currentUser");- const result = await opts.ctx.db- .select()- .from(usersToWorkspaces)- .where(eq(usersToWorkspaces.workspaceId, currentMonitor.workspaceId))- .innerJoin(currentUser, eq(usersToWorkspaces.userId, currentUser.id))- .get();-- if (!result?.users_to_workspaces) return;+ const result = await hasUserAccessToMonitor({+ monitorId: opts.input.id,+ ctx: opts.ctx,+ });+ if (!result) return;await opts.ctx.db.update(monitor)@@ -240,30 +179,14 @@ export const monitorRouter = createTRPCRouter({deleteMonitor: protectedProcedure.input(z.object({ id: z.number() })).mutation(async (opts) => {- const currentMonitor = await opts.ctx.db- .select()- .from(monitor)- .where(eq(monitor.id, opts.input.id))- .get();- if (!currentMonitor || !currentMonitor.workspaceId) return;-- const currentUser = opts.ctx.db- .select()- .from(user)- .where(eq(user.tenantId, opts.ctx.auth.userId))- .as("currentUser");- const result = await opts.ctx.db- .select()- .from(usersToWorkspaces)- .where(eq(usersToWorkspaces.workspaceId, currentMonitor.workspaceId))- .innerJoin(currentUser, eq(usersToWorkspaces.userId, currentUser.id))- .get();-- if (!result || !result.users_to_workspaces) return;-+ const result = await hasUserAccessToMonitor({+ monitorId: opts.input.id,+ ctx: opts.ctx,+ });+ if (!result) return;await opts.ctx.db.delete(monitor)- .where(eq(monitor.id, currentMonitor.id))+ .where(eq(monitor.id, result.monitor.id)).run();}),getMonitorsByWorkspace: protectedProcedure@@ -283,6 +206,68 @@ export const monitorRouter = createTRPCRouter({.all();// const selectMonitorsArray = selectMonitorSchema.array();- return allMonitorsSchema.parse(monitors);+ try {+ return allMonitorsExtendedSchema.parse(monitors);+ } catch (e) {+ console.log(e);+ }+ return;+ }),++ updateMonitorAdvanced: protectedProcedure+ .input(+ z.object({+ id: z.number(),+ method: z.enum(METHODS).default("GET"),+ body: z.string().default("").optional(),+ headers: z+ .array(z.object({ key: z.string(), value: z.string() }))+ .transform((val) => JSON.stringify(val))+ .default([])+ .optional(),+ }),+ )+ .mutation(async (opts) => {+ const result = await hasUserAccessToMonitor({+ monitorId: opts.input.id,+ ctx: opts.ctx,+ });+ if (!result) return;+ await opts.ctx.db+ .update(monitor)+ .set({+ method: opts.input.method,+ body: opts.input.body,+ headers: opts.input.headers,+ })+ .where(eq(monitor.id, opts.input.id))+ .run();+ }),++ getMonitorsForPeriodicity: protectedProcedure+ .input(z.object({ periodicity: periodicityEnum }))+ .query(async (opts) => {+ const result = await opts.ctx.db+ .select()+ .from(monitor)+ .where(+ and(+ eq(monitor.periodicity, opts.input.periodicity),+ eq(monitor.active, true),+ ),+ )+ .all();+ return allMonitorsExtendedSchema.parse(result);+ }),++ getAllPagesForMonitor: protectedProcedure+ .input(z.object({ monitorId: z.number() }))+ .query(async (opts) => {+ const allPages = await opts.ctx.db+ .select()+ .from(monitorsToPages)+ .where(eq(monitorsToPages.monitorId, opts.input.monitorId))+ .all();+ return allPages;}),});diff --git a/packages/api/src/router/utils.ts b/packages/api/src/router/utils.tsindex 9421aec7c..67f7d1e26 100644--- a/packages/api/src/router/utils.ts+++ b/packages/api/src/router/utils.ts@@ -1,5 +1,10 @@import { eq } from "@openstatus/db";-import { user, usersToWorkspaces, workspace } from "@openstatus/db/src/schema";+import {+ monitor,+ user,+ usersToWorkspaces,+ workspace,+} from "@openstatus/db/src/schema";import { allPlans } from "@openstatus/plans";import { Context } from "../trpc";@@ -48,3 +53,47 @@ export const hasUserAccessToWorkspace = async ({plan: allPlans[plan],};};++export const hasUserAccessToMonitor = async ({+ monitorId,+ ctx,+}: {+ monitorId: number;+ ctx: Context;+}) => {+ if (!ctx.auth?.userId) return;++ const currentMonitor = await ctx.db+ .select()+ .from(monitor)+ .where(eq(monitor.id, monitorId))+ .get();+ if (!currentMonitor || !currentMonitor.workspaceId) return;++ // TODO: we should use hasUserAccess and pass `workspaceId` instead of `workspaceSlug`+ const currentUser = ctx.db+ .select()+ .from(user)+ .where(eq(user.tenantId, ctx.auth.userId))+ .as("currentUser");++ const result = await ctx.db+ .select()+ .from(usersToWorkspaces)+ .where(eq(usersToWorkspaces.workspaceId, currentMonitor.workspaceId))+ .innerJoin(currentUser, eq(usersToWorkspaces.userId, currentUser.id))+ .get();++ if (!result || !result.users_to_workspaces) return;++ const currentWorkspace = await ctx.db.query.workspace.findFirst({+ where: eq(workspace.id, result.users_to_workspaces.workspaceId),+ });++ if (!currentWorkspace) return;+ return {+ workspace: currentWorkspace,+ user: result.currentUser,+ monitor: currentMonitor,+ };+};diff --git a/packages/api/src/trpc.ts b/packages/api/src/trpc.tsindex 5c83aea58..33818e903 100644--- a/packages/api/src/trpc.ts+++ b/packages/api/src/trpc.ts@@ -46,8 +46,11 @@ export const createInnerTRPCContext = (opts: CreateContextOptions) => {* process every request that goes through your tRPC endpoint* @link https://trpc.io/docs/context*/-export const createTRPCContext = (opts: { req: NextRequest }) => {- const auth = getAuth(opts.req);+export const createTRPCContext = (opts: {+ req: NextRequest;+ serverSideCall?: boolean;+}) => {+ const auth = !opts.serverSideCall ? getAuth(opts.req) : null;return createInnerTRPCContext({auth,diff --git a/packages/db/drizzle/0006_tired_anita_blake.sql b/packages/db/drizzle/0006_tired_anita_blake.sqlnew file mode 100644index 000000000..3bb7eebda--- /dev/null+++ b/packages/db/drizzle/0006_tired_anita_blake.sql@@ -0,0 +1,60 @@+/*+ SQLite does not support "Changing existing column type" out of the box, we do not generate automatic migration for that, so it has to be done manually+ Please refer to: https://www.techonthenet.com/sqlite/tables/alter_table.php+ https://www.sqlite.org/lang_altertable.html+ https://stackoverflow.com/questions/2083543/modify-a-columns-type-in-sqlite3++ Due to that we don't generate migration automatically and it has to be done manually++*/+PRAGMA foreign_keys=OFF;+--> statement-breakpoint++CREATE TABLE `monitor_new` (+ `id` integer PRIMARY KEY NOT NULL,+ `job_type` text(3) DEFAULT 'other' NOT NULL,+ `periodicity` text(6) DEFAULT 'other' NOT NULL,+ `status` text(2) DEFAULT 'inactive' NOT NULL,+ `active` integer DEFAULT false,+ `url` text(512) NOT NULL,+ `name` text(256) DEFAULT '' NOT NULL,+ `description` text DEFAULT '' NOT NULL,+ `workspace_id` integer,+ `headers` text DEFAULT '',+ `body` text DEFAULT '',+ `method` text(5) DEFAULT 'GET',+ `created_at` integer DEFAULT (strftime('%s', 'now')), `regions` text DEFAULT '' NOT NULL, `updated_at` integer,+ FOREIGN KEY (`workspace_id`) REFERENCES `workspace`(`id`) ON UPDATE no action ON DELETE no action+);+--> statement-breakpoint+INSERT INTO monitor_new(`id`,`job_type`,`periodicity`,`status`,`active`,`url`,`name`,`description`,`workspace_id`,`created_at`,`regions`,`updated_at`) SELECT * FROM monitor;+--> statement-breakpoint++CREATE TABLE `monitors_to_pages_new` (+ `monitor_id` integer NOT NULL,+ `page_id` integer NOT NULL,+ PRIMARY KEY(`monitor_id`, `page_id`)+);+--> statement-breakpoint+INSERT INTO monitors_to_pages_new(`monitor_id`,`page_id`) SELECT * FROM monitors_to_pages;+--> statement-breakpoint++CREATE TABLE `incidents_to_monitors_new` (+ `monitor_id` integer NOT NULL,+ `incident_id` integer NOT NULL,+ PRIMARY KEY(`incident_id`, `monitor_id`)+);+--> statement-breakpoint+INSERT INTO incidents_to_monitors_new(`monitor_id`,`incident_id`) SELECT * FROM incidents_to_monitors;+--> statement-breakpoint+DROP TABLE monitor;+--> statement-breakpoint+ALTER TABLE monitor_new RENAME TO monitor;+--> statement-breakpoint+INSERT INTO monitors_to_pages(`monitor_id`,`page_id`) SELECT * FROM monitors_to_pages_new;+--> statement-breakpoint+INSERT INTO incidents_to_monitors(`monitor_id`,`incident_id`) SELECT * FROM incidents_to_monitors_new;+--> statement-breakpoint+DROP TABLE monitors_to_pages_new;+--> statement-breakpoint+DROP TABLE incidents_to_monitors_new;diff --git a/packages/db/drizzle/meta/0006_snapshot.json b/packages/db/drizzle/meta/0006_snapshot.jsonnew file mode 100644index 000000000..53519fa69--- /dev/null+++ b/packages/db/drizzle/meta/0006_snapshot.json@@ -0,0 +1,746 @@+{+ "version": "5",+ "dialect": "sqlite",+ "id": "fee77e21-b52b-49c0-b109-5ccc37821935",+ "prevId": "84447f0c-af79-4add-93d7-eb6868983258",+ "tables": {+ "incident": {+ "name": "incident",+ "columns": {+ "id": {+ "name": "id",+ "type": "integer",+ "primaryKey": true,+ "notNull": true,+ "autoincrement": false+ },+ "status": {+ "name": "status",+ "type": "text(4)",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "title": {+ "name": "title",+ "type": "text(256)",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "workspace_id": {+ "name": "workspace_id",+ "type": "integer",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "created_at": {+ "name": "created_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false,+ "default": "(strftime('%s', 'now'))"+ },+ "updated_at": {+ "name": "updated_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false,+ "default": "(strftime('%s', 'now'))"+ }+ },+ "indexes": {},+ "foreignKeys": {+ "incident_workspace_id_workspace_id_fk": {+ "name": "incident_workspace_id_workspace_id_fk",+ "tableFrom": "incident",+ "tableTo": "workspace",+ "columnsFrom": [+ "workspace_id"+ ],+ "columnsTo": [+ "id"+ ],+ "onDelete": "no action",+ "onUpdate": "no action"+ }+ },+ "compositePrimaryKeys": {},+ "uniqueConstraints": {}+ },+ "incident_update": {+ "name": "incident_update",+ "columns": {+ "id": {+ "name": "id",+ "type": "integer",+ "primaryKey": true,+ "notNull": true,+ "autoincrement": false+ },+ "status": {+ "name": "status",+ "type": "text(4)",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "date": {+ "name": "date",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "message": {+ "name": "message",+ "type": "text",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "incident_id": {+ "name": "incident_id",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "created_at": {+ "name": "created_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false,+ "default": "(strftime('%s', 'now'))"+ },+ "updated_at": {+ "name": "updated_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false,+ "default": "(strftime('%s', 'now'))"+ }+ },+ "indexes": {},+ "foreignKeys": {+ "incident_update_incident_id_incident_id_fk": {+ "name": "incident_update_incident_id_incident_id_fk",+ "tableFrom": "incident_update",+ "tableTo": "incident",+ "columnsFrom": [+ "incident_id"+ ],+ "columnsTo": [+ "id"+ ],+ "onDelete": "cascade",+ "onUpdate": "no action"+ }+ },+ "compositePrimaryKeys": {},+ "uniqueConstraints": {}+ },+ "incidents_to_monitors": {+ "name": "incidents_to_monitors",+ "columns": {+ "monitor_id": {+ "name": "monitor_id",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "incident_id": {+ "name": "incident_id",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ }+ },+ "indexes": {},+ "foreignKeys": {+ "incidents_to_monitors_monitor_id_monitor_id_fk": {+ "name": "incidents_to_monitors_monitor_id_monitor_id_fk",+ "tableFrom": "incidents_to_monitors",+ "tableTo": "monitor",+ "columnsFrom": [+ "monitor_id"+ ],+ "columnsTo": [+ "id"+ ],+ "onDelete": "cascade",+ "onUpdate": "no action"+ },+ "incidents_to_monitors_incident_id_incident_id_fk": {+ "name": "incidents_to_monitors_incident_id_incident_id_fk",+ "tableFrom": "incidents_to_monitors",+ "tableTo": "incident",+ "columnsFrom": [+ "incident_id"+ ],+ "columnsTo": [+ "id"+ ],+ "onDelete": "cascade",+ "onUpdate": "no action"+ }+ },+ "compositePrimaryKeys": {+ "incidents_to_monitors_monitor_id_incident_id_pk": {+ "columns": [+ "incident_id",+ "monitor_id"+ ]+ }+ },+ "uniqueConstraints": {}+ },+ "page": {+ "name": "page",+ "columns": {+ "id": {+ "name": "id",+ "type": "integer",+ "primaryKey": true,+ "notNull": true,+ "autoincrement": false+ },+ "workspace_id": {+ "name": "workspace_id",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "title": {+ "name": "title",+ "type": "text",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "description": {+ "name": "description",+ "type": "text",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "icon": {+ "name": "icon",+ "type": "text(256)",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false,+ "default": "''"+ },+ "slug": {+ "name": "slug",+ "type": "text(256)",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "custom_domain": {+ "name": "custom_domain",+ "type": "text(256)",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "published": {+ "name": "published",+ "type": "integer",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false,+ "default": false+ },+ "created_at": {+ "name": "created_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false,+ "default": "(strftime('%s', 'now'))"+ },+ "updated_at": {+ "name": "updated_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false,+ "default": "(strftime('%s', 'now'))"+ }+ },+ "indexes": {+ "page_slug_unique": {+ "name": "page_slug_unique",+ "columns": [+ "slug"+ ],+ "isUnique": true+ }+ },+ "foreignKeys": {+ "page_workspace_id_workspace_id_fk": {+ "name": "page_workspace_id_workspace_id_fk",+ "tableFrom": "page",+ "tableTo": "workspace",+ "columnsFrom": [+ "workspace_id"+ ],+ "columnsTo": [+ "id"+ ],+ "onDelete": "cascade",+ "onUpdate": "no action"+ }+ },+ "compositePrimaryKeys": {},+ "uniqueConstraints": {}+ },+ "monitor": {+ "name": "monitor",+ "columns": {+ "id": {+ "name": "id",+ "type": "integer",+ "primaryKey": true,+ "notNull": true,+ "autoincrement": false+ },+ "job_type": {+ "name": "job_type",+ "type": "text(3)",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false,+ "default": "'other'"+ },+ "periodicity": {+ "name": "periodicity",+ "type": "text(6)",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false,+ "default": "'other'"+ },+ "status": {+ "name": "status",+ "type": "text(2)",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false,+ "default": "'inactive'"+ },+ "active": {+ "name": "active",+ "type": "integer",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false,+ "default": false+ },+ "regions": {+ "name": "regions",+ "type": "text",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false,+ "default": "''"+ },+ "url": {+ "name": "url",+ "type": "text(512)",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "name": {+ "name": "name",+ "type": "text(256)",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false,+ "default": "''"+ },+ "description": {+ "name": "description",+ "type": "text",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false,+ "default": "''"+ },+ "headers": {+ "name": "headers",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false,+ "default": "''"+ },+ "body": {+ "name": "body",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false,+ "default": "''"+ },+ "method": {+ "name": "method",+ "type": "text(5)",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false,+ "default": "'GET'"+ },+ "workspace_id": {+ "name": "workspace_id",+ "type": "integer",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "created_at": {+ "name": "created_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false,+ "default": "(strftime('%s', 'now'))"+ },+ "updated_at": {+ "name": "updated_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false,+ "default": "(strftime('%s', 'now'))"+ }+ },+ "indexes": {},+ "foreignKeys": {+ "monitor_workspace_id_workspace_id_fk": {+ "name": "monitor_workspace_id_workspace_id_fk",+ "tableFrom": "monitor",+ "tableTo": "workspace",+ "columnsFrom": [+ "workspace_id"+ ],+ "columnsTo": [+ "id"+ ],+ "onDelete": "no action",+ "onUpdate": "no action"+ }+ },+ "compositePrimaryKeys": {},+ "uniqueConstraints": {}+ },+ "monitors_to_pages": {+ "name": "monitors_to_pages",+ "columns": {+ "monitor_id": {+ "name": "monitor_id",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "page_id": {+ "name": "page_id",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ }+ },+ "indexes": {},+ "foreignKeys": {+ "monitors_to_pages_monitor_id_monitor_id_fk": {+ "name": "monitors_to_pages_monitor_id_monitor_id_fk",+ "tableFrom": "monitors_to_pages",+ "tableTo": "monitor",+ "columnsFrom": [+ "monitor_id"+ ],+ "columnsTo": [+ "id"+ ],+ "onDelete": "cascade",+ "onUpdate": "no action"+ },+ "monitors_to_pages_page_id_page_id_fk": {+ "name": "monitors_to_pages_page_id_page_id_fk",+ "tableFrom": "monitors_to_pages",+ "tableTo": "page",+ "columnsFrom": [+ "page_id"+ ],+ "columnsTo": [+ "id"+ ],+ "onDelete": "cascade",+ "onUpdate": "no action"+ }+ },+ "compositePrimaryKeys": {+ "monitors_to_pages_monitor_id_page_id_pk": {+ "columns": [+ "monitor_id",+ "page_id"+ ]+ }+ },+ "uniqueConstraints": {}+ },+ "user": {+ "name": "user",+ "columns": {+ "id": {+ "name": "id",+ "type": "integer",+ "primaryKey": true,+ "notNull": true,+ "autoincrement": false+ },+ "tenant_id": {+ "name": "tenant_id",+ "type": "text(256)",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "first_name": {+ "name": "first_name",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false,+ "default": "''"+ },+ "last_name": {+ "name": "last_name",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false,+ "default": "''"+ },+ "email": {+ "name": "email",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false,+ "default": "''"+ },+ "photo_url": {+ "name": "photo_url",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false,+ "default": "''"+ },+ "created_at": {+ "name": "created_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false,+ "default": "(strftime('%s', 'now'))"+ },+ "updated_at": {+ "name": "updated_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false,+ "default": "(strftime('%s', 'now'))"+ }+ },+ "indexes": {+ "user_tenant_id_unique": {+ "name": "user_tenant_id_unique",+ "columns": [+ "tenant_id"+ ],+ "isUnique": true+ }+ },+ "foreignKeys": {},+ "compositePrimaryKeys": {},+ "uniqueConstraints": {}+ },+ "users_to_workspaces": {+ "name": "users_to_workspaces",+ "columns": {+ "user_id": {+ "name": "user_id",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "workspace_id": {+ "name": "workspace_id",+ "type": "integer",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ }+ },+ "indexes": {},+ "foreignKeys": {+ "users_to_workspaces_user_id_user_id_fk": {+ "name": "users_to_workspaces_user_id_user_id_fk",+ "tableFrom": "users_to_workspaces",+ "tableTo": "user",+ "columnsFrom": [+ "user_id"+ ],+ "columnsTo": [+ "id"+ ],+ "onDelete": "no action",+ "onUpdate": "no action"+ },+ "users_to_workspaces_workspace_id_workspace_id_fk": {+ "name": "users_to_workspaces_workspace_id_workspace_id_fk",+ "tableFrom": "users_to_workspaces",+ "tableTo": "workspace",+ "columnsFrom": [+ "workspace_id"+ ],+ "columnsTo": [+ "id"+ ],+ "onDelete": "no action",+ "onUpdate": "no action"+ }+ },+ "compositePrimaryKeys": {+ "users_to_workspaces_user_id_workspace_id_pk": {+ "columns": [+ "user_id",+ "workspace_id"+ ]+ }+ },+ "uniqueConstraints": {}+ },+ "workspace": {+ "name": "workspace",+ "columns": {+ "id": {+ "name": "id",+ "type": "integer",+ "primaryKey": true,+ "notNull": true,+ "autoincrement": false+ },+ "slug": {+ "name": "slug",+ "type": "text",+ "primaryKey": false,+ "notNull": true,+ "autoincrement": false+ },+ "name": {+ "name": "name",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "stripe_id": {+ "name": "stripe_id",+ "type": "text(256)",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "subscription_id": {+ "name": "subscription_id",+ "type": "text",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "plan": {+ "name": "plan",+ "type": "text(2)",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "ends_at": {+ "name": "ends_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "paid_until": {+ "name": "paid_until",+ "type": "integer",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false+ },+ "created_at": {+ "name": "created_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false,+ "default": "(strftime('%s', 'now'))"+ },+ "updated_at": {+ "name": "updated_at",+ "type": "integer",+ "primaryKey": false,+ "notNull": false,+ "autoincrement": false,+ "default": "(strftime('%s', 'now'))"+ }+ },+ "indexes": {+ "workspace_slug_unique": {+ "name": "workspace_slug_unique",+ "columns": [+ "slug"+ ],+ "isUnique": true+ },+ "workspace_stripe_id_unique": {+ "name": "workspace_stripe_id_unique",+ "columns": [+ "stripe_id"+ ],+ "isUnique": true+ }+ },+ "foreignKeys": {},+ "compositePrimaryKeys": {},+ "uniqueConstraints": {}+ }+ },+ "enums": {},+ "_meta": {+ "schemas": {},+ "tables": {},+ "columns": {}+ }+}\ No newline at end of filediff --git a/packages/db/drizzle/meta/_journal.json b/packages/db/drizzle/meta/_journal.jsonindex 086658d09..33e867592 100644--- a/packages/db/drizzle/meta/_journal.json+++ b/packages/db/drizzle/meta/_journal.json@@ -43,6 +43,13 @@"when": 1691930414569,"tag": "0005_even_baron_strucker","breakpoints": true+ },+ {+ "idx": 6,+ "version": "5",+ "when": 1692646649111,+ "tag": "0006_tired_anita_blake",+ "breakpoints": true}]}\ No newline at end of filediff --git a/packages/db/src/schema/monitor.ts b/packages/db/src/schema/monitor.tsindex ebdedb677..89fcb5aa5 100644--- a/packages/db/src/schema/monitor.ts+++ b/packages/db/src/schema/monitor.ts@@ -34,6 +34,8 @@ export const availableRegions = ["syd1",] as const;+export const METHODS = ["GET", "POST"] as const;+export const RegionEnum = z.enum(availableRegions);export const monitor = sqliteTable("monitor", {@@ -54,6 +56,9 @@ export const monitor = sqliteTable("monitor", {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(@@ -117,6 +122,11 @@ export const insertMonitorSchema = createInsertSchema(monitor, {status: z.enum(["active", "inactive"]).default("inactive"),active: z.boolean().default(false),regions: z.array(RegionEnum).default([]).optional(),+ method: z.enum(METHODS).default("GET"),+ body: z.string().default(""),+ headers: z+ .array(z.object({ key: z.string(), value: z.string() }))+ .default([]),});// Schema for selecting a Monitor - can be used to validate API responses@@ -136,4 +146,25 @@ export const selectMonitorSchema = createSelectSchema(monitor, {.default([]),});-export const allMonitorsSchema = z.array(selectMonitorSchema);+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) => {+ 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 allMonitorsSchema = z.array(selectMonitorExtendedSchema);++export const allMonitorsExtendedSchema = z.array(selectMonitorExtendedSchema);