refactor: reorganize imports and enhance backup functionality across various components

packages/server/src/db/schema/backups.ts

@@ -11,15 +11,15 @@ import {
 import { createInsertSchema } from "drizzle-zod";
 import { nanoid } from "nanoid";
 import { z } from "zod";
+import { generateAppName } from ".";
+import { compose } from "./compose";
+import { deployments } from "./deployment";
 import { destinations } from "./destination";
 import { mariadb } from "./mariadb";
 import { mongo } from "./mongo";
 import { mysql } from "./mysql";
 import { postgres } from "./postgres";
 import { users_temp } from "./user";
-import { compose } from "./compose";
-import { deployments } from "./deployment";
-import { generateAppName } from ".";
 export const databaseType = pgEnum("databaseType", [
 	"postgres",
 	"mariadb",

packages/server/src/db/schema/compose.ts

@@ -3,6 +3,7 @@ import { boolean, integer, pgEnum, pgTable, text } from "drizzle-orm/pg-core";
 import { createInsertSchema } from "drizzle-zod";
 import { nanoid } from "nanoid";
 import { z } from "zod";
+import { backups } from "./backups";
 import { bitbucket } from "./bitbucket";
 import { deployments } from "./deployment";
 import { domains } from "./domain";
@@ -15,7 +16,6 @@ import { server } from "./server";
 import { applicationStatus, triggerType } from "./shared";
 import { sshKeys } from "./ssh-key";
 import { generateAppName } from "./utils";
-import { backups } from "./backups";
 
 import { schedules } from "./schedule";
 export const sourceTypeCompose = pgEnum("sourceTypeCompose", [

packages/server/src/db/schema/deployment.ts

@@ -10,11 +10,11 @@ import { createInsertSchema } from "drizzle-zod";
 import { nanoid } from "nanoid";
 import { z } from "zod";
 import { applications } from "./application";
+import { backups } from "./backups";
 import { compose } from "./compose";
 import { previewDeployments } from "./preview-deployments";
-import { server } from "./server";
 import { schedules } from "./schedule";
-import { backups } from "./backups";
+import { server } from "./server";
 export const deploymentStatus = pgEnum("deploymentStatus", [
 	"running",
 	"done",

packages/server/src/db/schema/schedule.ts

@@ -4,11 +4,11 @@ import { createInsertSchema } from "drizzle-zod";
 import { nanoid } from "nanoid";
 import { z } from "zod";
 import { applications } from "./application";
-import { deployments } from "./deployment";
-import { generateAppName } from "./utils";
 import { compose } from "./compose";
+import { deployments } from "./deployment";
 import { server } from "./server";
 import { users_temp } from "./user";
+import { generateAppName } from "./utils";
 export const shellTypes = pgEnum("shellType", ["bash", "sh"]);
 
 export const scheduleType = pgEnum("scheduleType", [

packages/server/src/db/schema/server.ts

@@ -20,9 +20,9 @@ import { mongo } from "./mongo";
 import { mysql } from "./mysql";
 import { postgres } from "./postgres";
 import { redis } from "./redis";
+import { schedules } from "./schedule";
 import { sshKeys } from "./ssh-key";
 import { generateAppName } from "./utils";
-import { schedules } from "./schedule";
 export const serverStatus = pgEnum("serverStatus", ["active", "inactive"]);
 
 export const server = pgTable("server", {

packages/server/src/db/schema/user.ts

@@ -11,10 +11,10 @@ import { createInsertSchema } from "drizzle-zod";
 import { nanoid } from "nanoid";
 import { z } from "zod";
 import { account, apikey, organization } from "./account";
-import { projects } from "./project";
-import { certificateType } from "./shared";
 import { backups } from "./backups";
+import { projects } from "./project";
 import { schedules } from "./schedule";
+import { certificateType } from "./shared";
 /**
  * This is an example of how to use the multi-project schema feature of Drizzle ORM. Use the same
  * database instance for multiple projects.

packages/server/src/lib/auth.ts

@@ -3,7 +3,7 @@ import * as bcrypt from "bcrypt";
 import { betterAuth } from "better-auth";
 import { drizzleAdapter } from "better-auth/adapters/drizzle";
 import { APIError } from "better-auth/api";
-import { apiKey, organization, twoFactor, admin } from "better-auth/plugins";
+import { admin, apiKey, organization, twoFactor } from "better-auth/plugins";
 import { and, desc, eq } from "drizzle-orm";
 import { IS_CLOUD } from "../constants";
 import { db } from "../db";

packages/server/src/services/deployment.ts

@@ -24,13 +24,13 @@ import { type Compose, findComposeById, updateCompose } from "./compose";
 import { type Server, findServerById } from "./server";
 
 import { execAsyncRemote } from "@dokploy/server/utils/process/execAsync";
+import { findBackupById } from "./backup";
 import {
 	type PreviewDeployment,
 	findPreviewDeploymentById,
 	updatePreviewDeployment,
 } from "./preview-deployment";
 import { findScheduleById } from "./schedule";
-import { findBackupById } from "./backup";
 
 export type Deployment = typeof deployments.$inferSelect;
 

packages/server/src/services/domain.ts

@@ -1,3 +1,5 @@
+import dns from "node:dns";
+import { promisify } from "node:util";
 import { db } from "@dokploy/server/db";
 import { generateRandomDomain } from "@dokploy/server/templates";
 import { manageDomain } from "@dokploy/server/utils/traefik/domain";
@@ -7,8 +9,6 @@ import { type apiCreateDomain, domains } from "../db/schema";
 import { findUserById } from "./admin";
 import { findApplicationById } from "./application";
 import { findServerById } from "./server";
-import dns from "node:dns";
-import { promisify } from "node:util";
 
 export type Domain = typeof domains.$inferSelect;
 

packages/server/src/services/schedule.ts

@@ -1,16 +1,16 @@
-import { type Schedule, schedules } from "../db/schema/schedule";
-import { db } from "../db";
-import { eq } from "drizzle-orm";
+import path from "node:path";
 import { TRPCError } from "@trpc/server";
+import { eq } from "drizzle-orm";
 import type { z } from "zod";
+import { paths } from "../constants";
+import { db } from "../db";
+import { type Schedule, schedules } from "../db/schema/schedule";
 import type {
 	createScheduleSchema,
 	updateScheduleSchema,
 } from "../db/schema/schedule";
-import { execAsync, execAsyncRemote } from "../utils/process/execAsync";
-import { paths } from "../constants";
-import path from "node:path";
 import { encodeBase64 } from "../utils/docker/utils";
+import { execAsync, execAsyncRemote } from "../utils/process/execAsync";
 
 export type ScheduleExtended = Awaited<ReturnType<typeof findScheduleById>>;
 

packages/server/src/templates/index.ts

@@ -1,4 +1,4 @@
-import { randomBytes, createHmac } from "node:crypto";
+import { createHmac, randomBytes } from "node:crypto";
 import { existsSync } from "node:fs";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { join } from "node:path";

packages/server/src/utils/backups/compose.ts

@@ -1,13 +1,13 @@
 import type { BackupSchedule } from "@dokploy/server/services/backup";
 import type { Compose } from "@dokploy/server/services/compose";
-import { findProjectById } from "@dokploy/server/services/project";
-import { sendDatabaseBackupNotifications } from "../notifications/database-backup";
-import { execAsync, execAsyncRemote } from "../process/execAsync";
-import { getS3Credentials, normalizeS3Path, getBackupCommand } from "./utils";
 import {
 	createDeploymentBackup,
 	updateDeploymentStatus,
 } from "@dokploy/server/services/deployment";
+import { findProjectById } from "@dokploy/server/services/project";
+import { sendDatabaseBackupNotifications } from "../notifications/database-backup";
+import { execAsync, execAsyncRemote } from "../process/execAsync";
+import { getBackupCommand, getS3Credentials, normalizeS3Path } from "./utils";
 
 export const runComposeBackup = async (
 	compose: Compose,

packages/server/src/utils/backups/index.ts

@@ -11,10 +11,10 @@ import { sendDockerCleanupNotifications } from "../notifications/docker-cleanup"
 import { execAsync, execAsyncRemote } from "../process/execAsync";
 import { getS3Credentials, scheduleBackup } from "./utils";
 
-import type { BackupSchedule } from "@dokploy/server/services/backup";
-import { startLogCleanup } from "../access-log/handler";
 import { member } from "@dokploy/server/db/schema";
+import type { BackupSchedule } from "@dokploy/server/services/backup";
 import { eq } from "drizzle-orm";
+import { startLogCleanup } from "../access-log/handler";
 
 export const initCronJobs = async () => {
 	console.log("Setting up cron jobs....");

packages/server/src/utils/backups/mariadb.ts

@@ -1,13 +1,13 @@
 import type { BackupSchedule } from "@dokploy/server/services/backup";
+import {
+	createDeploymentBackup,
+	updateDeploymentStatus,
+} from "@dokploy/server/services/deployment";
 import type { Mariadb } from "@dokploy/server/services/mariadb";
 import { findProjectById } from "@dokploy/server/services/project";
 import { sendDatabaseBackupNotifications } from "../notifications/database-backup";
 import { execAsync, execAsyncRemote } from "../process/execAsync";
 import { getBackupCommand, getS3Credentials, normalizeS3Path } from "./utils";
-import {
-	createDeploymentBackup,
-	updateDeploymentStatus,
-} from "@dokploy/server/services/deployment";
 
 export const runMariadbBackup = async (
 	mariadb: Mariadb,

packages/server/src/utils/backups/mongo.ts

@@ -1,13 +1,13 @@
 import type { BackupSchedule } from "@dokploy/server/services/backup";
+import {
+	createDeploymentBackup,
+	updateDeploymentStatus,
+} from "@dokploy/server/services/deployment";
 import type { Mongo } from "@dokploy/server/services/mongo";
 import { findProjectById } from "@dokploy/server/services/project";
 import { sendDatabaseBackupNotifications } from "../notifications/database-backup";
 import { execAsync, execAsyncRemote } from "../process/execAsync";
 import { getBackupCommand, getS3Credentials, normalizeS3Path } from "./utils";
-import {
-	createDeploymentBackup,
-	updateDeploymentStatus,
-} from "@dokploy/server/services/deployment";
 
 export const runMongoBackup = async (mongo: Mongo, backup: BackupSchedule) => {
 	const { projectId, name } = mongo;

packages/server/src/utils/backups/mysql.ts

@@ -1,13 +1,13 @@
 import type { BackupSchedule } from "@dokploy/server/services/backup";
+import {
+	createDeploymentBackup,
+	updateDeploymentStatus,
+} from "@dokploy/server/services/deployment";
 import type { MySql } from "@dokploy/server/services/mysql";
 import { findProjectById } from "@dokploy/server/services/project";
 import { sendDatabaseBackupNotifications } from "../notifications/database-backup";
 import { execAsync, execAsyncRemote } from "../process/execAsync";
 import { getBackupCommand, getS3Credentials, normalizeS3Path } from "./utils";
-import {
-	createDeploymentBackup,
-	updateDeploymentStatus,
-} from "@dokploy/server/services/deployment";
 
 export const runMySqlBackup = async (mysql: MySql, backup: BackupSchedule) => {
 	const { projectId, name } = mysql;

packages/server/src/utils/backups/postgres.ts

@@ -1,13 +1,13 @@
 import type { BackupSchedule } from "@dokploy/server/services/backup";
+import {
+	createDeploymentBackup,
+	updateDeploymentStatus,
+} from "@dokploy/server/services/deployment";
 import type { Postgres } from "@dokploy/server/services/postgres";
 import { findProjectById } from "@dokploy/server/services/project";
 import { sendDatabaseBackupNotifications } from "../notifications/database-backup";
 import { execAsync, execAsyncRemote } from "../process/execAsync";
 import { getBackupCommand, getS3Credentials, normalizeS3Path } from "./utils";
-import {
-	createDeploymentBackup,
-	updateDeploymentStatus,
-} from "@dokploy/server/services/deployment";
 
 export const runPostgresBackup = async (
 	postgres: Postgres,

packages/server/src/utils/backups/utils.ts

@@ -1,14 +1,14 @@
+import { logger } from "@dokploy/server/lib/logger";
 import type { BackupSchedule } from "@dokploy/server/services/backup";
 import type { Destination } from "@dokploy/server/services/destination";
 import { scheduleJob, scheduledJobs } from "node-schedule";
 import { keepLatestNBackups } from ".";
+import { runComposeBackup } from "./compose";
 import { runMariadbBackup } from "./mariadb";
 import { runMongoBackup } from "./mongo";
 import { runMySqlBackup } from "./mysql";
 import { runPostgresBackup } from "./postgres";
 import { runWebServerBackup } from "./web-server";
-import { runComposeBackup } from "./compose";
-import { logger } from "@dokploy/server/lib/logger";
 
 export const scheduleBackup = (backup: BackupSchedule) => {
 	const {

packages/server/src/utils/backups/web-server.ts

@@ -1,16 +1,16 @@
-import type { BackupSchedule } from "@dokploy/server/services/backup";
-import { execAsync } from "../process/execAsync";
-import { getS3Credentials, normalizeS3Path } from "./utils";
-import { findDestinationById } from "@dokploy/server/services/destination";
-import { IS_CLOUD, paths } from "@dokploy/server/constants";
+import { createWriteStream } from "node:fs";
 import { mkdtemp, rm } from "node:fs/promises";
-import { join } from "node:path";
 import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { IS_CLOUD, paths } from "@dokploy/server/constants";
+import type { BackupSchedule } from "@dokploy/server/services/backup";
 import {
 	createDeploymentBackup,
 	updateDeploymentStatus,
 } from "@dokploy/server/services/deployment";
-import { createWriteStream } from "node:fs";
+import { findDestinationById } from "@dokploy/server/services/destination";
+import { execAsync } from "../process/execAsync";
+import { getS3Credentials, normalizeS3Path } from "./utils";
 
 export const runWebServerBackup = async (backup: BackupSchedule) => {
 	if (IS_CLOUD) {

packages/server/src/utils/docker/utils.ts

@@ -2,6 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import type { Readable } from "node:stream";
 import { docker, paths } from "@dokploy/server/constants";
+import type { Compose } from "@dokploy/server/services/compose";
 import type { ContainerInfo, ResourceRequirements } from "dockerode";
 import { parse } from "dotenv";
 import type { ApplicationNested } from "../builders";
@@ -13,7 +14,6 @@ import type { RedisNested } from "../databases/redis";
 import { execAsync, execAsyncRemote } from "../process/execAsync";
 import { spawnAsync } from "../process/spawnAsync";
 import { getRemoteDocker } from "../servers/remote-docker";
-import type { Compose } from "@dokploy/server/services/compose";
 
 interface RegistryAuth {
 	username: string;

packages/server/src/utils/providers/gitlab.ts

@@ -256,7 +256,7 @@ export const getGitlabRepositories = async (gitlabId?: string) => {
 			const isIncluded = groupName
 				.split(",")
 				.some((name) =>
-					full_path.toLowerCase().startsWith(name.trim().toLowerCase())
+					full_path.toLowerCase().startsWith(name.trim().toLowerCase()),
 				);
 
 			return isIncluded && kind === "group";
@@ -425,11 +425,10 @@ export const testGitlabConnection = async (
 
 		if (groupName) {
 			return groupName
-			.split(",")
-			.some((name) =>
-				full_path.toLowerCase().startsWith(name.trim().toLowerCase())
-			);
-
+				.split(",")
+				.some((name) =>
+					full_path.toLowerCase().startsWith(name.trim().toLowerCase()),
+				);
 		}
 		return kind === "user";
 	});

packages/server/src/utils/restore/compose.ts

@@ -1,10 +1,10 @@
-import type { Destination } from "@dokploy/server/services/destination";
+import type { apiRestoreBackup } from "@dokploy/server/db/schema";
 import type { Compose } from "@dokploy/server/services/compose";
+import type { Destination } from "@dokploy/server/services/destination";
+import type { z } from "zod";
 import { getS3Credentials } from "../backups/utils";
 import { execAsync, execAsyncRemote } from "../process/execAsync";
 import { getRestoreCommand } from "./utils";
-import type { apiRestoreBackup } from "@dokploy/server/db/schema";
-import type { z } from "zod";
 
 interface DatabaseCredentials {
 	databaseUser?: string;

packages/server/src/utils/restore/mariadb.ts

@@ -1,10 +1,10 @@
+import type { apiRestoreBackup } from "@dokploy/server/db/schema";
 import type { Destination } from "@dokploy/server/services/destination";
 import type { Mariadb } from "@dokploy/server/services/mariadb";
+import type { z } from "zod";
 import { getS3Credentials } from "../backups/utils";
 import { execAsync, execAsyncRemote } from "../process/execAsync";
 import { getRestoreCommand } from "./utils";
-import type { apiRestoreBackup } from "@dokploy/server/db/schema";
-import type { z } from "zod";
 
 export const restoreMariadbBackup = async (
 	mariadb: Mariadb,

packages/server/src/utils/restore/mongo.ts

@@ -1,10 +1,10 @@
+import type { apiRestoreBackup } from "@dokploy/server/db/schema";
 import type { Destination } from "@dokploy/server/services/destination";
 import type { Mongo } from "@dokploy/server/services/mongo";
+import type { z } from "zod";
 import { getS3Credentials } from "../backups/utils";
 import { execAsync, execAsyncRemote } from "../process/execAsync";
 import { getRestoreCommand } from "./utils";
-import type { apiRestoreBackup } from "@dokploy/server/db/schema";
-import type { z } from "zod";
 
 export const restoreMongoBackup = async (
 	mongo: Mongo,

packages/server/src/utils/restore/mysql.ts

@@ -1,10 +1,10 @@
+import type { apiRestoreBackup } from "@dokploy/server/db/schema";
 import type { Destination } from "@dokploy/server/services/destination";
 import type { MySql } from "@dokploy/server/services/mysql";
+import type { z } from "zod";
 import { getS3Credentials } from "../backups/utils";
 import { execAsync, execAsyncRemote } from "../process/execAsync";
 import { getRestoreCommand } from "./utils";
-import type { apiRestoreBackup } from "@dokploy/server/db/schema";
-import type { z } from "zod";
 
 export const restoreMySqlBackup = async (
 	mysql: MySql,

packages/server/src/utils/restore/postgres.ts

@@ -1,10 +1,10 @@
+import type { apiRestoreBackup } from "@dokploy/server/db/schema";
 import type { Destination } from "@dokploy/server/services/destination";
 import type { Postgres } from "@dokploy/server/services/postgres";
+import type { z } from "zod";
 import { getS3Credentials } from "../backups/utils";
 import { execAsync, execAsyncRemote } from "../process/execAsync";
 import { getRestoreCommand } from "./utils";
-import type { apiRestoreBackup } from "@dokploy/server/db/schema";
-import type { z } from "zod";
 
 export const restorePostgresBackup = async (
 	postgres: Postgres,

packages/server/src/utils/restore/web-server.ts

@@ -1,10 +1,10 @@
+import { mkdtemp } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { IS_CLOUD, paths } from "@dokploy/server/constants";
 import type { Destination } from "@dokploy/server/services/destination";
 import { getS3Credentials } from "../backups/utils";
 import { execAsync } from "../process/execAsync";
-import { paths, IS_CLOUD } from "@dokploy/server/constants";
-import { mkdtemp } from "node:fs/promises";
-import { join } from "node:path";
-import { tmpdir } from "node:os";
 
 export const restoreWebServerBackup = async (
 	destination: Destination,

packages/server/src/utils/schedules/index.ts

@@ -1,6 +1,6 @@
-import { db } from "../../db/index";
 import { schedules } from "@dokploy/server/db/schema";
 import { eq } from "drizzle-orm";
+import { db } from "../../db/index";
 import { scheduleJob } from "./utils";
 
 export const initSchedules = async () => {

packages/server/src/utils/schedules/utils.ts

@@ -1,14 +1,14 @@
+import { createWriteStream } from "node:fs";
+import path from "node:path";
+import { paths } from "@dokploy/server/constants";
 import type { Schedule } from "@dokploy/server/db/schema/schedule";
+import { createDeploymentSchedule } from "@dokploy/server/services/deployment";
+import { updateDeploymentStatus } from "@dokploy/server/services/deployment";
 import { findScheduleById } from "@dokploy/server/services/schedule";
-import { scheduledJobs, scheduleJob as scheduleJobNode } from "node-schedule";
+import { scheduleJob as scheduleJobNode, scheduledJobs } from "node-schedule";
 import { getComposeContainer, getServiceContainer } from "../docker/utils";
 import { execAsyncRemote } from "../process/execAsync";
 import { spawnAsync } from "../process/spawnAsync";
-import { createDeploymentSchedule } from "@dokploy/server/services/deployment";
-import { createWriteStream } from "node:fs";
-import { updateDeploymentStatus } from "@dokploy/server/services/deployment";
-import { paths } from "@dokploy/server/constants";
-import path from "node:path";
 
 export const scheduleJob = (schedule: Schedule) => {
 	const { cronExpression, scheduleId } = schedule;