Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
🚀 Improve cron jobs (#14)
Thibault Le Ouayc36db5914f8b
diff --git a/apps/web/.env.example b/apps/web/.env.exampleindex 8ae34640d..7e129d07c 100644--- a/apps/web/.env.example+++ b/apps/web/.env.example@@ -18,4 +18,8 @@ RESEND_API_KEY=UPSTASH_REDIS_REST_URL=UPSTASH_REDIS_REST_TOKEN=+QSTASH_CURRENT_SIGNING_KEY=+QSTASH_NEXT_SIGNING_KEY=+QSTASH_TOKEN=+RESEND_API_KEY='api-key'diff --git a/apps/web/package.json b/apps/web/package.jsonindex f8a609e3f..ccfdbfd80 100644--- a/apps/web/package.json+++ b/apps/web/package.json@@ -22,6 +22,7 @@"@trpc/next": "10.32.0","@trpc/react-query": "10.32.0","@trpc/server": "10.32.0",+ "@upstash/qstash": "^0.3.6","@upstash/redis": "1.21.0","class-variance-authority": "^0.6.0","clsx": "^1.2.1",@@ -42,11 +43,11 @@"zod": "^3.21.4"},"devDependencies": {+ "@openstatus/eslint-config": "workspace:*","@types/node": "20.3.1","@types/react": "18.2.12","@types/react-dom": "18.2.5","autoprefixer": "10.4.14",- "@openstatus/eslint-config": "workspace:*","postcss": "8.4.24","tailwindcss": "3.3.2","tsconfig": "workspace:*",diff --git a/apps/web/src/app/_components/event-table.tsx b/apps/web/src/app/_components/event-table.tsxindex ac667e48b..b46f32a76 100644--- a/apps/web/src/app/_components/event-table.tsx+++ b/apps/web/src/app/_components/event-table.tsx@@ -1,8 +1,13 @@"use client";-import { Badge } from "@/components/ui/badge";-import { cn } from "@/lib/utils";+import React from "react";import { formatDistance } from "date-fns";+import type { z } from "zod";++import type { tinyBirdEventType } from "@openstatus/tinybird";++import { Badge } from "@/components/ui/badge";+import { Button } from "@/components/ui/button";import {Table,TableBody,@@ -12,25 +17,18 @@ import {TableHeader,TableRow,} from "@/components/ui/table";-import React from "react";-import { Button } from "@/components/ui/button";+import { cn } from "@/lib/utils";export function EventTable({events,}: {// FIXME: should be return type- events: {- id: string;- timestamp: number;- statusCode: number;- latency: number;- url: string;- }[];+ events: z.infer<typeof tinyBirdEventType>[];}) {const [open, toggle] = React.useReducer((state) => !state, false);return (- <div className="relative overflow-hidden max-h-56">- <div className="relative overflow-y-scroll max-h-56">+ <div className="relative max-h-56 overflow-hidden">+ <div className="relative max-h-56 overflow-y-scroll"><Table><TableCaption>A list of the latest {events.length} pings.@@ -59,17 +57,17 @@ export function EventTable({<Badgevariant="outline"className={cn(- "text-xs py-0.5 px-2",+ "px-2 py-0.5 text-xs",isOk? "border-green-100 bg-green-50"- : "border-red-100 bg-red-50"+ : "border-red-100 bg-red-50",)}>{event.statusCode}<divclassName={cn(- "rounded-full bg-foreground h-1.5 w-1.5 ml-1",- isOk ? "bg-green-500" : "bg-red-500"+ "bg-foreground ml-1 h-1.5 w-1.5 rounded-full",+ isOk ? "bg-green-500" : "bg-red-500",)}/></Badge>@@ -77,7 +75,7 @@ export function EventTable({<TableCell className="text-muted-foreground">{event.latency}</TableCell>- <TableCell className="text-right font-light truncate">+ <TableCell className="truncate text-right font-light">{url.pathname}</TableCell></TableRow>@@ -87,7 +85,7 @@ export function EventTable({</Table></div>{!open && (- <div className="absolute inset-0 flex items-end justify-center bg-gradient bg-gradient-to-b from-transparent from-20% to-background">+ <div className="bg-gradient to-background absolute inset-0 flex items-end justify-center bg-gradient-to-b from-transparent from-20%"><ButtononClick={toggle}variant="outline"diff --git a/apps/web/src/app/_components/table-input-container.tsx b/apps/web/src/app/_components/table-input-container.tsxindex 9f09d3e71..cc8a6ff15 100644--- a/apps/web/src/app/_components/table-input-container.tsx+++ b/apps/web/src/app/_components/table-input-container.tsx@@ -1,6 +1,10 @@"use client";import React from "react";+import type { z } from "zod";++import type { tinyBirdEventType } from "@openstatus/tinybird";+import { EventTable } from "./event-table";import { InputSearch } from "./input-search";@@ -10,13 +14,7 @@ export function TableInputContainer({events,}: {// FIXME: should be return type- events: {- id: string;- timestamp: number;- statusCode: number;- latency: number;- url: string;- }[];+ events: z.infer<typeof tinyBirdEventType>[];}) {const [search, setSearch] = React.useState<Record<string, string>>({});diff --git a/apps/web/src/app/_mocks/response-list.json b/apps/web/src/app/_mocks/response-list.jsonindex 9dc663836..08b049fce 100644--- a/apps/web/src/app/_mocks/response-list.json+++ b/apps/web/src/app/_mocks/response-list.json@@ -1,37 +1,62 @@[{"id": "openstatus",+ "monitorId": "openstatus",+ "workspaceId": "openstatus",+ "pageId": "openstatus",+ "metadata": "openstatus","timestamp": 1687718354031,"statusCode": 200,"latency": 221,+ "region": "fra1","url": "http://localhost:3000/api/v0/ping"},{"id": "openstatus",+ "monitorId": "openstatus",+ "workspaceId": "openstatus",+ "pageId": "openstatus",+ "metadata": "openstatus","timestamp": 16877183268,"statusCode": 200,"latency": 660,+ "region": "fra1","url": "http://localhost:3000/api/v0/ping"},{"id": "openstatus",+ "monitorId": "openstatus",+ "workspaceId": "openstatus",+ "pageId": "openstatus",+ "metadata": "openstatus","timestamp": 1687718289489,"statusCode": 500,"latency": 332,+ "region": "fra1","url": "http://localhost:3000/api/v0/ping"},{"id": "openstatus",+ "monitorId": "openstatus",+ "workspaceId": "openstatus",+ "pageId": "openstatus",+ "metadata": "openstatus","timestamp": 168771832688,"statusCode": 500,"latency": 660,+ "region": "fra1","url": "http://localhost:3000/api/v0/ping"},{"id": "openstatus",+ "monitorId": "openstatus",+ "workspaceId": "openstatus",+ "pageId": "openstatus",+ "metadata": "openstatus","timestamp": 16877182894,"statusCode": 200,"latency": 332,+ "region": "fra1","url": "http://localhost:3000/api/v0/ping"}]diff --git a/apps/web/src/app/api/checker/cron/10m/route.ts b/apps/web/src/app/api/checker/cron/10m/route.tsnew file mode 100644index 000000000..4b87e1c94--- /dev/null+++ b/apps/web/src/app/api/checker/cron/10m/route.ts@@ -0,0 +1,9 @@+import { cron } from "../_cron";++export const runtime = "edge";+export const preferredRegion = ["auto"];+export const dynamic = "force-dynamic";++export async function GET(req: Request) {+ await cron({ frequency: "10m" });+}diff --git a/apps/web/src/app/api/checker/cron/_cron.ts b/apps/web/src/app/api/checker/cron/_cron.tsnew file mode 100644index 000000000..0b59e45ee--- /dev/null+++ b/apps/web/src/app/api/checker/cron/_cron.ts@@ -0,0 +1,52 @@+import { Client } from "@upstash/qstash/cloudflare";+import type { z } from "zod";++import { db, eq } from "@openstatus/db";+import { monitor, selectMonitorSchema } from "@openstatus/db/src/schema";++import { env } from "@/env.mjs";+import { availableRegions } from "../regions/_checker";++const frequencyAvailable = selectMonitorSchema.pick({ frequency: true });++export const runtime = "edge";++const DEFAULT_URL =+ process.env.NODE_ENV === "development"+ ? "http://localhost:3000"+ : "https://openstatus.dev";++export const cron = async ({+ frequency,+}: z.infer<typeof frequencyAvailable>) => {+ const c = new Client({+ token: env.QSTASH_TOKEN,+ });++ // FIXME: Wait until db is ready+ // const result = await db+ // .select()+ // .from(monitor)+ // .where(eq(monitor.frequency, frequency));++ // for (const row of result) {+ // for (const region of availableRegions) {+ // await c.publishJSON({+ // url: `${DEFAULT_URL}/api/checker/region/${region}`,+ // body: {+ // url: row.url,+ // },+ // });+ // }+ // }++ // Right now we are just checking the ping endpoint+ for (const region of availableRegions) {+ await c.publishJSON({+ url: `${DEFAULT_URL}/api/checker/region/${region}`,+ body: {+ url: `${DEFAULT_URL}/api/ping`,+ },+ });+ }+};diff --git a/apps/web/src/app/api/checker/regions/_checker.ts b/apps/web/src/app/api/checker/regions/_checker.tsnew file mode 100644index 000000000..39ecfa66c--- /dev/null+++ b/apps/web/src/app/api/checker/regions/_checker.ts@@ -0,0 +1,77 @@+import { Receiver } from "@upstash/qstash/cloudflare";+import { z } from "zod";++import { publishPingResponse, Tinybird } from "@openstatus/tinybird";++import { env } from "@/env.mjs";++export const monitorSchema = z.object({+ url: z.string().url(),+});++export const availableRegions = [+ "arn1",+ "bom1",+ "cdg1",+ "cle1",+ "cpt1",+ "dub1",+ "ewr1",+ "fra1",+ "gru1",+ "hkg1",+ "hnd1",+ "icn1",+ "kix1",+ "lhr1",+ "pdx1",+ "sfo1",+ "sin1",+ "syd1",+] as const;++export const availableRegionsEnum = z.enum(availableRegions);++const tb = new Tinybird({ token: env.TINY_BIRD_API_KEY });++const monitor = async (+ res: Response,+ { latency, url, region }: { latency: number; url: string; region: string },+) => {+ await publishPingResponse(tb)({+ workspaceId: "openstatus",+ pageId: "openstatus",+ monitorId: "openstatusPing",+ timestamp: Date.now(),+ statusCode: res.status,+ latency,+ url,+ region,+ });+};++export const checker = async (request: Request, region: string) => {+ const r = new Receiver({+ currentSigningKey: env.QSTASH_CURRENT_SIGNING_KEY,+ nextSigningKey: env.QSTASH_NEXT_SIGNING_KEY,+ });++ const body = await request.text();+ const isValid = r.verify({+ signature: request?.headers?.get("Upstash-Signature") || "",+ body,+ });+ if (!isValid) {+ return new Response("Error", { status: 400 });+ }++ const jsonData = await request.json();++ const data = monitorSchema.parse(jsonData);+ const startTime = Date.now();+ const res = await fetch(data.url, { cache: "no-store" });+ const endTime = Date.now();+ const latency = endTime - startTime;++ await monitor(res, { latency, url: data.url, region: region });+};diff --git a/apps/web/src/app/api/checker/regions/arn1/route.ts b/apps/web/src/app/api/checker/regions/arn1/route.tsnew file mode 100644index 000000000..6be1ea49e--- /dev/null+++ b/apps/web/src/app/api/checker/regions/arn1/route.ts@@ -0,0 +1,9 @@+import { checker } from "../_checker";++export const runtime = "edge";+export const preferredRegion = ["arn1"];+export const dynamic = "force-dynamic";++export async function POST(request: Request) {+ await checker(request, preferredRegion[0]);+}diff --git a/apps/web/src/app/api/checker/regions/bom1/route.ts b/apps/web/src/app/api/checker/regions/bom1/route.tsnew file mode 100644index 000000000..93486a572--- /dev/null+++ b/apps/web/src/app/api/checker/regions/bom1/route.ts@@ -0,0 +1,9 @@+import { checker } from "../_checker";++export const runtime = "edge";+export const preferredRegion = ["bom1"];+export const dynamic = "force-dynamic";++export async function POST(request: Request) {+ await checker(request, preferredRegion[0]);+}diff --git a/apps/web/src/app/api/checker/regions/cdg1/route.ts b/apps/web/src/app/api/checker/regions/cdg1/route.tsnew file mode 100644index 000000000..9e1af5d47--- /dev/null+++ b/apps/web/src/app/api/checker/regions/cdg1/route.ts@@ -0,0 +1,9 @@+import { checker } from "../_checker";++export const runtime = "edge";+export const preferredRegion = ["cdg1"];+export const dynamic = "force-dynamic";++export async function POST(request: Request) {+ await checker(request, preferredRegion[0]);+}diff --git a/apps/web/src/app/api/checker/regions/cle1/route.ts b/apps/web/src/app/api/checker/regions/cle1/route.tsnew file mode 100644index 000000000..1e530f998--- /dev/null+++ b/apps/web/src/app/api/checker/regions/cle1/route.ts@@ -0,0 +1,9 @@+import { checker } from "../_checker";++export const runtime = "edge";+export const preferredRegion = ["cle1"];+export const dynamic = "force-dynamic";++export async function POST(request: Request) {+ await checker(request, preferredRegion[0]);+}diff --git a/apps/web/src/app/api/checker/regions/cpt1/route.ts b/apps/web/src/app/api/checker/regions/cpt1/route.tsnew file mode 100644index 000000000..7249b1191--- /dev/null+++ b/apps/web/src/app/api/checker/regions/cpt1/route.ts@@ -0,0 +1,9 @@+import { checker } from "../_checker";++export const runtime = "edge";+export const preferredRegion = ["cpt1"];+export const dynamic = "force-dynamic";++export async function POST(request: Request) {+ await checker(request, preferredRegion[0]);+}diff --git a/apps/web/src/app/api/checker/regions/dub1/route.ts b/apps/web/src/app/api/checker/regions/dub1/route.tsnew file mode 100644index 000000000..215cf3867--- /dev/null+++ b/apps/web/src/app/api/checker/regions/dub1/route.ts@@ -0,0 +1,9 @@+import { checker } from "../_checker";++export const runtime = "edge";+export const preferredRegion = ["dub1"];+export const dynamic = "force-dynamic";++export async function POST(request: Request) {+ await checker(request, preferredRegion[0]);+}diff --git a/apps/web/src/app/api/checker/regions/fra1/route.ts b/apps/web/src/app/api/checker/regions/fra1/route.tsnew file mode 100644index 000000000..f006060ba--- /dev/null+++ b/apps/web/src/app/api/checker/regions/fra1/route.ts@@ -0,0 +1,9 @@+import { checker } from "../_checker";++export const runtime = "edge";+export const preferredRegion = ["fra1"];+export const dynamic = "force-dynamic";++export async function POST(request: Request) {+ await checker(request, preferredRegion[0]);+}diff --git a/apps/web/src/app/api/checker/regions/gru1/route.ts b/apps/web/src/app/api/checker/regions/gru1/route.tsnew file mode 100644index 000000000..51a057c2f--- /dev/null+++ b/apps/web/src/app/api/checker/regions/gru1/route.ts@@ -0,0 +1,9 @@+import { checker } from "../_checker";++export const runtime = "edge";+export const preferredRegion = ["gru1"];+export const dynamic = "force-dynamic";++export async function POST(request: Request) {+ await checker(request, preferredRegion[0]);+}diff --git a/apps/web/src/app/api/checker/regions/hkg1/route.ts b/apps/web/src/app/api/checker/regions/hkg1/route.tsnew file mode 100644index 000000000..3120badf9--- /dev/null+++ b/apps/web/src/app/api/checker/regions/hkg1/route.ts@@ -0,0 +1,9 @@+import { checker } from "../_checker";++export const runtime = "edge";+export const preferredRegion = ["hkg1"];+export const dynamic = "force-dynamic";++export async function POST(request: Request) {+ await checker(request, preferredRegion[0]);+}diff --git a/apps/web/src/app/api/checker/regions/hnd1/route.ts b/apps/web/src/app/api/checker/regions/hnd1/route.tsnew file mode 100644index 000000000..fbb22f14f--- /dev/null+++ b/apps/web/src/app/api/checker/regions/hnd1/route.ts@@ -0,0 +1,9 @@+import { checker } from "../_checker";++export const runtime = "edge";+export const preferredRegion = ["hnd1"];+export const dynamic = "force-dynamic";++export async function POST(request: Request) {+ await checker(request, preferredRegion[0]);+}diff --git a/apps/web/src/app/api/checker/regions/iad1/route.ts b/apps/web/src/app/api/checker/regions/iad1/route.tsnew file mode 100644index 000000000..3cd1294c3--- /dev/null+++ b/apps/web/src/app/api/checker/regions/iad1/route.ts@@ -0,0 +1,9 @@+import { checker } from "../_checker";++export const runtime = "edge";+export const preferredRegion = ["iad1"];+export const dynamic = "force-dynamic";++export async function POST(request: Request) {+ await checker(request, preferredRegion[0]);+}diff --git a/apps/web/src/app/api/checker/regions/icn1/route.ts b/apps/web/src/app/api/checker/regions/icn1/route.tsnew file mode 100644index 000000000..d0f15aeb4--- /dev/null+++ b/apps/web/src/app/api/checker/regions/icn1/route.ts@@ -0,0 +1,9 @@+import { checker } from "../_checker";++export const runtime = "edge";+export const preferredRegion = ["icn1"];+export const dynamic = "force-dynamic";++export async function POST(request: Request) {+ await checker(request, preferredRegion[0]);+}diff --git a/apps/web/src/app/api/checker/regions/kix1/route.ts b/apps/web/src/app/api/checker/regions/kix1/route.tsnew file mode 100644index 000000000..d054ad75e--- /dev/null+++ b/apps/web/src/app/api/checker/regions/kix1/route.ts@@ -0,0 +1,9 @@+import { checker } from "../_checker";++export const runtime = "edge";+export const preferredRegion = ["kix1"];+export const dynamic = "force-dynamic";++export async function POST(request: Request) {+ await checker(request, preferredRegion[0]);+}diff --git a/apps/web/src/app/api/checker/regions/lhr1/route.ts b/apps/web/src/app/api/checker/regions/lhr1/route.tsnew file mode 100644index 000000000..3f208ad8f--- /dev/null+++ b/apps/web/src/app/api/checker/regions/lhr1/route.ts@@ -0,0 +1,9 @@+import { checker } from "../_checker";++export const runtime = "edge";+export const preferredRegion = ["lhr1"];+export const dynamic = "force-dynamic";++export async function POST(request: Request) {+ await checker(request, preferredRegion[0]);+}diff --git a/apps/web/src/app/api/checker/regions/pdx1/route.ts b/apps/web/src/app/api/checker/regions/pdx1/route.tsnew file mode 100644index 000000000..a614949e8--- /dev/null+++ b/apps/web/src/app/api/checker/regions/pdx1/route.ts@@ -0,0 +1,9 @@+import { checker } from "../_checker";++export const runtime = "edge";+export const preferredRegion = ["pdx1"];+export const dynamic = "force-dynamic";++export async function POST(request: Request) {+ await checker(request, preferredRegion[0]);+}diff --git a/apps/web/src/app/api/checker/regions/sfo1/route.ts b/apps/web/src/app/api/checker/regions/sfo1/route.tsnew file mode 100644index 000000000..f6e9e193d--- /dev/null+++ b/apps/web/src/app/api/checker/regions/sfo1/route.ts@@ -0,0 +1,9 @@+import { checker } from "../_checker";++export const runtime = "edge";+export const preferredRegion = ["sfo1"];+export const dynamic = "force-dynamic";++export async function POST(request: Request) {+ await checker(request, preferredRegion[0]);+}diff --git a/apps/web/src/app/api/checker/regions/sin1/route.ts b/apps/web/src/app/api/checker/regions/sin1/route.tsnew file mode 100644index 000000000..e0db650ba--- /dev/null+++ b/apps/web/src/app/api/checker/regions/sin1/route.ts@@ -0,0 +1,9 @@+import { checker } from "../_checker";++export const runtime = "edge";+export const preferredRegion = ["sin1"];+export const dynamic = "force-dynamic";++export async function POST(request: Request) {+ await checker(request, preferredRegion[0]);+}diff --git a/apps/web/src/app/api/checker/regions/syd1/route.ts b/apps/web/src/app/api/checker/regions/syd1/route.tsnew file mode 100644index 000000000..01ca9e01d--- /dev/null+++ b/apps/web/src/app/api/checker/regions/syd1/route.ts@@ -0,0 +1,9 @@+import { checker } from "../_checker";++export const runtime = "edge";+export const preferredRegion = ["syd1"];+export const dynamic = "force-dynamic";++export async function POST(request: Request) {+ await checker(request, preferredRegion[0]);+}diff --git a/apps/web/src/app/api/v0/cron/route.ts b/apps/web/src/app/api/v0/cron/route.tsdeleted file mode 100644index 5e6d1f839..000000000--- a/apps/web/src/app/api/v0/cron/route.ts+++ /dev/null@@ -1,54 +0,0 @@-import { publishPingResponse, Tinybird } from "@openstatus/tinybird";--import { env } from "@/env.mjs";--// TODO: create one route per region-export const preferredRegion = ["fra1"];-export const runtime = "edge";--const DEFAULT_URL =- process.env.NODE_ENV === "development"- ? "http://localhost:3000"- : "https://openstatus.dev";--const tb = new Tinybird({ token: env.TINY_BIRD_API_KEY });--// TODO: create a package for monitor-async function monitor(- res: Response,- { latency, url }: { latency: number; url: string },-) {- return await publishPingResponse(tb)({- id: "openstatus",- timestamp: Date.now(),- statusCode: res.status,- latency,- url,- // TODO: add region, res- });-}--// TODO: auth middleware for user API check (unkey)-export async function GET(req: Request) {- try {- const { searchParams } = new URL(req.url);- const hasUrl = searchParams.has("url");- const url = hasUrl ? searchParams.get("url") : `${DEFAULT_URL}/api/v0/ping`;-- if (!url) {- return new Response("Error", { status: 400 });- }-- const startTime = Date.now();- const res = await fetch(url, { cache: "no-store" });- const endTime = Date.now();- const latency = endTime - startTime;-- await monitor(res, { latency, url });-- return new Response("OK", { status: 200 });- } catch (e) {- console.error(e);- return new Response("Error", { status: 500 });- }-}diff --git a/apps/web/src/app/api/v0/ping/route.ts b/apps/web/src/app/api/v0/ping/route.tsdeleted file mode 100644index 44e2e13a2..000000000--- a/apps/web/src/app/api/v0/ping/route.ts+++ /dev/null@@ -1,28 +0,0 @@-import { Redis } from "@openstatus/upstash";--const redis = Redis.fromEnv();--export async function GET(req: Request) {- const RANDOM = Math.random() > 0.6;- try {- // TODO: connect tinybird, upstash and planetscale- await redis.ping();- if (RANDOM) {- throw new Error("Arg");- }- return new Response("OK", {- status: 200,- headers: {- "cache-control": "public, max-age=0, s-maxage=0",- },- });- } catch (e) {- console.error(e);- return new Response("Error", {- status: 500,- headers: {- "cache-control": "public, max-age=0, s-maxage=0",- },- });- }-}diff --git a/apps/web/src/env.mjs b/apps/web/src/env.mjsindex f1fceee58..9d0b4d94b 100644--- a/apps/web/src/env.mjs+++ b/apps/web/src/env.mjs@@ -1,5 +1,6 @@import { createEnv } from "@t3-oss/env-nextjs";import { z } from "zod";+import "@openstatus/db/env.mjs";export const env = createEnv({@@ -8,6 +9,9 @@ export const env = createEnv({TINY_BIRD_API_KEY: z.string().min(1),RESEND_API_KEY: z.string().min(1),CLERK_WEBHOOK_SECRET: z.string().min(1),+ QSTASH_CURRENT_SIGNING_KEY: z.string().min(1),+ QSTASH_NEXT_SIGNING_KEY: z.string().min(1),+ QSTASH_TOKEN: z.string().min(1),},client: {NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY: z.string().min(1),@@ -29,5 +33,8 @@ export const env = createEnv({process.env.NEXT_PUBLIC_CLERK_AFTER_SIGN_IN_URL,NEXT_PUBLIC_CLERK_AFTER_SIGN_UP_URL:process.env.NEXT_PUBLIC_CLERK_AFTER_SIGN_UP_URL,+ QSTASH_CURRENT_SIGNING_KEY: process.env.QSTASH_CURRENT_SIGNING_KEY,+ QSTASH_NEXT_SIGNING_KEY: process.env.QSTASH_NEXT_SIGNING_KEY,+ QSTASH_TOKEN: process.env.QSTASH_TOKEN,},});diff --git a/apps/web/vercel.json b/apps/web/vercel.jsonindex 11fd658e8..c44a1ecc3 100644--- a/apps/web/vercel.json+++ b/apps/web/vercel.json@@ -1,7 +1,7 @@{"crons": [{- "path": "/api/v0/cron",+ "path": "/api/checker/cron","schedule": "*/10 * * * *"}]diff --git a/package.json b/package.jsonindex 96bb52203..01eae62cd 100644--- a/package.json+++ b/package.json@@ -13,7 +13,7 @@"@ianvs/prettier-plugin-sort-imports": "4.0.2","prettier-plugin-tailwindcss": "0.3.0","prettier": "2.8.8",- "turbo": "latest",+ "turbo": "1.10.6","typescript": "5.1.3"},"packageManager": "[email protected]",diff --git a/packages/api/src/lambda.ts b/packages/api/src/lambda.tsindex 224a6c83a..f520c747d 100644--- a/packages/api/src/lambda.ts+++ b/packages/api/src/lambda.ts@@ -4,4 +4,6 @@ import { createTRPCRouter } from "./trpc";// Deployed to /trpc/lambda/**export const lambdaRouter = createTRPCRouter({clerkRouter: clerkRouter,+ // TODO: Add open api router+ // See trpc-openapi});diff --git a/packages/db/package.json b/packages/db/package.jsonindex 2215f2dbc..f16d59100 100644--- a/packages/db/package.json+++ b/packages/db/package.json@@ -12,6 +12,7 @@"@t3-oss/env-core": "0.4.1","dotenv": "16.3.1","drizzle-orm": "0.27.0",+ "drizzle-zod": "^0.4.4","zod": "3.21.4"},"devDependencies": {diff --git a/packages/db/src/schema/monitor.ts b/packages/db/src/schema/monitor.tsindex 40f57eb02..760785dd4 100644--- a/packages/db/src/schema/monitor.ts+++ b/packages/db/src/schema/monitor.ts@@ -6,6 +6,7 @@ import {timestamp,varchar,} from "drizzle-orm/mysql-core";+import { createInsertSchema, createSelectSchema } from "drizzle-zod";import { page } from "./page";@@ -35,3 +36,9 @@ export const monitorRelation = relations(monitor, ({ one }) => ({references: [page.id],}),}));++// Schema for inserting a Monitor - can be used to validate API requests+export const insertMonitorSchema = createInsertSchema(monitor);++// Schema for selecting a Monitor - can be used to validate API responses+export const selectMonitorSchema = createSelectSchema(monitor);diff --git a/packages/tinybird/src/client.ts b/packages/tinybird/src/client.tsindex ed3d2c59d..f11e70181 100644--- a/packages/tinybird/src/client.ts+++ b/packages/tinybird/src/client.ts@@ -4,18 +4,24 @@ import * as z from "zod";// REMINDER:// const tb = new Tinybird({ token: process.env.TINYBIRD_TOKEN! });+export const tinyBirdEventType = z.object({+ id: z.string(),+ workspaceId: z.string(),+ pageId: z.string(),+ monitorId: z.string(),+ timestamp: z.number().int(),+ statusCode: z.number().int(),+ latency: z.number().int(), // in ms+ url: z.string(),+ metadata: z.string().optional().default(""),+ region: z.string().min(4).max(4), // TODO: object + stringify json+});+// TODO: think of a better name `publishHttpResponse`export function publishPingResponse(tb: Tinybird) {return tb.buildIngestEndpoint({datasource: "ping_response__v0",- event: z.object({- id: z.string(),- timestamp: z.number().int(),- statusCode: z.number().int(),- latency: z.number().int(), // in ms- url: z.string(),- metadata: z.string().optional().default(""), // TODO: object + stringify json- }),+ event: tinyBirdEventType.omit({ id: true }),});}@@ -24,18 +30,12 @@ export function getResponseList(tb: Tinybird) {pipe: "response_list__v0",parameters: z.object({siteId: z.string().default("openstatus"), // REMINDER: remove default once alpha+ monitorId: z.string().default("openstatus"), // REMINDER: remove default once alphastart: z.number().int().default(0), // always start from a dateend: z.number().int().optional(),limit: z.number().int().optional().default(100), // used for pagination}),- data: z.object({- id: z.string(),- timestamp: z.number().int(), // .transform(t => new Date(t))- statusCode: z.number().int(),- latency: z.number().int(),- url: z.string(),- // metadata: z.string().transform((m) => JSON.parse(m))- }),+ data: tinyBirdEventType,opts: {revalidate: 5 * 60, // 5 minutes cache validation},diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex e7af5cfd8..b361e8495 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -27,8 +27,8 @@ importers:specifier: 0.3.0version: 0.3.0(@ianvs/[email protected])([email protected])turbo:- specifier: latest- version: 1.10.3+ specifier: 1.10.6+ version: 1.10.6typescript:specifier: 5.1.3version: 5.1.3@@ -74,6 +74,9 @@ importers:'@trpc/server':specifier: 10.32.0version: 10.32.0+ '@upstash/qstash':+ specifier: ^0.3.6+ version: 0.3.6'@upstash/redis':specifier: 1.21.0version: 1.21.0@@ -233,6 +236,9 @@ importers:drizzle-orm:specifier: 0.27.0version: 0.27.0(@planetscale/[email protected])+ drizzle-zod:+ specifier: ^0.4.4+ version: 0.4.4([email protected])([email protected])zod:specifier: 3.21.4version: 3.21.4@@ -3426,6 +3432,16 @@ packages:'@planetscale/database': 1.7.0dev: false+ resolution: {integrity: sha512-XNn0mjQ306Hvg+CuyKV98wnsWBWeTqv+kgE/N79Zj0EdCvjD2kaoN5sFDGFkMVqPQuP7IB1IPs0lEcOij1RvBA==}+ peerDependencies:+ drizzle-orm: '>=0.23.13'+ zod: '*'+ dependencies:+ drizzle-orm: 0.27.0(@planetscale/[email protected])+ zod: 3.21.4+ dev: false+resolution: {integrity: sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==}hasBin: true@@ -6503,65 +6519,65 @@ packages:typescript: 5.1.3dev: false- resolution: {integrity: sha512-IIB9IomJGyD3EdpSscm7Ip1xVWtYb7D0x7oH3vad3gjFcjHJzDz9xZ/iw/qItFEW+wGFcLSRPd+1BNnuLM8AsA==}+ resolution: {integrity: sha512-s2Gc7i9Ud+H9GDcrGJjPIyscJfzDGQ6il4Sl2snfvwngJs4/TaqKuBoX3HNt/7F4NiFRs7ZhlLV1/Yu9zGBRhw==}cpu: [x64]os: [darwin]requiresBuild: truedev: trueoptional: true- resolution: {integrity: sha512-SBNmOZU9YEB0eyNIxeeQ+Wi0Ufd+nprEVp41rgUSRXEIpXjsDjyBnKnF+sQQj3+FLb4yyi/yZQckB+55qXWEsw==}+ resolution: {integrity: sha512-tgl70t5PBLyRcNTdP9N6NjvdvQ5LUk8Z60JGUhBhnc+oCOdA4pltrDJNPyel3tQAXXt1dDpl8pp9vUrbwoVyGg==}cpu: [arm64]os: [darwin]requiresBuild: truedev: trueoptional: true- resolution: {integrity: sha512-kvAisGKE7xHJdyMxZLvg53zvHxjqPK1UVj4757PQqtx9dnjYHSc8epmivE6niPgDHon5YqImzArCjVZJYpIGHQ==}+ resolution: {integrity: sha512-h7eyAA3xtAVpamcYJYUwe0xm0LWdbv7/I7QiM09AZ67TTNpyUgqW8giFN3h793BHEQ2Rcnk9FNkpIbjWBbyamg==}cpu: [x64]os: [linux]requiresBuild: truedev: trueoptional: true- resolution: {integrity: sha512-Qgaqln0IYRgyL0SowJOi+PNxejv1I2xhzXOI+D+z4YHbgSx87ox1IsALYBlK8VRVYY8VCXl+PN12r1ioV09j7A==}+ resolution: {integrity: sha512-8cZhOeLqu3QZ27yLd6bw4FNaB8y5pLdWeRLJeiWHkIb/cptKnRKJFP+keBJzJi8ovaMqdBpabrxiBRN2lhau5Q==}cpu: [arm64]os: [linux]requiresBuild: truedev: trueoptional: true- resolution: {integrity: sha512-rbH9wManURNN8mBnN/ZdkpUuTvyVVEMiUwFUX4GVE5qmV15iHtZfDLUSGGCP2UFBazHcpNHG1OJzgc55GFFrUw==}+ resolution: {integrity: sha512-qx5jcfCJodN1Mh0KtSVQau7pK8CxDvtif7+joPHI2HbQPAADgdUl0LHfA5tFHh6aWgfvhxbvIXqJd6v7Mqkj9g==}cpu: [x64]os: [win32]requiresBuild: truedev: trueoptional: true- resolution: {integrity: sha512-ThlkqxhcGZX39CaTjsHqJnqVe+WImjX13pmjnpChz6q5HHbeRxaJSFzgrHIOt0sUUVx90W/WrNRyoIt/aafniw==}+ resolution: {integrity: sha512-vTQaRG3/s2XTreOBr6J9HKFtjzusvwGQg0GtuW2+9Z7fizdzP8MuhaDbN6FhKHcWC81PQPD61TBIKTVTsYOEZg==}cpu: [arm64]os: [win32]requiresBuild: truedev: trueoptional: true- resolution: {integrity: sha512-U4gKCWcKgLcCjQd4Pl8KJdfEKumpyWbzRu75A6FCj6Ctea1PIm58W6Ltw1QXKqHrl2pF9e1raAskf/h6dlrPCA==}+ resolution: {integrity: sha512-0/wbjw4HvmPP1abVWHTdeFRfCA9cn5oxCPP5bDixagLzvDgGWE3xfdlsyGmq779Ekr9vjtDPgC2Y4JlXEhyryw==}hasBin: truerequiresBuild: trueoptionalDependencies:- turbo-darwin-64: 1.10.3- turbo-darwin-arm64: 1.10.3- turbo-linux-64: 1.10.3- turbo-linux-arm64: 1.10.3- turbo-windows-64: 1.10.3- turbo-windows-arm64: 1.10.3+ turbo-darwin-64: 1.10.6+ turbo-darwin-arm64: 1.10.6+ turbo-linux-64: 1.10.6+ turbo-linux-arm64: 1.10.6+ turbo-windows-64: 1.10.6+ turbo-windows-arm64: 1.10.6dev: true