refactor: rename builders to server

This commit is contained in:
Mauricio Siu
2024-10-05 22:15:47 -06:00
parent 43555cdabe
commit f3ce69b656
361 changed files with 551 additions and 562 deletions
+5 -5
View File
@@ -7,16 +7,16 @@ import {
users,
} from "@/server/db/schema";
import { TRPCError } from "@trpc/server";
import { eq } from "drizzle-orm";
import {
createInvitation,
getUserByToken,
removeUserByAuthId,
findAdminById,
findUserByAuthId,
findUserById,
} from "@dokploy/builders";
getUserByToken,
removeUserByAuthId,
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
import { eq } from "drizzle-orm";
import { adminProcedure, createTRPCRouter, publicProcedure } from "../trpc";
export const adminRouter = createTRPCRouter({
+20 -20
View File
@@ -24,39 +24,39 @@ import {
cleanQueuesByApplication,
} from "@/server/queues/deployments-queue";
import { myQueue } from "@/server/queues/queueSetup";
import { deploy } from "@/server/utils/deploy";
import { uploadFileSchema } from "@/utils/schema";
import {
unzipDrop,
IS_CLOUD,
addNewService,
checkServiceAccess,
createApplication,
deleteAllMiddlewares,
findApplicationById,
findProjectById,
getApplicationStats,
readConfig,
readRemoteConfig,
removeDeployments,
removeDirectoryCode,
removeMonitoringDirectory,
removeService,
removeTraefikConfig,
startService,
startServiceRemote,
stopService,
stopServiceRemote,
removeDirectoryCode,
removeMonitoringDirectory,
readConfig,
readRemoteConfig,
removeTraefikConfig,
writeConfig,
writeConfigRemote,
deleteAllMiddlewares,
createApplication,
findApplicationById,
getApplicationStats,
unzipDrop,
updateApplication,
updateApplicationStatus,
removeDeployments,
addNewService,
checkServiceAccess,
IS_CLOUD,
findProjectById,
writeConfig,
writeConfigRemote,
// uploadFileSchema
} from "@dokploy/builders";
import { uploadFileSchema } from "@/utils/schema";
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
import { eq } from "drizzle-orm";
import { nanoid } from "nanoid";
import { z } from "zod";
import { deploy } from "@/server/utils/deploy";
export const applicationRouter = createTRPCRouter({
create: protectedProcedure
+9 -9
View File
@@ -8,23 +8,23 @@ import {
apiVerify2FA,
apiVerifyLogin2FA,
} from "@/server/db/schema";
import { TRPCError } from "@trpc/server";
import * as bcrypt from "bcrypt";
import { db } from "../../db";
import {
getUserByToken,
IS_CLOUD,
createAdmin,
createUser,
findAuthByEmail,
findAuthById,
generate2FASecret,
updateAuthById,
verify2FA,
getUserByToken,
lucia,
validateRequest,
luciaToken,
IS_CLOUD,
} from "@dokploy/builders";
updateAuthById,
validateRequest,
verify2FA,
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
import * as bcrypt from "bcrypt";
import { db } from "../../db";
import {
adminProcedure,
createTRPCRouter,
+10 -10
View File
@@ -7,22 +7,22 @@ import {
} from "@/server/db/schema";
import { removeJob, schedule } from "@/server/utils/backup";
import {
IS_CLOUD,
createBackup,
findBackupById,
removeBackupById,
updateBackupById,
runMariadbBackup,
runMongoBackup,
runMySqlBackup,
runPostgresBackup,
removeScheduleBackup,
scheduleBackup,
findMariadbByBackupId,
findMongoByBackupId,
findMySqlByBackupId,
findPostgresByBackupId,
IS_CLOUD,
} from "@dokploy/builders";
removeBackupById,
removeScheduleBackup,
runMariadbBackup,
runMongoBackup,
runMySqlBackup,
runPostgresBackup,
scheduleBackup,
updateBackupById,
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
+4 -4
View File
@@ -8,14 +8,14 @@ import {
apiUpdateBitbucket,
} from "@/server/db/schema";
import {
IS_CLOUD,
createBitbucket,
findBitbucketById,
getBitbucketBranches,
getBitbucketRepositories,
testBitbucketConnection,
createBitbucket,
findBitbucketById,
updateBitbucket,
IS_CLOUD,
} from "@dokploy/builders";
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
export const bitbucketRouter = createTRPCRouter({
@@ -6,7 +6,7 @@ import {
findCertificateById,
findCertificates,
removeCertificateById,
} from "@dokploy/builders";
} from "@dokploy/server";
export const certificateRouter = createTRPCRouter({
create: adminProcedure
+1 -6
View File
@@ -1,13 +1,8 @@
import { getPublicIpWithFallback } from "@/server/wss/terminal";
import { type DockerNode, IS_CLOUD, docker, execAsync } from "@dokploy/server";
import { TRPCError } from "@trpc/server";
import { z } from "zod";
import { createTRPCRouter, protectedProcedure } from "../trpc";
import {
execAsync,
docker,
type DockerNode,
IS_CLOUD,
} from "@dokploy/builders";
export const clusterRouter = createTRPCRouter({
getNodes: protectedProcedure.query(async () => {
+19 -19
View File
@@ -28,33 +28,33 @@ import _ from "lodash";
import { nanoid } from "nanoid";
import { createTRPCRouter, protectedProcedure } from "../trpc";
import { deploy } from "@/server/utils/deploy";
import {
createMount,
createCommand,
randomizeComposeFile,
removeComposeDirectory,
IS_CLOUD,
addDomainToCompose,
cloneCompose,
cloneComposeRemote,
addNewService,
checkServiceAccess,
findServerById,
findProjectById,
createDomain,
findDomainsByComposeId,
removeDeploymentsByComposeId,
cloneCompose,
cloneComposeRemote,
createCommand,
createCompose,
createComposeByTemplate,
findComposeById,
loadServices,
removeCompose,
stopCompose,
updateCompose,
createDomain,
createMount,
findAdmin,
findAdminById,
IS_CLOUD,
} from "@dokploy/builders";
import { deploy } from "@/server/utils/deploy";
findComposeById,
findDomainsByComposeId,
findProjectById,
findServerById,
loadServices,
randomizeComposeFile,
removeCompose,
removeComposeDirectory,
removeDeploymentsByComposeId,
stopCompose,
updateCompose,
} from "@dokploy/server";
export const composeRouter = createTRPCRouter({
create: protectedProcedure
@@ -10,9 +10,9 @@ import {
findApplicationById,
findComposeById,
findServerById,
} from "@dokploy/builders";
import { createTRPCRouter, protectedProcedure } from "../trpc";
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
import { createTRPCRouter, protectedProcedure } from "../trpc";
export const deploymentRouter = createTRPCRouter({
all: protectedProcedure
@@ -11,15 +11,15 @@ import {
apiUpdateDestination,
destinations,
} from "@/server/db/schema";
import { TRPCError } from "@trpc/server";
import {
createDestintation,
execAsync,
findAdmin,
createDestintation,
findDestinationById,
removeDestinationById,
updateDestinationById,
} from "@dokploy/builders";
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
import { eq } from "drizzle-orm";
export const destinationRouter = createTRPCRouter({
+2 -2
View File
@@ -1,11 +1,11 @@
import { z } from "zod";
import {
containerRestart,
getConfig,
getContainers,
getContainersByAppLabel,
getContainersByAppNameMatch,
} from "@dokploy/builders";
} from "@dokploy/server";
import { z } from "zod";
import { createTRPCRouter, protectedProcedure } from "../trpc";
export const dockerRouter = createTRPCRouter({
+7 -7
View File
@@ -6,21 +6,21 @@ import {
apiFindOneApplication,
apiUpdateDomain,
} from "@/server/db/schema";
import { TRPCError } from "@trpc/server";
import { z } from "zod";
import {
manageDomain,
removeDomain,
findApplicationById,
createDomain,
findApplicationById,
findComposeById,
findDomainById,
findDomainsByApplicationId,
findDomainsByComposeId,
generateTraefikMeDomain,
manageDomain,
removeDomain,
removeDomainById,
updateDomainById,
findComposeById,
} from "@dokploy/builders";
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
import { z } from "zod";
export const domainRouter = createTRPCRouter({
create: protectedProcedure
@@ -1,13 +1,13 @@
import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc";
import { db } from "@/server/db";
import { apiRemoveGitProvider, gitProvider } from "@/server/db/schema";
import {
IS_CLOUD,
findGitProviderById,
removeGitProvider,
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
import { desc, eq } from "drizzle-orm";
import {
findGitProviderById,
IS_CLOUD,
removeGitProvider,
} from "@dokploy/builders";
export const gitProviderRouter = createTRPCRouter({
getAll: protectedProcedure.query(async ({ ctx }) => {
+4 -4
View File
@@ -5,15 +5,15 @@ import {
apiFindOneGithub,
apiUpdateGithub,
} from "@/server/db/schema";
import { TRPCError } from "@trpc/server";
import {
IS_CLOUD,
findGithubById,
getGithubBranches,
getGithubRepositories,
findGithubById,
haveGithubRequirements,
updateGitProvider,
IS_CLOUD,
} from "@dokploy/builders";
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
export const githubRouter = createTRPCRouter({
one: protectedProcedure
+6 -6
View File
@@ -8,18 +8,18 @@ import {
} from "@/server/db/schema";
import { db } from "@/server/db";
import { TRPCError } from "@trpc/server";
import {
IS_CLOUD,
createGitlab,
findGitlabById,
getGitlabBranches,
getGitlabRepositories,
haveGitlabRequirements,
testGitlabConnection,
createGitlab,
findGitlabById,
updateGitlab,
updateGitProvider,
IS_CLOUD,
} from "@dokploy/builders";
updateGitlab,
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
export const gitlabRouter = createTRPCRouter({
create: protectedProcedure
+11 -11
View File
@@ -9,24 +9,24 @@ import {
apiSaveExternalPortMariaDB,
apiUpdateMariaDB,
} from "@/server/db/schema";
import { TRPCError } from "@trpc/server";
import {
IS_CLOUD,
addNewService,
checkServiceAccess,
createMariadb,
createMount,
deployMariadb,
findMariadbById,
findProjectById,
removeMariadbById,
removeService,
startService,
startServiceRemote,
stopService,
stopServiceRemote,
createMariadb,
deployMariadb,
findMariadbById,
removeMariadbById,
updateMariadbById,
addNewService,
checkServiceAccess,
createMount,
findProjectById,
IS_CLOUD,
} from "@dokploy/builders";
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
export const mariadbRouter = createTRPCRouter({
create: protectedProcedure
+6 -6
View File
@@ -9,24 +9,24 @@ import {
apiSaveExternalPortMongo,
apiUpdateMongo,
} from "@/server/db/schema";
import { TRPCError } from "@trpc/server";
import {
IS_CLOUD,
addNewService,
checkServiceAccess,
createMount,
createMongo,
createMount,
deployMongo,
findMongoById,
findProjectById,
removeMongoById,
updateMongoById,
removeService,
startService,
startServiceRemote,
stopService,
stopServiceRemote,
findProjectById,
IS_CLOUD,
} from "@dokploy/builders";
updateMongoById,
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
export const mongoRouter = createTRPCRouter({
create: protectedProcedure
+1 -1
View File
@@ -9,7 +9,7 @@ import {
deleteMount,
findMountById,
updateMount,
} from "@dokploy/builders";
} from "@dokploy/server";
import { createTRPCRouter, protectedProcedure } from "../trpc";
export const mountRouter = createTRPCRouter({
+5 -5
View File
@@ -13,22 +13,22 @@ import {
import { TRPCError } from "@trpc/server";
import {
IS_CLOUD,
addNewService,
checkServiceAccess,
createMount,
createMysql,
deployMySql,
findMySqlById,
findProjectById,
removeMySqlById,
updateMySqlById,
createMount,
removeService,
startService,
startServiceRemote,
stopService,
stopServiceRemote,
findProjectById,
IS_CLOUD,
} from "@dokploy/builders";
updateMySqlById,
} from "@dokploy/server";
export const mysqlRouter = createTRPCRouter({
create: protectedProcedure
@@ -20,25 +20,25 @@ import {
apiUpdateTelegram,
notifications,
} from "@/server/db/schema";
import { TRPCError } from "@trpc/server";
import { desc, eq } from "drizzle-orm";
import {
IS_CLOUD,
createDiscordNotification,
createEmailNotification,
createSlackNotification,
createTelegramNotification,
findNotificationById,
removeNotificationById,
updateDiscordNotification,
updateEmailNotification,
updateSlackNotification,
updateTelegramNotification,
sendDiscordNotification,
sendEmailNotification,
sendSlackNotification,
sendTelegramNotification,
IS_CLOUD,
} from "@dokploy/builders";
updateDiscordNotification,
updateEmailNotification,
updateSlackNotification,
updateTelegramNotification,
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
import { desc, eq } from "drizzle-orm";
// TODO: Uncomment the validations when is cloud ready
export const notificationRouter = createTRPCRouter({
+2 -2
View File
@@ -4,13 +4,13 @@ import {
apiFindOnePort,
apiUpdatePort,
} from "@/server/db/schema";
import { TRPCError } from "@trpc/server";
import {
createPort,
finPortById,
removePortById,
updatePortById,
} from "@dokploy/builders";
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
export const portRouter = createTRPCRouter({
create: protectedProcedure
+11 -11
View File
@@ -9,24 +9,24 @@ import {
apiSaveExternalPortPostgres,
apiUpdatePostgres,
} from "@/server/db/schema";
import { TRPCError } from "@trpc/server";
import {
IS_CLOUD,
addNewService,
checkServiceAccess,
createMount,
createPostgres,
deployPostgres,
findPostgresById,
findProjectById,
removePostgresById,
removeService,
startService,
startServiceRemote,
stopService,
stopServiceRemote,
createMount,
addNewService,
checkServiceAccess,
createPostgres,
deployPostgres,
findPostgresById,
removePostgresById,
updatePostgresById,
findProjectById,
IS_CLOUD,
} from "@dokploy/builders";
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
export const postgresRouter = createTRPCRouter({
create: protectedProcedure
+9 -9
View File
@@ -1,18 +1,18 @@
import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc";
import { db } from "@/server/db";
import {
apiCreateProject,
apiFindOneProject,
apiRemoveProject,
apiUpdateProject,
applications,
compose,
mariadb,
mongo,
mysql,
postgres,
redis,
apiCreateProject,
apiFindOneProject,
apiRemoveProject,
apiUpdateProject,
projects,
redis,
} from "@/server/db/schema";
import { TRPCError } from "@trpc/server";
@@ -20,14 +20,14 @@ import { and, desc, eq, sql } from "drizzle-orm";
import type { AnyPgColumn } from "drizzle-orm/pg-core";
import {
addNewProject,
checkProjectAccess,
createProject,
deleteProject,
findProjectById,
updateProjectById,
addNewProject,
checkProjectAccess,
findUserByAuthId,
} from "@dokploy/builders";
updateProjectById,
} from "@dokploy/server";
export const projectRouter = createTRPCRouter({
create: protectedProcedure
+2 -2
View File
@@ -9,9 +9,9 @@ import {
findRedirectById,
removeRedirectById,
updateRedirectById,
} from "@dokploy/builders";
import { createTRPCRouter, protectedProcedure } from "../trpc";
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
import { createTRPCRouter, protectedProcedure } from "../trpc";
export const redirectsRouter = createTRPCRouter({
create: protectedProcedure
+10 -10
View File
@@ -13,22 +13,22 @@ import {
import { TRPCError } from "@trpc/server";
import {
IS_CLOUD,
addNewService,
checkServiceAccess,
createMount,
createRedis,
deployRedis,
findProjectById,
findRedisById,
removeRedisById,
removeService,
startService,
startServiceRemote,
stopService,
stopServiceRemote,
createMount,
addNewService,
checkServiceAccess,
createRedis,
deployRedis,
findRedisById,
removeRedisById,
updateRedisById,
IS_CLOUD,
findProjectById,
} from "@dokploy/builders";
} from "@dokploy/server";
export const redisRouter = createTRPCRouter({
create: protectedProcedure
+7 -7
View File
@@ -6,19 +6,19 @@ import {
apiTestRegistry,
apiUpdateRegistry,
} from "@/server/db/schema";
import { TRPCError } from "@trpc/server";
import {
execAsyncRemote,
initializeRegistry,
execAsync,
manageRegistry,
IS_CLOUD,
createRegistry,
execAsync,
execAsyncRemote,
findAllRegistryByAdminId,
findRegistryById,
initializeRegistry,
manageRegistry,
removeRegistry,
updateRegistry,
IS_CLOUD,
} from "@dokploy/builders";
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
import { adminProcedure, createTRPCRouter, protectedProcedure } from "../trpc";
export const registryRouter = createTRPCRouter({
+2 -2
View File
@@ -9,9 +9,9 @@ import {
findApplicationById,
findSecurityById,
updateSecurityById,
} from "@dokploy/builders";
import { createTRPCRouter, protectedProcedure } from "../trpc";
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
import { createTRPCRouter, protectedProcedure } from "../trpc";
export const securityRouter = createTRPCRouter({
create: protectedProcedure
+6 -6
View File
@@ -14,18 +14,18 @@ import {
redis,
server,
} from "@/server/db/schema";
// import { serverSetup } from "@/server/setup/server-setup";
import { TRPCError } from "@trpc/server";
import { and, desc, eq, getTableColumns, isNotNull, sql } from "drizzle-orm";
import {
serverSetup,
removeDeploymentsByServerId,
createServer,
deleteServer,
findServerById,
haveActiveServices,
removeDeploymentsByServerId,
serverSetup,
updateServerById,
} from "@dokploy/builders";
} from "@dokploy/server";
// import { serverSetup } from "@/server/setup/server-setup";
import { TRPCError } from "@trpc/server";
import { and, desc, eq, getTableColumns, isNotNull, sql } from "drizzle-orm";
export const serverRouter = createTRPCRouter({
create: protectedProcedure
+35 -35
View File
@@ -1,3 +1,4 @@
import { db } from "@/server/db";
import {
apiAssignDomain,
apiEnableDashboard,
@@ -9,61 +10,60 @@ import {
apiTraefikConfig,
apiUpdateDockerCleanup,
} from "@/server/db/schema";
import { db } from "@/server/db";
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,
IS_CLOUD,
canAccessToTraefikFiles,
cleanStoppedContainers,
cleanUpDockerBuilder,
cleanUpSystemPrune,
cleanUpUnusedImages,
cleanUpUnusedVolumes,
execAsync,
execAsyncRemote,
findAdmin,
findServerById,
getDokployImage,
initializeTraefik,
logRotationManager,
parseRawConfig,
paths,
prepareEnvironmentVariables,
processLogs,
pullLatestRelease,
readConfig,
readConfigInPath,
readDirectory,
readMainConfig,
readMonitoringConfig,
recreateDirectory,
sendDockerCleanupNotifications,
spawnAsync,
startService,
startServiceRemote,
stopService,
stopServiceRemote,
recreateDirectory,
sendDockerCleanupNotifications,
execAsync,
execAsyncRemote,
spawnAsync,
readConfig,
readConfigInPath,
readMonitoringConfig,
writeConfig,
writeTraefikConfigInPath,
readMainConfig,
updateLetsEncryptEmail,
updateServerTraefik,
writeMainConfig,
findAdmin,
updateAdmin,
findServerById,
updateLetsEncryptEmail,
updateServerById,
canAccessToTraefikFiles,
getDokployImage,
pullLatestRelease,
readDirectory,
IS_CLOUD,
} from "@dokploy/builders";
updateServerTraefik,
writeConfig,
writeMainConfig,
writeTraefikConfigInPath,
} from "@dokploy/server";
import { generateOpenApiDocument } from "@dokploy/trpc-openapi";
import { TRPCError } from "@trpc/server";
import { sql } from "drizzle-orm";
import { dump, load } from "js-yaml";
import { scheduleJob, scheduledJobs } from "node-schedule";
import { z } from "zod";
import packageInfo from "../../../package.json";
import { appRouter } from "../root";
import {
adminProcedure,
createTRPCRouter,
protectedProcedure,
publicProcedure,
} from "../trpc";
import { sql } from "drizzle-orm";
export const settingsRouter = createTRPCRouter({
reloadServer: adminProcedure.mutation(async () => {
+4 -4
View File
@@ -8,15 +8,15 @@ import {
apiUpdateSshKey,
sshKeys,
} from "@/server/db/schema";
import { TRPCError } from "@trpc/server";
import {
generateSSHKey,
IS_CLOUD,
createSshKey,
findSSHKeyById,
generateSSHKey,
removeSSHKeyById,
updateSSHKeyById,
IS_CLOUD,
} from "@dokploy/builders";
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
import { eq } from "drizzle-orm";
export const sshRouter = createTRPCRouter({
+2 -2
View File
@@ -1,7 +1,7 @@
import { apiFindOneUser, apiFindOneUserByAuth } from "@/server/db/schema";
import { adminProcedure, createTRPCRouter, protectedProcedure } from "../trpc";
import { findUserByAuthId, findUserById, findUsers } from "@dokploy/builders";
import { findUserByAuthId, findUserById, findUsers } from "@dokploy/server";
import { TRPCError } from "@trpc/server";
import { adminProcedure, createTRPCRouter, protectedProcedure } from "../trpc";
export const userRouter = createTRPCRouter({
all: adminProcedure.query(async ({ ctx }) => {
+1 -1
View File
@@ -9,6 +9,7 @@
// import { getServerAuthSession } from "@/server/auth";
import { db } from "@/server/db";
import { validateBearerToken, validateRequest } from "@dokploy/server";
import type { OpenApiMeta } from "@dokploy/trpc-openapi";
import { TRPCError, initTRPC } from "@trpc/server";
import type { CreateNextContextOptions } from "@trpc/server/adapters/next";
@@ -20,7 +21,6 @@ import {
import type { Session, User } from "lucia";
import superjson from "superjson";
import { ZodError } from "zod";
import { validateRequest, validateBearerToken } from "@dokploy/builders";
/**
* 1. CONTEXT