cleanup basket

izadoesdev · izadoesdev · commit 9ffb628f5a7e · 2025-12-23T20:22:27.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -47,4 +47,5 @@ yarn-error.log*
 
 *.mmdb
 
-*.tsbuildinfo
+*.tsbuildinfo
+*.buildinfo
diff --git a/apps/basket/src/hooks/auth.ts b/apps/basket/src/hooks/auth.ts
@@ -7,7 +7,7 @@
 
 import { and, db, eq, member, websites } from "@databuddy/db";
 import { cacheable } from "@databuddy/redis";
-import { captureError, record, setAttributes } from "../lib/tracing";
+import { captureError, record, setAttributes } from "lib/tracing";
 
 type Website = typeof websites.$inferSelect;
 
diff --git a/apps/basket/src/index.ts b/apps/basket/src/index.ts
@@ -1,18 +1,18 @@
 import "./polyfills/compression";
 
 import { Elysia } from "elysia";
-import { disconnectProducer, getProducerStats } from "./lib/producer";
+import { disconnectProducer, getProducerStats } from "lib/producer";
 import {
 	captureError,
 	endRequestSpan,
 	initTracing,
 	shutdownTracing,
 	startRequestSpan,
-} from "./lib/tracing";
-import basketRouter from "./routes/basket";
-import emailRouter from "./routes/email";
-import llmRouter from "./routes/llm";
-import { closeGeoIPReader } from "./utils/ip-geo";
+} from "lib/tracing";
+import basketRouter from "routes/basket";
+import emailRouter from "routes/email";
+import llmRouter from "routes/llm";
+import { closeGeoIPReader } from "utils/ip-geo";
 
 initTracing();
 
diff --git a/apps/basket/src/lib/blocked-traffic.ts b/apps/basket/src/lib/blocked-traffic.ts
@@ -1,10 +1,10 @@
-import { randomUUID } from "node:crypto";
 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 { sendEvent } from "./producer";
