fix: more logs

izadoesdev · izadoesdev · commit 6f46b100403d · 2025-11-14T21:13:55.000+02:00
diff --git a/apps/api/src/index.ts b/apps/api/src/index.ts
@@ -108,11 +108,11 @@ export default {
 };
 
 process.on("SIGINT", () => {
-	logger.info("SIGINT signal received, shutting down...");
+	logger.info({ message: "SIGINT signal received, shutting down..." });
 	process.exit(0);
 });
 
 process.on("SIGTERM", () => {
-	logger.info("SIGTERM signal received, shutting down...");
+	logger.info({ message: "SIGTERM signal received, shutting down..." });
 	process.exit(0);
 });
diff --git a/apps/api/src/lib/api-key.ts b/apps/api/src/lib/api-key.ts
@@ -17,7 +17,8 @@ const getCachedApiKeyBySecret = cacheable(
 				),
 			});
 			return key ?? null;
-		} catch {
+		} catch (error) {
+			logger.error({ error }, "Failed to get API key by secret from cache");
 			return null;
 		}
 	},
@@ -36,7 +37,8 @@ const getCachedAccessEntries = cacheable(
 				.select()
 				.from(apikeyAccess)
 				.where(eq(apikeyAccess.apikeyId, keyId));
-		} catch {
+		} catch (error) {
+			logger.error({ error, keyId }, "Failed to get API key access entries from cache");
 			return [] as InferSelectModel<typeof apikeyAccess>[];
 		}
 	},
@@ -67,33 +69,42 @@ export async function getApiKeyFromHeader(
 	}
 	const key = await getCachedApiKeyBySecret(secret);
 	if (!key) {
-		logger.warn("API key authentication failed: invalid key", {
-			userAgent: headers.get("user-agent"),
-			ip: headers.get("x-forwarded-for") || headers.get("x-real-ip"),
-			method: "getApiKeyFromHeader",
-		});
+		logger.warn(
+			{
+				userAgent: headers.get("user-agent"),
+				ip: headers.get("x-forwarded-for") || headers.get("x-real-ip"),
+				method: "getApiKeyFromHeader",
+			},
+			"API key authentication failed: invalid key"
+		);
 		return null;
 	}
 	if (key.expiresAt && new Date(key.expiresAt) <= new Date()) {
-		logger.warn("API key authentication failed: expired key", {
-			apikeyId: key.id,
-			expiresAt: key.expiresAt,
-			userAgent: headers.get("user-agent"),
-			ip: headers.get("x-forwarded-for") || headers.get("x-real-ip"),
-		});
+		logger.warn(
+			{
+				apikeyId: key.id,
+				expiresAt: key.expiresAt,
+				userAgent: headers.get("user-agent"),
+				ip: headers.get("x-forwarded-for") || headers.get("x-real-ip"),
+			},
+			"API key authentication failed: expired key"
+		);
 		return null;
 	}
 
 	// Audit log successful API key usage
-	logger.info("API key used successfully", {
-		apikeyId: key.id,
-		userId: key.userId,
-		organizationId: key.organizationId,
-		scopes: key.scopes,
-		userAgent: headers.get("user-agent"),
-		ip: headers.get("x-forwarded-for") || headers.get("x-real-ip"),
-		keyPrefix: key.prefix,
-	});
+	logger.info(
+		{
+			apikeyId: key.id,
+			userId: key.userId,
+			organizationId: key.organizationId,
+			scopes: key.scopes,
+			userAgent: headers.get("user-agent"),
+			ip: headers.get("x-forwarded-for") || headers.get("x-real-ip"),
+			keyPrefix: key.prefix,
+		},
+		"API key used successfully"
+	);
 
 	return key;
 }
@@ -112,7 +123,6 @@ export async function resolveEffectiveScopesForWebsite(
 	websiteId: string
 ): Promise<Set<ApiScope>> {
 	if (!key) {
-		logger.debug("Cannot resolve scopes for null API key", { websiteId });
 		return new Set();
 	}
 
@@ -133,15 +143,6 @@ export async function resolveEffectiveScopesForWebsite(
 		}
 	}
 
-	// Audit log scope resolution for website access
-	logger.debug("Resolved effective scopes for website", {
-		apikeyId: key.id,
-		websiteId,
-		effectiveScopes: Array.from(effective),
-		globalScopes: key.scopes || [],
-		accessEntriesCount: entries.length,
-	});
-
 	return effective;
 }
 
