refactor(server): update imports

apps/api/package.json

@@ -1,7 +1,8 @@
 {
 	"name": "my-app",
 	"scripts": {
-		"dev": "tsx watch src/index.ts",
+		"dev": "PORT=4000 tsx watch src/index.ts",
+		"dev2": "PORT=4001 tsx watch src/index.ts",
 		"tsc": "tsc --project tsconfig.json"
 	},
 	"dependencies": {

apps/api/src/index.ts

@@ -47,11 +47,11 @@ const queue = new Queue({
 	},
 	redisClient,
 });
-const port = 4000;
+const port = process.env.PORT;
 (async () => {
 	await redisClient.connect();
 	await redisClient.flushAll();
 })();
 
-console.log("Starting Server ✅");
+console.log("Starting Server ✅", port);
 serve({ fetch: app.fetch, port });

apps/dokploy/server/api/routers/admin.ts

@@ -7,16 +7,8 @@ import {
 	users,
 } from "@/server/db/schema";
 
-// import {
-
-// } from "@dokploy/builders";
 import { TRPCError } from "@trpc/server";
 import { eq } from "drizzle-orm";
-// import {
-// 	createInvitation,
-// 	getUserByToken,
-// 	removeUserByAuthId,
-// } from "../services/admin";
 import {
 	findAdmin,
 	createInvitation,

apps/dokploy/server/api/routers/application.ts

@@ -24,40 +24,36 @@ import {
 	cleanQueuesByApplication,
 } from "@/server/queues/deployments-queue";
 import { myQueue } from "@/server/queues/queueSetup";
-import { unzipDrop } from "@/server/utils/builders/drop";
 import {
+	unzipDrop,
 	removeService,
 	startService,
 	startServiceRemote,
 	stopService,
 	stopServiceRemote,
-} from "@/server/utils/docker/utils";
-import {
 	removeDirectoryCode,
 	removeMonitoringDirectory,
-} from "@/server/utils/filesystem/directory";
-import {
 	readConfig,
 	readRemoteConfig,
 	removeTraefikConfig,
 	writeConfig,
 	writeConfigRemote,
-} from "@/server/utils/traefik/application";
+	deleteAllMiddlewares,
-import { deleteAllMiddlewares } from "@/server/utils/traefik/middleware";
-import { uploadFileSchema } from "@/utils/schema";
-import { TRPCError } from "@trpc/server";
-import { eq } from "drizzle-orm";
-import { nanoid } from "nanoid";
-import { z } from "zod";
-import {
 	createApplication,
 	findApplicationById,
 	getApplicationStats,
 	updateApplication,
 	updateApplicationStatus,
+	removeDeployments,
+	addNewService,
+	checkServiceAccess,
+	// uploadFileSchema
 } from "@dokploy/builders";
-import { removeDeployments } from "../services/deployment";
+import { uploadFileSchema } from "@/utils/schema";
-import { addNewService, checkServiceAccess } from "../services/user";
+import { TRPCError } from "@trpc/server";
+import { eq } from "drizzle-orm";
+import { nanoid } from "nanoid";
+import { z } from "zod";
 
 export const applicationRouter = createTRPCRouter({
 	create: protectedProcedure

apps/dokploy/server/api/routers/auth.ts

@@ -14,8 +14,8 @@ import {
 import { TRPCError } from "@trpc/server";
 import * as bcrypt from "bcrypt";
 import { db } from "../../db";
-import { getUserByToken } from "../services/admin";
 import {
+	getUserByToken,
 	createAdmin,
 	createUser,
 	findAuthByEmail,
@@ -23,7 +23,7 @@ import {
 	generate2FASecret,
 	updateAuthById,
 	verify2FA,
-} from "../services/auth";
+} from "@dokploy/builders";
 import {
 	adminProcedure,
 	createTRPCRouter,

apps/dokploy/server/api/routers/backup.ts

@@ -5,25 +5,24 @@ import {
 	apiRemoveBackup,
 	apiUpdateBackup,
 } from "@/server/db/schema";
-import { runMariadbBackup } from "@/server/utils/backups/mariadb";
-import { runMongoBackup } from "@/server/utils/backups/mongo";
-import { runMySqlBackup } from "@/server/utils/backups/mysql";
-import { runPostgresBackup } from "@/server/utils/backups/postgres";
-import {
-	removeScheduleBackup,
-	scheduleBackup,
-} from "@/server/utils/backups/utils";
-import { TRPCError } from "@trpc/server";
 import {
 	createBackup,
 	findBackupById,
 	removeBackupById,
 	updateBackupById,
-} from "../services/backup";
+	runMariadbBackup,
-import { findMariadbByBackupId } from "../services/mariadb";
+	runMongoBackup,
-import { findMongoByBackupId } from "../services/mongo";
+	runMySqlBackup,
-import { findMySqlByBackupId } from "../services/mysql";
+	runPostgresBackup,
-import { findPostgresByBackupId } from "../services/postgres";
+	removeScheduleBackup,
+	scheduleBackup,
+	findMariadbByBackupId,
+	findMongoByBackupId,
+	findMySqlByBackupId,
+	findPostgresByBackupId,
+} from "@dokploy/builders";
+
+import { TRPCError } from "@trpc/server";
 
 export const backupRouter = createTRPCRouter({
 	create: protectedProcedure

apps/dokploy/server/api/routers/bitbucket.ts

@@ -11,13 +11,11 @@ import {
 	getBitbucketBranches,
 	getBitbucketRepositories,
 	testBitbucketConnection,
-} from "@/server/utils/providers/bitbucket";
-import { TRPCError } from "@trpc/server";
-import {
 	createBitbucket,
 	findBitbucketById,
 	updateBitbucket,
-} from "../services/bitbucket";
+} from "@dokploy/builders";
+import { TRPCError } from "@trpc/server";
 
 export const bitbucketRouter = createTRPCRouter({
 	create: protectedProcedure

apps/dokploy/server/api/routers/certificate.ts

@@ -1,11 +1,12 @@
 import { adminProcedure, createTRPCRouter } from "@/server/api/trpc";
 import { apiCreateCertificate, apiFindCertificate } from "@/server/db/schema";
+
 import {
 	createCertificate,
 	findCertificateById,
 	findCertificates,
 	removeCertificateById,
-} from "../services/certificate";
+} from "@dokploy/builders";
 
 export const certificateRouter = createTRPCRouter({
 	create: adminProcedure

apps/dokploy/server/api/routers/cluster.ts

@@ -1,10 +1,8 @@
-import { docker } from "@/server/constants";
-import { execAsync } from "@/server/utils/process/execAsync";
 import { getPublicIpWithFallback } from "@/server/wss/terminal";
 import { TRPCError } from "@trpc/server";
 import { z } from "zod";
-import type { DockerNode } from "../services/cluster";
 import { createTRPCRouter, protectedProcedure } from "../trpc";
+import { execAsync, docker, type DockerNode } from "@dokploy/builders";
 
 export const clusterRouter = createTRPCRouter({
 	getNodes: protectedProcedure.query(async () => {

apps/dokploy/server/api/routers/compose.ts

@@ -14,14 +14,6 @@ import {
 	cleanQueuesByCompose,
 } from "@/server/queues/deployments-queue";
 import { myQueue } from "@/server/queues/queueSetup";
-import { createCommand } from "@/server/utils/builders/compose";
-import { randomizeComposeFile } from "@/server/utils/docker/compose";
-import {
-	addDomainToCompose,
-	cloneCompose,
-	cloneComposeRemote,
-} from "@/server/utils/docker/domain";
-import { removeComposeDirectory } from "@/server/utils/filesystem/directory";
 import { templates } from "@/templates/templates";
 import type { TemplatesKeys } from "@/templates/types/templates-data.type";
 import {
@@ -34,8 +26,23 @@ import { eq } from "drizzle-orm";
 import { dump } from "js-yaml";
 import _ from "lodash";
 import { nanoid } from "nanoid";
-import { findAdmin, findAdminById } from "../services/admin";
+import { createTRPCRouter, protectedProcedure } from "../trpc";
+
 import {
+	createMount,
+	createCommand,
+	randomizeComposeFile,
+	removeComposeDirectory,
+	addDomainToCompose,
+	cloneCompose,
+	cloneComposeRemote,
+	addNewService,
+	checkServiceAccess,
+	findServerById,
+	findProjectById,
+	createDomain,
+	findDomainsByComposeId,
+	removeDeploymentsByComposeId,
 	createCompose,
 	createComposeByTemplate,
 	findComposeById,
@@ -43,14 +50,9 @@ import {
 	removeCompose,
 	stopCompose,
 	updateCompose,
-} from "../services/compose";
+	findAdmin,
-import { removeDeploymentsByComposeId } from "../services/deployment";
+	findAdminById,
-import { createDomain, findDomainsByComposeId } from "../services/domain";
+} from "@dokploy/builders";
-import { createMount } from "../services/mount";
-import { findProjectById } from "../services/project";
-import { findServerById } from "../services/server";
-import { addNewService, checkServiceAccess } from "../services/user";
-import { createTRPCRouter, protectedProcedure } from "../trpc";
 
 export const composeRouter = createTRPCRouter({
 	create: protectedProcedure

apps/dokploy/server/api/routers/deployment.ts

@@ -7,7 +7,7 @@ import {
 	findAllDeploymentsByApplicationId,
 	findAllDeploymentsByComposeId,
 	findAllDeploymentsByServerId,
-} from "../services/deployment";
+} from "@dokploy/builders";
 import { createTRPCRouter, protectedProcedure } from "../trpc";
 
 export const deploymentRouter = createTRPCRouter({

apps/dokploy/server/api/routers/destination.ts

@@ -10,15 +10,15 @@ import {
 	apiRemoveDestination,
 	apiUpdateDestination,
 } from "@/server/db/schema";
-import { execAsync } from "@/server/utils/process/execAsync";
 import { TRPCError } from "@trpc/server";
-import { findAdmin } from "../services/admin";
 import {
+	execAsync,
+	findAdmin,
 	createDestintation,
 	findDestinationById,
 	removeDestinationById,
 	updateDestinationById,
-} from "../services/destination";
+} from "@dokploy/builders";
 
 export const destinationRouter = createTRPCRouter({
 	create: adminProcedure

apps/dokploy/server/api/routers/docker.ts

@@ -5,7 +5,7 @@ import {
 	getContainers,
 	getContainersByAppLabel,
 	getContainersByAppNameMatch,
-} from "../services/docker";
+} from "@dokploy/builders";
 import { createTRPCRouter, protectedProcedure } from "../trpc";
 
 export const dockerRouter = createTRPCRouter({

apps/dokploy/server/api/routers/domain.ts

@@ -6,11 +6,12 @@ import {
 	apiFindOneApplication,
 	apiUpdateDomain,
 } from "@/server/db/schema";
-import { manageDomain, removeDomain } from "@/server/utils/traefik/domain";
 import { TRPCError } from "@trpc/server";
 import { z } from "zod";
-import { findApplicationById } from "../services/application";
 import {
+	manageDomain,
+	removeDomain,
+	findApplicationById,
 	createDomain,
 	findDomainById,
 	findDomainsByApplicationId,
@@ -18,7 +19,7 @@ import {
 	generateTraefikMeDomain,
 	removeDomainById,
 	updateDomainById,
-} from "../services/domain";
+} from "@dokploy/builders";
 
 export const domainRouter = createTRPCRouter({
 	create: protectedProcedure

apps/dokploy/server/api/routers/git-provider.ts

@@ -2,8 +2,8 @@ import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc";
 import { db } from "@/server/db";
 import { apiRemoveGitProvider, gitProvider } from "@/server/db/schema";
 import { TRPCError } from "@trpc/server";
-import { asc, desc } from "drizzle-orm";
+import { desc } from "drizzle-orm";
-import { removeGitProvider } from "../services/git-provider";
+import { removeGitProvider } from "@dokploy/builders";
 
 export const gitProviderRouter = createTRPCRouter({
 	getAll: protectedProcedure.query(async () => {

apps/dokploy/server/api/routers/github.ts

@@ -5,13 +5,14 @@ import {
 	apiFindOneGithub,
 	apiUpdateGithub,
 } from "@/server/db/schema";
+import { TRPCError } from "@trpc/server";
 import {
 	getGithubBranches,
 	getGithubRepositories,
-} from "@/server/utils/providers/github";
+	findGithubById,
-import { TRPCError } from "@trpc/server";
+	haveGithubRequirements,
-import { updateGitProvider } from "../services/git-provider";
+	updateGitProvider,
-import { findGithubById, haveGithubRequirements } from "../services/github";
+} from "@dokploy/builders";
 
 export const githubRouter = createTRPCRouter({
 	one: protectedProcedure.input(apiFindOneGithub).query(async ({ input }) => {

apps/dokploy/server/api/routers/gitlab.ts

@@ -8,15 +8,17 @@ import {
 } from "@/server/db/schema";
 
 import { db } from "@/server/db";
+import { TRPCError } from "@trpc/server";
 import {
 	getGitlabBranches,
 	getGitlabRepositories,
 	haveGitlabRequirements,
 	testGitlabConnection,
-} from "@/server/utils/providers/gitlab";
+	createGitlab,
-import { TRPCError } from "@trpc/server";
+	findGitlabById,
-import { updateGitProvider } from "../services/git-provider";
+	updateGitlab,
-import { createGitlab, findGitlabById, updateGitlab } from "../services/gitlab";
+	updateGitProvider,
+} from "@dokploy/builders";
 
 export const gitlabRouter = createTRPCRouter({
 	create: protectedProcedure

apps/dokploy/server/api/routers/mariadb.ts

@@ -9,23 +9,22 @@ import {
 	apiSaveExternalPortMariaDB,
 	apiUpdateMariaDB,
 } from "@/server/db/schema";
+import { TRPCError } from "@trpc/server";
 import {
 	removeService,
 	startService,
 	startServiceRemote,
 	stopService,
 	stopServiceRemote,
-} from "@/server/utils/docker/utils";
-import { TRPCError } from "@trpc/server";
-import {
 	createMariadb,
 	deployMariadb,
 	findMariadbById,
 	removeMariadbById,
 	updateMariadbById,
-} from "../services/mariadb";
+	addNewService,
-import { createMount } from "../services/mount";
+	checkServiceAccess,
-import { addNewService, checkServiceAccess } from "../services/user";
+	createMount,
+} from "@dokploy/builders";
 
 export const mariadbRouter = createTRPCRouter({
 	create: protectedProcedure

apps/dokploy/server/api/routers/mongo.ts

@@ -9,23 +9,22 @@ import {
 	apiSaveExternalPortMongo,
 	apiUpdateMongo,
 } from "@/server/db/schema";
-import {
-	removeService,
-	startService,
-	startServiceRemote,
-	stopService,
-	stopServiceRemote,
-} from "@/server/utils/docker/utils";
 import { TRPCError } from "@trpc/server";
 import {
+	addNewService,
+	checkServiceAccess,
+	createMount,
 	createMongo,
 	deployMongo,
 	findMongoById,
 	removeMongoById,
 	updateMongoById,
-} from "../services/mongo";
+	removeService,
-import { createMount } from "../services/mount";
+	startService,
-import { addNewService, checkServiceAccess } from "../services/user";
+	startServiceRemote,
+	stopService,
+	stopServiceRemote,
+} from "@dokploy/builders";
 
 export const mongoRouter = createTRPCRouter({
 	create: protectedProcedure

apps/dokploy/server/api/routers/mount.ts

@@ -9,7 +9,7 @@ import {
 	deleteMount,
 	findMountById,
 	updateMount,
-} from "../services/mount";
+} from "@dokploy/builders";
 import { createTRPCRouter, protectedProcedure } from "../trpc";
 
 export const mountRouter = createTRPCRouter({

apps/dokploy/server/api/routers/mysql.ts

@@ -9,23 +9,24 @@ import {
 	apiSaveExternalPortMySql,
 	apiUpdateMySql,
 } from "@/server/db/schema";
-import {
+
-	removeService,
-	startService,
-	startServiceRemote,
-	stopService,
-	stopServiceRemote,
-} from "@/server/utils/docker/utils";
 import { TRPCError } from "@trpc/server";
-import { createMount } from "../services/mount";
+
 import {
+	addNewService,
+	checkServiceAccess,
 	createMysql,
 	deployMySql,
 	findMySqlById,
 	removeMySqlById,
 	updateMySqlById,
-} from "../services/mysql";
+	createMount,
-import { addNewService, checkServiceAccess } from "../services/user";
+	removeService,
+	startService,
+	startServiceRemote,
+	stopService,
+	stopServiceRemote,
+} from "@dokploy/builders";
 
 export const mysqlRouter = createTRPCRouter({
 	create: protectedProcedure

apps/dokploy/server/api/routers/notification.ts

@@ -20,12 +20,6 @@ import {
 	apiUpdateTelegram,
 	notifications,
 } from "@/server/db/schema";
-import {
-	sendDiscordNotification,
-	sendEmailNotification,
-	sendSlackNotification,
-	sendTelegramNotification,
-} from "@/server/utils/notifications/utils";
 import { TRPCError } from "@trpc/server";
 import { desc } from "drizzle-orm";
 import {
@@ -39,7 +33,11 @@ import {
 	updateEmailNotification,
 	updateSlackNotification,
 	updateTelegramNotification,
-} from "../services/notification";
+	sendDiscordNotification,
+	sendEmailNotification,
+	sendSlackNotification,
+	sendTelegramNotification,
+} from "@dokploy/builders";
 
 export const notificationRouter = createTRPCRouter({
 	createSlack: adminProcedure

apps/dokploy/server/api/routers/port.ts

@@ -10,7 +10,7 @@ import {
 	finPortById,
 	removePortById,
 	updatePortById,
-} from "../services/port";
+} from "@dokploy/builders";
 
 export const portRouter = createTRPCRouter({
 	create: protectedProcedure

apps/dokploy/server/api/routers/postgres.ts

@@ -9,23 +9,22 @@ import {
 	apiSaveExternalPortPostgres,
 	apiUpdatePostgres,
 } from "@/server/db/schema";
+import { TRPCError } from "@trpc/server";
 import {
 	removeService,
 	startService,
 	startServiceRemote,
 	stopService,
 	stopServiceRemote,
-} from "@/server/utils/docker/utils";
+	createMount,
-import { TRPCError } from "@trpc/server";
+	addNewService,
-import { createMount } from "../services/mount";
+	checkServiceAccess,
-import {
 	createPostgres,
 	deployPostgres,
 	findPostgresById,
 	removePostgresById,
 	updatePostgresById,
-} from "../services/postgres";
+} from "@dokploy/builders";
-import { addNewService, checkServiceAccess } from "../services/user";
 
 export const postgresRouter = createTRPCRouter({
 	create: protectedProcedure

apps/dokploy/server/api/routers/project.ts

@@ -9,27 +9,25 @@ import {
 	postgres,
 	redis,
 } from "@/server/db/schema";
+
+import { TRPCError } from "@trpc/server";
+import { desc, eq, sql } from "drizzle-orm";
+import type { AnyPgColumn } from "drizzle-orm/pg-core";
+
 import {
 	apiCreateProject,
 	apiFindOneProject,
 	apiRemoveProject,
 	apiUpdateProject,
 	projects,
-} from "@/server/db/schema";
-import { TRPCError } from "@trpc/server";
-import { desc, eq, sql } from "drizzle-orm";
-import type { AnyPgColumn } from "drizzle-orm/pg-core";
-import {
 	createProject,
 	deleteProject,
 	findProjectById,
 	updateProjectById,
-} from "../services/project";
-import {
 	addNewProject,
 	checkProjectAccess,
 	findUserByAuthId,
-} from "../services/user";
+} from "@dokploy/builders";
 
 export const projectRouter = createTRPCRouter({
 	create: protectedProcedure

apps/dokploy/server/api/routers/redirects.ts

@@ -8,7 +8,7 @@ import {
 	findRedirectById,
 	removeRedirectById,
 	updateRedirectById,
-} from "../services/redirect";
+} from "@dokploy/builders";
 import { createTRPCRouter, protectedProcedure } from "../trpc";
 
 export const redirectsRouter = createTRPCRouter({

apps/dokploy/server/api/routers/redis.ts

@@ -9,23 +9,24 @@ import {
 	apiSaveExternalPortRedis,
 	apiUpdateRedis,
 } from "@/server/db/schema";
+
+import { TRPCError } from "@trpc/server";
+
 import {
 	removeService,
 	startService,
 	startServiceRemote,
 	stopService,
 	stopServiceRemote,
-} from "@/server/utils/docker/utils";
+	createMount,
-import { TRPCError } from "@trpc/server";
+	addNewService,
-import { createMount } from "../services/mount";
+	checkServiceAccess,
-import {
 	createRedis,
 	deployRedis,
 	findRedisById,
 	removeRedisById,
 	updateRedisById,
-} from "../services/redis";
+} from "@dokploy/builders";
-import { addNewService, checkServiceAccess } from "../services/user";
 
 export const redisRouter = createTRPCRouter({
 	create: protectedProcedure

apps/dokploy/server/api/routers/registry.ts

@@ -6,17 +6,17 @@ import {
 	apiTestRegistry,
 	apiUpdateRegistry,
 } from "@/server/db/schema";
-import { initializeRegistry } from "@/server/setup/registry-setup";
-import { execAsync } from "@/server/utils/process/execAsync";
-import { manageRegistry } from "@/server/utils/traefik/registry";
 import { TRPCError } from "@trpc/server";
 import {
+	initializeRegistry,
+	execAsync,
+	manageRegistry,
 	createRegistry,
 	findAllRegistry,
 	findRegistryById,
 	removeRegistry,
 	updateRegistry,
-} from "../services/registry";
+} from "@dokploy/builders";
 import { adminProcedure, createTRPCRouter, protectedProcedure } from "../trpc";
 
 export const registryRouter = createTRPCRouter({

apps/dokploy/server/api/routers/security.ts

@@ -8,7 +8,7 @@ import {
 	deleteSecurityById,
 	findSecurityById,
 	updateSecurityById,
-} from "../services/security";
+} from "@dokploy/builders";
 import { createTRPCRouter, protectedProcedure } from "../trpc";
 
 export const securityRouter = createTRPCRouter({

apps/dokploy/server/api/routers/server.ts

@@ -14,17 +14,18 @@ import {
 	redis,
 	server,
 } from "@/server/db/schema";
-import { serverSetup } from "@/server/setup/server-setup";
+// import { serverSetup } from "@/server/setup/server-setup";
 import { TRPCError } from "@trpc/server";
 import { and, desc, eq, getTableColumns, isNotNull, sql } from "drizzle-orm";
-import { removeDeploymentsByServerId } from "../services/deployment";
 import {
+	serverSetup,
+	removeDeploymentsByServerId,
 	createServer,
 	deleteServer,
 	findServerById,
 	haveActiveServices,
 	updateServerById,
-} from "../services/server";
+} from "@dokploy/builders";
 
 export const serverRouter = createTRPCRouter({
 	create: protectedProcedure

apps/dokploy/server/api/routers/settings.ts

@@ -1,4 +1,3 @@
-import { paths } from "@/server/constants";
 import {
 	apiAssignDomain,
 	apiEnableDashboard,
@@ -10,10 +9,18 @@ import {
 	apiTraefikConfig,
 	apiUpdateDockerCleanup,
 } from "@/server/db/schema";
-import { initializeTraefik } from "@/server/setup/traefik-setup";
+import { generateOpenApiDocument } from "@dokploy/trpc-openapi";
-import { logRotationManager } from "@/server/utils/access-log/handler";
+import { TRPCError } from "@trpc/server";
-import { parseRawConfig, processLogs } from "@/server/utils/access-log/utils";
+import { dump, load } from "js-yaml";
+import { scheduleJob, scheduledJobs } from "node-schedule";
+import { z } from "zod";
+import { appRouter } from "../root";
 import {
+	paths,
+	logRotationManager,
+	parseRawConfig,
+	processLogs,
+	initializeTraefik,
 	cleanStoppedContainers,
 	cleanUpDockerBuilder,
 	cleanUpSystemPrune,
@@ -24,39 +31,30 @@ import {
 	startServiceRemote,
 	stopService,
 	stopServiceRemote,
-} from "@/server/utils/docker/utils";
+	recreateDirectory,
-import { recreateDirectory } from "@/server/utils/filesystem/directory";
+	sendDockerCleanupNotifications,
-import { sendDockerCleanupNotifications } from "@/server/utils/notifications/docker-cleanup";
+	execAsync,
-import { execAsync, execAsyncRemote } from "@/server/utils/process/execAsync";
+	execAsyncRemote,
-import { spawnAsync } from "@/server/utils/process/spawnAsync";
+	spawnAsync,
-import {
 	readConfig,
 	readConfigInPath,
 	readMonitoringConfig,
 	writeConfig,
 	writeTraefikConfigInPath,
-} from "@/server/utils/traefik/application";
-import {
 	readMainConfig,
 	updateLetsEncryptEmail,
 	updateServerTraefik,
 	writeMainConfig,
-} from "@/server/utils/traefik/web-server";
+	findAdmin,
-import { generateOpenApiDocument } from "@dokploy/trpc-openapi";
+	updateAdmin,
-import { TRPCError } from "@trpc/server";
+	findServerById,
-import { dump, load } from "js-yaml";
+	updateServerById,
-import { scheduleJob, scheduledJobs } from "node-schedule";
+	canAccessToTraefikFiles,
-import { z } from "zod";
-import { appRouter } from "../root";
-import { findAdmin, updateAdmin } from "../services/admin";
-import { findServerById, updateServerById } from "../services/server";
-import {
 	getDokployImage,
 	getDokployVersion,
 	pullLatestRelease,
 	readDirectory,
-} from "../services/settings";
+} from "@dokploy/builders";
-import { canAccessToTraefikFiles } from "../services/user";
 import { adminProcedure, createTRPCRouter, protectedProcedure } from "../trpc";
 
 export const settingsRouter = createTRPCRouter({
@@ -371,7 +369,8 @@ export const settingsRouter = createTRPCRouter({
 			openApiDocument.info = {
 				title: "Dokploy API",
 				description: "Endpoints for dokploy",
-				version: getDokployVersion(),
+				// TODO: get version from package.json
+				version: "1.0.0",
 			};
 
 			return openApiDocument;

apps/dokploy/server/api/routers/ssh-key.ts

@@ -1,8 +1,4 @@
-import {
+import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc";
-	adminProcedure,
-	createTRPCRouter,
-	protectedProcedure,
-} from "@/server/api/trpc";
 import { db } from "@/server/db";
 import {
 	apiCreateSshKey,
@@ -11,14 +7,14 @@ import {
 	apiRemoveSshKey,
 	apiUpdateSshKey,
 } from "@/server/db/schema";
-import { generateSSHKey } from "@/server/utils/filesystem/ssh";
 import { TRPCError } from "@trpc/server";
 import {
+	generateSSHKey,
 	createSshKey,
 	findSSHKeyById,
 	removeSSHKeyById,
 	updateSSHKeyById,
-} from "../services/ssh-key";
+} from "@dokploy/builders";
 
 export const sshRouter = createTRPCRouter({
 	create: protectedProcedure

apps/dokploy/server/api/routers/user.ts

@@ -1,7 +1,7 @@
 import { apiFindOneUser, apiFindOneUserByAuth } from "@/server/db/schema";
 import { adminProcedure, createTRPCRouter, protectedProcedure } from "../trpc";
 
-import { findUserByAuthId, findUserById, findUsers } from "../services/user";
+import { findUserByAuthId, findUserById, findUsers } from "@dokploy/builders";
 
 export const userRouter = createTRPCRouter({
 	all: adminProcedure.query(async () => {

apps/dokploy/server/api/trpc.ts

@@ -22,8 +22,6 @@ import superjson from "superjson";
 import { ZodError } from "zod";
 import { validateRequest } from "../auth/auth";
 import { validateBearerToken } from "../auth/token";
-import { findAdminByAuthId } from "./services/admin";
-import { findUserByAuthId } from "./services/user";
 
 /**
  * 1. CONTEXT

packages/builders/src/index.ts

@@ -3,11 +3,15 @@ export * from "./auth/auth";
 export * from "./services/admin";
 export * from "./services/user";
 export * from "./services/project";
+export * from "./services/postgres";
 export * from "./services/domain";
 export * from "./services/mariadb";
 export * from "./services/mongo";
 export * from "./services/mysql";
 export * from "./services/backup";
+export * from "./services/cluster";
+export * from "./services/settings";
+export * from "./services/docker";
 export * from "./services/destination";
 export * from "./services/deployment";
 export * from "./services/mount";
@@ -23,6 +27,7 @@ export * from "./services/ssh-key";
 export * from "./services/git-provider";
 export * from "./services/bitbucket";
 export * from "./services/github";
+export * from "./services/auth";
 export * from "./services/gitlab";
 export * from "./services/server";
 export * from "./services/application";
@@ -135,3 +140,4 @@ export * from "./wss/utils";
 export * from "./utils/access-log/handler";
 export * from "./utils/access-log/types";
 export * from "./utils/access-log/utils";
+export * from "./constants/index";