feat: actual logging

Author: izadoesdev

apps/api/src/index.ts

@@ -1,12 +1,12 @@
 import "./polyfills/compression";
 import { auth } from "@databuddy/auth";
 import { appRouter, createRPCContext } from "@databuddy/rpc";
+import { logger } from "@databuddy/shared/logger";
 import cors from "@elysiajs/cors";
 import { onError } from "@orpc/server";
 import { RPCHandler } from "@orpc/server/fetch";
 import { autumnHandler } from "autumn-js/elysia";
 import { Elysia } from "elysia";
-import { logger } from "./lib/logger";
 import { assistant } from "./routes/assistant";
 // import { customSQL } from './routes/custom-sql';
 import { exportRoute } from "./routes/export";
@@ -59,16 +59,20 @@ const app = new Elysia()
 	.use(query)
 	.use(assistant)
 	.use(exportRoute)
-	.all("/rpc/*", async ({ request }: { request: Request }) => {
-		const context = await createRPCContext({ headers: request.headers });
-		const { response } = await rpcHandler.handle(request, {
-			prefix: "/rpc",
-			context,
-		});
-		return response ?? new Response("Not Found", { status: 404 });
-	}, {
-		parse: "none",
-	})
+	.all(
+		"/rpc/*",
+		async ({ request }: { request: Request }) => {
+			const context = await createRPCContext({ headers: request.headers });
+			const { response } = await rpcHandler.handle(request, {
+				prefix: "/rpc",
+				context,
+			});
+			return response ?? new Response("Not Found", { status: 404 });
+		},
+		{
+			parse: "none",
+		}
+	)
 	.onError(({ error, code }) => {
 		const errorMessage = error instanceof Error ? error.message : String(error);
 		logger.error({ message: errorMessage, code, error });

apps/basket/src/hooks/auth.ts

@@ -83,17 +83,22 @@ const getOwnerId = cacheable(
 // Cache the website lookup and owner lookup
 export const getWebsiteById = cacheable(
 	async (id: string): Promise<WebsiteWithOwner | null> => {
-		const website = await db.query.websites.findFirst({
-			where: eq(websites.id, id),
-		});
+		try {
+			const website = await db.query.websites.findFirst({
+				where: eq(websites.id, id),
+			});
 
-		if (!website) {
-			return null;
-		}
+			if (!website) {
+				return null;
+			}
 
-		const ownerId = await getOwnerId(website);
+			const ownerId = await getOwnerId(website);
 
-		return { ...website, ownerId };
+			return { ...website, ownerId };
+		} catch (error) {
+			logger.error({ error, websiteId: id }, "Failed to get website by ID");
+			return null;
+		}
 	},
 	{
 		expireInSec: 300,
@@ -124,7 +129,10 @@ export function isValidOrigin(
 		return true;
 	}
 	if (!allowedDomain?.trim()) {
-		logger.warn("[isValidOrigin] No allowed domain provided");
+		logger.warn(
+			{ originHeader },
+			"[isValidOrigin] No allowed domain provided"
+		);
 		return false;
 	}
 	try {
@@ -139,9 +147,8 @@ export function isValidOrigin(
 		);
 	} catch (error) {
 		logger.error(
-			new Error(
-				`[isValidOrigin] Validation failed: ${error instanceof Error ? error.message : String(error)}`
-			)
+			{ error, originHeader, allowedDomain },
+			"[isValidOrigin] Validation failed"
 		);
 		return false;
 	}
@@ -176,7 +183,7 @@ export function normalizeDomain(domain: string): string {
 		}
 		return finalDomain;
 	} catch (error) {
-		logger.error({ error }, `Failed to parse domain: ${domain}`);
+		logger.error({ error, domain }, "Failed to parse domain");
 		throw new Error(`Invalid domain format: ${domain}`);
 	}
 }
@@ -297,9 +304,8 @@ export function isValidOriginSecure(
 		);
 	} catch (error) {
 		logger.error(
-			new Error(
-				`[isValidOriginSecure] Validation failed: ${error instanceof Error ? error.message : String(error)}`
-			)
+			{ error, originHeader, allowedDomain },
+			"[isValidOriginSecure] Validation failed"
 		);
 		return false;
 	}
@@ -320,10 +326,15 @@ export function isLocalhost(hostname: string): boolean {
 
 const getWebsiteByIdCached = cacheable(
 	async (id: string): Promise<Website | null> => {
-		const website = await db.query.websites.findFirst({
-			where: eq(websites.id, id),
-		});
-		return website ?? null;
+		try {
+			const website = await db.query.websites.findFirst({
+				where: eq(websites.id, id),
+			});
+			return website ?? null;
+		} catch (error) {
+			logger.error({ error, websiteId: id }, "Failed to get website by ID from cache");
+			return null;
+		}
 	},
 	{
 		expireInSec: 300, // 5 minutes
@@ -347,11 +358,16 @@ const getOwnerIdCached = cacheable(
 export async function getWebsiteByIdV2(
 	id: string
 ): Promise<WebsiteWithOwner | null> {
-	const website = await getWebsiteByIdCached(id);
-	if (!website) {
+	try {
+		const website = await getWebsiteByIdCached(id);
+		if (!website) {
+			return null;
+		}
+
+		const ownerId = await getOwnerIdCached(website);
+		return { ...website, ownerId };
+	} catch (error) {
+		logger.error({ error, websiteId: id }, "Failed to get website by ID V2");
 		return null;
 	}
-
-	const ownerId = await getOwnerIdCached(website);
-	return { ...website, ownerId };
 }

apps/basket/src/index.ts

@@ -78,5 +78,5 @@ console.log(`Basket service running on http://localhost:${port}`);
 
 export default {
 	fetch: app.fetch,
-	port: Number.parseInt(port.toString()),
+	port,
 };

apps/basket/src/lib/blocked-traffic.ts

@@ -3,6 +3,7 @@ import type { BlockedTraffic } from "@databuddy/db";
 import { extractIpFromRequest, getGeo } from "../utils/ip-geo";
 import { parseUserAgent } from "../utils/user-agent";
 import { sanitizeString, VALIDATION_LIMITS } from "../utils/validation";
+import { logger } from "./logger";
 import { sendEvent } from "./producer";
 
 /**
@@ -84,7 +85,7 @@ export async function logBlockedTraffic(
 		};
 
 		sendEvent("analytics-blocked-traffic", blockedEvent);
-	} catch {
-		//
+	} catch (error) {
+		logger.error({ error }, "Failed to log blocked traffic");
 	}
 }

apps/basket/src/lib/event-service.ts

@@ -14,6 +14,7 @@ import {
 	validatePerformanceMetric,
 	validateSessionId,
 } from "../utils/validation";
+import { logger } from "./logger";
 import { sendEvent, sendEventBatch } from "./producer";
 import { checkDuplicate } from "./security";
 
@@ -86,11 +87,11 @@ export async function insertError(
 
 	try {
 		sendEvent("analytics-errors", errorEvent);
-	} catch (err) {
-		console.error("Failed to queue error event", {
-			error: err as Error,
-			eventId,
-		});
+	} catch (error) {
+		logger.error(
+			{ error, eventId },
+			"Failed to queue error event"
+		);
 	}
 }
 
@@ -152,11 +153,11 @@ export async function insertWebVitals(
 
 	try {
 		sendEvent("analytics-web-vitals", webVitalsEvent);
-	} catch (err) {
-		console.error("Failed to queue web vitals event", {
-			error: err as Error,
-			eventId,
-		});
+	} catch (error) {
+		logger.error(
+			{ error, eventId },
+			"Failed to queue web vitals event"
+		);
 		// Don't throw - event is buffered or sent async
 	}
 }
@@ -206,11 +207,11 @@ export async function insertCustomEvent(
 
 	try {
 		sendEvent("analytics-custom-events", customEvent);
-	} catch (err) {
-		console.error("Failed to queue custom event", {
-			error: err as Error,
-			eventId,
-		});
+	} catch (error) {
+		logger.error(
+			{ error, eventId },
+			"Failed to queue custom event"
+		);
 		// Don't throw - event is buffered or sent async
 	}
 }
@@ -258,11 +259,11 @@ export async function insertOutgoingLink(
 
 	try {
 		sendEvent("analytics-outgoing-links", outgoingLinkEvent);
-	} catch (err) {
-		console.error("Failed to queue outgoing link event", {
-			error: err as Error,
-			eventId,
-		});
+	} catch (error) {
+		logger.error(
+			{ error, eventId },
+			"Failed to queue outgoing link event"
+		);
 	}
 }
 
@@ -380,11 +381,11 @@ export async function insertTrackEvent(
 
 	try {
 		sendEvent("analytics-events", trackEvent);
-	} catch (err) {
-		console.error("Failed to queue track event", {
-			error: err as Error,
-			eventId,
-		});
+	} catch (error) {
+		logger.error(
+			{ error, eventId },
+			"Failed to queue track event"
+		);
 	}
 }
 
@@ -397,12 +398,11 @@ export async function insertTrackEventsBatch(
 
 	try {
 		await sendEventBatch("analytics-events", events);
-	} catch (err) {
-		console.error("Failed to queue track events batch", {
-			error: err as Error,
-			count: events.length,
-		});
-		// Don't throw - events are buffered
+	} catch (error) {
+		logger.error(
+			{ error, count: events.length },
+			"Failed to queue track events batch"
+		);
 	}
 }
 
@@ -413,11 +413,11 @@ export async function insertErrorsBatch(events: ErrorEvent[]): Promise<void> {
 
 	try {
 		await sendEventBatch("analytics-errors", events);
-	} catch (err) {
-		console.error("Failed to queue errors batch", {
-			error: err as Error,
-			count: events.length,
-		});
+	} catch (error) {
+		logger.error(
+			{ error, count: events.length },
+			"Failed to queue errors batch"
+		);
 	}
 }
 
@@ -430,11 +430,11 @@ export async function insertWebVitalsBatch(
 
 	try {
 		await sendEventBatch("analytics-web-vitals", events);
-	} catch (err) {
-		console.error("Failed to queue web vitals batch", {
-			error: err as Error,
-			count: events.length,
-		});
+	} catch (error) {
+		logger.error(
+			{ error, count: events.length },
+			"Failed to queue web vitals batch"
+		);
 	}
 }
 
@@ -447,11 +447,11 @@ export async function insertCustomEventsBatch(
 
 	try {
 		await sendEventBatch("analytics-custom-events", events);
-	} catch (err) {
-		console.error("Failed to queue custom events batch", {
-			error: err as Error,
-			count: events.length,
-		});
+	} catch (error) {
+		logger.error(
+			{ error, count: events.length },
+			"Failed to queue custom events batch"
+		);
 	}
 }
 
@@ -464,10 +464,10 @@ export async function insertOutgoingLinksBatch(
 
 	try {
 		await sendEventBatch("analytics-outgoing-links", events);
-	} catch (err) {
-		console.error("Failed to queue outgoing links batch", {
-			error: err as Error,
-			count: events.length,
-		});
+	} catch (error) {
+		logger.error(
+			{ error, count: events.length },
+			"Failed to queue outgoing links batch"
+		);
 	}
 }

apps/basket/src/lib/logger.ts

@@ -1,16 +1,5 @@
-import pino from "pino";
+import { logger as sharedLogger } from "@databuddy/shared/logger";
 
-export const logger = pino({
-	level: process.env.LOG_LEVEL || "info",
-	transport:
-		process.env.NODE_ENV === "development"
-			? {
-					target: "pino-pretty",
-					options: {
-						colorize: true,
-						translateTime: "HH:MM:ss",
-						ignore: "pid,hostname",
-					},
-				}
-			: undefined,
+export const logger = sharedLogger.child({
+	service: "basket",
 });