@@ -151,33 +152,14 @@ export async function hasWebsiteScope(
 	required: ApiScope
 ): Promise<boolean> {
 	if (!key) {
-		logger.debug("Scope check failed: null API key", {
-			websiteId,
-			requiredScope: required,
-		});
 		return false;
 	}
 
 	if ((key.scopes || []).includes(required)) {
-		logger.debug("Scope check passed via global scope", {
-			apikeyId: key.id,
-			websiteId,
-			requiredScope: required,
-			source: "global",
-		});
 		return true;
 	}
 	const effective = await resolveEffectiveScopesForWebsite(key, websiteId);
 	const hasScope = effective.has(required);
 
-	logger.debug("Scope check result", {
-		apikeyId: key.id,
-		websiteId,
-		requiredScope: required,
-		hasScope,
-		source: hasScope ? "effective" : "denied",
-		effectiveScopes: Array.from(effective),
-	});
-
 	return hasScope;
 }
diff --git a/apps/api/src/lib/export/data-fetcher.ts b/apps/api/src/lib/export/data-fetcher.ts
@@ -48,32 +48,29 @@ export async function fetchExportData(
 		// Execute queries in parallel with secure parameters
 		const [events, errors, webVitals] = await Promise.all([
 			chQuery<SanitizedEvent>(eventsQuery, queryParams).catch((error) => {
-				logger.error({
-					message: "Failed to fetch events for export",
-					websiteId,
-					error: error instanceof Error ? error.message : String(error),
-				});
+				logger.error(
+					{ error, websiteId },
+					"Failed to fetch events for export"
+				);
 				throw new Error(
 					`Failed to fetch events: ${error instanceof Error ? error.message : String(error)}`
 				);
 			}),
 			chQuery<SanitizedError>(errorsQuery, queryParams).catch((error) => {
-				logger.error({
-					message: "Failed to fetch errors for export",
-					websiteId,
-					error: error instanceof Error ? error.message : String(error),
-				});
+				logger.error(
+					{ error, websiteId },
+					"Failed to fetch errors for export"
+				);
 				throw new Error(
 					`Failed to fetch errors: ${error instanceof Error ? error.message : String(error)}`
 				);
 			}),
 			chQuery<SanitizedWebVitals>(webVitalsQuery, queryParams).catch(
 				(error) => {
-					logger.error({
-						message: "Failed to fetch web vitals for export",
-						websiteId,
-						error: error instanceof Error ? error.message : String(error),
-					});
+					logger.error(
+						{ error, websiteId },
+						"Failed to fetch web vitals for export"
+					);
 					throw new Error(
 						`Failed to fetch web vitals: ${error instanceof Error ? error.message : String(error)}`
 					);
@@ -87,14 +84,15 @@ export async function fetchExportData(
 			webVitals,
 		};
 	} catch (error) {
-		logger.error({
-			message: "Export data fetch failed",
-			websiteId,
-			startDate,
-			endDate,
-			error: error instanceof Error ? error.message : String(error),
-			stack: error instanceof Error ? error.stack : undefined,
-		});
+		logger.error(
+			{
+				error,
+				websiteId,
+				startDate,
+				endDate,
+			},
+			"Export data fetch failed"
+		);
 		throw error;
 	}
 }
diff --git a/apps/api/src/lib/export/index.ts b/apps/api/src/lib/export/index.ts
@@ -10,7 +10,7 @@ import {
 } from "./file-generator";
 import type { ExportRequest } from "./types";
 
-export interface ExportResult {
+export type ExportResult = {
 	buffer: Buffer;
 	filename: string;
 	metadata: {
@@ -26,22 +26,28 @@ export async function processExport(
 ): Promise<ExportResult> {
 	const { website_id: websiteId, format = "json" } = request;
 
-	logger.info("Starting data export", {
-		websiteId,
-		startDate: request.start_date,
-		endDate: request.end_date,
-		format,
-	});
+	logger.info(
+		{
+			websiteId,
+			startDate: request.start_date,
+			endDate: request.end_date,
+			format,
+		},
+		"Starting data export"
+	);
 
 	// Fetch data from ClickHouse
 	const data = await fetchExportData(request);
 
-	logger.info("Data export queries completed", {
-		websiteId,
-		eventsCount: data.events.length,
-		errorsCount: data.errors.length,
-		webVitalsCount: data.webVitals.length,
-	});
+	logger.info(
+		{
+			websiteId,
+			eventsCount: data.events.length,
+			errorsCount: data.errors.length,
+			webVitalsCount: data.webVitals.length,
+		},
+		"Data export queries completed"
+	);
 
 	// Generate export files
 	const exportFiles = generateExportFiles(data, format);
@@ -55,12 +61,15 @@ export async function processExport(
 	const totalRecords =
 		data.events.length + data.errors.length + data.webVitals.length;
 
-	logger.info("Data export completed successfully", {
-		websiteId,
-		filename,
-		totalSize: buffer.length,
-		totalRecords,
-	});
+	logger.info(
+		{
+			websiteId,
+			filename,
+			totalSize: buffer.length,
+			totalRecords,
+		},
+		"Data export completed successfully"
+	);
 
 	return {
 		buffer,
