Skip to content

Commit 6ad5c05

Browse files
izadoesdevizadoesdev
committed
cleanup basket
1 parent 9ffb628 commit 6ad5c05

File tree

15 files changed

+50
-47
lines changed

15 files changed

+50
-47
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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import "./polyfills/compression";
22

33
import { Elysia } from "elysia";
4-
import { disconnectProducer, getProducerStats } from "lib/producer";
4+
import { disconnectProducer, getProducerStats } from "@/lib/producer";
55
import {
66
captureError,
77
endRequestSpan,
88
initTracing,
99
shutdownTracing,
1010
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";
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";
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";
22
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";
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: 1 addition & 1 deletion
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";
33
import { CompressionTypes, Kafka, type Producer } from "kafkajs";
4-
import { captureError, record, setAttributes } from "lib/tracing";
4+
import { captureError, record, setAttributes } from "@/lib/tracing";
55

66
/**
77
* JSON stringify with undefined -> null conversion

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
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";
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";
77
import {
88
sanitizeString,
99
VALIDATION_LIMITS,
1010
validatePayloadSize,
11-
} from "utils/validation";
11+
} from "@/utils/validation";
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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,30 @@ import {
1414
insertOutgoingLinksBatch,
1515
insertTrackEvent,
1616
insertTrackEventsBatch,
17-
} from "lib/event-service";
18-
import { checkForBot, validateRequest } from "lib/request-validation";
19-
import { captureError, record } from "lib/tracing";
17+
} from "@/lib/event-service";
18+
import { checkForBot, validateRequest } from "@/lib/request-validation";
19+
import { captureError, record } from "@/lib/tracing";
2020

2121
import {
2222
analyticsEventSchema,
2323
outgoingLinkSchema,
24-
} from "utils/event-schema";
25-
import { getGeo } from "utils/ip-geo";
24+
} from "@/utils/event-schema";
25+
import { getGeo } from "@/utils/ip-geo";
2626
import {
2727
createBotDetectedResponse,
2828
createSchemaErrorResponse,
2929
parseEventId,
3030
parseProperties,
3131
parseTimestamp,
3232
validateEventSchema,
33-
} from "utils/parsing-helpers";
34-
import { parseUserAgent } from "utils/user-agent";
33+
} from "@/utils/parsing-helpers";
34+
import { parseUserAgent } from "@/utils/user-agent";
3535
import {
3636
sanitizeString,
3737
VALIDATION_LIMITS,
3838
validatePerformanceMetric,
3939
validateSessionId,
40-
} from "utils/validation";
40+
} from "@/utils/validation";
4141

4242
function processTrackEventData(
4343
trackData: any,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import {
77
emailEventSchema,
88
} from "@databuddy/validation";
99
import { Elysia } from "elysia";
10-
import { sendEvent } from "lib/producer";
11-
import { captureError } from "lib/tracing";
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 @@
11
import { Elysia } from "elysia";
2-
import { insertAICallSpans } from "lib/event-service";
3-
import { validateRequest } from "lib/request-validation";
4-
import { captureError } from "lib/tracing";
52
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)