Refactor and update various components in the Dokploy application, enhancing functionality and fixing minor issues across multiple pages and features, including dashboard, settings, and API integrations.

packages/server/src/utils/access-log/handler.ts

@@ -1,7 +1,7 @@
 import { paths } from "@dokploy/server/constants";
 import { findAdmin } from "@dokploy/server/services/admin";
 import { updateUser } from "@dokploy/server/services/user";
-import { scheduleJob, scheduledJobs } from "node-schedule";
+import { scheduledJobs, scheduleJob } from "node-schedule";
 import { execAsync } from "../process/execAsync";
 
 const LOG_CLEANUP_JOB_NAME = "access-log-cleanup";

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

@@ -1,7 +1,7 @@
 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 { scheduledJobs, scheduleJob } from "node-schedule";
 import { keepLatestNBackups } from ".";
 import { runComposeBackup } from "./compose";
 import { runMariadbBackup } from "./mariadb";

packages/server/src/utils/builders/docker-file.ts

@@ -1,11 +1,11 @@
 import type { WriteStream } from "node:fs";
 import { prepareEnvironmentVariables } from "@dokploy/server/utils/docker/utils";
-import type { ApplicationNested } from ".";
 import {
 	getBuildAppDirectory,
 	getDockerContextPath,
 } from "../filesystem/directory";
 import { spawnAsync } from "../process/spawnAsync";
