Skip to content

Commit 190f73c

Browse files
izadoesdevizadoesdev
committed
cleanup basket
1 parent 6ad5c05 commit 190f73c

File tree

15 files changed

+55
-55
lines changed

15 files changed

+55
-55
lines changed

‎apps/basket/src/hooks/auth.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import { and, db, eq, member, websites } from "@databuddy/db";
99
import { cacheable } from "@databuddy/redis";
10-
import { captureError, record, setAttributes } from "@/lib/tracing";
10+
import { captureError, record, setAttributes } from "@lib/tracing";
1111

1212
type Website = typeof websites.$inferSelect;
1313

‎apps/basket/src/index.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import "./polyfills/compression";
22

3-
import { Elysia } from "elysia";
4-
import { disconnectProducer, getProducerStats } from "@/lib/producer";
3+
import { disconnectProducer, getProducerStats } from "@lib/producer";
54
import {
65
captureError,
76
endRequestSpan,
87
initTracing,
98
shutdownTracing,
109
startRequestSpan,
11-
} from "@/lib/tracing";
12-
import basketRouter from "@/routes/basket";
13-
import emailRouter from "@/routes/email";
14-
import llmRouter from "@/routes/llm";
15-
import { closeGeoIPReader } from "@/utils/ip-geo";
10+
} from "@lib/tracing";
11+
import basketRouter from "@routes/basket";
12+
import emailRouter from "@routes/email";
13+
import llmRouter from "@routes/llm";
14+
import { closeGeoIPReader } from "@utils/ip-geo";
15+
import { Elysia } from "elysia";
1616

1717
initTracing();
1818

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import type { BlockedTraffic } from "@databuddy/db";
2+
import { sendEvent } from "@lib/producer";
3+
import { captureError } from "@lib/tracing";
4+
import { extractIpFromRequest, getGeo } from "@utils/ip-geo";
5+
import { parseUserAgent } from "@utils/user-agent";
6+
import { sanitizeString, VALIDATION_LIMITS } from "@utils/validation";
27
import { randomUUIDv7 } from "bun";
3-
import { sendEvent } from "@/lib/producer";
4-
import { captureError } from "@/lib/tracing";
5-
import { extractIpFromRequest, getGeo } from "@/utils/ip-geo";
6-
import { parseUserAgent } from "@/utils/user-agent";
7-
import { sanitizeString, VALIDATION_LIMITS } from "@/utils/validation";
88

99
async function _logBlockedTrafficAsync(
1010
request: Request,

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ import type {
1212
ErrorSpan,
1313
IndividualVital,
1414
} from "@databuddy/validation";
15-
import { sendEvent, sendEventBatch } from "@/lib/producer";
16-
import { checkDuplicate, getDailySalt, saltAnonymousId } from "@/lib/security";
17-
import { captureError, record, setAttributes } from "@/lib/tracing";
18-
import { getGeo } from "@/utils/ip-geo";
19-
import { parseUserAgent } from "@/utils/user-agent";
15+
import { sendEvent, sendEventBatch } from "@lib/producer";
16+
import { checkDuplicate, getDailySalt, saltAnonymousId } from "@lib/security";
17+
import { captureError, record, setAttributes } from "@lib/tracing";
18+
import { getGeo } from "@utils/ip-geo";
19+
import { parseUserAgent } from "@utils/user-agent";
2020
import {
2121
sanitizeString,
2222
VALIDATION_LIMITS,
2323
validatePerformanceMetric,
2424
validateSessionId,
25-
} from "@/utils/validation";
25+
} from "@utils/validation";
2626

