feat(libsql): implement libsql service schema and update related components

- Created a new SQL type for 'libsql' and established a corresponding table with necessary fields and constraints.
- Updated existing tables (backup, mount, volume_backup) to include foreign key references to 'libsql'.
- Enhanced the libsql schema in the application to support additional fields such as stopGracePeriodSwarm and endpointSpecSwarm.
- Adjusted form handling and validation to accommodate the new libsql service type, improving overall integration and functionality.
This commit is contained in:
Mauricio Siu
2026-03-23 21:51:02 -06:00
parent cf25c17c20
commit c752cf3f9e
11 changed files with 58 additions and 115 deletions
@@ -17,7 +17,6 @@ import {
TooltipTrigger, TooltipTrigger,
} from "@/components/ui/tooltip"; } from "@/components/ui/tooltip";
import { cn } from "@/lib/utils"; import { cn } from "@/lib/utils";
import { api } from "@/utils/api";
import { import {
EndpointSpecForm, EndpointSpecForm,
HealthCheckForm, HealthCheckForm,
@@ -111,13 +110,6 @@ const menuItems: MenuItem[] = [
}, },
]; ];
const hasStopGracePeriodSwarm = (
value: unknown,
): value is { stopGracePeriodSwarm: bigint | number | string | null } =>
typeof value === "object" &&
value !== null &&
"stopGracePeriodSwarm" in value;
interface Props { interface Props {
id: string; id: string;
type: type:
@@ -131,107 +123,6 @@ interface Props {
} }
export const AddSwarmSettings = ({ id, type }: Props) => { export const AddSwarmSettings = ({ id, type }: Props) => {
const queryMap = {
application: () =>
api.application.one.useQuery({ applicationId: id }, { enabled: !!id }),
libsql: () => api.libsql.one.useQuery({ libsqlId: id }, { enabled: !!id }),
mariadb: () =>
api.mariadb.one.useQuery({ mariadbId: id }, { enabled: !!id }),
mongo: () => api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id }),
mysql: () => api.mysql.one.useQuery({ mysqlId: id }, { enabled: !!id }),
postgres: () =>
api.postgres.one.useQuery({ postgresId: id }, { enabled: !!id }),
redis: () => api.redis.one.useQuery({ redisId: id }, { enabled: !!id }),
};
const { data, refetch } = queryMap[type]
? queryMap[type]()
: api.mongo.one.useQuery({ mongoId: id }, { enabled: !!id });
const mutationMap = {
application: () => api.application.update.useMutation(),
libsql: () => api.libsql.update.useMutation(),
mariadb: () => api.mariadb.update.useMutation(),
mongo: () => api.mongo.update.useMutation(),
mysql: () => api.mysql.update.useMutation(),
postgres: () => api.postgres.update.useMutation(),
redis: () => api.redis.update.useMutation(),
};
const { mutateAsync, isError, error, isLoading } = mutationMap[type]
? mutationMap[type]()
: api.mongo.update.useMutation();
const form = useForm<AddSwarmSettings>({
defaultValues: {
healthCheckSwarm: null,
restartPolicySwarm: null,
placementSwarm: null,
updateConfigSwarm: null,
rollbackConfigSwarm: null,
modeSwarm: null,
labelsSwarm: null,
networkSwarm: null,
},
resolver: zodResolver(addSwarmSettings),
});
useEffect(() => {
if (data) {
form.reset({
healthCheckSwarm: data.healthCheckSwarm
? JSON.stringify(data.healthCheckSwarm, null, 2)
: null,
restartPolicySwarm: data.restartPolicySwarm
? JSON.stringify(data.restartPolicySwarm, null, 2)
: null,
placementSwarm: data.placementSwarm
? JSON.stringify(data.placementSwarm, null, 2)
: null,
updateConfigSwarm: data.updateConfigSwarm
? JSON.stringify(data.updateConfigSwarm, null, 2)
: null,
rollbackConfigSwarm: data.rollbackConfigSwarm
? JSON.stringify(data.rollbackConfigSwarm, null, 2)
: null,
modeSwarm: data.modeSwarm
? JSON.stringify(data.modeSwarm, null, 2)
: null,
labelsSwarm: data.labelsSwarm
? JSON.stringify(data.labelsSwarm, null, 2)
: null,
networkSwarm: data.networkSwarm
? JSON.stringify(data.networkSwarm, null, 2)
: null,
});
}
}, [form, form.reset, data]);
const onSubmit = async (data: AddSwarmSettings) => {
await mutateAsync({
applicationId: id || "",
libsqlId: id || "",
mariadbId: id || "",
mongoId: id || "",
mysqlId: id || "",
postgresId: id || "",
redisId: id || "",
healthCheckSwarm: data.healthCheckSwarm,
restartPolicySwarm: data.restartPolicySwarm,
placementSwarm: data.placementSwarm,
updateConfigSwarm: data.updateConfigSwarm,
rollbackConfigSwarm: data.rollbackConfigSwarm,
modeSwarm: data.modeSwarm,
labelsSwarm: data.labelsSwarm,
networkSwarm: data.networkSwarm,
})
.then(async () => {
toast.success("Swarm settings updated");
refetch();
})
.catch(() => {
toast.error("Error updating the swarm settings");
});
};
const [activeMenu, setActiveMenu] = useState<string>("health-check"); const [activeMenu, setActiveMenu] = useState<string>("health-check");
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
return ( return (
@@ -30,6 +30,8 @@ CREATE TABLE "libsql" (
"modeSwarm" json, "modeSwarm" json,
"labelsSwarm" json, "labelsSwarm" json,
"networkSwarm" json, "networkSwarm" json,
"stopGracePeriodSwarm" bigint,
"endpointSpecSwarm" json,
"replicas" integer DEFAULT 1 NOT NULL, "replicas" integer DEFAULT 1 NOT NULL,
"createdAt" text NOT NULL, "createdAt" text NOT NULL,
"environmentId" text NOT NULL, "environmentId" text NOT NULL,
+13 -1
View File
@@ -1,5 +1,5 @@
{ {
"id": "72bb48c9-d724-458b-bd91-3ae50e9afe0f", "id": "2819200c-c7c0-474e-8d78-b96ee4785b2a",
"prevId": "68c71185-6e91-4b8d-8f91-795457e75ab2", "prevId": "68c71185-6e91-4b8d-8f91-795457e75ab2",
"version": "7", "version": "7",
"dialect": "postgresql", "dialect": "postgresql",
@@ -3759,6 +3759,18 @@
"primaryKey": false, "primaryKey": false,
"notNull": false "notNull": false
}, },
"stopGracePeriodSwarm": {
"name": "stopGracePeriodSwarm",
"type": "bigint",
"primaryKey": false,
"notNull": false
},
"endpointSpecSwarm": {
"name": "endpointSpecSwarm",
"type": "json",
"primaryKey": false,
"notNull": false
},
"replicas": { "replicas": {
"name": "replicas", "name": "replicas",
"type": "integer", "type": "integer",
+2 -2
View File
@@ -1076,8 +1076,8 @@
{ {
"idx": 153, "idx": 153,
"version": "7", "version": "7",
"when": 1774303955927, "when": 1774322599182,
"tag": "0153_green_boomerang", "tag": "0153_motionless_mastermind",
"breakpoints": true "breakpoints": true
} }
] ]
@@ -238,6 +238,7 @@ export const backupRouter = createTRPCRouter({
backup.mysqlId || backup.mysqlId ||
backup.mariadbId || backup.mariadbId ||
backup.mongoId || backup.mongoId ||
backup.libsqlId ||
backup.composeId; backup.composeId;
if (serviceId) { if (serviceId) {
await checkServicePermissionAndAccess(ctx, serviceId, { await checkServicePermissionAndAccess(ctx, serviceId, {
+3
View File
@@ -100,6 +100,7 @@ export const mountRouter = createTRPCRouter({
mount.mongoId || mount.mongoId ||
mount.mysqlId || mount.mysqlId ||
mount.redisId || mount.redisId ||
mount.libsqlId ||
mount.composeId; mount.composeId;
if (serviceId) { if (serviceId) {
await checkServicePermissionAndAccess(ctx, serviceId, { await checkServicePermissionAndAccess(ctx, serviceId, {
@@ -125,6 +126,7 @@ export const mountRouter = createTRPCRouter({
mount.mongoId || mount.mongoId ||
mount.mysqlId || mount.mysqlId ||
mount.redisId || mount.redisId ||
mount.libsqlId ||
mount.composeId; mount.composeId;
if (serviceId) { if (serviceId) {
await checkServicePermissionAndAccess(ctx, serviceId, { await checkServicePermissionAndAccess(ctx, serviceId, {
@@ -144,6 +146,7 @@ export const mountRouter = createTRPCRouter({
mount.mongoId || mount.mongoId ||
mount.mysqlId || mount.mysqlId ||
mount.redisId || mount.redisId ||
mount.libsqlId ||
mount.composeId; mount.composeId;
if (serviceId) { if (serviceId) {
await checkServicePermissionAndAccess(ctx, serviceId, { await checkServicePermissionAndAccess(ctx, serviceId, {
@@ -15,6 +15,7 @@ import {
updateVolumeBackupSchema, updateVolumeBackupSchema,
volumeBackups, volumeBackups,
} from "@dokploy/server/db/schema"; } from "@dokploy/server/db/schema";
import { checkServicePermissionAndAccess } from "@dokploy/server/services/permission";
import { import {
execAsyncRemote, execAsyncRemote,
execAsyncStream, execAsyncStream,
@@ -25,7 +26,6 @@ import { desc, eq } from "drizzle-orm";
import { z } from "zod"; import { z } from "zod";
import { audit } from "@/server/api/utils/audit"; import { audit } from "@/server/api/utils/audit";
import { removeJob, schedule, updateJob } from "@/server/utils/backup"; import { removeJob, schedule, updateJob } from "@/server/utils/backup";
import { checkServicePermissionAndAccess } from "@dokploy/server/services/permission";
import { createTRPCRouter, protectedProcedure, withPermission } from "../trpc"; import { createTRPCRouter, protectedProcedure, withPermission } from "../trpc";
export const volumeBackupsRouter = createTRPCRouter({ export const volumeBackupsRouter = createTRPCRouter({
@@ -41,6 +41,7 @@ export const volumeBackupsRouter = createTRPCRouter({
"mongo", "mongo",
"redis", "redis",
"compose", "compose",
"libsql",
]), ]),
}), }),
) )
@@ -58,6 +59,7 @@ export const volumeBackupsRouter = createTRPCRouter({
mongo: true, mongo: true,
redis: true, redis: true,
compose: true, compose: true,
libsql: true,
}, },
orderBy: [desc(volumeBackups.createdAt)], orderBy: [desc(volumeBackups.createdAt)],
}); });
@@ -72,6 +74,7 @@ export const volumeBackupsRouter = createTRPCRouter({
input.mariadbId || input.mariadbId ||
input.mongoId || input.mongoId ||
input.redisId || input.redisId ||
input.libsqlId ||
input.composeId; input.composeId;
if (serviceId) { if (serviceId) {
await checkServicePermissionAndAccess(ctx, serviceId, { await checkServicePermissionAndAccess(ctx, serviceId, {
@@ -113,6 +116,7 @@ export const volumeBackupsRouter = createTRPCRouter({
vb.mariadbId || vb.mariadbId ||
vb.mongoId || vb.mongoId ||
vb.redisId || vb.redisId ||
vb.libsqlId ||
vb.composeId; vb.composeId;
if (serviceId) { if (serviceId) {
await checkServicePermissionAndAccess(ctx, serviceId, { await checkServicePermissionAndAccess(ctx, serviceId, {
@@ -136,6 +140,7 @@ export const volumeBackupsRouter = createTRPCRouter({
vb.mariadbId || vb.mariadbId ||
vb.mongoId || vb.mongoId ||
vb.redisId || vb.redisId ||
vb.libsqlId ||
vb.composeId; vb.composeId;
if (serviceId) { if (serviceId) {
await checkServicePermissionAndAccess(ctx, serviceId, { await checkServicePermissionAndAccess(ctx, serviceId, {
@@ -161,6 +166,7 @@ export const volumeBackupsRouter = createTRPCRouter({
existingVb.mariadbId || existingVb.mariadbId ||
existingVb.mongoId || existingVb.mongoId ||
existingVb.redisId || existingVb.redisId ||
existingVb.libsqlId ||
existingVb.composeId; existingVb.composeId;
if (serviceId) { if (serviceId) {
await checkServicePermissionAndAccess(ctx, serviceId, { await checkServicePermissionAndAccess(ctx, serviceId, {
@@ -220,6 +226,7 @@ export const volumeBackupsRouter = createTRPCRouter({
vb.mariadbId || vb.mariadbId ||
vb.mongoId || vb.mongoId ||
vb.redisId || vb.redisId ||
vb.libsqlId ||
vb.composeId; vb.composeId;
if (serviceId) { if (serviceId) {
await checkServicePermissionAndAccess(ctx, serviceId, { await checkServicePermissionAndAccess(ctx, serviceId, {
+11
View File
@@ -8,6 +8,7 @@ import {
keepLatestNBackups, keepLatestNBackups,
runCommand, runCommand,
runComposeBackup, runComposeBackup,
runLibsqlBackup,
runMariadbBackup, runMariadbBackup,
runMongoBackup, runMongoBackup,
runMySqlBackup, runMySqlBackup,
@@ -38,6 +39,7 @@ export const runJobs = async (job: QueueJob) => {
mysql, mysql,
mongo, mongo,
mariadb, mariadb,
libsql,
compose, compose,
backupType, backupType,
} = backup; } = backup;
@@ -75,6 +77,14 @@ export const runJobs = async (job: QueueJob) => {
} }
await runMariadbBackup(mariadb, backup); await runMariadbBackup(mariadb, backup);
await keepLatestNBackups(backup, server.serverId); await keepLatestNBackups(backup, server.serverId);
} else if (databaseType === "libsql" && libsql) {
const server = await findServerById(libsql.serverId as string);
if (server.serverStatus === "inactive") {
logger.info("Server is inactive");
return;
}
await runLibsqlBackup(libsql, backup);
await keepLatestNBackups(backup, server.serverId);
} }
} else if (backupType === "compose" && compose) { } else if (backupType === "compose" && compose) {
const server = await findServerById(compose.serverId as string); const server = await findServerById(compose.serverId as string);
@@ -141,6 +151,7 @@ export const initializeJobs = async () => {
mysql: true, mysql: true,
postgres: true, postgres: true,
mongo: true, mongo: true,
libsql: true,
compose: true, compose: true,
}, },
}); });
+14 -1
View File
@@ -1,5 +1,12 @@
import { relations } from "drizzle-orm"; import { relations } from "drizzle-orm";
import { boolean, integer, json, pgTable, text } from "drizzle-orm/pg-core"; import {
bigint,
boolean,
integer,
json,
pgTable,
text,
} from "drizzle-orm/pg-core";
import { createInsertSchema } from "drizzle-zod"; import { createInsertSchema } from "drizzle-zod";
import { nanoid } from "nanoid"; import { nanoid } from "nanoid";
import { z } from "zod"; import { z } from "zod";
@@ -9,6 +16,8 @@ import { mounts } from "./mount";
import { server } from "./server"; import { server } from "./server";
import { import {
applicationStatus, applicationStatus,
type EndpointSpecSwarm,
EndpointSpecSwarmSchema,
type HealthCheckSwarm, type HealthCheckSwarm,
HealthCheckSwarmSchema, HealthCheckSwarmSchema,
type LabelsSwarm, type LabelsSwarm,
@@ -66,6 +75,8 @@ export const libsql = pgTable("libsql", {
modeSwarm: json("modeSwarm").$type<ServiceModeSwarm>(), modeSwarm: json("modeSwarm").$type<ServiceModeSwarm>(),
labelsSwarm: json("labelsSwarm").$type<LabelsSwarm>(), labelsSwarm: json("labelsSwarm").$type<LabelsSwarm>(),
networkSwarm: json("networkSwarm").$type<NetworkSwarm[]>(), networkSwarm: json("networkSwarm").$type<NetworkSwarm[]>(),
stopGracePeriodSwarm: bigint("stopGracePeriodSwarm", { mode: "bigint" }),
endpointSpecSwarm: json("endpointSpecSwarm").$type<EndpointSpecSwarm>(),
replicas: integer("replicas").default(1).notNull(), replicas: integer("replicas").default(1).notNull(),
createdAt: text("createdAt") createdAt: text("createdAt")
.notNull() .notNull()
@@ -131,6 +142,8 @@ const createSchema = createInsertSchema(libsql, {
modeSwarm: ServiceModeSwarmSchema.nullable(), modeSwarm: ServiceModeSwarmSchema.nullable(),
labelsSwarm: LabelsSwarmSchema.nullable(), labelsSwarm: LabelsSwarmSchema.nullable(),
networkSwarm: NetworkSwarmSchema.nullable(), networkSwarm: NetworkSwarmSchema.nullable(),
stopGracePeriodSwarm: z.bigint().nullable(),
endpointSpecSwarm: EndpointSpecSwarmSchema.nullable(),
}); });
export const apiCreateLibsql = createSchema export const apiCreateLibsql = createSchema
@@ -18,7 +18,8 @@ export const getVolumeServiceAppName = (
volumeBackup.mysql?.appName || volumeBackup.mysql?.appName ||
volumeBackup.mariadb?.appName || volumeBackup.mariadb?.appName ||
volumeBackup.mongo?.appName || volumeBackup.mongo?.appName ||
volumeBackup.redis?.appName; volumeBackup.redis?.appName ||
volumeBackup.libsql?.appName;
return serviceAppName || volumeBackup.appName; return serviceAppName || volumeBackup.appName;
}; };
@@ -26,6 +26,7 @@ const getProjectName = (
volumeBackup.mariadb, volumeBackup.mariadb,
volumeBackup.mongo, volumeBackup.mongo,
volumeBackup.redis, volumeBackup.redis,
volumeBackup.libsql,
]; ];
for (const service of services) { for (const service of services) {
@@ -48,6 +49,7 @@ const getOrganizationId = (
volumeBackup.mariadb, volumeBackup.mariadb,
volumeBackup.mongo, volumeBackup.mongo,
volumeBackup.redis, volumeBackup.redis,
volumeBackup.libsql,
]; ];
for (const service of services) { for (const service of services) {