From e4b998c6080b5ab1a1003d0cf475f10c6876efbc Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sun, 29 Sep 2024 11:55:29 -0600 Subject: [PATCH] refactor(server): update imports --- apps/api/package.json | 3 +- apps/api/src/index.ts | 4 +- apps/dokploy/server/api/routers/admin.ts | 8 --- .../dokploy/server/api/routers/application.ts | 26 +++++----- apps/dokploy/server/api/routers/auth.ts | 4 +- apps/dokploy/server/api/routers/backup.ts | 27 +++++----- apps/dokploy/server/api/routers/bitbucket.ts | 6 +-- .../dokploy/server/api/routers/certificate.ts | 3 +- apps/dokploy/server/api/routers/cluster.ts | 4 +- apps/dokploy/server/api/routers/compose.ts | 36 +++++++------- apps/dokploy/server/api/routers/deployment.ts | 2 +- .../dokploy/server/api/routers/destination.ts | 6 +-- apps/dokploy/server/api/routers/docker.ts | 2 +- apps/dokploy/server/api/routers/domain.ts | 7 +-- .../server/api/routers/git-provider.ts | 4 +- apps/dokploy/server/api/routers/github.ts | 9 ++-- apps/dokploy/server/api/routers/gitlab.ts | 10 ++-- apps/dokploy/server/api/routers/mariadb.ts | 11 ++--- apps/dokploy/server/api/routers/mongo.ts | 19 ++++--- apps/dokploy/server/api/routers/mount.ts | 2 +- apps/dokploy/server/api/routers/mysql.ts | 21 ++++---- .../server/api/routers/notification.ts | 12 ++--- apps/dokploy/server/api/routers/port.ts | 2 +- apps/dokploy/server/api/routers/postgres.ts | 11 ++--- apps/dokploy/server/api/routers/project.ts | 14 +++--- apps/dokploy/server/api/routers/redirects.ts | 2 +- apps/dokploy/server/api/routers/redis.ts | 13 ++--- apps/dokploy/server/api/routers/registry.ts | 8 +-- apps/dokploy/server/api/routers/security.ts | 2 +- apps/dokploy/server/api/routers/server.ts | 7 +-- apps/dokploy/server/api/routers/settings.ts | 49 +++++++++---------- apps/dokploy/server/api/routers/ssh-key.ts | 10 ++-- apps/dokploy/server/api/routers/user.ts | 2 +- apps/dokploy/server/api/trpc.ts | 2 - packages/builders/src/index.ts | 6 +++ 35 files changed, 170 insertions(+), 184 deletions(-) diff --git a/apps/api/package.json b/apps/api/package.json index fc27422f..561cbdbf 100644 --- a/apps/api/package.json +++ b/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": { diff --git a/apps/api/src/index.ts b/apps/api/src/index.ts index 816141b3..631304a4 100644 --- a/apps/api/src/index.ts +++ b/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 }); diff --git a/apps/dokploy/server/api/routers/admin.ts b/apps/dokploy/server/api/routers/admin.ts index acacc776..304102d5 100644 --- a/apps/dokploy/server/api/routers/admin.ts +++ b/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, diff --git a/apps/dokploy/server/api/routers/application.ts b/apps/dokploy/server/api/routers/application.ts index 09e45da1..23056e1f 100644 --- a/apps/dokploy/server/api/routers/application.ts +++ b/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"; -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 { + deleteAllMiddlewares, createApplication, findApplicationById, getApplicationStats, updateApplication, updateApplicationStatus, + removeDeployments, + addNewService, + checkServiceAccess, + // uploadFileSchema } from "@dokploy/builders"; -import { removeDeployments } from "../services/deployment"; -import { addNewService, checkServiceAccess } from "../services/user"; +import { uploadFileSchema } from "@/utils/schema"; +import { TRPCError } from "@trpc/server"; +import { eq } from "drizzle-orm"; +import { nanoid } from "nanoid"; +import { z } from "zod"; export const applicationRouter = createTRPCRouter({ create: protectedProcedure diff --git a/apps/dokploy/server/api/routers/auth.ts b/apps/dokploy/server/api/routers/auth.ts index 2d564f72..999c1384 100644 --- a/apps/dokploy/server/api/routers/auth.ts +++ b/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, diff --git a/apps/dokploy/server/api/routers/backup.ts b/apps/dokploy/server/api/routers/backup.ts index a8740104..b18cca6a 100644 --- a/apps/dokploy/server/api/routers/backup.ts +++ b/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"; -import { findMariadbByBackupId } from "../services/mariadb"; -import { findMongoByBackupId } from "../services/mongo"; -import { findMySqlByBackupId } from "../services/mysql"; -import { findPostgresByBackupId } from "../services/postgres"; + runMariadbBackup, + runMongoBackup, + runMySqlBackup, + runPostgresBackup, + removeScheduleBackup, + scheduleBackup, + findMariadbByBackupId, + findMongoByBackupId, + findMySqlByBackupId, + findPostgresByBackupId, +} from "@dokploy/builders"; + +import { TRPCError } from "@trpc/server"; export const backupRouter = createTRPCRouter({ create: protectedProcedure diff --git a/apps/dokploy/server/api/routers/bitbucket.ts b/apps/dokploy/server/api/routers/bitbucket.ts index cd47dac8..dcb29cf8 100644 --- a/apps/dokploy/server/api/routers/bitbucket.ts +++ b/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 diff --git a/apps/dokploy/server/api/routers/certificate.ts b/apps/dokploy/server/api/routers/certificate.ts index d28de4d8..597a6a8d 100644 --- a/apps/dokploy/server/api/routers/certificate.ts +++ b/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 diff --git a/apps/dokploy/server/api/routers/cluster.ts b/apps/dokploy/server/api/routers/cluster.ts index 7294c902..159fd9c2 100644 --- a/apps/dokploy/server/api/routers/cluster.ts +++ b/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 () => { diff --git a/apps/dokploy/server/api/routers/compose.ts b/apps/dokploy/server/api/routers/compose.ts index 8829ee55..a0269bbe 100644 --- a/apps/dokploy/server/api/routers/compose.ts +++ b/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"; -import { removeDeploymentsByComposeId } from "../services/deployment"; -import { createDomain, findDomainsByComposeId } from "../services/domain"; -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"; + findAdmin, + findAdminById, +} from "@dokploy/builders"; export const composeRouter = createTRPCRouter({ create: protectedProcedure diff --git a/apps/dokploy/server/api/routers/deployment.ts b/apps/dokploy/server/api/routers/deployment.ts index b9afdc06..d12e430f 100644 --- a/apps/dokploy/server/api/routers/deployment.ts +++ b/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({ diff --git a/apps/dokploy/server/api/routers/destination.ts b/apps/dokploy/server/api/routers/destination.ts index 6fcfa99b..8c2a8da2 100644 --- a/apps/dokploy/server/api/routers/destination.ts +++ b/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 diff --git a/apps/dokploy/server/api/routers/docker.ts b/apps/dokploy/server/api/routers/docker.ts index 4281cb3b..d3aa437a 100644 --- a/apps/dokploy/server/api/routers/docker.ts +++ b/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({ diff --git a/apps/dokploy/server/api/routers/domain.ts b/apps/dokploy/server/api/routers/domain.ts index 9e8a371a..2f044aca 100644 --- a/apps/dokploy/server/api/routers/domain.ts +++ b/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 diff --git a/apps/dokploy/server/api/routers/git-provider.ts b/apps/dokploy/server/api/routers/git-provider.ts index de3b1e72..3843ad69 100644 --- a/apps/dokploy/server/api/routers/git-provider.ts +++ b/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 { removeGitProvider } from "../services/git-provider"; +import { desc } from "drizzle-orm"; +import { removeGitProvider } from "@dokploy/builders"; export const gitProviderRouter = createTRPCRouter({ getAll: protectedProcedure.query(async () => { diff --git a/apps/dokploy/server/api/routers/github.ts b/apps/dokploy/server/api/routers/github.ts index 75c13654..236a969a 100644 --- a/apps/dokploy/server/api/routers/github.ts +++ b/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"; -import { TRPCError } from "@trpc/server"; -import { updateGitProvider } from "../services/git-provider"; -import { findGithubById, haveGithubRequirements } from "../services/github"; + findGithubById, + haveGithubRequirements, + updateGitProvider, +} from "@dokploy/builders"; export const githubRouter = createTRPCRouter({ one: protectedProcedure.input(apiFindOneGithub).query(async ({ input }) => { diff --git a/apps/dokploy/server/api/routers/gitlab.ts b/apps/dokploy/server/api/routers/gitlab.ts index 4bd440f9..deb174e6 100644 --- a/apps/dokploy/server/api/routers/gitlab.ts +++ b/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"; -import { TRPCError } from "@trpc/server"; -import { updateGitProvider } from "../services/git-provider"; -import { createGitlab, findGitlabById, updateGitlab } from "../services/gitlab"; + createGitlab, + findGitlabById, + updateGitlab, + updateGitProvider, +} from "@dokploy/builders"; export const gitlabRouter = createTRPCRouter({ create: protectedProcedure diff --git a/apps/dokploy/server/api/routers/mariadb.ts b/apps/dokploy/server/api/routers/mariadb.ts index d73215b2..3db73f11 100644 --- a/apps/dokploy/server/api/routers/mariadb.ts +++ b/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"; -import { createMount } from "../services/mount"; -import { addNewService, checkServiceAccess } from "../services/user"; + addNewService, + checkServiceAccess, + createMount, +} from "@dokploy/builders"; export const mariadbRouter = createTRPCRouter({ create: protectedProcedure diff --git a/apps/dokploy/server/api/routers/mongo.ts b/apps/dokploy/server/api/routers/mongo.ts index 89f3bc35..716db112 100644 --- a/apps/dokploy/server/api/routers/mongo.ts +++ b/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"; -import { createMount } from "../services/mount"; -import { addNewService, checkServiceAccess } from "../services/user"; + removeService, + startService, + startServiceRemote, + stopService, + stopServiceRemote, +} from "@dokploy/builders"; export const mongoRouter = createTRPCRouter({ create: protectedProcedure diff --git a/apps/dokploy/server/api/routers/mount.ts b/apps/dokploy/server/api/routers/mount.ts index c70e4d01..31df29c0 100644 --- a/apps/dokploy/server/api/routers/mount.ts +++ b/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({ diff --git a/apps/dokploy/server/api/routers/mysql.ts b/apps/dokploy/server/api/routers/mysql.ts index 0d4aaa6c..bc5ff6fe 100644 --- a/apps/dokploy/server/api/routers/mysql.ts +++ b/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"; -import { addNewService, checkServiceAccess } from "../services/user"; + createMount, + removeService, + startService, + startServiceRemote, + stopService, + stopServiceRemote, +} from "@dokploy/builders"; export const mysqlRouter = createTRPCRouter({ create: protectedProcedure diff --git a/apps/dokploy/server/api/routers/notification.ts b/apps/dokploy/server/api/routers/notification.ts index 80606a93..cf4c05d5 100644 --- a/apps/dokploy/server/api/routers/notification.ts +++ b/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 diff --git a/apps/dokploy/server/api/routers/port.ts b/apps/dokploy/server/api/routers/port.ts index 25297728..ac05b3e5 100644 --- a/apps/dokploy/server/api/routers/port.ts +++ b/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 diff --git a/apps/dokploy/server/api/routers/postgres.ts b/apps/dokploy/server/api/routers/postgres.ts index 1d2779ef..5ba9935e 100644 --- a/apps/dokploy/server/api/routers/postgres.ts +++ b/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"; -import { TRPCError } from "@trpc/server"; -import { createMount } from "../services/mount"; -import { + createMount, + addNewService, + checkServiceAccess, createPostgres, deployPostgres, findPostgresById, removePostgresById, updatePostgresById, -} from "../services/postgres"; -import { addNewService, checkServiceAccess } from "../services/user"; +} from "@dokploy/builders"; export const postgresRouter = createTRPCRouter({ create: protectedProcedure diff --git a/apps/dokploy/server/api/routers/project.ts b/apps/dokploy/server/api/routers/project.ts index 62c250ba..5a1328d8 100644 --- a/apps/dokploy/server/api/routers/project.ts +++ b/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 diff --git a/apps/dokploy/server/api/routers/redirects.ts b/apps/dokploy/server/api/routers/redirects.ts index e365c437..7bd57fe5 100644 --- a/apps/dokploy/server/api/routers/redirects.ts +++ b/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({ diff --git a/apps/dokploy/server/api/routers/redis.ts b/apps/dokploy/server/api/routers/redis.ts index 2f904384..b7f5014a 100644 --- a/apps/dokploy/server/api/routers/redis.ts +++ b/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"; -import { TRPCError } from "@trpc/server"; -import { createMount } from "../services/mount"; -import { + createMount, + addNewService, + checkServiceAccess, createRedis, deployRedis, findRedisById, removeRedisById, updateRedisById, -} from "../services/redis"; -import { addNewService, checkServiceAccess } from "../services/user"; +} from "@dokploy/builders"; export const redisRouter = createTRPCRouter({ create: protectedProcedure diff --git a/apps/dokploy/server/api/routers/registry.ts b/apps/dokploy/server/api/routers/registry.ts index 8fd8d2ce..a2bdd66c 100644 --- a/apps/dokploy/server/api/routers/registry.ts +++ b/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({ diff --git a/apps/dokploy/server/api/routers/security.ts b/apps/dokploy/server/api/routers/security.ts index 15509228..9b94c947 100644 --- a/apps/dokploy/server/api/routers/security.ts +++ b/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({ diff --git a/apps/dokploy/server/api/routers/server.ts b/apps/dokploy/server/api/routers/server.ts index 9ec0bfa4..ca8760ed 100644 --- a/apps/dokploy/server/api/routers/server.ts +++ b/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 diff --git a/apps/dokploy/server/api/routers/settings.ts b/apps/dokploy/server/api/routers/settings.ts index ff6ed68f..8f644d09 100644 --- a/apps/dokploy/server/api/routers/settings.ts +++ b/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 { logRotationManager } from "@/server/utils/access-log/handler"; -import { parseRawConfig, processLogs } from "@/server/utils/access-log/utils"; +import { generateOpenApiDocument } from "@dokploy/trpc-openapi"; +import { TRPCError } from "@trpc/server"; +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"; -import { recreateDirectory } from "@/server/utils/filesystem/directory"; -import { sendDockerCleanupNotifications } from "@/server/utils/notifications/docker-cleanup"; -import { execAsync, execAsyncRemote } from "@/server/utils/process/execAsync"; -import { spawnAsync } from "@/server/utils/process/spawnAsync"; -import { + recreateDirectory, + sendDockerCleanupNotifications, + execAsync, + execAsyncRemote, + spawnAsync, readConfig, readConfigInPath, readMonitoringConfig, writeConfig, writeTraefikConfigInPath, -} from "@/server/utils/traefik/application"; -import { readMainConfig, updateLetsEncryptEmail, updateServerTraefik, writeMainConfig, -} from "@/server/utils/traefik/web-server"; -import { generateOpenApiDocument } from "@dokploy/trpc-openapi"; -import { TRPCError } from "@trpc/server"; -import { dump, load } from "js-yaml"; -import { scheduleJob, scheduledJobs } from "node-schedule"; -import { z } from "zod"; -import { appRouter } from "../root"; -import { findAdmin, updateAdmin } from "../services/admin"; -import { findServerById, updateServerById } from "../services/server"; -import { + findAdmin, + updateAdmin, + findServerById, + updateServerById, + canAccessToTraefikFiles, getDokployImage, getDokployVersion, pullLatestRelease, readDirectory, -} from "../services/settings"; -import { canAccessToTraefikFiles } from "../services/user"; +} from "@dokploy/builders"; 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; diff --git a/apps/dokploy/server/api/routers/ssh-key.ts b/apps/dokploy/server/api/routers/ssh-key.ts index eb2bf8af..73d0d4de 100644 --- a/apps/dokploy/server/api/routers/ssh-key.ts +++ b/apps/dokploy/server/api/routers/ssh-key.ts @@ -1,8 +1,4 @@ -import { - adminProcedure, - createTRPCRouter, - protectedProcedure, -} from "@/server/api/trpc"; +import { 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 diff --git a/apps/dokploy/server/api/routers/user.ts b/apps/dokploy/server/api/routers/user.ts index 7e430db4..8a8c0018 100644 --- a/apps/dokploy/server/api/routers/user.ts +++ b/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 () => { diff --git a/apps/dokploy/server/api/trpc.ts b/apps/dokploy/server/api/trpc.ts index cfa85fc0..1fd4aea1 100644 --- a/apps/dokploy/server/api/trpc.ts +++ b/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 diff --git a/packages/builders/src/index.ts b/packages/builders/src/index.ts index f1583be5..883c2db2 100644 --- a/packages/builders/src/index.ts +++ b/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";