refactor(services): update service creation logic and enhance service group schema
Build and Push CFDM Docker Image / build-and-push (push) Successful in 2m2s
Build and Push CFDM Docker Image / create-release (push) Skipped
Build and Push CFDM Docker Image / update-wiki (push) Successful in 6s

- Changed service creation to default `enabled` to true in the database schema.
- Updated service group schema to set default values for `icon`, `domain`, and health check parameters.
- Refactored service routes to use `await` for fetching service views, ensuring proper asynchronous handling.
- Improved error handling in service groups query to provide clearer feedback on response validation.

This commit enhances the overall service management experience by ensuring services are enabled by default and improving the robustness of the service group schema.
This commit is contained in:
Denozordec
2026-08-07 13:18:47 +07:00
parent 3fb8480f8a
commit ce8393e0c3
12 changed files with 346 additions and 186 deletions
+3 -2
View File
@@ -40,7 +40,7 @@ export async function serviceRoutes(app: FastifyInstance) {
body.service_group_id,
);
}
const view = serviceConfig.getView(request.server.db, service.id);
const view = await serviceConfig.getView(request.server.db, service.id);
recordAudit(request.server, request, {
action: "service.create",
targetType: "app_resource",
@@ -56,6 +56,7 @@ export async function serviceRoutes(app: FastifyInstance) {
return serviceConfig.getView(request.server.db, Number(id));
});
app.patch("/services/:id", async (request) => {
const { id } = request.params as { id: string };
const body = updateServiceConfigSchema.parse(request.body);
@@ -77,7 +78,7 @@ export async function serviceRoutes(app: FastifyInstance) {
app.delete("/services/:id", async (request) => {
const { id } = request.params as { id: string };
const view = serviceConfig.getView(request.server.db, Number(id));
const view = await serviceConfig.getView(request.server.db, Number(id));
repos.deleteService(request.server.db, Number(id));
recordAudit(request.server, request, {
action: "service.delete",
+13 -52
View File
@@ -823,49 +823,6 @@ async function findOrImportDnsARecord(
);
}
async function serviceBindingsExistInDns(
db: Db,
cf: CloudflareClient,
serviceId: number,
): Promise<boolean> {
const bindings = repos.listBindingsByService(db, serviceId);
if (bindings.length === 0) return false;
for (const binding of bindings) {
const cnameTarget = binding.cname_target?.trim() || null;
if (cnameTarget) {
const record = await findOrImportDnsRecord(
db,
cf,
binding.domain_id,
binding.zone_name,
binding.hostname,
"CNAME",
cnameTarget,
);
if (!record) return false;
continue;
}
const targetIps = repos.listBindingIps(db, binding.id);
if (targetIps.length === 0) return false;
for (const ip of targetIps) {
const record = await findOrImportDnsARecord(
db,
cf,
binding.domain_id,
binding.zone_name,
binding.hostname,
ip,
);
if (!record) return false;
}
}
return true;
}
async function syncServiceBindingsToDns(
db: Db,
cf: CloudflareClient,
@@ -1281,20 +1238,24 @@ export async function updateConfig(
service = repos.getService(db, id);
const remainingBindings = repos.listBindingsByService(db, id);
// Creating/editing with FQDN bindings should publish DNS. Previously a
// disabled service stayed off unless records already existed in Cloudflare
// (chicken-and-egg for brand-new services).
if (
req.domains &&
req.domains.length > 0 &&
!service.enabled
) {
repos.setServiceEnabled(db, id, true);
service = repos.getService(db, id);
}
if (shouldPushDns(db, service)) {
if (remainingBindings.length > 0) {
await syncServiceBindingsToDns(db, cf, id);
}
await syncGroupDomainForService(db, cf, id);
} else if (
req.domains &&
req.domains.length > 0 &&
!service.enabled &&
(await serviceBindingsExistInDns(db, cf, id))
) {
repos.setServiceEnabled(db, id, true);
await syncServiceBindingsToDns(db, cf, id);
await syncGroupDomainForService(db, cf, id);
}
void syncServiceToVpsTracker(db, id, removedBindingIds);