Skip to content

Commit daac370

Browse files
izadoesdevizadoesdev
committed
cleanup
1 parent f186315 commit daac370

File tree

7 files changed

+88
-126
lines changed

7 files changed

+88
-126
lines changed

‎apps/dashboard/lib/orpc.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ import { RPCLink } from "@orpc/client/fetch";
44
import type { RouterClient } from "@orpc/server";
55
import { createTanstackQueryUtils } from "@orpc/tanstack-query";
66

7+
declare global {
8+
// eslint-disable-next-line no-var
9+
var $client: RouterClient<AppRouter> | undefined;
10+
}
11+
712
const link = new RPCLink({
813
url: `${process.env.NEXT_PUBLIC_API_URL || "http://localhost:3001"}/rpc`,
914
fetch: (url, options) =>
@@ -18,6 +23,8 @@ const link = new RPCLink({
1823
],
1924
});
2025

21-
const client: RouterClient<AppRouter> = createORPCClient(link);
26+
const client: RouterClient<AppRouter> =
27+
globalThis.$client ?? createORPCClient(link);
2228

2329
export const orpc = createTanstackQueryUtils(client);
30+

‎apps/dashboard/next.config.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ const nextConfig: NextConfig = {
44
experimental: {
55
optimizePackageImports: ["@phosphor-icons/react"],
66
},
7-
reactCompiler: true,
87
typescript: {
98
ignoreBuildErrors: true,
109
},

‎apps/dashboard/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.1.0",
44
"private": true,
55
"scripts": {
6-
"dev": "next dev --turbopack -p 3000",
6+
"dev": "bun --bun next dev --turbopack -p 3000",
77
"build": "next build --turbopack",
88
"start": "next start -p 3000",
99
"typecheck": "tsgo --noEmit",

‎packages/rpc/src/lib/logger.ts‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
import { Logtail } from "@logtail/edge";
1+
import pino from "pino";
22

3-
const token = process.env.LOGTAIL_SOURCE_TOKEN as string;
4-
const endpoint = process.env.LOGTAIL_ENDPOINT as string;
5-
export const logger = new Logtail(token, {
6-
endpoint,
7-
batchSize: 10,
8-
batchInterval: 1000,
9-
});
3+
export const logger = pino({
4+
level: "debug",
5+
transport: {
6+
target: "pino-pretty",
7+
options: {
8+
colorize: true,
9+
},
10+
},
11+
});

‎packages/rpc/src/services/website-service.ts‎

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { logger } from "@databuddy/shared/utils/discord-webhook";
1010
import { Effect, pipe } from "effect";
1111
import { nanoid } from "nanoid";
1212
import { z } from "zod";
13-
import { invalidateWebsiteCaches } from "../utils/cache-invalidation.js";
13+
import { invalidateWebsiteCaches } from "../utils/cache-invalidation";
1414

1515
export type Website = InferSelectModel<typeof websites>;
1616

@@ -164,7 +164,7 @@ export class WebsiteService {
164164
);
165165
return pipe(
166166
this.performDBOperation<Website | null>(() =>
167-
this.db.query.websites.findFirst({ where: websiteFilter })
167+
this.db.query.websites.findFirst({ where: websiteFilter }).then((result) => result ?? null)
168168
),
169169
Effect.flatMap((dup) =>
170170
dup
@@ -284,7 +284,7 @@ export class WebsiteService {
284284
);
285285
return pipe(
286286
this.performDBOperation<Website | null>(() =>
287-
this.db.query.websites.findFirst({ where: websiteFilter })
287+
this.db.query.websites.findFirst({ where: websiteFilter }).then((result) => result ?? null)
288288
),
289289
Effect.flatMap((dup) =>
290290
dup
@@ -319,15 +319,15 @@ export class WebsiteService {
319319
Effect.flatMap((updatedWebsite) =>
320320
updatedWebsite
321321
? pipe(
322-
Effect.tryPromise({
323-
try: () => invalidateWebsiteCaches(websiteId, userId),
324-
catch: (error) =>
325-
new Error(
326-
`Cache invalidation failed: ${String(error)}`
327-
) as WebsiteError,
328-
}),
329-
Effect.as(updatedWebsite)
330-
)
322+
Effect.tryPromise({
323+
try: () => invalidateWebsiteCaches(websiteId, userId),
324+
catch: (error) =>
325+
new Error(
326+
`Cache invalidation failed: ${String(error)}`
327+
) as WebsiteError,
328+
}),
329+
Effect.as(updatedWebsite)
330+
)
331331
: Effect.fail(new WebsiteNotFoundError())
332332
)
333333
);
@@ -373,15 +373,15 @@ export class WebsiteService {
373373
Effect.flatMap((updatedWebsite) =>
374374
updatedWebsite
375375
? pipe(
376-
Effect.tryPromise({
377-
try: () => invalidateWebsiteCaches(websiteId, userId),
378-
catch: (error) =>
379-
new Error(
380-
`Cache invalidation failed: ${String(error)}`
381-
) as WebsiteError,
382-
}),
383-
Effect.as(updatedWebsite)
384-
)
376+
Effect.tryPromise({
377+
try: () => invalidateWebsiteCaches(websiteId, userId),
378+
catch: (error) =>
379+
new Error(
380+
`Cache invalidation failed: ${String(error)}`
381+
) as WebsiteError,
382+
}),
383+
Effect.as(updatedWebsite)
384+
)
385385
: Effect.fail(new WebsiteNotFoundError())
386386
)
387387
);
@@ -408,31 +408,31 @@ export class WebsiteService {
408408
Effect.flatMap((transferredWebsite) =>
409409
transferredWebsite
410410
? pipe(
411-
Effect.try({
412-
try: () =>
413-
logger.info(
414-
"Website Transferred",
415-
`Website "${transferredWebsite.name}" was transferred to organization "${organizationId}"`,
416-
{
417-
websiteId: transferredWebsite.id,
418-
organizationId,
419-
userId,
420-
}
421-
),
411+
Effect.try({
412+
try: () =>
413+
logger.info(
414+
"Website Transferred",
415+
`Website "${transferredWebsite.name}" was transferred to organization "${organizationId}"`,
416+
{
417+
websiteId: transferredWebsite.id,
418+
organizationId,
419+
userId,
420+
}
421+
),
422+
catch: (error) =>
423+
new Error(`Logging failed: ${String(error)}`) as WebsiteError,
424+
}),
425+
Effect.flatMap(() =>
426+
Effect.tryPromise({
427+
try: () => invalidateWebsiteCaches(websiteId, userId),
422428
catch: (error) =>
423-
new Error(`Logging failed: ${String(error)}`) as WebsiteError,
424-
}),
425-
Effect.flatMap(() =>
426-
Effect.tryPromise({
427-
try: () => invalidateWebsiteCaches(websiteId, userId),
428-
catch: (error) =>
429-
new Error(
430-
`Cache invalidation failed: ${String(error)}`
431-
) as WebsiteError,
432-
})
433-
),
434-
Effect.as(transferredWebsite)
435-
)
429+
new Error(
430+
`Cache invalidation failed: ${String(error)}`
431+
) as WebsiteError,
432+
})
433+
),
434+
Effect.as(transferredWebsite)
435+
)
436436
: Effect.fail(new WebsiteNotFoundError())
437437
)
438438
);
@@ -459,31 +459,31 @@ export class WebsiteService {
459459
Effect.flatMap((transferredWebsite) =>
460460
transferredWebsite
461461
? pipe(
462-
Effect.try({
463-
try: () =>
464-
logger.info(
465-
"Website Transferred to Organization",
466-
`Website "${transferredWebsite.name}" was transferred to organization "${targetOrganizationId}"`,
467-
{
468-
websiteId: transferredWebsite.id,
469-
targetOrganizationId,
470-
userId,
471-
}
472-
),
462+
Effect.try({
463+
try: () =>
464+
logger.info(
465+
"Website Transferred to Organization",
466+
`Website "${transferredWebsite.name}" was transferred to organization "${targetOrganizationId}"`,
467+
{
468+
websiteId: transferredWebsite.id,
469+
targetOrganizationId,
470+
userId,
471+
}
472+
),
473+
catch: (error) =>
474+
new Error(`Logging failed: ${String(error)}`) as WebsiteError,
475+
}),
476+
Effect.flatMap(() =>
477+
Effect.tryPromise({
478+
try: () => invalidateWebsiteCaches(websiteId, userId),
473479
catch: (error) =>
474-
new Error(`Logging failed: ${String(error)}`) as WebsiteError,
475-
}),
476-
Effect.flatMap(() =>
477-
Effect.tryPromise({
478-
try: () => invalidateWebsiteCaches(websiteId, userId),
479-
catch: (error) =>
480-
new Error(
481-
`Cache invalidation failed: ${String(error)}`
482-
) as WebsiteError,
483-
})
484-
),
485-
Effect.as(transferredWebsite)
486-
)
480+
new Error(
481+
`Cache invalidation failed: ${String(error)}`
482+
) as WebsiteError,
483+
})
484+
),
485+
Effect.as(transferredWebsite)
486+
)
487487
: Effect.fail(new WebsiteNotFoundError())
488488
)
489489
);

‎packages/shared/src/types/index.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ export * from "./parameters";
1212
export * from "./performance";
1313
export * from "./query";
1414
export * from "./realtime";
15-
export * from "./revenue";
1615
export * from "./sessions";
1716
export * from "./vercel";
1817
export * from "./website";

‎packages/shared/src/types/revenue.ts‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)