refactor: universal logger and remove N+1 catalog queries

- Replace all 39 console.* calls with universal logger (pino server, console browser)
- Set server-only marker on import-badge.ts
- Disable DB query logging in production
- Add bulkInsertCatalogItems: one transaction instead of N per-item inserts
- Add reserveCatalogItemIds helper for bulk ID allocation
- Optimize translateCatalogItems: single inArray batch query instead of N per-item selects
- Test mock updated for logger.debug
- biome clean, tsc clean, 3569 tests passing

src/lib/db.ts

@@ -49,14 +49,7 @@ function createDb() {
 	return drizzle(instrumentDatabase(pool), {
 		schema: fullSchema,
 		mode: "default",
-		logger:
-			env.NODE_ENV === "development"
-				? {
-						logQuery(query, params) {
-							console.log("[db]", query, params);
-						},
-					}
-				: false,
+		logger: false,
 	});
 }
 

src/lib/logger.ts

@@ -5,6 +5,9 @@ import { getOperationContext } from "./foundation/request-context";
 
 type LogLevel = "debug" | "info" | "warn" | "error";
 
+const isBrowser =
+	typeof window !== "undefined" && typeof window.console !== "undefined";
+
 const level: LogLevel =
 	(env.LOG_LEVEL as LogLevel | undefined) ??
 	(env.NODE_ENV === "production" ? "info" : "debug");
@@ -32,18 +35,45 @@ export function generateRequestId(): string {
 	return `${Date.now().toString(36)}-${requestIdCounter.toString(36)}`;
 }
 