2727
/**
2828
* Insert a track event (pageview/analytics event) via Kafka

‎apps/basket/src/lib/producer.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { ClickHouseClient } from "@clickhouse/client";
22
import { clickHouse, TABLE_NAMES } from "@databuddy/db";
3+
import { captureError, record, setAttributes } from "@lib/tracing";
34
import { CompressionTypes, Kafka, type Producer } from "kafkajs";
4-
import { captureError, record, setAttributes } from "@/lib/tracing";
55

66
/**
77
* JSON stringify with undefined -> null conversion
@@ -26,7 +26,7 @@ interface ProducerStats {
2626
dropped: number;
2727
errors: number;
2828
lastErrorTime: number | null;
29-
};
29+
}
3030

3131
interface ProducerConfig {
3232
broker?: string;
@@ -64,7 +64,7 @@ interface ProducerDependencies {
6464
clickHouse: ClickHouseClient;
6565
topicMap: Record<string, string>;
6666
onError?: (error: Error) => void;
67-
};
67+
}
6868

6969
export class EventProducer {
7070
private readonly config: RequiredProducerConfig;

‎apps/basket/src/lib/request-validation.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import { Autumn as autumn } from "autumn-js";
2-
import { getWebsiteByIdV2, isValidOrigin } from "@/hooks/auth";
3-
import { logBlockedTraffic } from "@/lib/blocked-traffic";
4-
import { captureError, record, setAttributes } from "@/lib/tracing";
5-
import { extractIpFromRequest } from "@/utils/ip-geo";
6-
import { detectBot } from "@/utils/user-agent";
1+
import { getWebsiteByIdV2, isValidOrigin } from "@hooks/auth";
2+
import { logBlockedTraffic } from "@lib/blocked-traffic";
3+
import { captureError, record, setAttributes } from "@lib/tracing";
4+
import { extractIpFromRequest } from "@utils/ip-geo";
5+
import { detectBot } from "@utils/user-agent";
76
import {
87
sanitizeString,
98
VALIDATION_LIMITS,
109
validatePayloadSize,
11-
} from "@/utils/validation";
10+
} from "@utils/validation";
11+
import { Autumn as autumn } from "autumn-js";
1212

1313
interface ValidationResult {
1414
success: boolean;

‎apps/basket/src/lib/security.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import crypto, { createHash } from "node:crypto";
22
import { cacheable, redis } from "@databuddy/redis";
3-
import { captureError } from "@/lib/tracing";
3+
import { captureError } from "@lib/tracing";
44

55
const EXIT_EVENT_TTL = 172_800;
66
const STANDARD_EVENT_TTL = 86_400;

‎apps/basket/src/routes/basket.ts‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import {
55
batchedErrorsSchema,
66
batchedVitalsSchema,
77
} from "@databuddy/validation";
8-
import { Elysia } from "elysia";
98
import {
109
insertCustomEventSpans,
1110
insertErrorSpans,
@@ -14,30 +13,27 @@ import {
1413
insertOutgoingLinksBatch,
1514
insertTrackEvent,
1615
insertTrackEventsBatch,
17-
} from "@/lib/event-service";
18-
import { checkForBot, validateRequest } from "@/lib/request-validation";
19-
import { captureError, record } from "@/lib/tracing";
20-
21-
import {
22-
analyticsEventSchema,
23-
outgoingLinkSchema,
24-
} from "@/utils/event-schema";
25-
import { getGeo } from "@/utils/ip-geo";
16+
} from "@lib/event-service";
17+
import { checkForBot, validateRequest } from "@lib/request-validation";
18+
import { captureError, record } from "@lib/tracing";
19+
import { analyticsEventSchema, outgoingLinkSchema } from "@utils/event-schema";
20+
import { getGeo } from "@utils/ip-geo";
2621
import {
2722
createBotDetectedResponse,
2823
createSchemaErrorResponse,
2924
parseEventId,
3025
parseProperties,
3126
parseTimestamp,
3227
validateEventSchema,
33-
} from "@/utils/parsing-helpers";
34-
import { parseUserAgent } from "@/utils/user-agent";
28+
} from "@utils/parsing-helpers";
29+
import { parseUserAgent } from "@utils/user-agent";
3530
import {
3631
sanitizeString,
3732
VALIDATION_LIMITS,
3833
validatePerformanceMetric,
3934
validateSessionId,
40-
} from "@/utils/validation";
35+
} from "@utils/validation";
36+
import { Elysia } from "elysia";
4137

4238
function processTrackEventData(
4339
trackData: any,

‎apps/basket/src/routes/email.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import {
66
type EmailEventInput,
77
emailEventSchema,
88
} from "@databuddy/validation";
9+
import { sendEvent } from "@lib/producer";
10+
import { captureError } from "@lib/tracing";
911
import { Elysia } from "elysia";
10-
import { sendEvent } from "@/lib/producer";
11-
import { captureError } from "@/lib/tracing";
1212

1313
const expectedKey = process.env.EMAIL_API_KEY;
1414

‎apps/basket/src/routes/llm.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import { insertAICallSpans } from "@lib/event-service";
2+
import { validateRequest } from "@lib/request-validation";
3+
import { captureError } from "@lib/tracing";
14
import { Elysia } from "elysia";
25
import { z } from "zod";
3-
import { insertAICallSpans } from "@/lib/event-service";
4-
import { validateRequest } from "@/lib/request-validation";
5-
import { captureError } from "@/lib/tracing";
66

77
const aiCallSchema = z.object({
88
timestamp: z.union([z.date(), z.number(), z.string()]),

0 commit comments

Comments
 (0)