Skip to content

Open-source status page, incident response and uptime monitoring

🔥 improve returning data (#1072)

Thibault Le Ouay30aa303d3770
diff --git a/apps/server/src/v1/monitors/put.ts b/apps/server/src/v1/monitors/put.ts
index 68b5ba15f..a911143dc 100644
--- a/apps/server/src/v1/monitors/put.ts
+++ b/apps/server/src/v1/monitors/put.ts
@@ -46,7 +46,6 @@ export function registerPutMonitor(api: typeof monitorsApi) {
const { id } = c.req.valid("param");
const input = c.req.valid("json");
- console.log("input", input);
if (!limits.periodicity.includes(input.periodicity)) {
throw new HTTPException(403, { message: "Forbidden" });
}
diff --git a/apps/server/src/v1/monitors/results/get.ts b/apps/server/src/v1/monitors/results/get.ts
index 69bde9207..78b7ebe13 100644
--- a/apps/server/src/v1/monitors/results/get.ts
+++ b/apps/server/src/v1/monitors/results/get.ts
@@ -42,33 +42,29 @@ const getMonitorStats = createRoute({
200: {
content: {
"application/json": {
- schema: z.object({
- data: z.array(
- z.object({
- latency: z.number().int(), // in ms
- statusCode: z.number().int().nullable().default(null),
- monitorId: z.string().default(""),
- url: z.string().url().optional(),
- error: z
- .number()
- .default(0)
- .transform((val) => val !== 0),
- region: z.enum(flyRegions),
- timestamp: z.number().int().optional(),
- message: z.string().nullable().optional(),
- timing: z
- .string()
- .nullable()
- .optional()
- .transform((val) => {
- if (!val) return null;
- const value = timingSchema.safeParse(JSON.parse(val));
- if (value.success) return value.data;
- return null;
- }),
- }),
- ),
- }),
+ schema: z.array(
+ z.object({
+ latency: z.number().int(), // in ms
+ statusCode: z.number().int().nullable().default(null),
+ monitorId: z.string().default(""),
+ url: z.string().url().optional(),
+ error: z
+ .number()
+ .default(0)
+ .transform((val) => val !== 0),
+ region: z.enum(flyRegions),
+ timestamp: z.number().int().optional(),
+ message: z.string().nullable().optional(),
+ timing: z
+ .preprocess((val) => {
+ if (!val) return null;
+ const value = timingSchema.safeParse(JSON.parse(String(val)));
+ if (value.success) return value.data;
+ return null;
+ }, timingSchema.nullable())
+ .optional(),
+ }),
+ ),
},
},
description: "All the metrics for the monitor",
@@ -117,6 +113,6 @@ export function registerGetMonitorResult(api: typeof monitorsApi) {
if (!data) {
throw new HTTPException(404, { message: "Not Found" });
}
- return c.json({ data }, 200);
+ return c.json(data, 200);
});
}
diff --git a/apps/server/src/v1/monitors/schema.ts b/apps/server/src/v1/monitors/schema.ts
index e9d6c32fa..7a1bf15ae 100644
--- a/apps/server/src/v1/monitors/schema.ts
+++ b/apps/server/src/v1/monitors/schema.ts
@@ -170,7 +170,6 @@ export const MonitorSchema = z
}),
assertions: z
.preprocess((val) => {
- console.log("val", val);
try {
if (Array.isArray(val)) return val;
if (String(val).length > 0) {