-/** Compatibility wrapper — existing call sites use (message, meta). */
+function formatMeta(meta: Record<string, unknown> = {}): string {
+	const keys = Object.keys(meta);
+	if (keys.length === 0) return "";
+	return keys
+		.map((k) => {
+			const v = meta[k];
+			return `${k}=${v instanceof Error ? v.message : String(v)}`;
+		})
+		.join(" ");
+}
+
+/** Universal logger: pino on server, console in browser. Same interface everywhere. */
 export const logger = {
 	debug(message: string, meta: Record<string, unknown> = {}): void {
+		if (isBrowser) {
+			console.debug(`[debug] ${message} ${formatMeta(meta)}`.trim());
+			return;
+		}
 		pinoLogger.debug({ ...meta, ...getOperationContext() }, message);
 	},
 	info(message: string, meta: Record<string, unknown> = {}): void {
+		if (isBrowser) {
+			console.info(`[info] ${message} ${formatMeta(meta)}`.trim());
+			return;
+		}
 		pinoLogger.info({ ...meta, ...getOperationContext() }, message);
 	},
 	warn(message: string, meta: Record<string, unknown> = {}): void {
+		if (isBrowser) {
+			console.warn(`[warn] ${message} ${formatMeta(meta)}`.trim());
+			return;
+		}
 		pinoLogger.warn({ ...meta, ...getOperationContext() }, message);
 	},
 	error(message: string, meta: Record<string, unknown> = {}): string {
+		if (isBrowser) {
+			console.error(`[error] ${message} ${formatMeta(meta)}`.trim());
+			return "";
+		}
 		const error =
 			meta.err instanceof Error
 				? meta.err
@@ -57,7 +87,6 @@ export const logger = {
 									: message,
 						);
 		const operation = getOperationContext();
-		// Keep trusted correlation first so bounded error context retains it.
 		const context = { ...operation, ...meta, ...operation };
 		const errorId = captureCmsError("server", message, error, context);
 		pinoLogger.error({ ...context, errorId }, message);

src/lib/services/furni-import-cache.ts

@@ -21,6 +21,7 @@ import {
 	normalizeClassname,
 } from "@/lib/furni/classname";
 import { indexLocalFurniture } from "@/lib/furni/local-presence";
+import { logger } from "@/lib/logger";
 import { readFurniData } from "./furni-data";
 
 const CACHE_TTL = 30_000; // 30 seconds
@@ -244,9 +245,8 @@ export async function getFurniImportStats(
 		statsSnapshot = { stats, timestamp: now };
 		return stats;
 	} catch (err) {
-		console.warn(
-			"[furni-import-cache] Stats scan failed:",
-			(err as Error).message,
+		logger.warn(
+			`[furni-import-cache] Stats scan failed: ${(err as Error).message}`,
 		);
 		return (
 			statsSnapshot?.stats ?? {

src/lib/services/furni-import.ts

@@ -534,6 +534,46 @@ export async function allocateCatalogItemId<T>(
 	return await insertFn(nextId);
 }
 
+/** Reserveer N sequentiële catalog item IDs uit de in-process counter, zonder
+ * per-item transaction. Gebruikt door bulk insert paden. */
+export async function reserveCatalogItemIds(count: number): Promise<number[]> {
+	if (count <= 0) return [];
+
+	const now = Date.now();
+	if (
+		catalogNextId === null ||
+		now - catalogIdLastUsed > CATALOG_ID_REFRESH_MS
+	) {
+		let settle!: () => void;
+		const prev = catalogIdSeedChain;
+		catalogIdSeedChain = new Promise<void>((r) => {
+			settle = r;
+		});
+		await prev.catch((error) =>
+			logServerError("furni.catalog_id_chain_failed", error),
+		);
+		try {
+			if (
+				catalogNextId === null ||
+				Date.now() - catalogIdLastUsed > CATALOG_ID_REFRESH_MS
+			) {
+				const maxIdResult = await queryRows<{
+					maxId: number | bigint | null;
+				}>(sql`
+					SELECT MAX(id) as maxId FROM catalog_items
+				`);
+				catalogNextId = Number(maxIdResult[0]?.maxId ?? 0) + 1;
+			}
+		} finally {
+			settle();
+		}
+	}
+	catalogIdLastUsed = Date.now();
+	const start = catalogNextId;
+	catalogNextId += count;
+	return Array.from({ length: count }, (_, i) => start + i);
+}
+
 /** Test seam: drop the cached id counter between tests. */
 
 /**

src/lib/services/habbo-furnidata-cache.test.ts

@@ -11,7 +11,7 @@ vi.mock("@/lib/services/habbo-gamedata-hotel", () => ({
 }));
 
 vi.mock("@/lib/logger", () => ({
-	logger: { warn: vi.fn() },
+	logger: { warn: vi.fn(), debug: vi.fn() },
 }));
 
 import * as cacheModule from "./habbo-furnidata-cache";

src/lib/services/habbo-furnidata-cache.ts

@@ -40,7 +40,7 @@ export async function getOfficialHabboFurnidata(): Promise<
 	loading = (async () => {
 		const url = habboFurnidataUrl(hotel);
 		try {
-			console.debug(`[habbo-furnidata] Fetching furnidata from ${url}...`);
+			logger.debug(`[habbo-furnidata] Fetching furnidata from ${url}...`);
 			const res = await fetch(url, {
 				signal: AbortSignal.timeout(20000),
 				headers: browserHeaders(),
@@ -114,7 +114,7 @@ export async function getOfficialHabboFurnidata(): Promise<
 				}
 			}
 
-			console.debug(
+			logger.debug(
 				`[habbo-furnidata] Cached ${map.size} items from habbo.${hotel} (${roomTypes?.length ?? 0} room + ${wallTypes?.length ?? 0} wall)`,
 			);
 			cache = map;

src/lib/services/habboassets.ts

@@ -106,7 +106,7 @@ async function loadBadges(): Promise<{
 
 			badges.sort((a, b) => a.code.localeCompare(b.code));
 
-			console.debug(
+			logger.debug(
 				`[badges] Loaded ${badges.length} badges from habbo.${hotel}`,
 			);
 			badgeCache = badges;

src/lib/services/import-badge.ts

@@ -1,6 +1,8 @@
+import "server-only";
 import { promises as fs } from "node:fs";
 import path from "node:path";
 import { db, WebsiteBadges } from "@/lib/db";
+import { logger } from "@/lib/logger";
 import { getGamedataRoot } from "@/lib/services/furni-asset-dirs";
 import { getRuntimePath } from "@/lib/utils/runtime-path";
 
@@ -37,9 +39,8 @@ export async function writeBadgeToExternalTexts(
 	} catch (err) {
 		// File not present yet (fresh deployment) — start with an empty object.
 		if ((err as NodeJS.ErrnoException).code !== "ENOENT") {
-			console.warn(
-				"[import-badges] Failed to update ExternalTexts.json:",
-				(err as Error).message,
+			logger.warn(
+				`[import-badges] Failed to update ExternalTexts.json: ${(err as Error).message}`,
 			);
 			return {
 				ok: false,
@@ -66,9 +67,8 @@ export async function writeBadgeToExternalTexts(
 		await fs.writeFile(extPath, JSON.stringify(texts, null, 4), "utf-8");
 		return { ok: true };
 	} catch (err) {
-		console.warn(
-			"[import-badges] Failed to update ExternalTexts.json:",
-			(err as Error).message,
+		logger.warn(
+			`[import-badges] Failed to update ExternalTexts.json: ${(err as Error).message}`,
 		);
 		return {
 			ok: false,

src/lib/services/import/core/download.ts

@@ -1,4 +1,5 @@
 import { promises as fs } from "node:fs";
+import { logger } from "@/lib/logger";
 import { getByparrCookies } from "@/lib/services/byparr";
 import {
 	detectNitroTextureFormat,
@@ -119,7 +120,7 @@ export async function downloadFile(
 						const stat = await fs.stat(destPath);
 						return { ok: true, size: stat.size };
 					}
-					console.warn(
+					logger.warn(
 						`[import-download] Download failed ${url}: ${res.status}${deterministic ? " (deterministic, not retrying)" : ` after ${maxRetries + 1} attempts`}`,
 					);
 					return { ok: false, size: 0, error: `HTTP ${res.status}` };
@@ -134,14 +135,14 @@ export async function downloadFile(
 			}
 			if (options?.validate === "swf" && !validateSwfBytes(buffer)) {
 				if (attempt === maxRetries) {
-					console.warn(`[import-download] Invalid SWF magic bytes from ${url}`);
+					logger.warn(`[import-download] Invalid SWF magic bytes from ${url}`);
 					return { ok: false, size: 0, error: "Response is not a SWF file" };
 				}
 				continue;
 			}
 			if (options?.validate === "png" && !validatePngBytes(buffer)) {
 				if (attempt === maxRetries) {
-					console.warn(`[import-download] Invalid PNG magic bytes from ${url}`);
+					logger.warn(`[import-download] Invalid PNG magic bytes from ${url}`);
 					return { ok: false, size: 0, error: "Response is not a PNG file" };
 				}
 				continue;
@@ -159,9 +160,8 @@ export async function downloadFile(
 					const stat = await fs.stat(destPath);
 					return { ok: true, size: stat.size };
 				}
-				console.warn(
-					`[import-download] Download error ${url}:`,
-					(err as Error).message,
+				logger.warn(
+					`[import-download] Download error ${url}: ${(err as Error).message}`,
 				);
 				const failure = err as {
 					code?: string;

src/lib/services/import/core/gamedata-json.ts

@@ -1,4 +1,5 @@
 import { promises as fs } from "node:fs";
+import { logger } from "@/lib/logger";
 
 const LOCK_STALE_MS = 60_000;
 const LOCK_ACQUIRE_TIMEOUT_MS = 30_000;
@@ -50,7 +51,7 @@ async function waitForChain(filePath: string): Promise<void> {
 
 	if (elapsed > CHAIN_TIMEOUT_MS) {
 		// Previous holder took too long — break the chain
-		console.warn(
+		logger.warn(
 			`[gamedata-lock] Breaking stale chain for ${filePath} (held for ${elapsed}ms)`,
 		);
 		chains.delete(filePath);
@@ -70,7 +71,7 @@ async function waitForChain(filePath: string): Promise<void> {
 		]);
 	} catch {
 		// Chain holder timed out or crashed — break the chain
-		console.warn(
+		logger.warn(
 			`[gamedata-lock] Chain timeout for ${filePath}, breaking chain`,
 		);
 		chains.delete(filePath);