zias/stats
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

improve: prepare for coolify and general self-hosting improvements (#175)

Browse Source 
* fix(self-hosting): improve docker compose, add healthchecks, rename env SELF_HOSTED

* improve(db): improve initial migration when no data exists

* fix(db): misstakes were made

* improve(dashboard): better curl preview depending on project type

* fix(db): fix migrations

* fix(onboarding): ensure we publish event correctly

* wip

* fix: curl preview

* add coolify template

* fix(dashboard): page -> route

* fix

* fix env
This commit is contained in:
Carl-Gerhard Lindesvärd
2025-06-23 22:21:11 +02:00
committed by GitHub
parent 4a2dbc5c4d
commit 92d62c3e5c
22 changed files with 382 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/db/src/buffers/event-buffer-redis.ts
View File

@@ -261,7 +261,7 @@ return "OK"
if (!_multi) {
await multi.exec();
}
await publishEvent('events', 'received', transformEvent(event), multi);
await publishEvent('events', 'received', transformEvent(event));
} catch (error) {
this.logger.error('Failed to add event to Redis buffer', { error });
}

44
packages/db/src/prisma-client.ts
View File

@@ -59,12 +59,20 @@ const getPrismaClient = () => {
subscriptionStatus: {
needs: { subscriptionStatus: true, subscriptionCanceledAt: true },
compute(org) {
if (process.env.NEXT_PUBLIC_SELF_HOSTED === 'true') {
return 'active';
}
return org.subscriptionStatus || 'trialing';
},
},
hasSubscription: {
needs: { subscriptionStatus: true, subscriptionEndsAt: true },
compute(org) {
if (process.env.NEXT_PUBLIC_SELF_HOSTED === 'true') {
return false;
}
if (
[null, 'canceled', 'trialing'].includes(org.subscriptionStatus)
) {
@@ -86,6 +94,10 @@ const getPrismaClient = () => {
subscriptionPeriodEventsCountExceededAt: true,
},
compute(org) {
if (process.env.NEXT_PUBLIC_SELF_HOSTED === 'true') {
return null;
}
if (
org.subscriptionEndsAt &&
org.subscriptionPeriodEventsCountExceededAt
@@ -119,6 +131,10 @@ const getPrismaClient = () => {
isCanceled: {
needs: { subscriptionStatus: true, subscriptionCanceledAt: true },
compute(org) {
if (process.env.NEXT_PUBLIC_SELF_HOSTED === 'true') {
return false;
}
return isCanceled(org);
},
},
@@ -129,6 +145,10 @@ const getPrismaClient = () => {
subscriptionEndsAt: true,
},
compute(org) {
if (process.env.NEXT_PUBLIC_SELF_HOSTED === 'true') {
return false;
}
return isWillBeCanceled(org);
},
},
@@ -139,6 +159,10 @@ const getPrismaClient = () => {
subscriptionCanceledAt: true,
},
compute(org) {
if (process.env.NEXT_PUBLIC_SELF_HOSTED === 'true') {
return false;
}
if (isCanceled(org)) {
return false;
}
@@ -158,6 +182,10 @@ const getPrismaClient = () => {
subscriptionPeriodEventsLimit: true,
},
compute(org) {
if (process.env.NEXT_PUBLIC_SELF_HOSTED === 'true') {
return false;
}
return (
org.subscriptionPeriodEventsCount >
org.subscriptionPeriodEventsLimit
@@ -167,7 +195,13 @@ const getPrismaClient = () => {
subscriptionCurrentPeriodStart: {
needs: { subscriptionStartsAt: true, subscriptionInterval: true },
compute(org) {
if (!org.subscriptionStartsAt) return org.subscriptionStartsAt;
if (process.env.NEXT_PUBLIC_SELF_HOSTED === 'true') {
return null;
}
if (!org.subscriptionStartsAt) {
return null;
}
if (org.subscriptionInterval === 'year') {
const startDay = org.subscriptionStartsAt.getUTCDate();
@@ -195,7 +229,13 @@ const getPrismaClient = () => {
subscriptionInterval: true,
},
compute(org) {
if (!org.subscriptionStartsAt) return org.subscriptionEndsAt;
if (process.env.NEXT_PUBLIC_SELF_HOSTED === 'true') {
return null;
}
if (!org.subscriptionStartsAt) {
return null;
}
if (org.subscriptionInterval === 'year') {
const startDay = org.subscriptionStartsAt.getUTCDate();