+import type { ApplicationNested } from ".";
 import { createEnvFile, createEnvFileCommand } from "./utils";
 
 export const buildCustomDocker = async (

packages/server/src/utils/builders/heroku.ts

@@ -1,8 +1,8 @@
 import type { WriteStream } from "node:fs";
-import type { ApplicationNested } from ".";
 import { prepareEnvironmentVariables } from "../docker/utils";
 import { getBuildAppDirectory } from "../filesystem/directory";
 import { spawnAsync } from "../process/spawnAsync";
+import type { ApplicationNested } from ".";
 
 // TODO: integrate in the vps sudo chown -R $(whoami) ~/.docker
 export const buildHeroku = async (

packages/server/src/utils/builders/nixpacks.ts

@@ -1,14 +1,14 @@
-import { type WriteStream, existsSync, mkdirSync } from "node:fs";
+import { existsSync, mkdirSync, type WriteStream } from "node:fs";
 import path from "node:path";
 import {
 	buildStatic,
 	getStaticCommand,
 } from "@dokploy/server/utils/builders/static";
 import { nanoid } from "nanoid";
-import type { ApplicationNested } from ".";
 import { prepareEnvironmentVariables } from "../docker/utils";
 import { getBuildAppDirectory } from "../filesystem/directory";
 import { spawnAsync } from "../process/spawnAsync";
+import type { ApplicationNested } from ".";
 
 export const buildNixpacks = async (
 	application: ApplicationNested,

packages/server/src/utils/builders/paketo.ts

@@ -1,8 +1,8 @@
 import type { WriteStream } from "node:fs";
-import type { ApplicationNested } from ".";
 import { prepareEnvironmentVariables } from "../docker/utils";
 import { getBuildAppDirectory } from "../filesystem/directory";
 import { spawnAsync } from "../process/spawnAsync";
+import type { ApplicationNested } from ".";
 
 export const buildPaketo = async (
 	application: ApplicationNested,

packages/server/src/utils/builders/static.ts

@@ -3,9 +3,9 @@ import {
 	buildCustomDocker,
 	getDockerCommand,
 } from "@dokploy/server/utils/builders/docker-file";
-import type { ApplicationNested } from ".";
 import { createFile, getCreateFileCommand } from "../docker/utils";
 import { getBuildAppDirectory } from "../filesystem/directory";
+import type { ApplicationNested } from ".";
 
 const nginxSpaConfig = `
 worker_processes 1;

packages/server/src/utils/databases/rebuild.ts

@@ -13,8 +13,7 @@ import { deployPostgres } from "@dokploy/server/services/postgres";
 import { deployRedis } from "@dokploy/server/services/redis";
 import { eq } from "drizzle-orm";
 import { removeService } from "../docker/utils";
-import { execAsyncRemote } from "../process/execAsync";
-import { execAsync } from "../process/execAsync";
+import { execAsync, execAsyncRemote } from "../process/execAsync";
 
 type DatabaseType = "postgres" | "mysql" | "mariadb" | "mongo" | "redis";
 

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

@@ -6,6 +6,7 @@
 
 import _ from "lodash";
 import type { ComposeSpecification, DefinitionsService } from "../types";
+
 type DependsOnObject = NonNullable<
 	Exclude<DefinitionsService["depends_on"], string[]> extends infer T
 		? { [K in keyof T]: T[K] }

packages/server/src/utils/gpu-setup.ts

@@ -1,6 +1,5 @@
 import * as fs from "node:fs/promises";
-import { execAsync, sleep } from "../utils/process/execAsync";
-import { execAsyncRemote } from "../utils/process/execAsync";
+import { execAsync, execAsyncRemote, sleep } from "../utils/process/execAsync";
 
 interface GPUInfo {
 	driverInstalled: boolean;
@@ -186,7 +185,7 @@ const checkCudaSupport = async (serverId?: string) => {
 			? await execAsyncRemote(serverId, cudaCommand)
 			: await execAsync(cudaCommand);
 
-		const cudaMatch = cudaInfo.match(/CUDA Version\s*:\s*([\d\.]+)/);
+		const cudaMatch = cudaInfo.match(/CUDA Version\s*:\s*([\d.]+)/);
 		cudaVersion = cudaMatch ? cudaMatch[1] : undefined;
 		cudaSupport = !!cudaVersion;
 	} catch (error) {

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

@@ -237,10 +237,10 @@ const sanitizeRepoPathSSH = (input: string) => {
 			/^\s*/,
 			/(?:(?<proto>[a-z]+):\/\/)?/,
 			/(?:(?<user>[a-z_][a-z0-9_-]+)@)?/,
-			/(?<domain>[^\s\/\?#:]+)/,
+			/(?<domain>[^\s/?#:]+)/,
 			/(?::(?<port>[0-9]{1,5}))?/,
-			/(?:[\/:](?<owner>[^\s\/\?#:]+))?/,
-			/(?:[\/:](?<repo>(?:[^\s\?#:.]|\.(?!git\/?\s*$))+))/,
+			/(?:[/:](?<owner>[^\s/?#:]+))?/,
+			/(?:[/:](?<repo>(?:[^\s?#:.]|\.(?!git\/?\s*$))+))/,
 			/(?:.git)?\/?\s*$/,
 		]
 			.map((r) => r.source)

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

@@ -1,17 +1,16 @@
 import { createWriteStream } from "node:fs";
 import { join } from "node:path";
 import { paths } from "@dokploy/server/constants";
+import type { apiFindGithubBranches } from "@dokploy/server/db/schema";
+import type { Compose } from "@dokploy/server/services/compose";
+import { findGithubById, type Github } from "@dokploy/server/services/github";
 import type { InferResultType } from "@dokploy/server/types/with";
 import { createAppAuth } from "@octokit/auth-app";
 import { TRPCError } from "@trpc/server";
 import { Octokit } from "octokit";
 import { recreateDirectory } from "../filesystem/directory";
-import { spawnAsync } from "../process/spawnAsync";
-
-import type { apiFindGithubBranches } from "@dokploy/server/db/schema";
-import type { Compose } from "@dokploy/server/services/compose";
-import { type Github, findGithubById } from "@dokploy/server/services/github";
 import { execAsyncRemote } from "../process/execAsync";
+import { spawnAsync } from "../process/spawnAsync";
 
 export const authGithub = (githubProvider: Github): Octokit => {
 	if (!haveGithubRequirements(githubProvider)) {

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

@@ -1,6 +1,6 @@
-export { restorePostgresBackup } from "./postgres";
-export { restoreMySqlBackup } from "./mysql";
+export { restoreComposeBackup } from "./compose";
 export { restoreMariadbBackup } from "./mariadb";
 export { restoreMongoBackup } from "./mongo";
+export { restoreMySqlBackup } from "./mysql";
+export { restorePostgresBackup } from "./postgres";
 export { restoreWebServerBackup } from "./web-server";
-export { restoreComposeBackup } from "./compose";

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

@@ -5,10 +5,10 @@ import type { Schedule } from "@dokploy/server/db/schema/schedule";
 import {
 	createDeploymentSchedule,
 	updateDeployment,
+	updateDeploymentStatus,
 } from "@dokploy/server/services/deployment";
-import { updateDeploymentStatus } from "@dokploy/server/services/deployment";
 import { findScheduleById } from "@dokploy/server/services/schedule";
-import { scheduleJob as scheduleJobNode, scheduledJobs } from "node-schedule";
+import { scheduledJobs, scheduleJob as scheduleJobNode } from "node-schedule";
 import { getComposeContainer, getServiceContainer } from "../docker/utils";
 import { execAsyncRemote } from "../process/execAsync";
 import { spawnAsync } from "../process/spawnAsync";

packages/server/src/utils/traefik/application.ts

@@ -1,5 +1,4 @@
-import fs, { writeFileSync } from "node:fs";
-import { createReadStream } from "node:fs";
+import fs, { createReadStream, writeFileSync } from "node:fs";
 import path from "node:path";
 import { createInterface } from "node:readline";
 import { paths } from "@dokploy/server/constants";

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

@@ -1,6 +1,7 @@
 export * from "./backup";
 export * from "./restore";
 export * from "./utils";
+
 import { volumeBackups } from "@dokploy/server/db/schema";
 import { eq } from "drizzle-orm";
 import { db } from "../../db/index";

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

@@ -1,5 +1,5 @@
 import { findVolumeBackupById } from "@dokploy/server/services/volume-backups";
-import { scheduleJob, scheduledJobs } from "node-schedule";
+import { scheduledJobs, scheduleJob } from "node-schedule";
 import {
 	createDeploymentVolumeBackup,
 	execAsync,