-import { captureError } from "./tracing";
+import { randomUUIDv7 } from "bun";
+import { sendEvent } from "lib/producer";
+import { captureError } from "lib/tracing";
+import { extractIpFromRequest, getGeo } from "utils/ip-geo";
+import { parseUserAgent } from "utils/user-agent";
+import { sanitizeString, VALIDATION_LIMITS } from "utils/validation";
 
 async function _logBlockedTrafficAsync(
 	request: Request,
@@ -32,7 +32,7 @@ async function _logBlockedTrafficAsync(
 		const { browserName, browserVersion, osName, osVersion, deviceType } = ua;
 
 		const blockedEvent: BlockedTraffic = {
-			id: randomUUID(),
+			id: randomUUIDv7(),
 			client_id: clientId || "",
 			timestamp: now,
 
diff --git a/apps/basket/src/lib/event-service.ts b/apps/basket/src/lib/event-service.ts
@@ -12,17 +12,17 @@ import type {
 	ErrorSpan,
 	IndividualVital,
 } from "@databuddy/validation";
-import { getGeo } from "../utils/ip-geo";
-import { parseUserAgent } from "../utils/user-agent";
+import { sendEvent, sendEventBatch } from "lib/producer";
+import { checkDuplicate, getDailySalt, saltAnonymousId } from "lib/security";
+import { captureError, record, setAttributes } from "lib/tracing";
+import { getGeo } from "utils/ip-geo";
+import { parseUserAgent } from "utils/user-agent";
 import {
 	sanitizeString,
 	VALIDATION_LIMITS,
 	validatePerformanceMetric,
 	validateSessionId,
-} from "../utils/validation";
-import { sendEvent, sendEventBatch } from "./producer";
-import { checkDuplicate, getDailySalt, saltAnonymousId } from "./security";
-import { captureError, record, setAttributes } from "./tracing";
+} from "utils/validation";
 
 /**
  * Insert a track event (pageview/analytics event) via Kafka
diff --git a/apps/basket/src/lib/producer.ts b/apps/basket/src/lib/producer.ts
@@ -1,7 +1,7 @@
 import type { ClickHouseClient } from "@clickhouse/client";
 import { clickHouse, TABLE_NAMES } from "@databuddy/db";
 import { CompressionTypes, Kafka, type Producer } from "kafkajs";
-import { captureError, record, setAttributes } from "./tracing";
+import { captureError, record, setAttributes } from "lib/tracing";
 
 /**
  * JSON stringify with undefined -> null conversion
diff --git a/apps/basket/src/lib/request-validation.ts b/apps/basket/src/lib/request-validation.ts
@@ -1,14 +1,14 @@
 import { Autumn as autumn } from "autumn-js";
-import { getWebsiteByIdV2, isValidOrigin } from "../hooks/auth";
-import { extractIpFromRequest } from "../utils/ip-geo";
-import { detectBot } from "../utils/user-agent";
+import { getWebsiteByIdV2, isValidOrigin } from "hooks/auth";
+import { logBlockedTraffic } from "lib/blocked-traffic";
+import { captureError, record, setAttributes } from "lib/tracing";
+import { extractIpFromRequest } from "utils/ip-geo";
+import { detectBot } from "utils/user-agent";
 import {
 	sanitizeString,
 	VALIDATION_LIMITS,
 	validatePayloadSize,
-} from "../utils/validation";
-import { logBlockedTraffic } from "./blocked-traffic";
-import { captureError, record, setAttributes } from "./tracing";
+} from "utils/validation";
 
 interface ValidationResult {
 	success: boolean;
diff --git a/apps/basket/src/lib/security.ts b/apps/basket/src/lib/security.ts
@@ -1,6 +1,6 @@
 import crypto, { createHash } from "node:crypto";
 import { cacheable, redis } from "@databuddy/redis";
-import { captureError } from "./tracing";
+import { captureError } from "lib/tracing";
 
 const EXIT_EVENT_TTL = 172_800;
 const STANDARD_EVENT_TTL = 86_400;
diff --git a/apps/basket/src/routes/basket.ts b/apps/basket/src/routes/basket.ts
@@ -14,30 +14,30 @@ import {
 	insertOutgoingLinksBatch,
 	insertTrackEvent,
 	insertTrackEventsBatch,
-} from "../lib/event-service";
-import { checkForBot, validateRequest } from "../lib/request-validation";
-import { captureError, record } from "../lib/tracing";
+} from "lib/event-service";
+import { checkForBot, validateRequest } from "lib/request-validation";
+import { captureError, record } from "lib/tracing";
 
 import {
 	analyticsEventSchema,
 	outgoingLinkSchema,
-} from "../utils/event-schema";
-import { getGeo } from "../utils/ip-geo";
+} from "utils/event-schema";
+import { getGeo } from "utils/ip-geo";
 import {
 	createBotDetectedResponse,
 	createSchemaErrorResponse,
 	parseEventId,
 	parseProperties,
 	parseTimestamp,
 	validateEventSchema,
-} from "../utils/parsing-helpers";
-import { parseUserAgent } from "../utils/user-agent";
+} from "utils/parsing-helpers";
+import { parseUserAgent } from "utils/user-agent";
 import {
 	sanitizeString,
 	VALIDATION_LIMITS,
 	validatePerformanceMetric,
 	validateSessionId,
-} from "../utils/validation";
+} from "utils/validation";
 
 function processTrackEventData(
 	trackData: any,
diff --git a/apps/basket/src/routes/email.ts b/apps/basket/src/routes/email.ts
@@ -7,8 +7,8 @@ import {
 	emailEventSchema,
 } from "@databuddy/validation";
 import { Elysia } from "elysia";
-import { sendEvent } from "../lib/producer";
-import { captureError } from "../lib/tracing";
+import { sendEvent } from "lib/producer";
+import { captureError } from "lib/tracing";
 
 const expectedKey = process.env.EMAIL_API_KEY;
 
diff --git a/apps/basket/src/routes/llm.ts b/apps/basket/src/routes/llm.ts
@@ -1,8 +1,8 @@
 import { Elysia } from "elysia";
+import { insertAICallSpans } from "lib/event-service";
+import { validateRequest } from "lib/request-validation";
+import { captureError } from "lib/tracing";
 import { z } from "zod";
-import { insertAICallSpans } from "../lib/event-service";
-import { validateRequest } from "../lib/request-validation";
-import { captureError } from "../lib/tracing";
 
 const aiCallSchema = z.object({
     timestamp: z.union([z.date(), z.number(), z.string()]),
diff --git a/apps/basket/src/utils/ip-geo.test.ts b/apps/basket/src/utils/ip-geo.test.ts
@@ -4,7 +4,7 @@ import {
 	closeGeoIPReader,
 	extractIpFromRequest,
 	getGeo,
-} from "./ip-geo";
+} from "utils/ip-geo";
 
 const ipRegex = /^[a-f0-9]{12}$/;
 
diff --git a/apps/basket/src/utils/ip-geo.ts b/apps/basket/src/utils/ip-geo.ts
@@ -6,7 +6,7 @@ import {
 	BadMethodCallError,
 	Reader,
 } from "@maxmind/geoip2-node";
-import { captureError, record, setAttributes } from "../lib/tracing";
+import { captureError, record, setAttributes } from "lib/tracing";
 
 interface GeoIPReader extends Reader {
 	city(ip: string): City;
diff --git a/apps/basket/src/utils/parsing-helpers.ts b/apps/basket/src/utils/parsing-helpers.ts
@@ -1,7 +1,7 @@
+import { logBlockedTraffic } from "lib/blocked-traffic";
+import { record, setAttributes } from "lib/tracing";
+import { VALIDATION_LIMITS } from "utils/validation";
 import type { z } from "zod";
-import { logBlockedTraffic } from "../lib/blocked-traffic";
-import { record, setAttributes } from "../lib/tracing";
-import { VALIDATION_LIMITS } from "./validation";
 
 type ParseResult<T> =
 	| { success: true; data: T }
@@ -101,7 +101,7 @@ export function parseProperties(properties: unknown): string {
 /**
  * Creates standardized bot check result
  */
-export type BotCheckResult = {
+export interface BotCheckResult {
 	isBot: boolean;
 	response?: {
 		status: string;
diff --git a/apps/basket/src/utils/user-agent.ts b/apps/basket/src/utils/user-agent.ts
@@ -6,10 +6,10 @@
  */
 
 import { bots } from "@databuddy/shared/lists/bots";
+import { captureError, record } from "lib/tracing";
 import { UAParser } from "ua-parser-js";
-import { captureError, record } from "../lib/tracing";
 
-export type UserAgentInfo = {
+export interface UserAgentInfo {
 	bot: {
 		isBot: boolean;
 		name?: string;
diff --git a/apps/basket/tsconfig.json b/apps/basket/tsconfig.json
@@ -3,6 +3,7 @@
     "target": "ES2021",
     "module": "ES2022",
     "moduleResolution": "bundler",
+    "baseUrl": "src",
     "types": ["bun-types", "autumn-js"],
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
diff --git a/apps/basket/tsconfig.tsbuildinfo b/apps/basket/tsconfig.tsbuildinfo
diff --git a/update-mmdb.ts b/update-mmdb.ts
