refactor: move analytics endpoint to public

Author: aurelleb

src/routes/v1/admin.ts

@@ -1,14 +1,6 @@
 import { Hono } from "hono";
 import type { AppContext } from "@/types/app.js";
-import {
-	queryRawRows,
-	queryStats,
-	queryAnalytics,
-	startMigration,
-	VALID_GRANULARITIES,
-	ALLOWED_FILTERS,
-	type Granularity,
-} from "@/analytics.js";
+import { startMigration } from "@/analytics.js";
 
 const admin = new Hono<AppContext>();
 
@@ -19,59 +11,6 @@ admin.use("*", async (c, next) => {
 	await next();
 });
 
-admin.get("/telemetry/system-info", async (c) => {
-	const limit = Math.min(Number(c.req.query("limit") || 100), 500);
-	const offset = Number(c.req.query("offset") || 0);
-
-	const data = await queryRawRows(limit, offset);
-
-	return c.json({ data, limit, offset });
-});
-
-admin.get("/telemetry/system-info/stats", async (c) => {
-	const granularity = (c.req.query("granularity") || "daily") as Granularity;
-	if (!VALID_GRANULARITIES.includes(granularity)) {
-		return c.json(
-			{
-				error: `Invalid granularity. Must be one of: ${VALID_GRANULARITIES.join(", ")}`,
-			},
-			400,
-		);
-	}
-
-	const periods = Math.min(Number(c.req.query("periods") || 30), 365);
-
-	const data = await queryStats(granularity, periods);
-
-	return c.json({ data, granularity, periods });
-});
-
-admin.get("/analytics", async (c) => {
-	const granularity = (c.req.query("granularity") || "daily") as Granularity;
-	if (!VALID_GRANULARITIES.includes(granularity)) {
-		return c.json(
-			{
-				error: `Invalid granularity. Must be one of: ${VALID_GRANULARITIES.join(", ")}`,
-			},
-			400,
-		);
-	}
-
-	const periods = Math.min(Number(c.req.query("periods") || 30), 365);
-
-	const filters: Record<string, string> = {};
-	for (const key of Object.keys(ALLOWED_FILTERS)) {
-		const value = c.req.query(key);
-		if (value) {
-			filters[key] = value;
-		}
-	}
-
-	const data = await queryAnalytics(granularity, periods, filters);
-
-	return c.json({ data, filters, granularity, periods });
-});
-
 admin.post("/telemetry/migrate", (c) => {
 	if (!startMigration()) {
 		return c.json({ error: "Migration already in progress" }, 409);

src/routes/v1/telemetry.ts

@@ -2,7 +2,14 @@ import { Hono } from "hono";
 import { zValidator } from "@hono/zod-validator";
 import { rateLimiter } from "hono-rate-limiter";
 import type { AppContext } from "@/types/app.js";
-import { upsertSystemInfo, deleteUserData } from "@/analytics.js";
+import {
+	upsertSystemInfo,
+	deleteUserData,
+	queryAnalytics,
+	VALID_GRANULARITIES,
+	ALLOWED_FILTERS,
+	type Granularity,
+} from "@/analytics.js";
 import { systemInfoSchema, forgetSchema } from "@/schemas/telemetry.js";
 
 const telemetry = new Hono<AppContext>();
@@ -48,4 +55,30 @@ telemetry.post(
 	},
 );
 
+telemetry.get("/analytics", async (c) => {
+	const granularity = (c.req.query("granularity") || "daily") as Granularity;
+	if (!VALID_GRANULARITIES.includes(granularity)) {
+		return c.json(
+			{
+				error: `Invalid granularity. Must be one of: ${VALID_GRANULARITIES.join(", ")}`,
+			},
+			400,
+		);
+	}
+
+	const periods = Math.min(Number(c.req.query("periods") || 30), 365);
+
+	const filters: Record<string, string> = {};
+	for (const key of Object.keys(ALLOWED_FILTERS)) {
+		const value = c.req.query(key);
+		if (value) {
+			filters[key] = value;
+		}
+	}
+
+	const data = await queryAnalytics(granularity, periods, filters);
+
+	return c.json({ data, filters, granularity, periods });
+});
+
 export default telemetry;