From f3ce69b65645aa4dea3ec795ef9a85deab5c8134 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sat, 5 Oct 2024 22:15:47 -0600 Subject: [PATCH] refactor: rename builders to server --- apps/api/package.json | 2 +- apps/api/src/utils.ts | 4 +- apps/dokploy/__test__/compose/compose.test.ts | 4 +- .../compose/config/config-root.test.ts | 6 +- .../compose/config/config-service.test.ts | 6 +- .../__test__/compose/config/config.test.ts | 9 +- .../__test__/compose/domain/labels.test.ts | 4 +- .../compose/domain/network-root.test.ts | 2 +- .../compose/domain/network-service.test.ts | 2 +- .../compose/network/network-root.test.ts | 6 +- .../compose/network/network-service.test.ts | 6 +- .../__test__/compose/network/network.test.ts | 8 +- .../compose/secrets/secret-root.test.ts | 6 +- .../compose/secrets/secret-services.test.ts | 6 +- .../__test__/compose/secrets/secret.test.ts | 4 +- .../service/service-container-name.test.ts | 6 +- .../service/service-depends-on.test.ts | 6 +- .../compose/service/service-extends.test.ts | 6 +- .../compose/service/service-links.test.ts | 6 +- .../compose/service/service-names.test.ts | 6 +- .../__test__/compose/service/service.test.ts | 4 +- .../service/sevice-volumes-from.test.ts | 6 +- .../__test__/compose/volume/volume-2.test.ts | 9 +- .../compose/volume/volume-root.test.ts | 6 +- .../compose/volume/volume-services.test.ts | 6 +- .../__test__/compose/volume/volume.test.ts | 6 +- apps/dokploy/__test__/drop/drop.test.test.ts | 6 +- .../dokploy/__test__/requests/request.test.ts | 2 +- .../server/update-server-config.test.ts | 4 +- apps/dokploy/__test__/traefik/traefik.test.ts | 8 +- .../components/layouts/navigation-tabs.tsx | 4 +- apps/dokploy/next.config.mjs | 78 +++++++++--------- apps/dokploy/package.json | 2 +- apps/dokploy/pages/api/[...trpc].ts | 2 +- .../pages/api/deploy/[refreshToken].ts | 2 +- .../api/deploy/compose/[refreshToken].ts | 4 +- apps/dokploy/pages/api/deploy/github.ts | 4 +- .../pages/api/providers/github/setup.ts | 6 +- .../pages/api/providers/gitlab/callback.ts | 2 +- apps/dokploy/pages/dashboard/docker.tsx | 2 +- apps/dokploy/pages/dashboard/monitoring.tsx | 2 +- .../pages/dashboard/project/[projectId].tsx | 4 +- .../services/application/[applicationId].tsx | 2 +- .../services/compose/[composeId].tsx | 2 +- .../services/mariadb/[mariadbId].tsx | 2 +- .../[projectId]/services/mongo/[mongoId].tsx | 2 +- .../[projectId]/services/mysql/[mysqlId].tsx | 2 +- .../services/postgres/[postgresId].tsx | 2 +- .../[projectId]/services/redis/[redisId].tsx | 2 +- apps/dokploy/pages/dashboard/projects.tsx | 2 +- apps/dokploy/pages/dashboard/requests.tsx | 2 +- .../pages/dashboard/settings/appearance.tsx | 2 +- .../pages/dashboard/settings/certificates.tsx | 2 +- .../pages/dashboard/settings/cluster.tsx | 2 +- .../pages/dashboard/settings/destinations.tsx | 2 +- .../dashboard/settings/git-providers.tsx | 2 +- .../dashboard/settings/notifications.tsx | 2 +- .../pages/dashboard/settings/profile.tsx | 2 +- .../pages/dashboard/settings/registry.tsx | 2 +- .../pages/dashboard/settings/server.tsx | 2 +- .../pages/dashboard/settings/servers.tsx | 2 +- .../pages/dashboard/settings/ssh-keys.tsx | 2 +- .../pages/dashboard/settings/users.tsx | 2 +- apps/dokploy/pages/dashboard/traefik.tsx | 2 +- apps/dokploy/pages/index.tsx | 2 +- apps/dokploy/pages/invitation.tsx | 2 +- apps/dokploy/pages/register.tsx | 4 +- apps/dokploy/pages/swagger.tsx | 2 +- apps/dokploy/reset-password.ts | 6 +- apps/dokploy/server/api/routers/admin.ts | 10 +-- .../dokploy/server/api/routers/application.ts | 40 ++++----- apps/dokploy/server/api/routers/auth.ts | 18 ++-- apps/dokploy/server/api/routers/backup.ts | 20 ++--- apps/dokploy/server/api/routers/bitbucket.ts | 8 +- .../dokploy/server/api/routers/certificate.ts | 2 +- apps/dokploy/server/api/routers/cluster.ts | 7 +- apps/dokploy/server/api/routers/compose.ts | 38 ++++----- apps/dokploy/server/api/routers/deployment.ts | 4 +- .../dokploy/server/api/routers/destination.ts | 6 +- apps/dokploy/server/api/routers/docker.ts | 4 +- apps/dokploy/server/api/routers/domain.ts | 14 ++-- .../server/api/routers/git-provider.ts | 10 +-- apps/dokploy/server/api/routers/github.ts | 8 +- apps/dokploy/server/api/routers/gitlab.ts | 12 +-- apps/dokploy/server/api/routers/mariadb.ts | 22 ++--- apps/dokploy/server/api/routers/mongo.ts | 12 +-- apps/dokploy/server/api/routers/mount.ts | 2 +- apps/dokploy/server/api/routers/mysql.ts | 10 +-- .../server/api/routers/notification.ts | 16 ++-- apps/dokploy/server/api/routers/port.ts | 4 +- apps/dokploy/server/api/routers/postgres.ts | 22 ++--- apps/dokploy/server/api/routers/project.ts | 18 ++-- apps/dokploy/server/api/routers/redirects.ts | 4 +- apps/dokploy/server/api/routers/redis.ts | 20 ++--- apps/dokploy/server/api/routers/registry.ts | 14 ++-- apps/dokploy/server/api/routers/security.ts | 4 +- apps/dokploy/server/api/routers/server.ts | 12 +-- apps/dokploy/server/api/routers/settings.ts | 70 ++++++++-------- apps/dokploy/server/api/routers/ssh-key.ts | 8 +- apps/dokploy/server/api/routers/user.ts | 4 +- apps/dokploy/server/api/trpc.ts | 2 +- .../server/queues/deployments-queue.ts | 12 +-- apps/dokploy/server/server.ts | 20 ++--- .../server/wss/docker-container-logs.ts | 2 +- .../server/wss/docker-container-terminal.ts | 2 +- apps/dokploy/server/wss/docker-stats.ts | 4 +- apps/dokploy/server/wss/listen-deployment.ts | 2 +- apps/dokploy/server/wss/terminal.ts | 4 +- apps/dokploy/setup.ts | 12 +-- apps/schedules/package.json | 2 +- apps/schedules/src/utils.ts | 4 +- packages/builders/tsconfig.json | 43 ---------- packages/builders/tsconfig.server.json | 25 ------ .../{builders => server}/esbuild.config.ts | 0 packages/{builders => server}/package.json | 2 +- .../{builders => server}/src/auth/auth.ts | 4 +- .../src/auth/random-password.ts | 0 .../{builders => server}/src/auth/token.ts | 2 +- .../src/constants/index.ts | 0 .../src/db/drizzle.config.ts | 0 packages/{builders => server}/src/db/index.ts | 0 .../{builders => server}/src/db/migration.ts | 0 packages/{builders => server}/src/db/reset.ts | 0 .../src/db/schema/admin.ts | 2 +- .../src/db/schema/application.ts | 8 +- .../src/db/schema/auth.ts | 0 .../src/db/schema/backups.ts | 0 .../src/db/schema/bitbucket.ts | 0 .../src/db/schema/certificate.ts | 0 .../src/db/schema/compose.ts | 12 +-- .../src/db/schema/deployment.ts | 0 .../src/db/schema/destination.ts | 0 .../src/db/schema/domain.ts | 2 +- .../src/db/schema/git-provider.ts | 2 +- .../src/db/schema/github.ts | 0 .../src/db/schema/gitlab.ts | 0 .../src/db/schema/index.ts | 0 .../src/db/schema/mariadb.ts | 0 .../src/db/schema/mongo.ts | 0 .../src/db/schema/mount.ts | 0 .../src/db/schema/mysql.ts | 0 .../src/db/schema/notification.ts | 0 .../src/db/schema/port.ts | 0 .../src/db/schema/postgres.ts | 0 .../src/db/schema/project.ts | 0 .../src/db/schema/redirects.ts | 0 .../src/db/schema/redis.ts | 0 .../src/db/schema/registry.ts | 0 .../src/db/schema/security.ts | 0 .../src/db/schema/server.ts | 6 +- .../src/db/schema/session.ts | 0 .../src/db/schema/shared.ts | 0 .../src/db/schema/source.ts | 0 .../src/db/schema/ssh-key.ts | 8 +- .../src/db/schema/user.ts | 0 .../src/db/schema/utils.ts | 0 packages/{builders => server}/src/db/seed.ts | 0 .../src/db/validations/domain.ts | 0 .../src/db/validations/index.ts | 0 .../src/emails/.gitignore | 0 .../src/emails/emails/build-failed.tsx | 0 .../src/emails/emails/build-success.tsx | 0 .../src/emails/emails/database-backup.tsx | 0 .../src/emails/emails/docker-cleanup.tsx | 0 .../src/emails/emails/dokploy-restart.tsx | 0 .../src/emails/emails/invitation.tsx | 0 .../src/emails/emails/notion-magic-link.tsx | 0 .../emails/emails/plaid-verify-identity.tsx | 0 .../src/emails/emails/static/logo.png | Bin .../src/emails/emails/static/notion-logo.png | Bin .../src/emails/emails/static/plaid-logo.png | Bin .../src/emails/emails/static/plaid.png | Bin .../src/emails/emails/static/stripe-logo.png | Bin .../src/emails/emails/static/vercel-arrow.png | Bin .../src/emails/emails/static/vercel-logo.png | Bin .../src/emails/emails/static/vercel-team.png | Bin .../src/emails/emails/static/vercel-user.png | Bin .../src/emails/emails/stripe-welcome.tsx | 0 .../src/emails/emails/vercel-invite-user.tsx | 0 .../src/emails/package.json | 0 .../src/emails/pnpm-lock.yaml | 0 .../{builders => server}/src/emails/readme.md | 0 packages/{builders => server}/src/index.ts | 0 .../src/monitoring/utilts.ts | 0 .../src/services/admin.ts | 0 .../src/services/application.ts | 2 +- .../{builders => server}/src/services/auth.ts | 0 .../src/services/backup.ts | 0 .../src/services/bitbucket.ts | 0 .../src/services/certificate.ts | 0 .../src/services/cluster.ts | 0 .../src/services/compose.ts | 2 +- .../src/services/deployment.ts | 0 .../src/services/destination.ts | 0 .../src/services/docker.ts | 0 .../src/services/domain.ts | 4 +- .../src/services/git-provider.ts | 0 .../src/services/github.ts | 0 .../src/services/gitlab.ts | 0 .../src/services/mariadb.ts | 2 +- .../src/services/mongo.ts | 2 +- .../src/services/mount.ts | 0 .../src/services/mysql.ts | 2 +- .../src/services/notification.ts | 0 .../{builders => server}/src/services/port.ts | 0 .../src/services/postgres.ts | 2 +- .../src/services/project.ts | 0 .../src/services/redirect.ts | 0 .../src/services/redis.ts | 2 +- .../src/services/registry.ts | 0 .../src/services/security.ts | 0 .../src/services/server.ts | 0 .../src/services/settings.ts | 0 .../src/services/ssh-key.ts | 0 .../{builders => server}/src/services/user.ts | 0 .../src/setup/config-paths.ts | 0 .../src/setup/postgres-setup.ts | 0 .../src/setup/redis-setup.ts | 0 .../src/setup/registry-setup.ts | 2 +- .../src/setup/server-setup.ts | 2 +- .../{builders => server}/src/setup/setup.ts | 0 .../src/setup/traefik-setup.ts | 0 .../src/templates/appsmith/docker-compose.yml | 0 .../src/templates/appsmith/index.ts | 0 .../src/templates/aptabase/docker-compose.yml | 0 .../src/templates/aptabase/index.ts | 0 .../src/templates/baserow/docker-compose.yml | 0 .../src/templates/baserow/index.ts | 0 .../src/templates/calcom/docker-compose.yml | 0 .../src/templates/calcom/index.ts | 0 .../src/templates/directus/docker-compose.yml | 0 .../src/templates/directus/index.ts | 0 .../templates/documenso/docker-compose.yml | 0 .../src/templates/documenso/index.ts | 0 .../templates/doublezero/docker-compose.yml | 0 .../src/templates/doublezero/index.ts | 0 .../templates/excalidraw/docker-compose.yml | 0 .../src/templates/excalidraw/index.ts | 0 .../src/templates/ghost/docker-compose.yml | 0 .../src/templates/ghost/index.ts | 0 .../src/templates/gitea/docker-compose.yml | 0 .../src/templates/gitea/index.ts | 0 .../templates/glitchtip/docker-compose.yml | 0 .../src/templates/glitchtip/index.ts | 0 .../src/templates/grafana/docker-compose.yml | 0 .../src/templates/grafana/index.ts | 0 .../src/templates/jellyfin/docker-compose.yml | 0 .../src/templates/jellyfin/index.ts | 0 .../src/templates/listmonk/docker-compose.yml | 0 .../src/templates/listmonk/index.ts | 0 .../templates/meilisearch/docker-compose.yml | 0 .../src/templates/meilisearch/index.ts | 0 .../src/templates/metabase/docker-compose.yml | 0 .../src/templates/metabase/index.ts | 0 .../src/templates/minio/docker-compose.yml | 0 .../src/templates/minio/index.ts | 0 .../src/templates/n8n/docker-compose.yml | 0 .../src/templates/n8n/index.ts | 0 .../src/templates/nocodb/docker-compose.yml | 0 .../src/templates/nocodb/index.ts | 0 .../src/templates/odoo/docker-compose.yml | 0 .../src/templates/odoo/index.ts | 0 .../templates/open-webui/docker-compose.yml | 0 .../src/templates/open-webui/index.ts | 0 .../templates/phpmyadmin/docker-compose.yml | 0 .../src/templates/phpmyadmin/index.ts | 0 .../templates/plausible/docker-compose.yml | 0 .../src/templates/plausible/index.ts | 0 .../templates/pocketbase/docker-compose.yml | 0 .../src/templates/pocketbase/index.ts | 0 .../templates/rocketchat/docker-compose.yml | 0 .../src/templates/rocketchat/index.ts | 0 .../src/templates/soketi/docker-compose.yml | 0 .../src/templates/soketi/index.ts | 0 .../src/templates/supabase/docker-compose.yml | 0 .../src/templates/supabase/index.ts | 0 .../src/templates/teable/docker-compose.yml | 0 .../src/templates/teable/index.ts | 0 .../src/templates/templates.ts | 0 .../src/templates/typebot/docker-compose.yml | 0 .../src/templates/typebot/index.ts | 0 .../templates/types/templates-data.type.ts | 0 .../src/templates/umami/docker-compose.yml | 0 .../src/templates/umami/index.ts | 0 .../templates/uptime-kuma/docker-compose.yml | 0 .../src/templates/uptime-kuma/index.ts | 0 .../src/templates/utils/index.ts | 0 .../templates/wordpress/docker-compose.yml | 0 .../src/templates/wordpress/index.ts | 0 .../src/templates/zipline/docker-compose.yml | 0 .../src/templates/zipline/index.ts | 0 .../{builders => server}/src/types/with.ts | 0 .../src/utils/access-log/handler.ts | 2 +- .../src/utils/access-log/types.ts | 0 .../src/utils/access-log/utils.ts | 0 .../src/utils/backups/index.ts | 0 .../src/utils/backups/mariadb.ts | 0 .../src/utils/backups/mongo.ts | 0 .../src/utils/backups/mysql.ts | 0 .../src/utils/backups/postgres.ts | 0 .../src/utils/backups/utils.ts | 0 .../src/utils/builders/compose.ts | 0 .../src/utils/builders/docker-file.ts | 0 .../src/utils/builders/drop.ts | 2 +- .../src/utils/builders/heroku.ts | 0 .../src/utils/builders/index.ts | 0 .../src/utils/builders/nixpacks.ts | 0 .../src/utils/builders/paketo.ts | 0 .../src/utils/builders/static.ts | 0 .../src/utils/builders/utils.ts | 0 .../src/utils/cluster/upload.ts | 0 .../src/utils/databases/mariadb.ts | 0 .../src/utils/databases/mongo.ts | 0 .../src/utils/databases/mysql.ts | 0 .../src/utils/databases/postgres.ts | 0 .../src/utils/databases/redis.ts | 0 .../src/utils/docker/compose.ts | 0 .../src/utils/docker/compose/configs.ts | 0 .../src/utils/docker/compose/network.ts | 0 .../src/utils/docker/compose/secrets.ts | 0 .../src/utils/docker/compose/service.ts | 0 .../src/utils/docker/compose/volume.ts | 0 .../src/utils/docker/domain.ts | 2 +- .../src/utils/docker/types.ts | 0 .../src/utils/docker/utils.ts | 0 .../src/utils/filesystem/directory.ts | 2 +- .../src/utils/filesystem/ssh.ts | 0 .../src/utils/notifications/build-error.ts | 2 +- .../src/utils/notifications/build-success.ts | 2 +- .../utils/notifications/database-backup.ts | 2 +- .../src/utils/notifications/docker-cleanup.ts | 2 +- .../utils/notifications/dokploy-restart.ts | 2 +- .../src/utils/notifications/utils.ts | 0 .../src/utils/process/execAsync.ts | 0 .../src/utils/process/spawnAsync.ts | 0 .../src/utils/providers/bitbucket.ts | 4 +- .../src/utils/providers/docker.ts | 0 .../src/utils/providers/git.ts | 2 +- .../src/utils/providers/github.ts | 2 +- .../src/utils/providers/gitlab.ts | 4 +- .../src/utils/providers/raw.ts | 2 +- .../src/utils/servers/remote-docker.ts | 2 +- .../src/utils/traefik/application.ts | 2 +- .../src/utils/traefik/domain.ts | 0 .../src/utils/traefik/file-types.ts | 0 .../src/utils/traefik/middleware.ts | 0 .../src/utils/traefik/redirect.ts | 0 .../src/utils/traefik/registry.ts | 2 +- .../src/utils/traefik/security.ts | 0 .../src/utils/traefik/types.ts | 0 .../src/utils/traefik/web-server.ts | 2 +- .../src/wss/docker-container-logs.ts | 2 +- .../src/wss/docker-container-terminal.ts | 2 +- .../src/wss/docker-stats.ts | 0 .../src/wss/listen-deployment.ts | 2 +- .../{builders => server}/src/wss/terminal.ts | 2 +- .../{builders => server}/src/wss/utils.ts | 0 packages/server/tsconfig.json | 43 ++++++++++ packages/server/tsconfig.server.json | 25 ++++++ pnpm-lock.yaml | 14 ++-- pnpm-workspace.yaml | 2 +- 361 files changed, 551 insertions(+), 562 deletions(-) delete mode 100644 packages/builders/tsconfig.json delete mode 100644 packages/builders/tsconfig.server.json rename packages/{builders => server}/esbuild.config.ts (100%) rename packages/{builders => server}/package.json (98%) rename packages/{builders => server}/src/auth/auth.ts (100%) rename packages/{builders => server}/src/auth/random-password.ts (100%) rename packages/{builders => server}/src/auth/token.ts (100%) rename packages/{builders => server}/src/constants/index.ts (100%) rename packages/{builders => server}/src/db/drizzle.config.ts (100%) rename packages/{builders => server}/src/db/index.ts (100%) rename packages/{builders => server}/src/db/migration.ts (100%) rename packages/{builders => server}/src/db/reset.ts (100%) rename packages/{builders => server}/src/db/schema/admin.ts (100%) rename packages/{builders => server}/src/db/schema/application.ts (100%) rename packages/{builders => server}/src/db/schema/auth.ts (100%) rename packages/{builders => server}/src/db/schema/backups.ts (100%) rename packages/{builders => server}/src/db/schema/bitbucket.ts (100%) rename packages/{builders => server}/src/db/schema/certificate.ts (100%) rename packages/{builders => server}/src/db/schema/compose.ts (100%) rename packages/{builders => server}/src/db/schema/deployment.ts (100%) rename packages/{builders => server}/src/db/schema/destination.ts (100%) rename packages/{builders => server}/src/db/schema/domain.ts (100%) rename packages/{builders => server}/src/db/schema/git-provider.ts (100%) rename packages/{builders => server}/src/db/schema/github.ts (100%) rename packages/{builders => server}/src/db/schema/gitlab.ts (100%) rename packages/{builders => server}/src/db/schema/index.ts (100%) rename packages/{builders => server}/src/db/schema/mariadb.ts (100%) rename packages/{builders => server}/src/db/schema/mongo.ts (100%) rename packages/{builders => server}/src/db/schema/mount.ts (100%) rename packages/{builders => server}/src/db/schema/mysql.ts (100%) rename packages/{builders => server}/src/db/schema/notification.ts (100%) rename packages/{builders => server}/src/db/schema/port.ts (100%) rename packages/{builders => server}/src/db/schema/postgres.ts (100%) rename packages/{builders => server}/src/db/schema/project.ts (100%) rename packages/{builders => server}/src/db/schema/redirects.ts (100%) rename packages/{builders => server}/src/db/schema/redis.ts (100%) rename packages/{builders => server}/src/db/schema/registry.ts (100%) rename packages/{builders => server}/src/db/schema/security.ts (100%) rename packages/{builders => server}/src/db/schema/server.ts (100%) rename packages/{builders => server}/src/db/schema/session.ts (100%) rename packages/{builders => server}/src/db/schema/shared.ts (100%) rename packages/{builders => server}/src/db/schema/source.ts (100%) rename packages/{builders => server}/src/db/schema/ssh-key.ts (100%) rename packages/{builders => server}/src/db/schema/user.ts (100%) rename packages/{builders => server}/src/db/schema/utils.ts (100%) rename packages/{builders => server}/src/db/seed.ts (100%) rename packages/{builders => server}/src/db/validations/domain.ts (100%) rename packages/{builders => server}/src/db/validations/index.ts (100%) rename packages/{builders => server}/src/emails/.gitignore (100%) rename packages/{builders => server}/src/emails/emails/build-failed.tsx (100%) rename packages/{builders => server}/src/emails/emails/build-success.tsx (100%) rename packages/{builders => server}/src/emails/emails/database-backup.tsx (100%) rename packages/{builders => server}/src/emails/emails/docker-cleanup.tsx (100%) rename packages/{builders => server}/src/emails/emails/dokploy-restart.tsx (100%) rename packages/{builders => server}/src/emails/emails/invitation.tsx (100%) rename packages/{builders => server}/src/emails/emails/notion-magic-link.tsx (100%) rename packages/{builders => server}/src/emails/emails/plaid-verify-identity.tsx (100%) rename packages/{builders => server}/src/emails/emails/static/logo.png (100%) rename packages/{builders => server}/src/emails/emails/static/notion-logo.png (100%) rename packages/{builders => server}/src/emails/emails/static/plaid-logo.png (100%) rename packages/{builders => server}/src/emails/emails/static/plaid.png (100%) rename packages/{builders => server}/src/emails/emails/static/stripe-logo.png (100%) rename packages/{builders => server}/src/emails/emails/static/vercel-arrow.png (100%) rename packages/{builders => server}/src/emails/emails/static/vercel-logo.png (100%) rename packages/{builders => server}/src/emails/emails/static/vercel-team.png (100%) rename packages/{builders => server}/src/emails/emails/static/vercel-user.png (100%) rename packages/{builders => server}/src/emails/emails/stripe-welcome.tsx (100%) rename packages/{builders => server}/src/emails/emails/vercel-invite-user.tsx (100%) rename packages/{builders => server}/src/emails/package.json (100%) rename packages/{builders => server}/src/emails/pnpm-lock.yaml (100%) rename packages/{builders => server}/src/emails/readme.md (100%) rename packages/{builders => server}/src/index.ts (100%) rename packages/{builders => server}/src/monitoring/utilts.ts (100%) rename packages/{builders => server}/src/services/admin.ts (100%) rename packages/{builders => server}/src/services/application.ts (100%) rename packages/{builders => server}/src/services/auth.ts (100%) rename packages/{builders => server}/src/services/backup.ts (100%) rename packages/{builders => server}/src/services/bitbucket.ts (100%) rename packages/{builders => server}/src/services/certificate.ts (100%) rename packages/{builders => server}/src/services/cluster.ts (100%) rename packages/{builders => server}/src/services/compose.ts (100%) rename packages/{builders => server}/src/services/deployment.ts (100%) rename packages/{builders => server}/src/services/destination.ts (100%) rename packages/{builders => server}/src/services/docker.ts (100%) rename packages/{builders => server}/src/services/domain.ts (100%) rename packages/{builders => server}/src/services/git-provider.ts (100%) rename packages/{builders => server}/src/services/github.ts (100%) rename packages/{builders => server}/src/services/gitlab.ts (100%) rename packages/{builders => server}/src/services/mariadb.ts (100%) rename packages/{builders => server}/src/services/mongo.ts (100%) rename packages/{builders => server}/src/services/mount.ts (100%) rename packages/{builders => server}/src/services/mysql.ts (100%) rename packages/{builders => server}/src/services/notification.ts (100%) rename packages/{builders => server}/src/services/port.ts (100%) rename packages/{builders => server}/src/services/postgres.ts (100%) rename packages/{builders => server}/src/services/project.ts (100%) rename packages/{builders => server}/src/services/redirect.ts (100%) rename packages/{builders => server}/src/services/redis.ts (100%) rename packages/{builders => server}/src/services/registry.ts (100%) rename packages/{builders => server}/src/services/security.ts (100%) rename packages/{builders => server}/src/services/server.ts (100%) rename packages/{builders => server}/src/services/settings.ts (100%) rename packages/{builders => server}/src/services/ssh-key.ts (100%) rename packages/{builders => server}/src/services/user.ts (100%) rename packages/{builders => server}/src/setup/config-paths.ts (100%) rename packages/{builders => server}/src/setup/postgres-setup.ts (100%) rename packages/{builders => server}/src/setup/redis-setup.ts (100%) rename packages/{builders => server}/src/setup/registry-setup.ts (100%) rename packages/{builders => server}/src/setup/server-setup.ts (100%) rename packages/{builders => server}/src/setup/setup.ts (100%) rename packages/{builders => server}/src/setup/traefik-setup.ts (100%) rename packages/{builders => server}/src/templates/appsmith/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/appsmith/index.ts (100%) rename packages/{builders => server}/src/templates/aptabase/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/aptabase/index.ts (100%) rename packages/{builders => server}/src/templates/baserow/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/baserow/index.ts (100%) rename packages/{builders => server}/src/templates/calcom/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/calcom/index.ts (100%) rename packages/{builders => server}/src/templates/directus/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/directus/index.ts (100%) rename packages/{builders => server}/src/templates/documenso/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/documenso/index.ts (100%) rename packages/{builders => server}/src/templates/doublezero/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/doublezero/index.ts (100%) rename packages/{builders => server}/src/templates/excalidraw/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/excalidraw/index.ts (100%) rename packages/{builders => server}/src/templates/ghost/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/ghost/index.ts (100%) rename packages/{builders => server}/src/templates/gitea/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/gitea/index.ts (100%) rename packages/{builders => server}/src/templates/glitchtip/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/glitchtip/index.ts (100%) rename packages/{builders => server}/src/templates/grafana/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/grafana/index.ts (100%) rename packages/{builders => server}/src/templates/jellyfin/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/jellyfin/index.ts (100%) rename packages/{builders => server}/src/templates/listmonk/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/listmonk/index.ts (100%) rename packages/{builders => server}/src/templates/meilisearch/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/meilisearch/index.ts (100%) rename packages/{builders => server}/src/templates/metabase/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/metabase/index.ts (100%) rename packages/{builders => server}/src/templates/minio/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/minio/index.ts (100%) rename packages/{builders => server}/src/templates/n8n/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/n8n/index.ts (100%) rename packages/{builders => server}/src/templates/nocodb/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/nocodb/index.ts (100%) rename packages/{builders => server}/src/templates/odoo/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/odoo/index.ts (100%) rename packages/{builders => server}/src/templates/open-webui/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/open-webui/index.ts (100%) rename packages/{builders => server}/src/templates/phpmyadmin/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/phpmyadmin/index.ts (100%) rename packages/{builders => server}/src/templates/plausible/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/plausible/index.ts (100%) rename packages/{builders => server}/src/templates/pocketbase/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/pocketbase/index.ts (100%) rename packages/{builders => server}/src/templates/rocketchat/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/rocketchat/index.ts (100%) rename packages/{builders => server}/src/templates/soketi/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/soketi/index.ts (100%) rename packages/{builders => server}/src/templates/supabase/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/supabase/index.ts (100%) rename packages/{builders => server}/src/templates/teable/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/teable/index.ts (100%) rename packages/{builders => server}/src/templates/templates.ts (100%) rename packages/{builders => server}/src/templates/typebot/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/typebot/index.ts (100%) rename packages/{builders => server}/src/templates/types/templates-data.type.ts (100%) rename packages/{builders => server}/src/templates/umami/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/umami/index.ts (100%) rename packages/{builders => server}/src/templates/uptime-kuma/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/uptime-kuma/index.ts (100%) rename packages/{builders => server}/src/templates/utils/index.ts (100%) rename packages/{builders => server}/src/templates/wordpress/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/wordpress/index.ts (100%) rename packages/{builders => server}/src/templates/zipline/docker-compose.yml (100%) rename packages/{builders => server}/src/templates/zipline/index.ts (100%) rename packages/{builders => server}/src/types/with.ts (100%) rename packages/{builders => server}/src/utils/access-log/handler.ts (100%) rename packages/{builders => server}/src/utils/access-log/types.ts (100%) rename packages/{builders => server}/src/utils/access-log/utils.ts (100%) rename packages/{builders => server}/src/utils/backups/index.ts (100%) rename packages/{builders => server}/src/utils/backups/mariadb.ts (100%) rename packages/{builders => server}/src/utils/backups/mongo.ts (100%) rename packages/{builders => server}/src/utils/backups/mysql.ts (100%) rename packages/{builders => server}/src/utils/backups/postgres.ts (100%) rename packages/{builders => server}/src/utils/backups/utils.ts (100%) rename packages/{builders => server}/src/utils/builders/compose.ts (100%) rename packages/{builders => server}/src/utils/builders/docker-file.ts (100%) rename packages/{builders => server}/src/utils/builders/drop.ts (100%) rename packages/{builders => server}/src/utils/builders/heroku.ts (100%) rename packages/{builders => server}/src/utils/builders/index.ts (100%) rename packages/{builders => server}/src/utils/builders/nixpacks.ts (100%) rename packages/{builders => server}/src/utils/builders/paketo.ts (100%) rename packages/{builders => server}/src/utils/builders/static.ts (100%) rename packages/{builders => server}/src/utils/builders/utils.ts (100%) rename packages/{builders => server}/src/utils/cluster/upload.ts (100%) rename packages/{builders => server}/src/utils/databases/mariadb.ts (100%) rename packages/{builders => server}/src/utils/databases/mongo.ts (100%) rename packages/{builders => server}/src/utils/databases/mysql.ts (100%) rename packages/{builders => server}/src/utils/databases/postgres.ts (100%) rename packages/{builders => server}/src/utils/databases/redis.ts (100%) rename packages/{builders => server}/src/utils/docker/compose.ts (100%) rename packages/{builders => server}/src/utils/docker/compose/configs.ts (100%) rename packages/{builders => server}/src/utils/docker/compose/network.ts (100%) rename packages/{builders => server}/src/utils/docker/compose/secrets.ts (100%) rename packages/{builders => server}/src/utils/docker/compose/service.ts (100%) rename packages/{builders => server}/src/utils/docker/compose/volume.ts (100%) rename packages/{builders => server}/src/utils/docker/domain.ts (100%) rename packages/{builders => server}/src/utils/docker/types.ts (100%) rename packages/{builders => server}/src/utils/docker/utils.ts (100%) rename packages/{builders => server}/src/utils/filesystem/directory.ts (100%) rename packages/{builders => server}/src/utils/filesystem/ssh.ts (100%) rename packages/{builders => server}/src/utils/notifications/build-error.ts (100%) rename packages/{builders => server}/src/utils/notifications/build-success.ts (100%) rename packages/{builders => server}/src/utils/notifications/database-backup.ts (100%) rename packages/{builders => server}/src/utils/notifications/docker-cleanup.ts (100%) rename packages/{builders => server}/src/utils/notifications/dokploy-restart.ts (100%) rename packages/{builders => server}/src/utils/notifications/utils.ts (100%) rename packages/{builders => server}/src/utils/process/execAsync.ts (100%) rename packages/{builders => server}/src/utils/process/spawnAsync.ts (100%) rename packages/{builders => server}/src/utils/providers/bitbucket.ts (100%) rename packages/{builders => server}/src/utils/providers/docker.ts (100%) rename packages/{builders => server}/src/utils/providers/git.ts (100%) rename packages/{builders => server}/src/utils/providers/github.ts (100%) rename packages/{builders => server}/src/utils/providers/gitlab.ts (100%) rename packages/{builders => server}/src/utils/providers/raw.ts (100%) rename packages/{builders => server}/src/utils/servers/remote-docker.ts (100%) rename packages/{builders => server}/src/utils/traefik/application.ts (100%) rename packages/{builders => server}/src/utils/traefik/domain.ts (100%) rename packages/{builders => server}/src/utils/traefik/file-types.ts (100%) rename packages/{builders => server}/src/utils/traefik/middleware.ts (100%) rename packages/{builders => server}/src/utils/traefik/redirect.ts (100%) rename packages/{builders => server}/src/utils/traefik/registry.ts (100%) rename packages/{builders => server}/src/utils/traefik/security.ts (100%) rename packages/{builders => server}/src/utils/traefik/types.ts (100%) rename packages/{builders => server}/src/utils/traefik/web-server.ts (100%) rename packages/{builders => server}/src/wss/docker-container-logs.ts (100%) rename packages/{builders => server}/src/wss/docker-container-terminal.ts (100%) rename packages/{builders => server}/src/wss/docker-stats.ts (100%) rename packages/{builders => server}/src/wss/listen-deployment.ts (100%) rename packages/{builders => server}/src/wss/terminal.ts (100%) rename packages/{builders => server}/src/wss/utils.ts (100%) create mode 100644 packages/server/tsconfig.json create mode 100644 packages/server/tsconfig.server.json diff --git a/apps/api/package.json b/apps/api/package.json index 85e74e12..06c75baa 100644 --- a/apps/api/package.json +++ b/apps/api/package.json @@ -14,7 +14,7 @@ "zod": "^3.23.4", "react": "18.2.0", "react-dom": "18.2.0", - "@dokploy/builders": "workspace:*", + "@dokploy/server": "workspace:*", "@hono/node-server": "^1.12.1", "hono": "^4.5.8", "dotenv": "^16.3.1", diff --git a/apps/api/src/utils.ts b/apps/api/src/utils.ts index 9416f8ad..01b83a77 100644 --- a/apps/api/src/utils.ts +++ b/apps/api/src/utils.ts @@ -9,9 +9,9 @@ import { rebuildRemoteCompose, updateApplicationStatus, updateCompose, -} from "@dokploy/builders"; -import type { LemonSqueezyLicenseResponse } from "./types"; +} from "@dokploy/server"; import type { DeployJob } from "./schema"; +import type { LemonSqueezyLicenseResponse } from "./types"; // const LEMON_SQUEEZY_API_KEY = process.env.LEMON_SQUEEZY_API_KEY; // const LEMON_SQUEEZY_STORE_ID = process.env.LEMON_SQUEEZY_STORE_ID; diff --git a/apps/dokploy/__test__/compose/compose.test.ts b/apps/dokploy/__test__/compose/compose.test.ts index 626c98d4..9d4ba20f 100644 --- a/apps/dokploy/__test__/compose/compose.test.ts +++ b/apps/dokploy/__test__/compose/compose.test.ts @@ -1,5 +1,5 @@ -import { addSuffixToAllProperties } from "@dokploy/builders"; -import type { ComposeSpecification } from "@dokploy/builders"; +import { addSuffixToAllProperties } from "@dokploy/server"; +import type { ComposeSpecification } from "@dokploy/server"; import { load } from "js-yaml"; import { expect, test } from "vitest"; diff --git a/apps/dokploy/__test__/compose/config/config-root.test.ts b/apps/dokploy/__test__/compose/config/config-root.test.ts index cd45d786..4b40c073 100644 --- a/apps/dokploy/__test__/compose/config/config-root.test.ts +++ b/apps/dokploy/__test__/compose/config/config-root.test.ts @@ -1,6 +1,6 @@ -import { generateRandomHash } from "@dokploy/builders"; -import { addSuffixToConfigsRoot } from "@dokploy/builders"; -import type { ComposeSpecification } from "@dokploy/builders"; +import { generateRandomHash } from "@dokploy/server"; +import { addSuffixToConfigsRoot } from "@dokploy/server"; +import type { ComposeSpecification } from "@dokploy/server"; import { load } from "js-yaml"; import { expect, test } from "vitest"; diff --git a/apps/dokploy/__test__/compose/config/config-service.test.ts b/apps/dokploy/__test__/compose/config/config-service.test.ts index d4d2bd3c..de014eb5 100644 --- a/apps/dokploy/__test__/compose/config/config-service.test.ts +++ b/apps/dokploy/__test__/compose/config/config-service.test.ts @@ -1,6 +1,6 @@ -import { generateRandomHash } from "@dokploy/builders"; -import { addSuffixToConfigsInServices } from "@dokploy/builders"; -import type { ComposeSpecification } from "@dokploy/builders"; +import { generateRandomHash } from "@dokploy/server"; +import { addSuffixToConfigsInServices } from "@dokploy/server"; +import type { ComposeSpecification } from "@dokploy/server"; import { load } from "js-yaml"; import { expect, test } from "vitest"; diff --git a/apps/dokploy/__test__/compose/config/config.test.ts b/apps/dokploy/__test__/compose/config/config.test.ts index b3947f37..3f98525a 100644 --- a/apps/dokploy/__test__/compose/config/config.test.ts +++ b/apps/dokploy/__test__/compose/config/config.test.ts @@ -1,9 +1,6 @@ -import { generateRandomHash } from "@dokploy/builders"; -import { - addSuffixToAllConfigs, - addSuffixToConfigsRoot, -} from "@dokploy/builders"; -import type { ComposeSpecification } from "@dokploy/builders"; +import { generateRandomHash } from "@dokploy/server"; +import { addSuffixToAllConfigs, addSuffixToConfigsRoot } from "@dokploy/server"; +import type { ComposeSpecification } from "@dokploy/server"; import { load } from "js-yaml"; import { expect, test } from "vitest"; diff --git a/apps/dokploy/__test__/compose/domain/labels.test.ts b/apps/dokploy/__test__/compose/domain/labels.test.ts index bd339712..5076a204 100644 --- a/apps/dokploy/__test__/compose/domain/labels.test.ts +++ b/apps/dokploy/__test__/compose/domain/labels.test.ts @@ -1,5 +1,5 @@ -import type { Domain } from "@dokploy/builders"; -import { createDomainLabels } from "@dokploy/builders"; +import type { Domain } from "@dokploy/server"; +import { createDomainLabels } from "@dokploy/server"; import { describe, expect, it } from "vitest"; describe("createDomainLabels", () => { diff --git a/apps/dokploy/__test__/compose/domain/network-root.test.ts b/apps/dokploy/__test__/compose/domain/network-root.test.ts index dca7728f..73b850a4 100644 --- a/apps/dokploy/__test__/compose/domain/network-root.test.ts +++ b/apps/dokploy/__test__/compose/domain/network-root.test.ts @@ -1,4 +1,4 @@ -import { addDokployNetworkToRoot } from "@dokploy/builders"; +import { addDokployNetworkToRoot } from "@dokploy/server"; import { describe, expect, it } from "vitest"; describe("addDokployNetworkToRoot", () => { diff --git a/apps/dokploy/__test__/compose/domain/network-service.test.ts b/apps/dokploy/__test__/compose/domain/network-service.test.ts index 58513112..b8d03c75 100644 --- a/apps/dokploy/__test__/compose/domain/network-service.test.ts +++ b/apps/dokploy/__test__/compose/domain/network-service.test.ts @@ -1,4 +1,4 @@ -import { addDokployNetworkToService } from "@dokploy/builders"; +import { addDokployNetworkToService } from "@dokploy/server"; import { describe, expect, it } from "vitest"; describe("addDokployNetworkToService", () => { diff --git a/apps/dokploy/__test__/compose/network/network-root.test.ts b/apps/dokploy/__test__/compose/network/network-root.test.ts index 5d0dcb71..7e06a9f0 100644 --- a/apps/dokploy/__test__/compose/network/network-root.test.ts +++ b/apps/dokploy/__test__/compose/network/network-root.test.ts @@ -1,6 +1,6 @@ -import { generateRandomHash } from "@dokploy/builders"; -import { addSuffixToNetworksRoot } from "@dokploy/builders"; -import type { ComposeSpecification } from "@dokploy/builders"; +import { generateRandomHash } from "@dokploy/server"; +import { addSuffixToNetworksRoot } from "@dokploy/server"; +import type { ComposeSpecification } from "@dokploy/server"; import { load } from "js-yaml"; import { expect, test } from "vitest"; diff --git a/apps/dokploy/__test__/compose/network/network-service.test.ts b/apps/dokploy/__test__/compose/network/network-service.test.ts index 30b33b35..ee07d9de 100644 --- a/apps/dokploy/__test__/compose/network/network-service.test.ts +++ b/apps/dokploy/__test__/compose/network/network-service.test.ts @@ -1,6 +1,6 @@ -import { generateRandomHash } from "@dokploy/builders"; -import { addSuffixToServiceNetworks } from "@dokploy/builders"; -import type { ComposeSpecification } from "@dokploy/builders"; +import { generateRandomHash } from "@dokploy/server"; +import { addSuffixToServiceNetworks } from "@dokploy/server"; +import type { ComposeSpecification } from "@dokploy/server"; import { load } from "js-yaml"; import { expect, test } from "vitest"; diff --git a/apps/dokploy/__test__/compose/network/network.test.ts b/apps/dokploy/__test__/compose/network/network.test.ts index 8a308e0b..39cf0395 100644 --- a/apps/dokploy/__test__/compose/network/network.test.ts +++ b/apps/dokploy/__test__/compose/network/network.test.ts @@ -1,10 +1,10 @@ -import { generateRandomHash } from "@dokploy/builders"; +import { generateRandomHash } from "@dokploy/server"; import { addSuffixToAllNetworks, addSuffixToServiceNetworks, -} from "@dokploy/builders"; -import { addSuffixToNetworksRoot } from "@dokploy/builders"; -import type { ComposeSpecification } from "@dokploy/builders"; +} from "@dokploy/server"; +import { addSuffixToNetworksRoot } from "@dokploy/server"; +import type { ComposeSpecification } from "@dokploy/server"; import { load } from "js-yaml"; import { expect, test } from "vitest"; diff --git a/apps/dokploy/__test__/compose/secrets/secret-root.test.ts b/apps/dokploy/__test__/compose/secrets/secret-root.test.ts index 61325d71..2bd91b58 100644 --- a/apps/dokploy/__test__/compose/secrets/secret-root.test.ts +++ b/apps/dokploy/__test__/compose/secrets/secret-root.test.ts @@ -1,6 +1,6 @@ -import { generateRandomHash } from "@dokploy/builders"; -import { addSuffixToSecretsRoot } from "@dokploy/builders"; -import type { ComposeSpecification } from "@dokploy/builders"; +import { generateRandomHash } from "@dokploy/server"; +import { addSuffixToSecretsRoot } from "@dokploy/server"; +import type { ComposeSpecification } from "@dokploy/server"; import { dump, load } from "js-yaml"; import { expect, test } from "vitest"; diff --git a/apps/dokploy/__test__/compose/secrets/secret-services.test.ts b/apps/dokploy/__test__/compose/secrets/secret-services.test.ts index c22a5712..5206bbba 100644 --- a/apps/dokploy/__test__/compose/secrets/secret-services.test.ts +++ b/apps/dokploy/__test__/compose/secrets/secret-services.test.ts @@ -1,6 +1,6 @@ -import { generateRandomHash } from "@dokploy/builders"; -import { addSuffixToSecretsInServices } from "@dokploy/builders"; -import type { ComposeSpecification } from "@dokploy/builders"; +import { generateRandomHash } from "@dokploy/server"; +import { addSuffixToSecretsInServices } from "@dokploy/server"; +import type { ComposeSpecification } from "@dokploy/server"; import { load } from "js-yaml"; import { expect, test } from "vitest"; diff --git a/apps/dokploy/__test__/compose/secrets/secret.test.ts b/apps/dokploy/__test__/compose/secrets/secret.test.ts index 74a8002b..d874dc5e 100644 --- a/apps/dokploy/__test__/compose/secrets/secret.test.ts +++ b/apps/dokploy/__test__/compose/secrets/secret.test.ts @@ -1,5 +1,5 @@ -import { addSuffixToAllSecrets } from "@dokploy/builders"; -import type { ComposeSpecification } from "@dokploy/builders"; +import { addSuffixToAllSecrets } from "@dokploy/server"; +import type { ComposeSpecification } from "@dokploy/server"; import { load } from "js-yaml"; import { expect, test } from "vitest"; diff --git a/apps/dokploy/__test__/compose/service/service-container-name.test.ts b/apps/dokploy/__test__/compose/service/service-container-name.test.ts index d6e8eb2e..bcb51fd0 100644 --- a/apps/dokploy/__test__/compose/service/service-container-name.test.ts +++ b/apps/dokploy/__test__/compose/service/service-container-name.test.ts @@ -1,6 +1,6 @@ -import { generateRandomHash } from "@dokploy/builders"; -import { addSuffixToServiceNames } from "@dokploy/builders"; -import type { ComposeSpecification } from "@dokploy/builders"; +import { generateRandomHash } from "@dokploy/server"; +import { addSuffixToServiceNames } from "@dokploy/server"; +import type { ComposeSpecification } from "@dokploy/server"; import { load } from "js-yaml"; import { expect, test } from "vitest"; diff --git a/apps/dokploy/__test__/compose/service/service-depends-on.test.ts b/apps/dokploy/__test__/compose/service/service-depends-on.test.ts index 7e2fe748..b27414be 100644 --- a/apps/dokploy/__test__/compose/service/service-depends-on.test.ts +++ b/apps/dokploy/__test__/compose/service/service-depends-on.test.ts @@ -1,6 +1,6 @@ -import { generateRandomHash } from "@dokploy/builders"; -import { addSuffixToServiceNames } from "@dokploy/builders"; -import type { ComposeSpecification } from "@dokploy/builders"; +import { generateRandomHash } from "@dokploy/server"; +import { addSuffixToServiceNames } from "@dokploy/server"; +import type { ComposeSpecification } from "@dokploy/server"; import { load } from "js-yaml"; import { expect, test } from "vitest"; diff --git a/apps/dokploy/__test__/compose/service/service-extends.test.ts b/apps/dokploy/__test__/compose/service/service-extends.test.ts index 051d3483..8309a32f 100644 --- a/apps/dokploy/__test__/compose/service/service-extends.test.ts +++ b/apps/dokploy/__test__/compose/service/service-extends.test.ts @@ -1,6 +1,6 @@ -import { generateRandomHash } from "@dokploy/builders"; -import { addSuffixToServiceNames } from "@dokploy/builders"; -import type { ComposeSpecification } from "@dokploy/builders"; +import { generateRandomHash } from "@dokploy/server"; +import { addSuffixToServiceNames } from "@dokploy/server"; +import type { ComposeSpecification } from "@dokploy/server"; import { load } from "js-yaml"; import { expect, test } from "vitest"; diff --git a/apps/dokploy/__test__/compose/service/service-links.test.ts b/apps/dokploy/__test__/compose/service/service-links.test.ts index c8e3ab2b..5f9b01ab 100644 --- a/apps/dokploy/__test__/compose/service/service-links.test.ts +++ b/apps/dokploy/__test__/compose/service/service-links.test.ts @@ -1,6 +1,6 @@ -import { generateRandomHash } from "@dokploy/builders"; -import { addSuffixToServiceNames } from "@dokploy/builders"; -import type { ComposeSpecification } from "@dokploy/builders"; +import { generateRandomHash } from "@dokploy/server"; +import { addSuffixToServiceNames } from "@dokploy/server"; +import type { ComposeSpecification } from "@dokploy/server"; import { load } from "js-yaml"; import { expect, test } from "vitest"; diff --git a/apps/dokploy/__test__/compose/service/service-names.test.ts b/apps/dokploy/__test__/compose/service/service-names.test.ts index d2b1b2b2..936a32ec 100644 --- a/apps/dokploy/__test__/compose/service/service-names.test.ts +++ b/apps/dokploy/__test__/compose/service/service-names.test.ts @@ -1,6 +1,6 @@ -import { generateRandomHash } from "@dokploy/builders"; -import { addSuffixToServiceNames } from "@dokploy/builders"; -import type { ComposeSpecification } from "@dokploy/builders"; +import { generateRandomHash } from "@dokploy/server"; +import { addSuffixToServiceNames } from "@dokploy/server"; +import type { ComposeSpecification } from "@dokploy/server"; import { load } from "js-yaml"; import { expect, test } from "vitest"; diff --git a/apps/dokploy/__test__/compose/service/service.test.ts b/apps/dokploy/__test__/compose/service/service.test.ts index 29f8318b..c6050f75 100644 --- a/apps/dokploy/__test__/compose/service/service.test.ts +++ b/apps/dokploy/__test__/compose/service/service.test.ts @@ -1,8 +1,8 @@ import { addSuffixToAllServiceNames, addSuffixToServiceNames, -} from "@dokploy/builders"; -import type { ComposeSpecification } from "@dokploy/builders"; +} from "@dokploy/server"; +import type { ComposeSpecification } from "@dokploy/server"; import { load } from "js-yaml"; import { expect, test } from "vitest"; diff --git a/apps/dokploy/__test__/compose/service/sevice-volumes-from.test.ts b/apps/dokploy/__test__/compose/service/sevice-volumes-from.test.ts index 544b8d69..8066a6dd 100644 --- a/apps/dokploy/__test__/compose/service/sevice-volumes-from.test.ts +++ b/apps/dokploy/__test__/compose/service/sevice-volumes-from.test.ts @@ -1,6 +1,6 @@ -import { generateRandomHash } from "@dokploy/builders"; -import { addSuffixToServiceNames } from "@dokploy/builders"; -import type { ComposeSpecification } from "@dokploy/builders"; +import { generateRandomHash } from "@dokploy/server"; +import { addSuffixToServiceNames } from "@dokploy/server"; +import type { ComposeSpecification } from "@dokploy/server"; import { load } from "js-yaml"; import { expect, test } from "vitest"; diff --git a/apps/dokploy/__test__/compose/volume/volume-2.test.ts b/apps/dokploy/__test__/compose/volume/volume-2.test.ts index ee342b57..bf34ed49 100644 --- a/apps/dokploy/__test__/compose/volume/volume-2.test.ts +++ b/apps/dokploy/__test__/compose/volume/volume-2.test.ts @@ -1,9 +1,6 @@ -import { generateRandomHash } from "@dokploy/builders"; -import { - addSuffixToAllVolumes, - addSuffixToVolumesRoot, -} from "@dokploy/builders"; -import type { ComposeSpecification } from "@dokploy/builders"; +import { generateRandomHash } from "@dokploy/server"; +import { addSuffixToAllVolumes, addSuffixToVolumesRoot } from "@dokploy/server"; +import type { ComposeSpecification } from "@dokploy/server"; import { load } from "js-yaml"; import { expect, test } from "vitest"; diff --git a/apps/dokploy/__test__/compose/volume/volume-root.test.ts b/apps/dokploy/__test__/compose/volume/volume-root.test.ts index 683cc3e1..d91cb64d 100644 --- a/apps/dokploy/__test__/compose/volume/volume-root.test.ts +++ b/apps/dokploy/__test__/compose/volume/volume-root.test.ts @@ -1,6 +1,6 @@ -import { generateRandomHash } from "@dokploy/builders"; -import { addSuffixToVolumesRoot } from "@dokploy/builders"; -import type { ComposeSpecification } from "@dokploy/builders"; +import { generateRandomHash } from "@dokploy/server"; +import { addSuffixToVolumesRoot } from "@dokploy/server"; +import type { ComposeSpecification } from "@dokploy/server"; import { load } from "js-yaml"; import { expect, test } from "vitest"; diff --git a/apps/dokploy/__test__/compose/volume/volume-services.test.ts b/apps/dokploy/__test__/compose/volume/volume-services.test.ts index c2e0e6ae..04a1a45a 100644 --- a/apps/dokploy/__test__/compose/volume/volume-services.test.ts +++ b/apps/dokploy/__test__/compose/volume/volume-services.test.ts @@ -1,6 +1,6 @@ -import { generateRandomHash } from "@dokploy/builders"; -import { addSuffixToVolumesInServices } from "@dokploy/builders"; -import type { ComposeSpecification } from "@dokploy/builders"; +import { generateRandomHash } from "@dokploy/server"; +import { addSuffixToVolumesInServices } from "@dokploy/server"; +import type { ComposeSpecification } from "@dokploy/server"; import { load } from "js-yaml"; import { expect, test } from "vitest"; diff --git a/apps/dokploy/__test__/compose/volume/volume.test.ts b/apps/dokploy/__test__/compose/volume/volume.test.ts index 3160dae2..d4623aeb 100644 --- a/apps/dokploy/__test__/compose/volume/volume.test.ts +++ b/apps/dokploy/__test__/compose/volume/volume.test.ts @@ -1,9 +1,9 @@ -import { generateRandomHash } from "@dokploy/builders"; +import { generateRandomHash } from "@dokploy/server"; import { addSuffixToAllVolumes, addSuffixToVolumesInServices, -} from "@dokploy/builders"; -import type { ComposeSpecification } from "@dokploy/builders"; +} from "@dokploy/server"; +import type { ComposeSpecification } from "@dokploy/server"; import { load } from "js-yaml"; import { expect, test } from "vitest"; diff --git a/apps/dokploy/__test__/drop/drop.test.test.ts b/apps/dokploy/__test__/drop/drop.test.test.ts index 23d6eace..2ca95984 100644 --- a/apps/dokploy/__test__/drop/drop.test.test.ts +++ b/apps/dokploy/__test__/drop/drop.test.test.ts @@ -2,8 +2,8 @@ import fs from "node:fs/promises"; import path from "node:path"; import { paths } from "@/server/constants"; const { APPLICATIONS_PATH } = paths(); -import type { ApplicationNested } from "@dokploy/builders"; -import { unzipDrop } from "@dokploy/builders"; +import type { ApplicationNested } from "@dokploy/server"; +import { unzipDrop } from "@dokploy/server"; import AdmZip from "adm-zip"; import { afterAll, beforeAll, describe, expect, it, vi } from "vitest"; @@ -82,7 +82,7 @@ const baseApp: ApplicationNested = { dockerContextPath: null, }; -vi.mock("@dokploy/builders", async (importOriginal) => { +vi.mock("@dokploy/server", async (importOriginal) => { const actual = await importOriginal(); return { ...actual, diff --git a/apps/dokploy/__test__/requests/request.test.ts b/apps/dokploy/__test__/requests/request.test.ts index 263f0864..997bd9ec 100644 --- a/apps/dokploy/__test__/requests/request.test.ts +++ b/apps/dokploy/__test__/requests/request.test.ts @@ -1,4 +1,4 @@ -import { parseRawConfig, processLogs } from "@dokploy/builders"; +import { parseRawConfig, processLogs } from "@dokploy/server"; import { describe, expect, it } from "vitest"; const sampleLogEntry = `{"ClientAddr":"172.19.0.1:56732","ClientHost":"172.19.0.1","ClientPort":"56732","ClientUsername":"-","DownstreamContentSize":0,"DownstreamStatus":304,"Duration":14729375,"OriginContentSize":0,"OriginDuration":14051833,"OriginStatus":304,"Overhead":677542,"RequestAddr":"s222-umami-c381af.traefik.me","RequestContentSize":0,"RequestCount":122,"RequestHost":"s222-umami-c381af.traefik.me","RequestMethod":"GET","RequestPath":"/dashboard?_rsc=1rugv","RequestPort":"-","RequestProtocol":"HTTP/1.1","RequestScheme":"http","RetryAttempts":0,"RouterName":"s222-umami-60e104-47-web@docker","ServiceAddr":"10.0.1.15:3000","ServiceName":"s222-umami-60e104-47-web@docker","ServiceURL":{"Scheme":"http","Opaque":"","User":null,"Host":"10.0.1.15:3000","Path":"","RawPath":"","ForceQuery":false,"RawQuery":"","Fragment":"","RawFragment":""},"StartLocal":"2024-08-25T04:34:37.306691884Z","StartUTC":"2024-08-25T04:34:37.306691884Z","entryPointName":"web","level":"info","msg":"","time":"2024-08-25T04:34:37Z"}`; diff --git a/apps/dokploy/__test__/traefik/server/update-server-config.test.ts b/apps/dokploy/__test__/traefik/server/update-server-config.test.ts index 0067903f..8eb387cc 100644 --- a/apps/dokploy/__test__/traefik/server/update-server-config.test.ts +++ b/apps/dokploy/__test__/traefik/server/update-server-config.test.ts @@ -5,12 +5,12 @@ vi.mock("node:fs", () => ({ default: fs, })); -import type { Admin, FileConfig } from "@dokploy/builders"; +import type { Admin, FileConfig } from "@dokploy/server"; import { createDefaultServerTraefikConfig, loadOrCreateConfig, updateServerTraefik, -} from "@dokploy/builders"; +} from "@dokploy/server"; import { beforeEach, expect, test, vi } from "vitest"; const baseAdmin: Admin = { diff --git a/apps/dokploy/__test__/traefik/traefik.test.ts b/apps/dokploy/__test__/traefik/traefik.test.ts index eea3c5a9..637d12ff 100644 --- a/apps/dokploy/__test__/traefik/traefik.test.ts +++ b/apps/dokploy/__test__/traefik/traefik.test.ts @@ -1,7 +1,7 @@ -import type { Domain } from "@dokploy/builders"; -import type { Redirect } from "@dokploy/builders"; -import type { ApplicationNested } from "@dokploy/builders"; -import { createRouterConfig } from "@dokploy/builders"; +import type { Domain } from "@dokploy/server"; +import type { Redirect } from "@dokploy/server"; +import type { ApplicationNested } from "@dokploy/server"; +import { createRouterConfig } from "@dokploy/server"; import { expect, test } from "vitest"; const baseApp: ApplicationNested = { diff --git a/apps/dokploy/components/layouts/navigation-tabs.tsx b/apps/dokploy/components/layouts/navigation-tabs.tsx index 9d6266c8..9110ba50 100644 --- a/apps/dokploy/components/layouts/navigation-tabs.tsx +++ b/apps/dokploy/components/layouts/navigation-tabs.tsx @@ -1,10 +1,10 @@ import { AddProject } from "@/components/dashboard/projects/add"; -import type { Auth, User, IS_CLOUD } from "@dokploy/builders"; import { api } from "@/utils/api"; +import type { Auth, IS_CLOUD, User } from "@dokploy/server"; +import { is } from "drizzle-orm"; import { useRouter } from "next/router"; import { useEffect, useMemo, useState } from "react"; import { Tabs, TabsContent, TabsList, TabsTrigger } from "../ui/tabs"; -import { is } from "drizzle-orm"; interface TabInfo { label: string; diff --git a/apps/dokploy/next.config.mjs b/apps/dokploy/next.config.mjs index 134cf19c..df3cf449 100644 --- a/apps/dokploy/next.config.mjs +++ b/apps/dokploy/next.config.mjs @@ -11,46 +11,46 @@ const __filename = fileURLToPath(import.meta.url); const __dirname = path.dirname(__filename); /** @type {import("next").NextConfig} */ const nextConfig = { - reactStrictMode: true, - eslint: { - ignoreDuringBuilds: true, - }, - typescript: { - ignoreBuildErrors: true, - }, - transpilePackages: ["@dokploy/builders"], - webpack: (config) => { - config.plugins.push( - new CopyWebpackPlugin({ - patterns: [ - { - from: path.resolve(__dirname, "templates/**/*.yml"), - to: ({ context, absoluteFilename }) => { - const relativePath = path.relative( - path.resolve(__dirname, "templates"), - absoluteFilename || context - ); - return path.join(__dirname, ".next", "templates", relativePath); - }, - globOptions: { - ignore: ["**/node_modules/**"], - }, - }, - ], - }) - ); - return config; - }, + reactStrictMode: true, + eslint: { + ignoreDuringBuilds: true, + }, + typescript: { + ignoreBuildErrors: true, + }, + transpilePackages: ["@dokploy/server"], + webpack: (config) => { + config.plugins.push( + new CopyWebpackPlugin({ + patterns: [ + { + from: path.resolve(__dirname, "templates/**/*.yml"), + to: ({ context, absoluteFilename }) => { + const relativePath = path.relative( + path.resolve(__dirname, "templates"), + absoluteFilename || context, + ); + return path.join(__dirname, ".next", "templates", relativePath); + }, + globOptions: { + ignore: ["**/node_modules/**"], + }, + }, + ], + }), + ); + return config; + }, - /** - * If you are using `appDir` then you must comment the below `i18n` config out. - * - * @see https://github.com/vercel/next.js/issues/41980 - */ - i18n: { - locales: ["en"], - defaultLocale: "en", - }, + /** + * If you are using `appDir` then you must comment the below `i18n` config out. + * + * @see https://github.com/vercel/next.js/issues/41980 + */ + i18n: { + locales: ["en"], + defaultLocale: "en", + }, }; export default nextConfig; diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json index 47957a20..710bb2ae 100644 --- a/apps/dokploy/package.json +++ b/apps/dokploy/package.json @@ -34,7 +34,7 @@ "test": "vitest --config __test__/vitest.config.ts" }, "dependencies": { - "@dokploy/builders": "workspace:*", + "@dokploy/server": "workspace:*", "@codemirror/lang-json": "^6.0.1", "@codemirror/lang-yaml": "^6.1.1", "@codemirror/language": "^6.10.1", diff --git a/apps/dokploy/pages/api/[...trpc].ts b/apps/dokploy/pages/api/[...trpc].ts index c5126fe9..df85440b 100644 --- a/apps/dokploy/pages/api/[...trpc].ts +++ b/apps/dokploy/pages/api/[...trpc].ts @@ -1,6 +1,6 @@ import { appRouter } from "@/server/api/root"; import { createTRPCContext } from "@/server/api/trpc"; -import { validateRequest, validateBearerToken } from "@dokploy/builders"; +import { validateBearerToken, validateRequest } from "@dokploy/server"; import { createOpenApiNextHandler } from "@dokploy/trpc-openapi"; import type { NextApiRequest, NextApiResponse } from "next"; diff --git a/apps/dokploy/pages/api/deploy/[refreshToken].ts b/apps/dokploy/pages/api/deploy/[refreshToken].ts index 7dea0d2f..a0b0ea7d 100644 --- a/apps/dokploy/pages/api/deploy/[refreshToken].ts +++ b/apps/dokploy/pages/api/deploy/[refreshToken].ts @@ -3,7 +3,7 @@ import { applications } from "@/server/db/schema"; import type { DeploymentJob } from "@/server/queues/deployments-queue"; import { myQueue } from "@/server/queues/queueSetup"; import { deploy } from "@/server/utils/deploy"; -import { IS_CLOUD } from "@dokploy/builders"; +import { IS_CLOUD } from "@dokploy/server"; import { eq } from "drizzle-orm"; import type { NextApiRequest, NextApiResponse } from "next"; diff --git a/apps/dokploy/pages/api/deploy/compose/[refreshToken].ts b/apps/dokploy/pages/api/deploy/compose/[refreshToken].ts index 65bf4aaf..5ef9c271 100644 --- a/apps/dokploy/pages/api/deploy/compose/[refreshToken].ts +++ b/apps/dokploy/pages/api/deploy/compose/[refreshToken].ts @@ -2,6 +2,8 @@ import { db } from "@/server/db"; import { compose } from "@/server/db/schema"; import type { DeploymentJob } from "@/server/queues/deployments-queue"; import { myQueue } from "@/server/queues/queueSetup"; +import { deploy } from "@/server/utils/deploy"; +import { IS_CLOUD } from "@dokploy/server"; import { eq } from "drizzle-orm"; import type { NextApiRequest, NextApiResponse } from "next"; import { @@ -9,8 +11,6 @@ import { extractCommitMessage, extractHash, } from "../[refreshToken]"; -import { IS_CLOUD } from "@dokploy/builders"; -import { deploy } from "@/server/utils/deploy"; export default async function handler( req: NextApiRequest, diff --git a/apps/dokploy/pages/api/deploy/github.ts b/apps/dokploy/pages/api/deploy/github.ts index 73c1bdb5..6a1135cb 100644 --- a/apps/dokploy/pages/api/deploy/github.ts +++ b/apps/dokploy/pages/api/deploy/github.ts @@ -1,13 +1,13 @@ -import { findAdmin, IS_CLOUD } from "@dokploy/builders"; import { db } from "@/server/db"; import { applications, compose, github } from "@/server/db/schema"; import type { DeploymentJob } from "@/server/queues/deployments-queue"; import { myQueue } from "@/server/queues/queueSetup"; +import { deploy } from "@/server/utils/deploy"; +import { IS_CLOUD, findAdmin } from "@dokploy/server"; import { Webhooks } from "@octokit/webhooks"; import { and, eq } from "drizzle-orm"; import type { NextApiRequest, NextApiResponse } from "next"; import { extractCommitMessage, extractHash } from "./[refreshToken]"; -import { deploy } from "@/server/utils/deploy"; export default async function handler( req: NextApiRequest, diff --git a/apps/dokploy/pages/api/providers/github/setup.ts b/apps/dokploy/pages/api/providers/github/setup.ts index 5608f0db..a1ce98d4 100644 --- a/apps/dokploy/pages/api/providers/github/setup.ts +++ b/apps/dokploy/pages/api/providers/github/setup.ts @@ -1,11 +1,11 @@ +import { db } from "@/server/db"; +import { github } from "@/server/db/schema"; import { createGithub, findAdminByAuthId, findAuthById, findUserByAuthId, -} from "@dokploy/builders"; -import { db } from "@/server/db"; -import { github } from "@/server/db/schema"; +} from "@dokploy/server"; import { eq } from "drizzle-orm"; import type { NextApiRequest, NextApiResponse } from "next"; import { Octokit } from "octokit"; diff --git a/apps/dokploy/pages/api/providers/gitlab/callback.ts b/apps/dokploy/pages/api/providers/gitlab/callback.ts index 97feca5d..8de9b7fa 100644 --- a/apps/dokploy/pages/api/providers/gitlab/callback.ts +++ b/apps/dokploy/pages/api/providers/gitlab/callback.ts @@ -1,4 +1,4 @@ -import { findGitlabById, updateGitlab } from "@dokploy/builders"; +import { findGitlabById, updateGitlab } from "@dokploy/server"; import type { NextApiRequest, NextApiResponse } from "next"; export default async function handler( diff --git a/apps/dokploy/pages/dashboard/docker.tsx b/apps/dokploy/pages/dashboard/docker.tsx index 24d11e2e..b066030f 100644 --- a/apps/dokploy/pages/dashboard/docker.tsx +++ b/apps/dokploy/pages/dashboard/docker.tsx @@ -1,7 +1,7 @@ import { ShowContainers } from "@/components/dashboard/docker/show/show-containers"; import { DashboardLayout } from "@/components/layouts/dashboard-layout"; import { appRouter } from "@/server/api/root"; -import { IS_CLOUD, validateRequest } from "@dokploy/builders"; +import { IS_CLOUD, validateRequest } from "@dokploy/server"; import { createServerSideHelpers } from "@trpc/react-query/server"; import type { GetServerSidePropsContext } from "next"; import React, { type ReactElement } from "react"; diff --git a/apps/dokploy/pages/dashboard/monitoring.tsx b/apps/dokploy/pages/dashboard/monitoring.tsx index e2afad11..f92b66d7 100644 --- a/apps/dokploy/pages/dashboard/monitoring.tsx +++ b/apps/dokploy/pages/dashboard/monitoring.tsx @@ -1,6 +1,6 @@ import { ShowMonitoring } from "@/components/dashboard/monitoring/web-server/show"; import { DashboardLayout } from "@/components/layouts/dashboard-layout"; -import { IS_CLOUD, validateRequest } from "@dokploy/builders"; +import { IS_CLOUD, validateRequest } from "@dokploy/server"; import type { GetServerSidePropsContext } from "next"; import React, { type ReactElement } from "react"; diff --git a/apps/dokploy/pages/dashboard/project/[projectId].tsx b/apps/dokploy/pages/dashboard/project/[projectId].tsx index 113baef8..afbd2590 100644 --- a/apps/dokploy/pages/dashboard/project/[projectId].tsx +++ b/apps/dokploy/pages/dashboard/project/[projectId].tsx @@ -29,9 +29,9 @@ import { DropdownMenuTrigger, } from "@/components/ui/dropdown-menu"; import { appRouter } from "@/server/api/root"; -import type { findProjectById } from "@dokploy/builders"; -import { validateRequest } from "@dokploy/builders"; import { api } from "@/utils/api"; +import type { findProjectById } from "@dokploy/server"; +import { validateRequest } from "@dokploy/server"; import { createServerSideHelpers } from "@trpc/react-query/server"; import { CircuitBoard, FolderInput, GlobeIcon, PlusIcon } from "lucide-react"; import type { diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/services/application/[applicationId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/services/application/[applicationId].tsx index a2d6f876..05625f5e 100644 --- a/apps/dokploy/pages/dashboard/project/[projectId]/services/application/[applicationId].tsx +++ b/apps/dokploy/pages/dashboard/project/[projectId]/services/application/[applicationId].tsx @@ -25,8 +25,8 @@ import { import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; import { cn } from "@/lib/utils"; import { appRouter } from "@/server/api/root"; -import { validateRequest } from "@dokploy/builders"; import { api } from "@/utils/api"; +import { validateRequest } from "@dokploy/server"; import { createServerSideHelpers } from "@trpc/react-query/server"; import { GlobeIcon } from "lucide-react"; import type { diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx index 40aa5ea8..2f14cfc4 100644 --- a/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx +++ b/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx @@ -19,8 +19,8 @@ import { import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; import { cn } from "@/lib/utils"; import { appRouter } from "@/server/api/root"; -import { validateRequest } from "@dokploy/builders"; import { api } from "@/utils/api"; +import { validateRequest } from "@dokploy/server"; import { createServerSideHelpers } from "@trpc/react-query/server"; import { CircuitBoard } from "lucide-react"; import type { diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/services/mariadb/[mariadbId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/services/mariadb/[mariadbId].tsx index a34241bc..50f7b664 100644 --- a/apps/dokploy/pages/dashboard/project/[projectId]/services/mariadb/[mariadbId].tsx +++ b/apps/dokploy/pages/dashboard/project/[projectId]/services/mariadb/[mariadbId].tsx @@ -20,8 +20,8 @@ import { import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; import { cn } from "@/lib/utils"; import { appRouter } from "@/server/api/root"; -import { validateRequest } from "@dokploy/builders"; import { api } from "@/utils/api"; +import { validateRequest } from "@dokploy/server"; import { createServerSideHelpers } from "@trpc/react-query/server"; import type { GetServerSidePropsContext, diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/services/mongo/[mongoId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/services/mongo/[mongoId].tsx index 916c4d07..09b054f5 100644 --- a/apps/dokploy/pages/dashboard/project/[projectId]/services/mongo/[mongoId].tsx +++ b/apps/dokploy/pages/dashboard/project/[projectId]/services/mongo/[mongoId].tsx @@ -20,8 +20,8 @@ import { import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; import { cn } from "@/lib/utils"; import { appRouter } from "@/server/api/root"; -import { validateRequest } from "@dokploy/builders"; import { api } from "@/utils/api"; +import { validateRequest } from "@dokploy/server"; import { createServerSideHelpers } from "@trpc/react-query/server"; import type { GetServerSidePropsContext, diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/services/mysql/[mysqlId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/services/mysql/[mysqlId].tsx index a454451c..de81b64c 100644 --- a/apps/dokploy/pages/dashboard/project/[projectId]/services/mysql/[mysqlId].tsx +++ b/apps/dokploy/pages/dashboard/project/[projectId]/services/mysql/[mysqlId].tsx @@ -20,8 +20,8 @@ import { import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; import { cn } from "@/lib/utils"; import { appRouter } from "@/server/api/root"; -import { validateRequest } from "@dokploy/builders"; import { api } from "@/utils/api"; +import { validateRequest } from "@dokploy/server"; import { createServerSideHelpers } from "@trpc/react-query/server"; import type { GetServerSidePropsContext, diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/services/postgres/[postgresId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/services/postgres/[postgresId].tsx index cd6342ea..196ae54c 100644 --- a/apps/dokploy/pages/dashboard/project/[projectId]/services/postgres/[postgresId].tsx +++ b/apps/dokploy/pages/dashboard/project/[projectId]/services/postgres/[postgresId].tsx @@ -20,8 +20,8 @@ import { import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; import { cn } from "@/lib/utils"; import { appRouter } from "@/server/api/root"; -import { validateRequest } from "@dokploy/builders"; import { api } from "@/utils/api"; +import { validateRequest } from "@dokploy/server"; import { createServerSideHelpers } from "@trpc/react-query/server"; import type { GetServerSidePropsContext, diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/services/redis/[redisId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/services/redis/[redisId].tsx index d3059fba..4b7f2ddc 100644 --- a/apps/dokploy/pages/dashboard/project/[projectId]/services/redis/[redisId].tsx +++ b/apps/dokploy/pages/dashboard/project/[projectId]/services/redis/[redisId].tsx @@ -19,8 +19,8 @@ import { import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; import { cn } from "@/lib/utils"; import { appRouter } from "@/server/api/root"; -import { validateRequest } from "@dokploy/builders"; import { api } from "@/utils/api"; +import { validateRequest } from "@dokploy/server"; import { createServerSideHelpers } from "@trpc/react-query/server"; import type { GetServerSidePropsContext, diff --git a/apps/dokploy/pages/dashboard/projects.tsx b/apps/dokploy/pages/dashboard/projects.tsx index 14e70684..c4ca6720 100644 --- a/apps/dokploy/pages/dashboard/projects.tsx +++ b/apps/dokploy/pages/dashboard/projects.tsx @@ -1,6 +1,6 @@ import { ShowProjects } from "@/components/dashboard/projects/show"; import { DashboardLayout } from "@/components/layouts/dashboard-layout"; -import { validateRequest } from "@dokploy/builders"; +import { validateRequest } from "@dokploy/server"; import type { GetServerSidePropsContext } from "next"; import React, { type ReactElement } from "react"; diff --git a/apps/dokploy/pages/dashboard/requests.tsx b/apps/dokploy/pages/dashboard/requests.tsx index d4e574a0..1b013156 100644 --- a/apps/dokploy/pages/dashboard/requests.tsx +++ b/apps/dokploy/pages/dashboard/requests.tsx @@ -1,6 +1,6 @@ import { ShowRequests } from "@/components/dashboard/requests/show-requests"; import { DashboardLayout } from "@/components/layouts/dashboard-layout"; -import { IS_CLOUD, validateRequest } from "@dokploy/builders"; +import { IS_CLOUD, validateRequest } from "@dokploy/server"; import type { GetServerSidePropsContext } from "next"; import type { ReactElement } from "react"; import * as React from "react"; diff --git a/apps/dokploy/pages/dashboard/settings/appearance.tsx b/apps/dokploy/pages/dashboard/settings/appearance.tsx index af31baaa..27c6075b 100644 --- a/apps/dokploy/pages/dashboard/settings/appearance.tsx +++ b/apps/dokploy/pages/dashboard/settings/appearance.tsx @@ -1,7 +1,7 @@ import { AppearanceForm } from "@/components/dashboard/settings/appearance-form"; import { DashboardLayout } from "@/components/layouts/dashboard-layout"; import { SettingsLayout } from "@/components/layouts/settings-layout"; -import { validateRequest } from "@dokploy/builders"; +import { validateRequest } from "@dokploy/server"; import type { GetServerSidePropsContext } from "next"; import React, { type ReactElement } from "react"; diff --git a/apps/dokploy/pages/dashboard/settings/certificates.tsx b/apps/dokploy/pages/dashboard/settings/certificates.tsx index 58d8ffa6..95f58d9b 100644 --- a/apps/dokploy/pages/dashboard/settings/certificates.tsx +++ b/apps/dokploy/pages/dashboard/settings/certificates.tsx @@ -1,7 +1,7 @@ import { ShowCertificates } from "@/components/dashboard/settings/certificates/show-certificates"; import { DashboardLayout } from "@/components/layouts/dashboard-layout"; import { SettingsLayout } from "@/components/layouts/settings-layout"; -import { validateRequest } from "@dokploy/builders"; +import { validateRequest } from "@dokploy/server"; import type { GetServerSidePropsContext } from "next"; import React, { type ReactElement } from "react"; diff --git a/apps/dokploy/pages/dashboard/settings/cluster.tsx b/apps/dokploy/pages/dashboard/settings/cluster.tsx index 473201d0..5551b999 100644 --- a/apps/dokploy/pages/dashboard/settings/cluster.tsx +++ b/apps/dokploy/pages/dashboard/settings/cluster.tsx @@ -2,7 +2,7 @@ import { ShowNodes } from "@/components/dashboard/settings/cluster/nodes/show-no import { ShowRegistry } from "@/components/dashboard/settings/cluster/registry/show-registry"; import { DashboardLayout } from "@/components/layouts/dashboard-layout"; import { SettingsLayout } from "@/components/layouts/settings-layout"; -import { IS_CLOUD, validateRequest } from "@dokploy/builders"; +import { IS_CLOUD, validateRequest } from "@dokploy/server"; import type { GetServerSidePropsContext } from "next"; import React, { type ReactElement } from "react"; diff --git a/apps/dokploy/pages/dashboard/settings/destinations.tsx b/apps/dokploy/pages/dashboard/settings/destinations.tsx index 31c344d1..b40ca040 100644 --- a/apps/dokploy/pages/dashboard/settings/destinations.tsx +++ b/apps/dokploy/pages/dashboard/settings/destinations.tsx @@ -1,7 +1,7 @@ import { ShowDestinations } from "@/components/dashboard/settings/destination/show-destinations"; import { DashboardLayout } from "@/components/layouts/dashboard-layout"; import { SettingsLayout } from "@/components/layouts/settings-layout"; -import { validateRequest } from "@dokploy/builders"; +import { validateRequest } from "@dokploy/server"; import type { GetServerSidePropsContext } from "next"; import React, { type ReactElement } from "react"; diff --git a/apps/dokploy/pages/dashboard/settings/git-providers.tsx b/apps/dokploy/pages/dashboard/settings/git-providers.tsx index 91bd8f8e..fc4601ad 100644 --- a/apps/dokploy/pages/dashboard/settings/git-providers.tsx +++ b/apps/dokploy/pages/dashboard/settings/git-providers.tsx @@ -2,7 +2,7 @@ import { ShowGitProviders } from "@/components/dashboard/settings/git/show-git-p import { DashboardLayout } from "@/components/layouts/dashboard-layout"; import { SettingsLayout } from "@/components/layouts/settings-layout"; import { appRouter } from "@/server/api/root"; -import { validateRequest } from "@dokploy/builders"; +import { validateRequest } from "@dokploy/server"; import { createServerSideHelpers } from "@trpc/react-query/server"; import type { GetServerSidePropsContext } from "next"; import React, { type ReactElement } from "react"; diff --git a/apps/dokploy/pages/dashboard/settings/notifications.tsx b/apps/dokploy/pages/dashboard/settings/notifications.tsx index 60008c9b..956413ae 100644 --- a/apps/dokploy/pages/dashboard/settings/notifications.tsx +++ b/apps/dokploy/pages/dashboard/settings/notifications.tsx @@ -2,7 +2,7 @@ import { ShowDestinations } from "@/components/dashboard/settings/destination/sh import { ShowNotifications } from "@/components/dashboard/settings/notifications/show-notifications"; import { DashboardLayout } from "@/components/layouts/dashboard-layout"; import { SettingsLayout } from "@/components/layouts/settings-layout"; -import { validateRequest } from "@dokploy/builders"; +import { validateRequest } from "@dokploy/server"; import type { GetServerSidePropsContext } from "next"; import React, { type ReactElement } from "react"; diff --git a/apps/dokploy/pages/dashboard/settings/profile.tsx b/apps/dokploy/pages/dashboard/settings/profile.tsx index d8580a68..8ea6ba3b 100644 --- a/apps/dokploy/pages/dashboard/settings/profile.tsx +++ b/apps/dokploy/pages/dashboard/settings/profile.tsx @@ -2,8 +2,8 @@ import { GenerateToken } from "@/components/dashboard/settings/profile/generate- import { ProfileForm } from "@/components/dashboard/settings/profile/profile-form"; import { DashboardLayout } from "@/components/layouts/dashboard-layout"; import { SettingsLayout } from "@/components/layouts/settings-layout"; -import { validateRequest } from "@dokploy/builders"; import { api } from "@/utils/api"; +import { validateRequest } from "@dokploy/server"; import type { GetServerSidePropsContext } from "next"; import React, { type ReactElement } from "react"; diff --git a/apps/dokploy/pages/dashboard/settings/registry.tsx b/apps/dokploy/pages/dashboard/settings/registry.tsx index 81f42fe0..db8b1bd5 100644 --- a/apps/dokploy/pages/dashboard/settings/registry.tsx +++ b/apps/dokploy/pages/dashboard/settings/registry.tsx @@ -1,7 +1,7 @@ import { ShowRegistry } from "@/components/dashboard/settings/cluster/registry/show-registry"; import { DashboardLayout } from "@/components/layouts/dashboard-layout"; import { SettingsLayout } from "@/components/layouts/settings-layout"; -import { validateRequest } from "@dokploy/builders"; +import { validateRequest } from "@dokploy/server"; import type { GetServerSidePropsContext } from "next"; import React, { type ReactElement } from "react"; diff --git a/apps/dokploy/pages/dashboard/settings/server.tsx b/apps/dokploy/pages/dashboard/settings/server.tsx index 179305bf..f4c34974 100644 --- a/apps/dokploy/pages/dashboard/settings/server.tsx +++ b/apps/dokploy/pages/dashboard/settings/server.tsx @@ -2,7 +2,7 @@ import { WebDomain } from "@/components/dashboard/settings/web-domain"; import { WebServer } from "@/components/dashboard/settings/web-server"; import { DashboardLayout } from "@/components/layouts/dashboard-layout"; import { SettingsLayout } from "@/components/layouts/settings-layout"; -import { IS_CLOUD, validateRequest } from "@dokploy/builders"; +import { IS_CLOUD, validateRequest } from "@dokploy/server"; import type { GetServerSidePropsContext } from "next"; import React, { type ReactElement } from "react"; diff --git a/apps/dokploy/pages/dashboard/settings/servers.tsx b/apps/dokploy/pages/dashboard/settings/servers.tsx index 1cb9ae7a..d7f9940d 100644 --- a/apps/dokploy/pages/dashboard/settings/servers.tsx +++ b/apps/dokploy/pages/dashboard/settings/servers.tsx @@ -1,7 +1,7 @@ import { ShowServers } from "@/components/dashboard/settings/servers/show-servers"; import { DashboardLayout } from "@/components/layouts/dashboard-layout"; import { SettingsLayout } from "@/components/layouts/settings-layout"; -import { validateRequest } from "@dokploy/builders"; +import { validateRequest } from "@dokploy/server"; import type { GetServerSidePropsContext } from "next"; import React, { type ReactElement } from "react"; diff --git a/apps/dokploy/pages/dashboard/settings/ssh-keys.tsx b/apps/dokploy/pages/dashboard/settings/ssh-keys.tsx index 1c0ece80..da1d5818 100644 --- a/apps/dokploy/pages/dashboard/settings/ssh-keys.tsx +++ b/apps/dokploy/pages/dashboard/settings/ssh-keys.tsx @@ -2,7 +2,7 @@ import { ShowDestinations } from "@/components/dashboard/settings/ssh-keys/show- import { DashboardLayout } from "@/components/layouts/dashboard-layout"; import { SettingsLayout } from "@/components/layouts/settings-layout"; import { appRouter } from "@/server/api/root"; -import { validateRequest } from "@dokploy/builders"; +import { validateRequest } from "@dokploy/server"; import { createServerSideHelpers } from "@trpc/react-query/server"; import type { GetServerSidePropsContext } from "next"; import React, { type ReactElement } from "react"; diff --git a/apps/dokploy/pages/dashboard/settings/users.tsx b/apps/dokploy/pages/dashboard/settings/users.tsx index 0b14214f..715acc30 100644 --- a/apps/dokploy/pages/dashboard/settings/users.tsx +++ b/apps/dokploy/pages/dashboard/settings/users.tsx @@ -1,7 +1,7 @@ import { ShowUsers } from "@/components/dashboard/settings/users/show-users"; import { DashboardLayout } from "@/components/layouts/dashboard-layout"; import { SettingsLayout } from "@/components/layouts/settings-layout"; -import { validateRequest } from "@dokploy/builders"; +import { validateRequest } from "@dokploy/server"; import type { GetServerSidePropsContext } from "next"; import React, { type ReactElement } from "react"; diff --git a/apps/dokploy/pages/dashboard/traefik.tsx b/apps/dokploy/pages/dashboard/traefik.tsx index b611ae69..ea75f1e0 100644 --- a/apps/dokploy/pages/dashboard/traefik.tsx +++ b/apps/dokploy/pages/dashboard/traefik.tsx @@ -1,7 +1,7 @@ import { ShowTraefikSystem } from "@/components/dashboard/file-system/show-traefik-system"; import { DashboardLayout } from "@/components/layouts/dashboard-layout"; import { appRouter } from "@/server/api/root"; -import { IS_CLOUD, validateRequest } from "@dokploy/builders"; +import { IS_CLOUD, validateRequest } from "@dokploy/server"; import { createServerSideHelpers } from "@trpc/react-query/server"; import type { GetServerSidePropsContext } from "next"; import React, { type ReactElement } from "react"; diff --git a/apps/dokploy/pages/index.tsx b/apps/dokploy/pages/index.tsx index d830895c..1f669d3f 100644 --- a/apps/dokploy/pages/index.tsx +++ b/apps/dokploy/pages/index.tsx @@ -17,8 +17,8 @@ import { FormMessage, } from "@/components/ui/form"; import { Input } from "@/components/ui/input"; -import { validateRequest, isAdminPresent, IS_CLOUD } from "@dokploy/builders"; import { api } from "@/utils/api"; +import { IS_CLOUD, isAdminPresent, validateRequest } from "@dokploy/server"; import { zodResolver } from "@hookform/resolvers/zod"; import type { GetServerSidePropsContext } from "next"; import Link from "next/link"; diff --git a/apps/dokploy/pages/invitation.tsx b/apps/dokploy/pages/invitation.tsx index 051214cd..9e7a02ff 100644 --- a/apps/dokploy/pages/invitation.tsx +++ b/apps/dokploy/pages/invitation.tsx @@ -15,8 +15,8 @@ import { FormMessage, } from "@/components/ui/form"; import { Input } from "@/components/ui/input"; -import { getUserByToken } from "@dokploy/builders"; import { api } from "@/utils/api"; +import { getUserByToken } from "@dokploy/server"; import { zodResolver } from "@hookform/resolvers/zod"; import { AlertTriangle } from "lucide-react"; import type { GetServerSidePropsContext } from "next"; diff --git a/apps/dokploy/pages/register.tsx b/apps/dokploy/pages/register.tsx index f808975b..0d602cf5 100644 --- a/apps/dokploy/pages/register.tsx +++ b/apps/dokploy/pages/register.tsx @@ -15,17 +15,17 @@ import { FormMessage, } from "@/components/ui/form"; import { Input } from "@/components/ui/input"; -import { IS_CLOUD, isAdminPresent, validateRequest } from "@dokploy/builders"; import { api } from "@/utils/api"; +import { IS_CLOUD, isAdminPresent, validateRequest } from "@dokploy/server"; import { zodResolver } from "@hookform/resolvers/zod"; import { AlertTriangle } from "lucide-react"; +import type { GetServerSidePropsContext } from "next"; import Link from "next/link"; import { useRouter } from "next/router"; import { useEffect } from "react"; import { useForm } from "react-hook-form"; import { toast } from "sonner"; import { z } from "zod"; -import type { GetServerSidePropsContext } from "next"; const registerSchema = z .object({ diff --git a/apps/dokploy/pages/swagger.tsx b/apps/dokploy/pages/swagger.tsx index f83fae8c..4c6f2f8f 100644 --- a/apps/dokploy/pages/swagger.tsx +++ b/apps/dokploy/pages/swagger.tsx @@ -1,6 +1,6 @@ import { appRouter } from "@/server/api/root"; -import { validateRequest } from "@dokploy/builders"; import { api } from "@/utils/api"; +import { validateRequest } from "@dokploy/server"; import { createServerSideHelpers } from "@trpc/react-query/server"; import type { GetServerSidePropsContext, NextPage } from "next"; import dynamic from "next/dynamic"; diff --git a/apps/dokploy/reset-password.ts b/apps/dokploy/reset-password.ts index 45478600..e13c348a 100644 --- a/apps/dokploy/reset-password.ts +++ b/apps/dokploy/reset-password.ts @@ -1,6 +1,6 @@ -import { findAdmin } from "@dokploy/builders"; -import { updateAuthById } from "@dokploy/builders"; -import { generateRandomPassword } from "@dokploy/builders"; +import { findAdmin } from "@dokploy/server"; +import { updateAuthById } from "@dokploy/server"; +import { generateRandomPassword } from "@dokploy/server"; (async () => { try { diff --git a/apps/dokploy/server/api/routers/admin.ts b/apps/dokploy/server/api/routers/admin.ts index 3f40e3f8..680dee11 100644 --- a/apps/dokploy/server/api/routers/admin.ts +++ b/apps/dokploy/server/api/routers/admin.ts @@ -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({ diff --git a/apps/dokploy/server/api/routers/application.ts b/apps/dokploy/server/api/routers/application.ts index 57cc73a2..85ceb1e3 100644 --- a/apps/dokploy/server/api/routers/application.ts +++ b/apps/dokploy/server/api/routers/application.ts @@ -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 diff --git a/apps/dokploy/server/api/routers/auth.ts b/apps/dokploy/server/api/routers/auth.ts index 5964b17e..cddcdede 100644 --- a/apps/dokploy/server/api/routers/auth.ts +++ b/apps/dokploy/server/api/routers/auth.ts @@ -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, diff --git a/apps/dokploy/server/api/routers/backup.ts b/apps/dokploy/server/api/routers/backup.ts index 7521889b..98c02d78 100644 --- a/apps/dokploy/server/api/routers/backup.ts +++ b/apps/dokploy/server/api/routers/backup.ts @@ -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"; diff --git a/apps/dokploy/server/api/routers/bitbucket.ts b/apps/dokploy/server/api/routers/bitbucket.ts index bae9e58c..48b7fdd4 100644 --- a/apps/dokploy/server/api/routers/bitbucket.ts +++ b/apps/dokploy/server/api/routers/bitbucket.ts @@ -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({ diff --git a/apps/dokploy/server/api/routers/certificate.ts b/apps/dokploy/server/api/routers/certificate.ts index 597a6a8d..baf8b5f9 100644 --- a/apps/dokploy/server/api/routers/certificate.ts +++ b/apps/dokploy/server/api/routers/certificate.ts @@ -6,7 +6,7 @@ import { findCertificateById, findCertificates, removeCertificateById, -} from "@dokploy/builders"; +} from "@dokploy/server"; 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 8f832943..e42d4b04 100644 --- a/apps/dokploy/server/api/routers/cluster.ts +++ b/apps/dokploy/server/api/routers/cluster.ts @@ -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 () => { diff --git a/apps/dokploy/server/api/routers/compose.ts b/apps/dokploy/server/api/routers/compose.ts index 6996cb6a..21704f94 100644 --- a/apps/dokploy/server/api/routers/compose.ts +++ b/apps/dokploy/server/api/routers/compose.ts @@ -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 diff --git a/apps/dokploy/server/api/routers/deployment.ts b/apps/dokploy/server/api/routers/deployment.ts index 22e750c7..bf981c6d 100644 --- a/apps/dokploy/server/api/routers/deployment.ts +++ b/apps/dokploy/server/api/routers/deployment.ts @@ -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 diff --git a/apps/dokploy/server/api/routers/destination.ts b/apps/dokploy/server/api/routers/destination.ts index f00838cd..7abc474d 100644 --- a/apps/dokploy/server/api/routers/destination.ts +++ b/apps/dokploy/server/api/routers/destination.ts @@ -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({ diff --git a/apps/dokploy/server/api/routers/docker.ts b/apps/dokploy/server/api/routers/docker.ts index d3aa437a..cb6b2712 100644 --- a/apps/dokploy/server/api/routers/docker.ts +++ b/apps/dokploy/server/api/routers/docker.ts @@ -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({ diff --git a/apps/dokploy/server/api/routers/domain.ts b/apps/dokploy/server/api/routers/domain.ts index 72a7a204..3c94fc93 100644 --- a/apps/dokploy/server/api/routers/domain.ts +++ b/apps/dokploy/server/api/routers/domain.ts @@ -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 diff --git a/apps/dokploy/server/api/routers/git-provider.ts b/apps/dokploy/server/api/routers/git-provider.ts index 996509a1..e1e8ef8b 100644 --- a/apps/dokploy/server/api/routers/git-provider.ts +++ b/apps/dokploy/server/api/routers/git-provider.ts @@ -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 }) => { diff --git a/apps/dokploy/server/api/routers/github.ts b/apps/dokploy/server/api/routers/github.ts index ead651f4..56222577 100644 --- a/apps/dokploy/server/api/routers/github.ts +++ b/apps/dokploy/server/api/routers/github.ts @@ -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 diff --git a/apps/dokploy/server/api/routers/gitlab.ts b/apps/dokploy/server/api/routers/gitlab.ts index dd436f31..f66dcbe3 100644 --- a/apps/dokploy/server/api/routers/gitlab.ts +++ b/apps/dokploy/server/api/routers/gitlab.ts @@ -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 diff --git a/apps/dokploy/server/api/routers/mariadb.ts b/apps/dokploy/server/api/routers/mariadb.ts index 89c008ab..99de2e3b 100644 --- a/apps/dokploy/server/api/routers/mariadb.ts +++ b/apps/dokploy/server/api/routers/mariadb.ts @@ -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 diff --git a/apps/dokploy/server/api/routers/mongo.ts b/apps/dokploy/server/api/routers/mongo.ts index f04b0798..49dc5ec2 100644 --- a/apps/dokploy/server/api/routers/mongo.ts +++ b/apps/dokploy/server/api/routers/mongo.ts @@ -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 diff --git a/apps/dokploy/server/api/routers/mount.ts b/apps/dokploy/server/api/routers/mount.ts index 31df29c0..0cfb0c07 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 "@dokploy/builders"; +} from "@dokploy/server"; 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 ce718ddf..893adb9c 100644 --- a/apps/dokploy/server/api/routers/mysql.ts +++ b/apps/dokploy/server/api/routers/mysql.ts @@ -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 diff --git a/apps/dokploy/server/api/routers/notification.ts b/apps/dokploy/server/api/routers/notification.ts index 925b75db..18e4ceb3 100644 --- a/apps/dokploy/server/api/routers/notification.ts +++ b/apps/dokploy/server/api/routers/notification.ts @@ -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({ diff --git a/apps/dokploy/server/api/routers/port.ts b/apps/dokploy/server/api/routers/port.ts index ac05b3e5..409eb8f0 100644 --- a/apps/dokploy/server/api/routers/port.ts +++ b/apps/dokploy/server/api/routers/port.ts @@ -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 diff --git a/apps/dokploy/server/api/routers/postgres.ts b/apps/dokploy/server/api/routers/postgres.ts index 42e744ae..14f9d967 100644 --- a/apps/dokploy/server/api/routers/postgres.ts +++ b/apps/dokploy/server/api/routers/postgres.ts @@ -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 diff --git a/apps/dokploy/server/api/routers/project.ts b/apps/dokploy/server/api/routers/project.ts index bede31d2..acc58d12 100644 --- a/apps/dokploy/server/api/routers/project.ts +++ b/apps/dokploy/server/api/routers/project.ts @@ -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 diff --git a/apps/dokploy/server/api/routers/redirects.ts b/apps/dokploy/server/api/routers/redirects.ts index 5c89a41c..bcd7962a 100644 --- a/apps/dokploy/server/api/routers/redirects.ts +++ b/apps/dokploy/server/api/routers/redirects.ts @@ -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 diff --git a/apps/dokploy/server/api/routers/redis.ts b/apps/dokploy/server/api/routers/redis.ts index 7b24bd8f..fdd2db9c 100644 --- a/apps/dokploy/server/api/routers/redis.ts +++ b/apps/dokploy/server/api/routers/redis.ts @@ -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 diff --git a/apps/dokploy/server/api/routers/registry.ts b/apps/dokploy/server/api/routers/registry.ts index 93203390..4b3f4628 100644 --- a/apps/dokploy/server/api/routers/registry.ts +++ b/apps/dokploy/server/api/routers/registry.ts @@ -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({ diff --git a/apps/dokploy/server/api/routers/security.ts b/apps/dokploy/server/api/routers/security.ts index 7a3e059c..5318a293 100644 --- a/apps/dokploy/server/api/routers/security.ts +++ b/apps/dokploy/server/api/routers/security.ts @@ -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 diff --git a/apps/dokploy/server/api/routers/server.ts b/apps/dokploy/server/api/routers/server.ts index f6465198..77221212 100644 --- a/apps/dokploy/server/api/routers/server.ts +++ b/apps/dokploy/server/api/routers/server.ts @@ -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 diff --git a/apps/dokploy/server/api/routers/settings.ts b/apps/dokploy/server/api/routers/settings.ts index 1218ea5f..4ce4a615 100644 --- a/apps/dokploy/server/api/routers/settings.ts +++ b/apps/dokploy/server/api/routers/settings.ts @@ -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 () => { diff --git a/apps/dokploy/server/api/routers/ssh-key.ts b/apps/dokploy/server/api/routers/ssh-key.ts index 19e0ac74..dcc10827 100644 --- a/apps/dokploy/server/api/routers/ssh-key.ts +++ b/apps/dokploy/server/api/routers/ssh-key.ts @@ -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({ diff --git a/apps/dokploy/server/api/routers/user.ts b/apps/dokploy/server/api/routers/user.ts index 05bbf31b..91db9826 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 "@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 }) => { diff --git a/apps/dokploy/server/api/trpc.ts b/apps/dokploy/server/api/trpc.ts index d02082d7..d37315c3 100644 --- a/apps/dokploy/server/api/trpc.ts +++ b/apps/dokploy/server/api/trpc.ts @@ -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 diff --git a/apps/dokploy/server/queues/deployments-queue.ts b/apps/dokploy/server/queues/deployments-queue.ts index fac05677..1ef88c3d 100644 --- a/apps/dokploy/server/queues/deployments-queue.ts +++ b/apps/dokploy/server/queues/deployments-queue.ts @@ -1,16 +1,16 @@ -import { type Job, Worker } from "bullmq"; import { deployApplication, - deployRemoteApplication, - rebuildApplication, - rebuildRemoteApplication, - updateApplicationStatus, deployCompose, + deployRemoteApplication, deployRemoteCompose, + rebuildApplication, rebuildCompose, + rebuildRemoteApplication, rebuildRemoteCompose, + updateApplicationStatus, updateCompose, -} from "@dokploy/builders"; +} from "@dokploy/server"; +import { type Job, Worker } from "bullmq"; import { myQueue, redisConfig } from "./queueSetup"; type DeployJob = diff --git a/apps/dokploy/server/server.ts b/apps/dokploy/server/server.ts index 9d1794a3..8ab7d421 100644 --- a/apps/dokploy/server/server.ts +++ b/apps/dokploy/server/server.ts @@ -1,21 +1,21 @@ import http from "node:http"; import { migration } from "@/server/db/migration"; -import { config } from "dotenv"; -import next from "next"; -import { deploymentWorker } from "./queues/deployments-queue"; import { - setupDirectories, - initializePostgres, - initializeRedis, - initializeNetwork, + IS_CLOUD, createDefaultMiddlewares, createDefaultServerTraefikConfig, createDefaultTraefikConfig, - initializeTraefik, initCronJobs, + initializeNetwork, + initializePostgres, + initializeRedis, + initializeTraefik, sendDokployRestartNotifications, - IS_CLOUD, -} from "@dokploy/builders"; + setupDirectories, +} from "@dokploy/server"; +import { config } from "dotenv"; +import next from "next"; +import { deploymentWorker } from "./queues/deployments-queue"; import { setupDockerContainerLogsWebSocketServer } from "./wss/docker-container-logs"; import { setupDockerContainerTerminalWebSocketServer } from "./wss/docker-container-terminal"; import { setupDockerStatsMonitoringSocketServer } from "./wss/docker-stats"; diff --git a/apps/dokploy/server/wss/docker-container-logs.ts b/apps/dokploy/server/wss/docker-container-logs.ts index c25fb931..63a0b89e 100644 --- a/apps/dokploy/server/wss/docker-container-logs.ts +++ b/apps/dokploy/server/wss/docker-container-logs.ts @@ -1,8 +1,8 @@ import type http from "node:http"; +import { findServerById, validateWebSocketRequest } from "@dokploy/server"; import { spawn } from "node-pty"; import { Client } from "ssh2"; import { WebSocketServer } from "ws"; -import { findServerById, validateWebSocketRequest } from "@dokploy/builders"; import { getShell } from "./utils"; export const setupDockerContainerLogsWebSocketServer = ( diff --git a/apps/dokploy/server/wss/docker-container-terminal.ts b/apps/dokploy/server/wss/docker-container-terminal.ts index d7a9b532..9091fcf0 100644 --- a/apps/dokploy/server/wss/docker-container-terminal.ts +++ b/apps/dokploy/server/wss/docker-container-terminal.ts @@ -1,8 +1,8 @@ import type http from "node:http"; +import { findServerById, validateWebSocketRequest } from "@dokploy/server"; import { spawn } from "node-pty"; import { Client } from "ssh2"; import { WebSocketServer } from "ws"; -import { findServerById, validateWebSocketRequest } from "@dokploy/builders"; import { getShell } from "./utils"; export const setupDockerContainerTerminalWebSocketServer = ( diff --git a/apps/dokploy/server/wss/docker-stats.ts b/apps/dokploy/server/wss/docker-stats.ts index 7672f722..89d94687 100644 --- a/apps/dokploy/server/wss/docker-stats.ts +++ b/apps/dokploy/server/wss/docker-stats.ts @@ -1,11 +1,11 @@ import type http from "node:http"; -import { WebSocketServer } from "ws"; import { docker, getLastAdvancedStatsFile, recordAdvancedStats, validateWebSocketRequest, -} from "@dokploy/builders"; +} from "@dokploy/server"; +import { WebSocketServer } from "ws"; export const setupDockerStatsMonitoringSocketServer = ( server: http.Server, diff --git a/apps/dokploy/server/wss/listen-deployment.ts b/apps/dokploy/server/wss/listen-deployment.ts index 5f3599e3..df77ceb4 100644 --- a/apps/dokploy/server/wss/listen-deployment.ts +++ b/apps/dokploy/server/wss/listen-deployment.ts @@ -1,8 +1,8 @@ import { spawn } from "node:child_process"; import type http from "node:http"; +import { findServerById, validateWebSocketRequest } from "@dokploy/server"; import { Client } from "ssh2"; import { WebSocketServer } from "ws"; -import { findServerById, validateWebSocketRequest } from "@dokploy/builders"; export const setupDeploymentLogsWebSocketServer = ( server: http.Server, diff --git a/apps/dokploy/server/wss/terminal.ts b/apps/dokploy/server/wss/terminal.ts index 96772849..548d5e45 100644 --- a/apps/dokploy/server/wss/terminal.ts +++ b/apps/dokploy/server/wss/terminal.ts @@ -1,8 +1,8 @@ import type http from "node:http"; +import { findServerById, validateWebSocketRequest } from "@dokploy/server"; import { publicIpv4, publicIpv6 } from "public-ip"; -import { WebSocketServer } from "ws"; -import { findServerById, validateWebSocketRequest } from "@dokploy/builders"; import { Client } from "ssh2"; +import { WebSocketServer } from "ws"; export const getPublicIpWithFallback = async () => { // @ts-ignore diff --git a/apps/dokploy/setup.ts b/apps/dokploy/setup.ts index 3e0042f8..c4c9a372 100644 --- a/apps/dokploy/setup.ts +++ b/apps/dokploy/setup.ts @@ -1,14 +1,14 @@ import { - setupDirectories, - initializePostgres, - initializeRedis, - initializeNetwork, - initializeSwarm, createDefaultMiddlewares, createDefaultServerTraefikConfig, createDefaultTraefikConfig, + initializeNetwork, + initializePostgres, + initializeRedis, + initializeSwarm, initializeTraefik, -} from "@dokploy/builders"; + setupDirectories, +} from "@dokploy/server"; (async () => { try { diff --git a/apps/schedules/package.json b/apps/schedules/package.json index 6013e560..ae54e603 100644 --- a/apps/schedules/package.json +++ b/apps/schedules/package.json @@ -11,7 +11,7 @@ "zod": "^3.23.4", "react": "18.2.0", "react-dom": "18.2.0", - "@dokploy/builders": "workspace:*", + "@dokploy/server": "workspace:*", "@hono/node-server": "^1.12.1", "hono": "^4.5.8", "dotenv": "^16.3.1", diff --git a/apps/schedules/src/utils.ts b/apps/schedules/src/utils.ts index 1ff7f283..fcc2bdf5 100644 --- a/apps/schedules/src/utils.ts +++ b/apps/schedules/src/utils.ts @@ -7,9 +7,9 @@ import { runMongoBackup, runMySqlBackup, runPostgresBackup, -} from "@dokploy/builders"; -import type { QueueJob } from "./schema"; +} from "@dokploy/server"; import { logger } from "./logger"; +import type { QueueJob } from "./schema"; export const runJobs = async (job: QueueJob) => { try { diff --git a/packages/builders/tsconfig.json b/packages/builders/tsconfig.json deleted file mode 100644 index 17c5e474..00000000 --- a/packages/builders/tsconfig.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "compilerOptions": { - /* Base Options: */ - "esModuleInterop": true, - "skipLibCheck": true, - "target": "es2022", - "allowJs": true, - "resolveJsonModule": true, - "moduleDetection": "force", - "isolatedModules": true, - /* Strictness */ - "strict": true, - "noUncheckedIndexedAccess": true, - "checkJs": true, - - /* Bundled projects */ - "lib": ["dom", "dom.iterable", "ES2022"], - "noEmit": true, - "module": "ESNext", - "moduleResolution": "Bundler", - "jsx": "preserve", - "plugins": [{ "name": "next" }], - "incremental": true, - "outDir": "./dist", - /* Path Aliases */ - "baseUrl": ".", - "paths": { - "@/server/*": ["./src/*"] - } - }, - - "include": ["next-env.d.ts", "./src/**/*.ts"], - "exclude": [ - "tsup.ts", - "node_modules", - "dokploy", - "config", - "dist", - "webpack.config.server.js", - "migration.ts", - "setup.ts" - ] -} diff --git a/packages/builders/tsconfig.server.json b/packages/builders/tsconfig.server.json deleted file mode 100644 index 98f04bed..00000000 --- a/packages/builders/tsconfig.server.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "module": "ESNext", - "outDir": "dist/", - "target": "ESNext", - "isolatedModules": false, - "noEmit": false, - "declaration": true, - "moduleResolution": "Node", - "rootDir": "./src", - "baseUrl": ".", - "incremental": false, - "jsx": "react-jsx", - "paths": { - "@/server/*": ["src/*"] - } - }, - "include": ["next-env.d.ts", "./src/**/*"], - "exclude": ["**/dist", "tsup.ts"], - "tsc-alias": { - "resolveFullPaths": true, - "verbose": false - } -} diff --git a/packages/builders/esbuild.config.ts b/packages/server/esbuild.config.ts similarity index 100% rename from packages/builders/esbuild.config.ts rename to packages/server/esbuild.config.ts diff --git a/packages/builders/package.json b/packages/server/package.json similarity index 98% rename from packages/builders/package.json rename to packages/server/package.json index ce28b23d..7fc48c4e 100644 --- a/packages/builders/package.json +++ b/packages/server/package.json @@ -1,5 +1,5 @@ { - "name": "@dokploy/builders", + "name": "@dokploy/server", "version": "1.0.0", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/builders/src/auth/auth.ts b/packages/server/src/auth/auth.ts similarity index 100% rename from packages/builders/src/auth/auth.ts rename to packages/server/src/auth/auth.ts index 839fb9bb..7d26a6c3 100644 --- a/packages/builders/src/auth/auth.ts +++ b/packages/server/src/auth/auth.ts @@ -1,11 +1,11 @@ import { webcrypto } from "node:crypto"; import type { IncomingMessage, ServerResponse } from "node:http"; +import { findAdminByAuthId } from "@/server/services/admin"; +import { findUserByAuthId } from "@/server/services/user"; import { DrizzlePostgreSQLAdapter } from "@lucia-auth/adapter-drizzle"; import { TimeSpan } from "lucia"; import { Lucia } from "lucia/dist/core.js"; import type { Session, User } from "lucia/dist/core.js"; -import { findAdminByAuthId } from "@/server/services/admin"; -import { findUserByAuthId } from "@/server/services/user"; import { db } from "../db"; import { type DatabaseUser, auth, sessionTable } from "../db/schema"; diff --git a/packages/builders/src/auth/random-password.ts b/packages/server/src/auth/random-password.ts similarity index 100% rename from packages/builders/src/auth/random-password.ts rename to packages/server/src/auth/random-password.ts diff --git a/packages/builders/src/auth/token.ts b/packages/server/src/auth/token.ts similarity index 100% rename from packages/builders/src/auth/token.ts rename to packages/server/src/auth/token.ts index 4c7c2036..8831a684 100644 --- a/packages/builders/src/auth/token.ts +++ b/packages/server/src/auth/token.ts @@ -1,9 +1,9 @@ import type { IncomingMessage } from "node:http"; import { TimeSpan } from "lucia"; import { Lucia } from "lucia/dist/core.js"; -import { type ReturnValidateToken, adapter } from "./auth"; import { findAdminByAuthId } from "../services/admin"; import { findUserByAuthId } from "../services/user"; +import { type ReturnValidateToken, adapter } from "./auth"; export const luciaToken = new Lucia(adapter, { sessionCookie: { diff --git a/packages/builders/src/constants/index.ts b/packages/server/src/constants/index.ts similarity index 100% rename from packages/builders/src/constants/index.ts rename to packages/server/src/constants/index.ts diff --git a/packages/builders/src/db/drizzle.config.ts b/packages/server/src/db/drizzle.config.ts similarity index 100% rename from packages/builders/src/db/drizzle.config.ts rename to packages/server/src/db/drizzle.config.ts diff --git a/packages/builders/src/db/index.ts b/packages/server/src/db/index.ts similarity index 100% rename from packages/builders/src/db/index.ts rename to packages/server/src/db/index.ts diff --git a/packages/builders/src/db/migration.ts b/packages/server/src/db/migration.ts similarity index 100% rename from packages/builders/src/db/migration.ts rename to packages/server/src/db/migration.ts diff --git a/packages/builders/src/db/reset.ts b/packages/server/src/db/reset.ts similarity index 100% rename from packages/builders/src/db/reset.ts rename to packages/server/src/db/reset.ts diff --git a/packages/builders/src/db/schema/admin.ts b/packages/server/src/db/schema/admin.ts similarity index 100% rename from packages/builders/src/db/schema/admin.ts rename to packages/server/src/db/schema/admin.ts index 4cfa4aff..efa7716e 100644 --- a/packages/builders/src/db/schema/admin.ts +++ b/packages/server/src/db/schema/admin.ts @@ -6,8 +6,8 @@ import { z } from "zod"; import { auth } from "./auth"; import { registry } from "./registry"; import { certificateType } from "./shared"; -import { users } from "./user"; import { sshKeys } from "./ssh-key"; +import { users } from "./user"; export const admins = pgTable("admin", { adminId: text("adminId") diff --git a/packages/builders/src/db/schema/application.ts b/packages/server/src/db/schema/application.ts similarity index 100% rename from packages/builders/src/db/schema/application.ts rename to packages/server/src/db/schema/application.ts index beeeece9..609ace58 100644 --- a/packages/builders/src/db/schema/application.ts +++ b/packages/server/src/db/schema/application.ts @@ -10,21 +10,21 @@ import { import { createInsertSchema } from "drizzle-zod"; import { nanoid } from "nanoid"; import { z } from "zod"; +import { bitbucket } from "./bitbucket"; import { deployments } from "./deployment"; import { domains } from "./domain"; +import { github } from "./github"; +import { gitlab } from "./gitlab"; import { mounts } from "./mount"; import { ports } from "./port"; import { projects } from "./project"; import { redirects } from "./redirects"; import { registry } from "./registry"; import { security } from "./security"; +import { server } from "./server"; import { applicationStatus } from "./shared"; import { sshKeys } from "./ssh-key"; import { generateAppName } from "./utils"; -import { github } from "./github"; -import { gitlab } from "./gitlab"; -import { bitbucket } from "./bitbucket"; -import { server } from "./server"; export const sourceType = pgEnum("sourceType", [ "docker", diff --git a/packages/builders/src/db/schema/auth.ts b/packages/server/src/db/schema/auth.ts similarity index 100% rename from packages/builders/src/db/schema/auth.ts rename to packages/server/src/db/schema/auth.ts diff --git a/packages/builders/src/db/schema/backups.ts b/packages/server/src/db/schema/backups.ts similarity index 100% rename from packages/builders/src/db/schema/backups.ts rename to packages/server/src/db/schema/backups.ts diff --git a/packages/builders/src/db/schema/bitbucket.ts b/packages/server/src/db/schema/bitbucket.ts similarity index 100% rename from packages/builders/src/db/schema/bitbucket.ts rename to packages/server/src/db/schema/bitbucket.ts diff --git a/packages/builders/src/db/schema/certificate.ts b/packages/server/src/db/schema/certificate.ts similarity index 100% rename from packages/builders/src/db/schema/certificate.ts rename to packages/server/src/db/schema/certificate.ts diff --git a/packages/builders/src/db/schema/compose.ts b/packages/server/src/db/schema/compose.ts similarity index 100% rename from packages/builders/src/db/schema/compose.ts rename to packages/server/src/db/schema/compose.ts index 29d90edc..02bac781 100644 --- a/packages/builders/src/db/schema/compose.ts +++ b/packages/server/src/db/schema/compose.ts @@ -1,19 +1,19 @@ -import { sshKeys } from "./ssh-key"; import { relations } from "drizzle-orm"; 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 { bitbucket } from "./bitbucket"; import { deployments } from "./deployment"; import { domains } from "./domain"; -import { mounts } from "./mount"; -import { projects } from "./project"; -import { applicationStatus } from "./shared"; -import { generateAppName } from "./utils"; import { github } from "./github"; import { gitlab } from "./gitlab"; -import { bitbucket } from "./bitbucket"; +import { mounts } from "./mount"; +import { projects } from "./project"; import { server } from "./server"; +import { applicationStatus } from "./shared"; +import { sshKeys } from "./ssh-key"; +import { generateAppName } from "./utils"; export const sourceTypeCompose = pgEnum("sourceTypeCompose", [ "git", diff --git a/packages/builders/src/db/schema/deployment.ts b/packages/server/src/db/schema/deployment.ts similarity index 100% rename from packages/builders/src/db/schema/deployment.ts rename to packages/server/src/db/schema/deployment.ts diff --git a/packages/builders/src/db/schema/destination.ts b/packages/server/src/db/schema/destination.ts similarity index 100% rename from packages/builders/src/db/schema/destination.ts rename to packages/server/src/db/schema/destination.ts diff --git a/packages/builders/src/db/schema/domain.ts b/packages/server/src/db/schema/domain.ts similarity index 100% rename from packages/builders/src/db/schema/domain.ts rename to packages/server/src/db/schema/domain.ts index eee9a819..28829118 100644 --- a/packages/builders/src/db/schema/domain.ts +++ b/packages/server/src/db/schema/domain.ts @@ -1,4 +1,3 @@ -import { domain } from "../validations/domain"; import { relations } from "drizzle-orm"; import { boolean, @@ -11,6 +10,7 @@ import { import { createInsertSchema } from "drizzle-zod"; import { nanoid } from "nanoid"; import { z } from "zod"; +import { domain } from "../validations/domain"; import { applications } from "./application"; import { compose } from "./compose"; import { certificateType } from "./shared"; diff --git a/packages/builders/src/db/schema/git-provider.ts b/packages/server/src/db/schema/git-provider.ts similarity index 100% rename from packages/builders/src/db/schema/git-provider.ts rename to packages/server/src/db/schema/git-provider.ts index 8c8fee50..dbbfc183 100644 --- a/packages/builders/src/db/schema/git-provider.ts +++ b/packages/server/src/db/schema/git-provider.ts @@ -3,10 +3,10 @@ import { pgEnum, pgTable, text } from "drizzle-orm/pg-core"; import { createInsertSchema } from "drizzle-zod"; import { nanoid } from "nanoid"; import { z } from "zod"; +import { admins } from "./admin"; import { bitbucket } from "./bitbucket"; import { github } from "./github"; import { gitlab } from "./gitlab"; -import { admins } from "./admin"; export const gitProviderType = pgEnum("gitProviderType", [ "github", diff --git a/packages/builders/src/db/schema/github.ts b/packages/server/src/db/schema/github.ts similarity index 100% rename from packages/builders/src/db/schema/github.ts rename to packages/server/src/db/schema/github.ts diff --git a/packages/builders/src/db/schema/gitlab.ts b/packages/server/src/db/schema/gitlab.ts similarity index 100% rename from packages/builders/src/db/schema/gitlab.ts rename to packages/server/src/db/schema/gitlab.ts diff --git a/packages/builders/src/db/schema/index.ts b/packages/server/src/db/schema/index.ts similarity index 100% rename from packages/builders/src/db/schema/index.ts rename to packages/server/src/db/schema/index.ts diff --git a/packages/builders/src/db/schema/mariadb.ts b/packages/server/src/db/schema/mariadb.ts similarity index 100% rename from packages/builders/src/db/schema/mariadb.ts rename to packages/server/src/db/schema/mariadb.ts diff --git a/packages/builders/src/db/schema/mongo.ts b/packages/server/src/db/schema/mongo.ts similarity index 100% rename from packages/builders/src/db/schema/mongo.ts rename to packages/server/src/db/schema/mongo.ts diff --git a/packages/builders/src/db/schema/mount.ts b/packages/server/src/db/schema/mount.ts similarity index 100% rename from packages/builders/src/db/schema/mount.ts rename to packages/server/src/db/schema/mount.ts diff --git a/packages/builders/src/db/schema/mysql.ts b/packages/server/src/db/schema/mysql.ts similarity index 100% rename from packages/builders/src/db/schema/mysql.ts rename to packages/server/src/db/schema/mysql.ts diff --git a/packages/builders/src/db/schema/notification.ts b/packages/server/src/db/schema/notification.ts similarity index 100% rename from packages/builders/src/db/schema/notification.ts rename to packages/server/src/db/schema/notification.ts diff --git a/packages/builders/src/db/schema/port.ts b/packages/server/src/db/schema/port.ts similarity index 100% rename from packages/builders/src/db/schema/port.ts rename to packages/server/src/db/schema/port.ts diff --git a/packages/builders/src/db/schema/postgres.ts b/packages/server/src/db/schema/postgres.ts similarity index 100% rename from packages/builders/src/db/schema/postgres.ts rename to packages/server/src/db/schema/postgres.ts diff --git a/packages/builders/src/db/schema/project.ts b/packages/server/src/db/schema/project.ts similarity index 100% rename from packages/builders/src/db/schema/project.ts rename to packages/server/src/db/schema/project.ts diff --git a/packages/builders/src/db/schema/redirects.ts b/packages/server/src/db/schema/redirects.ts similarity index 100% rename from packages/builders/src/db/schema/redirects.ts rename to packages/server/src/db/schema/redirects.ts diff --git a/packages/builders/src/db/schema/redis.ts b/packages/server/src/db/schema/redis.ts similarity index 100% rename from packages/builders/src/db/schema/redis.ts rename to packages/server/src/db/schema/redis.ts diff --git a/packages/builders/src/db/schema/registry.ts b/packages/server/src/db/schema/registry.ts similarity index 100% rename from packages/builders/src/db/schema/registry.ts rename to packages/server/src/db/schema/registry.ts diff --git a/packages/builders/src/db/schema/security.ts b/packages/server/src/db/schema/security.ts similarity index 100% rename from packages/builders/src/db/schema/security.ts rename to packages/server/src/db/schema/security.ts diff --git a/packages/builders/src/db/schema/server.ts b/packages/server/src/db/schema/server.ts similarity index 100% rename from packages/builders/src/db/schema/server.ts rename to packages/server/src/db/schema/server.ts index 6d435d88..45cfb86f 100644 --- a/packages/builders/src/db/schema/server.ts +++ b/packages/server/src/db/schema/server.ts @@ -5,16 +5,16 @@ import { nanoid } from "nanoid"; import { z } from "zod"; import { admins } from "./admin"; -import { deployments } from "./deployment"; -import { sshKeys } from "./ssh-key"; -import { generateAppName } from "./utils"; import { applications } from "./application"; import { compose } from "./compose"; +import { deployments } from "./deployment"; import { mariadb } from "./mariadb"; import { mongo } from "./mongo"; import { mysql } from "./mysql"; import { postgres } from "./postgres"; import { redis } from "./redis"; +import { sshKeys } from "./ssh-key"; +import { generateAppName } from "./utils"; export const server = pgTable("server", { serverId: text("serverId") diff --git a/packages/builders/src/db/schema/session.ts b/packages/server/src/db/schema/session.ts similarity index 100% rename from packages/builders/src/db/schema/session.ts rename to packages/server/src/db/schema/session.ts diff --git a/packages/builders/src/db/schema/shared.ts b/packages/server/src/db/schema/shared.ts similarity index 100% rename from packages/builders/src/db/schema/shared.ts rename to packages/server/src/db/schema/shared.ts diff --git a/packages/builders/src/db/schema/source.ts b/packages/server/src/db/schema/source.ts similarity index 100% rename from packages/builders/src/db/schema/source.ts rename to packages/server/src/db/schema/source.ts diff --git a/packages/builders/src/db/schema/ssh-key.ts b/packages/server/src/db/schema/ssh-key.ts similarity index 100% rename from packages/builders/src/db/schema/ssh-key.ts rename to packages/server/src/db/schema/ssh-key.ts index bb235dfe..e4842851 100644 --- a/packages/builders/src/db/schema/ssh-key.ts +++ b/packages/server/src/db/schema/ssh-key.ts @@ -1,12 +1,12 @@ -import { applications } from "./application"; -import { compose } from "./compose"; -import { sshKeyCreate, sshKeyType } from "../validations"; import { relations } from "drizzle-orm"; import { pgTable, text } from "drizzle-orm/pg-core"; import { createInsertSchema } from "drizzle-zod"; import { nanoid } from "nanoid"; -import { server } from "./server"; +import { sshKeyCreate, sshKeyType } from "../validations"; import { admins } from "./admin"; +import { applications } from "./application"; +import { compose } from "./compose"; +import { server } from "./server"; export const sshKeys = pgTable("ssh-key", { sshKeyId: text("sshKeyId") diff --git a/packages/builders/src/db/schema/user.ts b/packages/server/src/db/schema/user.ts similarity index 100% rename from packages/builders/src/db/schema/user.ts rename to packages/server/src/db/schema/user.ts diff --git a/packages/builders/src/db/schema/utils.ts b/packages/server/src/db/schema/utils.ts similarity index 100% rename from packages/builders/src/db/schema/utils.ts rename to packages/server/src/db/schema/utils.ts diff --git a/packages/builders/src/db/seed.ts b/packages/server/src/db/seed.ts similarity index 100% rename from packages/builders/src/db/seed.ts rename to packages/server/src/db/seed.ts diff --git a/packages/builders/src/db/validations/domain.ts b/packages/server/src/db/validations/domain.ts similarity index 100% rename from packages/builders/src/db/validations/domain.ts rename to packages/server/src/db/validations/domain.ts diff --git a/packages/builders/src/db/validations/index.ts b/packages/server/src/db/validations/index.ts similarity index 100% rename from packages/builders/src/db/validations/index.ts rename to packages/server/src/db/validations/index.ts diff --git a/packages/builders/src/emails/.gitignore b/packages/server/src/emails/.gitignore similarity index 100% rename from packages/builders/src/emails/.gitignore rename to packages/server/src/emails/.gitignore diff --git a/packages/builders/src/emails/emails/build-failed.tsx b/packages/server/src/emails/emails/build-failed.tsx similarity index 100% rename from packages/builders/src/emails/emails/build-failed.tsx rename to packages/server/src/emails/emails/build-failed.tsx diff --git a/packages/builders/src/emails/emails/build-success.tsx b/packages/server/src/emails/emails/build-success.tsx similarity index 100% rename from packages/builders/src/emails/emails/build-success.tsx rename to packages/server/src/emails/emails/build-success.tsx diff --git a/packages/builders/src/emails/emails/database-backup.tsx b/packages/server/src/emails/emails/database-backup.tsx similarity index 100% rename from packages/builders/src/emails/emails/database-backup.tsx rename to packages/server/src/emails/emails/database-backup.tsx diff --git a/packages/builders/src/emails/emails/docker-cleanup.tsx b/packages/server/src/emails/emails/docker-cleanup.tsx similarity index 100% rename from packages/builders/src/emails/emails/docker-cleanup.tsx rename to packages/server/src/emails/emails/docker-cleanup.tsx diff --git a/packages/builders/src/emails/emails/dokploy-restart.tsx b/packages/server/src/emails/emails/dokploy-restart.tsx similarity index 100% rename from packages/builders/src/emails/emails/dokploy-restart.tsx rename to packages/server/src/emails/emails/dokploy-restart.tsx diff --git a/packages/builders/src/emails/emails/invitation.tsx b/packages/server/src/emails/emails/invitation.tsx similarity index 100% rename from packages/builders/src/emails/emails/invitation.tsx rename to packages/server/src/emails/emails/invitation.tsx diff --git a/packages/builders/src/emails/emails/notion-magic-link.tsx b/packages/server/src/emails/emails/notion-magic-link.tsx similarity index 100% rename from packages/builders/src/emails/emails/notion-magic-link.tsx rename to packages/server/src/emails/emails/notion-magic-link.tsx diff --git a/packages/builders/src/emails/emails/plaid-verify-identity.tsx b/packages/server/src/emails/emails/plaid-verify-identity.tsx similarity index 100% rename from packages/builders/src/emails/emails/plaid-verify-identity.tsx rename to packages/server/src/emails/emails/plaid-verify-identity.tsx diff --git a/packages/builders/src/emails/emails/static/logo.png b/packages/server/src/emails/emails/static/logo.png similarity index 100% rename from packages/builders/src/emails/emails/static/logo.png rename to packages/server/src/emails/emails/static/logo.png diff --git a/packages/builders/src/emails/emails/static/notion-logo.png b/packages/server/src/emails/emails/static/notion-logo.png similarity index 100% rename from packages/builders/src/emails/emails/static/notion-logo.png rename to packages/server/src/emails/emails/static/notion-logo.png diff --git a/packages/builders/src/emails/emails/static/plaid-logo.png b/packages/server/src/emails/emails/static/plaid-logo.png similarity index 100% rename from packages/builders/src/emails/emails/static/plaid-logo.png rename to packages/server/src/emails/emails/static/plaid-logo.png diff --git a/packages/builders/src/emails/emails/static/plaid.png b/packages/server/src/emails/emails/static/plaid.png similarity index 100% rename from packages/builders/src/emails/emails/static/plaid.png rename to packages/server/src/emails/emails/static/plaid.png diff --git a/packages/builders/src/emails/emails/static/stripe-logo.png b/packages/server/src/emails/emails/static/stripe-logo.png similarity index 100% rename from packages/builders/src/emails/emails/static/stripe-logo.png rename to packages/server/src/emails/emails/static/stripe-logo.png diff --git a/packages/builders/src/emails/emails/static/vercel-arrow.png b/packages/server/src/emails/emails/static/vercel-arrow.png similarity index 100% rename from packages/builders/src/emails/emails/static/vercel-arrow.png rename to packages/server/src/emails/emails/static/vercel-arrow.png diff --git a/packages/builders/src/emails/emails/static/vercel-logo.png b/packages/server/src/emails/emails/static/vercel-logo.png similarity index 100% rename from packages/builders/src/emails/emails/static/vercel-logo.png rename to packages/server/src/emails/emails/static/vercel-logo.png diff --git a/packages/builders/src/emails/emails/static/vercel-team.png b/packages/server/src/emails/emails/static/vercel-team.png similarity index 100% rename from packages/builders/src/emails/emails/static/vercel-team.png rename to packages/server/src/emails/emails/static/vercel-team.png diff --git a/packages/builders/src/emails/emails/static/vercel-user.png b/packages/server/src/emails/emails/static/vercel-user.png similarity index 100% rename from packages/builders/src/emails/emails/static/vercel-user.png rename to packages/server/src/emails/emails/static/vercel-user.png diff --git a/packages/builders/src/emails/emails/stripe-welcome.tsx b/packages/server/src/emails/emails/stripe-welcome.tsx similarity index 100% rename from packages/builders/src/emails/emails/stripe-welcome.tsx rename to packages/server/src/emails/emails/stripe-welcome.tsx diff --git a/packages/builders/src/emails/emails/vercel-invite-user.tsx b/packages/server/src/emails/emails/vercel-invite-user.tsx similarity index 100% rename from packages/builders/src/emails/emails/vercel-invite-user.tsx rename to packages/server/src/emails/emails/vercel-invite-user.tsx diff --git a/packages/builders/src/emails/package.json b/packages/server/src/emails/package.json similarity index 100% rename from packages/builders/src/emails/package.json rename to packages/server/src/emails/package.json diff --git a/packages/builders/src/emails/pnpm-lock.yaml b/packages/server/src/emails/pnpm-lock.yaml similarity index 100% rename from packages/builders/src/emails/pnpm-lock.yaml rename to packages/server/src/emails/pnpm-lock.yaml diff --git a/packages/builders/src/emails/readme.md b/packages/server/src/emails/readme.md similarity index 100% rename from packages/builders/src/emails/readme.md rename to packages/server/src/emails/readme.md diff --git a/packages/builders/src/index.ts b/packages/server/src/index.ts similarity index 100% rename from packages/builders/src/index.ts rename to packages/server/src/index.ts diff --git a/packages/builders/src/monitoring/utilts.ts b/packages/server/src/monitoring/utilts.ts similarity index 100% rename from packages/builders/src/monitoring/utilts.ts rename to packages/server/src/monitoring/utilts.ts diff --git a/packages/builders/src/services/admin.ts b/packages/server/src/services/admin.ts similarity index 100% rename from packages/builders/src/services/admin.ts rename to packages/server/src/services/admin.ts diff --git a/packages/builders/src/services/application.ts b/packages/server/src/services/application.ts similarity index 100% rename from packages/builders/src/services/application.ts rename to packages/server/src/services/application.ts index 45a7ad65..afd9eb30 100644 --- a/packages/builders/src/services/application.ts +++ b/packages/server/src/services/application.ts @@ -3,6 +3,7 @@ import { db } from "@/server/db"; import { type apiCreateApplication, applications } from "@/server/db/schema"; import { generateAppName } from "@/server/db/schema"; import { getAdvancedStats } from "@/server/monitoring/utilts"; +import { generatePassword } from "@/server/templates/utils"; import { buildApplication, getBuildCommand, @@ -32,7 +33,6 @@ import { getGitlabCloneCommand, } from "@/server/utils/providers/gitlab"; import { createTraefikConfig } from "@/server/utils/traefik/application"; -import { generatePassword } from "@/server/templates/utils"; import { TRPCError } from "@trpc/server"; import { eq } from "drizzle-orm"; import { getDokployUrl } from "./admin"; diff --git a/packages/builders/src/services/auth.ts b/packages/server/src/services/auth.ts similarity index 100% rename from packages/builders/src/services/auth.ts rename to packages/server/src/services/auth.ts diff --git a/packages/builders/src/services/backup.ts b/packages/server/src/services/backup.ts similarity index 100% rename from packages/builders/src/services/backup.ts rename to packages/server/src/services/backup.ts diff --git a/packages/builders/src/services/bitbucket.ts b/packages/server/src/services/bitbucket.ts similarity index 100% rename from packages/builders/src/services/bitbucket.ts rename to packages/server/src/services/bitbucket.ts diff --git a/packages/builders/src/services/certificate.ts b/packages/server/src/services/certificate.ts similarity index 100% rename from packages/builders/src/services/certificate.ts rename to packages/server/src/services/certificate.ts diff --git a/packages/builders/src/services/cluster.ts b/packages/server/src/services/cluster.ts similarity index 100% rename from packages/builders/src/services/cluster.ts rename to packages/server/src/services/cluster.ts diff --git a/packages/builders/src/services/compose.ts b/packages/server/src/services/compose.ts similarity index 100% rename from packages/builders/src/services/compose.ts rename to packages/server/src/services/compose.ts index bacee42d..b1a76b6d 100644 --- a/packages/builders/src/services/compose.ts +++ b/packages/server/src/services/compose.ts @@ -3,6 +3,7 @@ import { paths } from "@/server/constants"; import { db } from "@/server/db"; import { type apiCreateCompose, compose } from "@/server/db/schema"; import { generateAppName } from "@/server/db/schema"; +import { generatePassword } from "@/server/templates/utils"; import { buildCompose, getBuildComposeCommand, @@ -38,7 +39,6 @@ import { createComposeFile, getCreateComposeFileCommand, } from "@/server/utils/providers/raw"; -import { generatePassword } from "@/server/templates/utils"; import { TRPCError } from "@trpc/server"; import { eq } from "drizzle-orm"; import { getDokployUrl } from "./admin"; diff --git a/packages/builders/src/services/deployment.ts b/packages/server/src/services/deployment.ts similarity index 100% rename from packages/builders/src/services/deployment.ts rename to packages/server/src/services/deployment.ts diff --git a/packages/builders/src/services/destination.ts b/packages/server/src/services/destination.ts similarity index 100% rename from packages/builders/src/services/destination.ts rename to packages/server/src/services/destination.ts diff --git a/packages/builders/src/services/docker.ts b/packages/server/src/services/docker.ts similarity index 100% rename from packages/builders/src/services/docker.ts rename to packages/server/src/services/docker.ts diff --git a/packages/builders/src/services/domain.ts b/packages/server/src/services/domain.ts similarity index 100% rename from packages/builders/src/services/domain.ts rename to packages/server/src/services/domain.ts index 2ff663c1..d94cdc08 100644 --- a/packages/builders/src/services/domain.ts +++ b/packages/server/src/services/domain.ts @@ -1,9 +1,9 @@ import { db } from "@/server/db"; -import { type apiCreateDomain, domains } from "../db/schema"; -import { manageDomain } from "@/server/utils/traefik/domain"; import { generateRandomDomain } from "@/server/templates/utils"; +import { manageDomain } from "@/server/utils/traefik/domain"; import { TRPCError } from "@trpc/server"; import { eq } from "drizzle-orm"; +import { type apiCreateDomain, domains } from "../db/schema"; import { findAdmin, findAdminById } from "./admin"; import { findApplicationById } from "./application"; import { findServerById } from "./server"; diff --git a/packages/builders/src/services/git-provider.ts b/packages/server/src/services/git-provider.ts similarity index 100% rename from packages/builders/src/services/git-provider.ts rename to packages/server/src/services/git-provider.ts diff --git a/packages/builders/src/services/github.ts b/packages/server/src/services/github.ts similarity index 100% rename from packages/builders/src/services/github.ts rename to packages/server/src/services/github.ts diff --git a/packages/builders/src/services/gitlab.ts b/packages/server/src/services/gitlab.ts similarity index 100% rename from packages/builders/src/services/gitlab.ts rename to packages/server/src/services/gitlab.ts diff --git a/packages/builders/src/services/mariadb.ts b/packages/server/src/services/mariadb.ts similarity index 100% rename from packages/builders/src/services/mariadb.ts rename to packages/server/src/services/mariadb.ts index 237d00e9..91cc7d73 100644 --- a/packages/builders/src/services/mariadb.ts +++ b/packages/server/src/services/mariadb.ts @@ -1,9 +1,9 @@ import { db } from "@/server/db"; import { type apiCreateMariaDB, backups, mariadb } from "@/server/db/schema"; import { generateAppName } from "@/server/db/schema"; +import { generatePassword } from "@/server/templates/utils"; import { buildMariadb } from "@/server/utils/databases/mariadb"; import { pullImage } from "@/server/utils/docker/utils"; -import { generatePassword } from "@/server/templates/utils"; import { TRPCError } from "@trpc/server"; import { eq, getTableColumns } from "drizzle-orm"; import { validUniqueServerAppName } from "./project"; diff --git a/packages/builders/src/services/mongo.ts b/packages/server/src/services/mongo.ts similarity index 100% rename from packages/builders/src/services/mongo.ts rename to packages/server/src/services/mongo.ts index 41c44f09..06b1cf58 100644 --- a/packages/builders/src/services/mongo.ts +++ b/packages/server/src/services/mongo.ts @@ -1,9 +1,9 @@ import { db } from "@/server/db"; import { type apiCreateMongo, backups, mongo } from "@/server/db/schema"; import { generateAppName } from "@/server/db/schema"; +import { generatePassword } from "@/server/templates/utils"; import { buildMongo } from "@/server/utils/databases/mongo"; import { pullImage } from "@/server/utils/docker/utils"; -import { generatePassword } from "@/server/templates/utils"; import { TRPCError } from "@trpc/server"; import { eq, getTableColumns } from "drizzle-orm"; import { validUniqueServerAppName } from "./project"; diff --git a/packages/builders/src/services/mount.ts b/packages/server/src/services/mount.ts similarity index 100% rename from packages/builders/src/services/mount.ts rename to packages/server/src/services/mount.ts diff --git a/packages/builders/src/services/mysql.ts b/packages/server/src/services/mysql.ts similarity index 100% rename from packages/builders/src/services/mysql.ts rename to packages/server/src/services/mysql.ts index e221c9b7..7cae5801 100644 --- a/packages/builders/src/services/mysql.ts +++ b/packages/server/src/services/mysql.ts @@ -1,9 +1,9 @@ import { db } from "@/server/db"; import { type apiCreateMySql, backups, mysql } from "@/server/db/schema"; import { generateAppName } from "@/server/db/schema"; +import { generatePassword } from "@/server/templates/utils"; import { buildMysql } from "@/server/utils/databases/mysql"; import { pullImage } from "@/server/utils/docker/utils"; -import { generatePassword } from "@/server/templates/utils"; import { TRPCError } from "@trpc/server"; import { eq, getTableColumns } from "drizzle-orm"; import { validUniqueServerAppName } from "./project"; diff --git a/packages/builders/src/services/notification.ts b/packages/server/src/services/notification.ts similarity index 100% rename from packages/builders/src/services/notification.ts rename to packages/server/src/services/notification.ts diff --git a/packages/builders/src/services/port.ts b/packages/server/src/services/port.ts similarity index 100% rename from packages/builders/src/services/port.ts rename to packages/server/src/services/port.ts diff --git a/packages/builders/src/services/postgres.ts b/packages/server/src/services/postgres.ts similarity index 100% rename from packages/builders/src/services/postgres.ts rename to packages/server/src/services/postgres.ts index 857df630..3307141d 100644 --- a/packages/builders/src/services/postgres.ts +++ b/packages/server/src/services/postgres.ts @@ -1,9 +1,9 @@ import { db } from "@/server/db"; import { type apiCreatePostgres, backups, postgres } from "@/server/db/schema"; import { generateAppName } from "@/server/db/schema"; +import { generatePassword } from "@/server/templates/utils"; import { buildPostgres } from "@/server/utils/databases/postgres"; import { pullImage } from "@/server/utils/docker/utils"; -import { generatePassword } from "@/server/templates/utils"; import { TRPCError } from "@trpc/server"; import { eq, getTableColumns } from "drizzle-orm"; import { validUniqueServerAppName } from "./project"; diff --git a/packages/builders/src/services/project.ts b/packages/server/src/services/project.ts similarity index 100% rename from packages/builders/src/services/project.ts rename to packages/server/src/services/project.ts diff --git a/packages/builders/src/services/redirect.ts b/packages/server/src/services/redirect.ts similarity index 100% rename from packages/builders/src/services/redirect.ts rename to packages/server/src/services/redirect.ts diff --git a/packages/builders/src/services/redis.ts b/packages/server/src/services/redis.ts similarity index 100% rename from packages/builders/src/services/redis.ts rename to packages/server/src/services/redis.ts index 498c5f4c..9d3471a7 100644 --- a/packages/builders/src/services/redis.ts +++ b/packages/server/src/services/redis.ts @@ -1,9 +1,9 @@ import { db } from "@/server/db"; import { type apiCreateRedis, redis } from "@/server/db/schema"; import { generateAppName } from "@/server/db/schema"; +import { generatePassword } from "@/server/templates/utils"; import { buildRedis } from "@/server/utils/databases/redis"; import { pullImage } from "@/server/utils/docker/utils"; -import { generatePassword } from "@/server/templates/utils"; import { TRPCError } from "@trpc/server"; import { eq } from "drizzle-orm"; import { validUniqueServerAppName } from "./project"; diff --git a/packages/builders/src/services/registry.ts b/packages/server/src/services/registry.ts similarity index 100% rename from packages/builders/src/services/registry.ts rename to packages/server/src/services/registry.ts diff --git a/packages/builders/src/services/security.ts b/packages/server/src/services/security.ts similarity index 100% rename from packages/builders/src/services/security.ts rename to packages/server/src/services/security.ts diff --git a/packages/builders/src/services/server.ts b/packages/server/src/services/server.ts similarity index 100% rename from packages/builders/src/services/server.ts rename to packages/server/src/services/server.ts diff --git a/packages/builders/src/services/settings.ts b/packages/server/src/services/settings.ts similarity index 100% rename from packages/builders/src/services/settings.ts rename to packages/server/src/services/settings.ts diff --git a/packages/builders/src/services/ssh-key.ts b/packages/server/src/services/ssh-key.ts similarity index 100% rename from packages/builders/src/services/ssh-key.ts rename to packages/server/src/services/ssh-key.ts diff --git a/packages/builders/src/services/user.ts b/packages/server/src/services/user.ts similarity index 100% rename from packages/builders/src/services/user.ts rename to packages/server/src/services/user.ts diff --git a/packages/builders/src/setup/config-paths.ts b/packages/server/src/setup/config-paths.ts similarity index 100% rename from packages/builders/src/setup/config-paths.ts rename to packages/server/src/setup/config-paths.ts diff --git a/packages/builders/src/setup/postgres-setup.ts b/packages/server/src/setup/postgres-setup.ts similarity index 100% rename from packages/builders/src/setup/postgres-setup.ts rename to packages/server/src/setup/postgres-setup.ts diff --git a/packages/builders/src/setup/redis-setup.ts b/packages/server/src/setup/redis-setup.ts similarity index 100% rename from packages/builders/src/setup/redis-setup.ts rename to packages/server/src/setup/redis-setup.ts diff --git a/packages/builders/src/setup/registry-setup.ts b/packages/server/src/setup/registry-setup.ts similarity index 100% rename from packages/builders/src/setup/registry-setup.ts rename to packages/server/src/setup/registry-setup.ts index 02c1d3d0..3c4cc566 100644 --- a/packages/builders/src/setup/registry-setup.ts +++ b/packages/server/src/setup/registry-setup.ts @@ -1,8 +1,8 @@ import type { CreateServiceOptions } from "dockerode"; import { docker, paths } from "../constants"; +import { generatePassword } from "../templates/utils"; import { pullImage } from "../utils/docker/utils"; import { execAsync } from "../utils/process/execAsync"; -import { generatePassword } from "../templates/utils"; export const initializeRegistry = async ( username: string, diff --git a/packages/builders/src/setup/server-setup.ts b/packages/server/src/setup/server-setup.ts similarity index 100% rename from packages/builders/src/setup/server-setup.ts rename to packages/server/src/setup/server-setup.ts index 3679f2e6..d3f6a539 100644 --- a/packages/builders/src/setup/server-setup.ts +++ b/packages/server/src/setup/server-setup.ts @@ -1,11 +1,11 @@ import { createWriteStream } from "node:fs"; import path from "node:path"; +import { paths } from "@/server/constants"; import { createServerDeployment, updateDeploymentStatus, } from "@/server/services/deployment"; import { findServerById } from "@/server/services/server"; -import { paths } from "@/server/constants"; import { getDefaultMiddlewares, getDefaultServerTraefikConfig, diff --git a/packages/builders/src/setup/setup.ts b/packages/server/src/setup/setup.ts similarity index 100% rename from packages/builders/src/setup/setup.ts rename to packages/server/src/setup/setup.ts diff --git a/packages/builders/src/setup/traefik-setup.ts b/packages/server/src/setup/traefik-setup.ts similarity index 100% rename from packages/builders/src/setup/traefik-setup.ts rename to packages/server/src/setup/traefik-setup.ts diff --git a/packages/builders/src/templates/appsmith/docker-compose.yml b/packages/server/src/templates/appsmith/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/appsmith/docker-compose.yml rename to packages/server/src/templates/appsmith/docker-compose.yml diff --git a/packages/builders/src/templates/appsmith/index.ts b/packages/server/src/templates/appsmith/index.ts similarity index 100% rename from packages/builders/src/templates/appsmith/index.ts rename to packages/server/src/templates/appsmith/index.ts diff --git a/packages/builders/src/templates/aptabase/docker-compose.yml b/packages/server/src/templates/aptabase/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/aptabase/docker-compose.yml rename to packages/server/src/templates/aptabase/docker-compose.yml diff --git a/packages/builders/src/templates/aptabase/index.ts b/packages/server/src/templates/aptabase/index.ts similarity index 100% rename from packages/builders/src/templates/aptabase/index.ts rename to packages/server/src/templates/aptabase/index.ts diff --git a/packages/builders/src/templates/baserow/docker-compose.yml b/packages/server/src/templates/baserow/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/baserow/docker-compose.yml rename to packages/server/src/templates/baserow/docker-compose.yml diff --git a/packages/builders/src/templates/baserow/index.ts b/packages/server/src/templates/baserow/index.ts similarity index 100% rename from packages/builders/src/templates/baserow/index.ts rename to packages/server/src/templates/baserow/index.ts diff --git a/packages/builders/src/templates/calcom/docker-compose.yml b/packages/server/src/templates/calcom/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/calcom/docker-compose.yml rename to packages/server/src/templates/calcom/docker-compose.yml diff --git a/packages/builders/src/templates/calcom/index.ts b/packages/server/src/templates/calcom/index.ts similarity index 100% rename from packages/builders/src/templates/calcom/index.ts rename to packages/server/src/templates/calcom/index.ts diff --git a/packages/builders/src/templates/directus/docker-compose.yml b/packages/server/src/templates/directus/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/directus/docker-compose.yml rename to packages/server/src/templates/directus/docker-compose.yml diff --git a/packages/builders/src/templates/directus/index.ts b/packages/server/src/templates/directus/index.ts similarity index 100% rename from packages/builders/src/templates/directus/index.ts rename to packages/server/src/templates/directus/index.ts diff --git a/packages/builders/src/templates/documenso/docker-compose.yml b/packages/server/src/templates/documenso/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/documenso/docker-compose.yml rename to packages/server/src/templates/documenso/docker-compose.yml diff --git a/packages/builders/src/templates/documenso/index.ts b/packages/server/src/templates/documenso/index.ts similarity index 100% rename from packages/builders/src/templates/documenso/index.ts rename to packages/server/src/templates/documenso/index.ts diff --git a/packages/builders/src/templates/doublezero/docker-compose.yml b/packages/server/src/templates/doublezero/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/doublezero/docker-compose.yml rename to packages/server/src/templates/doublezero/docker-compose.yml diff --git a/packages/builders/src/templates/doublezero/index.ts b/packages/server/src/templates/doublezero/index.ts similarity index 100% rename from packages/builders/src/templates/doublezero/index.ts rename to packages/server/src/templates/doublezero/index.ts diff --git a/packages/builders/src/templates/excalidraw/docker-compose.yml b/packages/server/src/templates/excalidraw/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/excalidraw/docker-compose.yml rename to packages/server/src/templates/excalidraw/docker-compose.yml diff --git a/packages/builders/src/templates/excalidraw/index.ts b/packages/server/src/templates/excalidraw/index.ts similarity index 100% rename from packages/builders/src/templates/excalidraw/index.ts rename to packages/server/src/templates/excalidraw/index.ts diff --git a/packages/builders/src/templates/ghost/docker-compose.yml b/packages/server/src/templates/ghost/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/ghost/docker-compose.yml rename to packages/server/src/templates/ghost/docker-compose.yml diff --git a/packages/builders/src/templates/ghost/index.ts b/packages/server/src/templates/ghost/index.ts similarity index 100% rename from packages/builders/src/templates/ghost/index.ts rename to packages/server/src/templates/ghost/index.ts diff --git a/packages/builders/src/templates/gitea/docker-compose.yml b/packages/server/src/templates/gitea/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/gitea/docker-compose.yml rename to packages/server/src/templates/gitea/docker-compose.yml diff --git a/packages/builders/src/templates/gitea/index.ts b/packages/server/src/templates/gitea/index.ts similarity index 100% rename from packages/builders/src/templates/gitea/index.ts rename to packages/server/src/templates/gitea/index.ts diff --git a/packages/builders/src/templates/glitchtip/docker-compose.yml b/packages/server/src/templates/glitchtip/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/glitchtip/docker-compose.yml rename to packages/server/src/templates/glitchtip/docker-compose.yml diff --git a/packages/builders/src/templates/glitchtip/index.ts b/packages/server/src/templates/glitchtip/index.ts similarity index 100% rename from packages/builders/src/templates/glitchtip/index.ts rename to packages/server/src/templates/glitchtip/index.ts diff --git a/packages/builders/src/templates/grafana/docker-compose.yml b/packages/server/src/templates/grafana/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/grafana/docker-compose.yml rename to packages/server/src/templates/grafana/docker-compose.yml diff --git a/packages/builders/src/templates/grafana/index.ts b/packages/server/src/templates/grafana/index.ts similarity index 100% rename from packages/builders/src/templates/grafana/index.ts rename to packages/server/src/templates/grafana/index.ts diff --git a/packages/builders/src/templates/jellyfin/docker-compose.yml b/packages/server/src/templates/jellyfin/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/jellyfin/docker-compose.yml rename to packages/server/src/templates/jellyfin/docker-compose.yml diff --git a/packages/builders/src/templates/jellyfin/index.ts b/packages/server/src/templates/jellyfin/index.ts similarity index 100% rename from packages/builders/src/templates/jellyfin/index.ts rename to packages/server/src/templates/jellyfin/index.ts diff --git a/packages/builders/src/templates/listmonk/docker-compose.yml b/packages/server/src/templates/listmonk/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/listmonk/docker-compose.yml rename to packages/server/src/templates/listmonk/docker-compose.yml diff --git a/packages/builders/src/templates/listmonk/index.ts b/packages/server/src/templates/listmonk/index.ts similarity index 100% rename from packages/builders/src/templates/listmonk/index.ts rename to packages/server/src/templates/listmonk/index.ts diff --git a/packages/builders/src/templates/meilisearch/docker-compose.yml b/packages/server/src/templates/meilisearch/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/meilisearch/docker-compose.yml rename to packages/server/src/templates/meilisearch/docker-compose.yml diff --git a/packages/builders/src/templates/meilisearch/index.ts b/packages/server/src/templates/meilisearch/index.ts similarity index 100% rename from packages/builders/src/templates/meilisearch/index.ts rename to packages/server/src/templates/meilisearch/index.ts diff --git a/packages/builders/src/templates/metabase/docker-compose.yml b/packages/server/src/templates/metabase/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/metabase/docker-compose.yml rename to packages/server/src/templates/metabase/docker-compose.yml diff --git a/packages/builders/src/templates/metabase/index.ts b/packages/server/src/templates/metabase/index.ts similarity index 100% rename from packages/builders/src/templates/metabase/index.ts rename to packages/server/src/templates/metabase/index.ts diff --git a/packages/builders/src/templates/minio/docker-compose.yml b/packages/server/src/templates/minio/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/minio/docker-compose.yml rename to packages/server/src/templates/minio/docker-compose.yml diff --git a/packages/builders/src/templates/minio/index.ts b/packages/server/src/templates/minio/index.ts similarity index 100% rename from packages/builders/src/templates/minio/index.ts rename to packages/server/src/templates/minio/index.ts diff --git a/packages/builders/src/templates/n8n/docker-compose.yml b/packages/server/src/templates/n8n/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/n8n/docker-compose.yml rename to packages/server/src/templates/n8n/docker-compose.yml diff --git a/packages/builders/src/templates/n8n/index.ts b/packages/server/src/templates/n8n/index.ts similarity index 100% rename from packages/builders/src/templates/n8n/index.ts rename to packages/server/src/templates/n8n/index.ts diff --git a/packages/builders/src/templates/nocodb/docker-compose.yml b/packages/server/src/templates/nocodb/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/nocodb/docker-compose.yml rename to packages/server/src/templates/nocodb/docker-compose.yml diff --git a/packages/builders/src/templates/nocodb/index.ts b/packages/server/src/templates/nocodb/index.ts similarity index 100% rename from packages/builders/src/templates/nocodb/index.ts rename to packages/server/src/templates/nocodb/index.ts diff --git a/packages/builders/src/templates/odoo/docker-compose.yml b/packages/server/src/templates/odoo/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/odoo/docker-compose.yml rename to packages/server/src/templates/odoo/docker-compose.yml diff --git a/packages/builders/src/templates/odoo/index.ts b/packages/server/src/templates/odoo/index.ts similarity index 100% rename from packages/builders/src/templates/odoo/index.ts rename to packages/server/src/templates/odoo/index.ts diff --git a/packages/builders/src/templates/open-webui/docker-compose.yml b/packages/server/src/templates/open-webui/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/open-webui/docker-compose.yml rename to packages/server/src/templates/open-webui/docker-compose.yml diff --git a/packages/builders/src/templates/open-webui/index.ts b/packages/server/src/templates/open-webui/index.ts similarity index 100% rename from packages/builders/src/templates/open-webui/index.ts rename to packages/server/src/templates/open-webui/index.ts diff --git a/packages/builders/src/templates/phpmyadmin/docker-compose.yml b/packages/server/src/templates/phpmyadmin/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/phpmyadmin/docker-compose.yml rename to packages/server/src/templates/phpmyadmin/docker-compose.yml diff --git a/packages/builders/src/templates/phpmyadmin/index.ts b/packages/server/src/templates/phpmyadmin/index.ts similarity index 100% rename from packages/builders/src/templates/phpmyadmin/index.ts rename to packages/server/src/templates/phpmyadmin/index.ts diff --git a/packages/builders/src/templates/plausible/docker-compose.yml b/packages/server/src/templates/plausible/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/plausible/docker-compose.yml rename to packages/server/src/templates/plausible/docker-compose.yml diff --git a/packages/builders/src/templates/plausible/index.ts b/packages/server/src/templates/plausible/index.ts similarity index 100% rename from packages/builders/src/templates/plausible/index.ts rename to packages/server/src/templates/plausible/index.ts diff --git a/packages/builders/src/templates/pocketbase/docker-compose.yml b/packages/server/src/templates/pocketbase/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/pocketbase/docker-compose.yml rename to packages/server/src/templates/pocketbase/docker-compose.yml diff --git a/packages/builders/src/templates/pocketbase/index.ts b/packages/server/src/templates/pocketbase/index.ts similarity index 100% rename from packages/builders/src/templates/pocketbase/index.ts rename to packages/server/src/templates/pocketbase/index.ts diff --git a/packages/builders/src/templates/rocketchat/docker-compose.yml b/packages/server/src/templates/rocketchat/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/rocketchat/docker-compose.yml rename to packages/server/src/templates/rocketchat/docker-compose.yml diff --git a/packages/builders/src/templates/rocketchat/index.ts b/packages/server/src/templates/rocketchat/index.ts similarity index 100% rename from packages/builders/src/templates/rocketchat/index.ts rename to packages/server/src/templates/rocketchat/index.ts diff --git a/packages/builders/src/templates/soketi/docker-compose.yml b/packages/server/src/templates/soketi/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/soketi/docker-compose.yml rename to packages/server/src/templates/soketi/docker-compose.yml diff --git a/packages/builders/src/templates/soketi/index.ts b/packages/server/src/templates/soketi/index.ts similarity index 100% rename from packages/builders/src/templates/soketi/index.ts rename to packages/server/src/templates/soketi/index.ts diff --git a/packages/builders/src/templates/supabase/docker-compose.yml b/packages/server/src/templates/supabase/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/supabase/docker-compose.yml rename to packages/server/src/templates/supabase/docker-compose.yml diff --git a/packages/builders/src/templates/supabase/index.ts b/packages/server/src/templates/supabase/index.ts similarity index 100% rename from packages/builders/src/templates/supabase/index.ts rename to packages/server/src/templates/supabase/index.ts diff --git a/packages/builders/src/templates/teable/docker-compose.yml b/packages/server/src/templates/teable/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/teable/docker-compose.yml rename to packages/server/src/templates/teable/docker-compose.yml diff --git a/packages/builders/src/templates/teable/index.ts b/packages/server/src/templates/teable/index.ts similarity index 100% rename from packages/builders/src/templates/teable/index.ts rename to packages/server/src/templates/teable/index.ts diff --git a/packages/builders/src/templates/templates.ts b/packages/server/src/templates/templates.ts similarity index 100% rename from packages/builders/src/templates/templates.ts rename to packages/server/src/templates/templates.ts diff --git a/packages/builders/src/templates/typebot/docker-compose.yml b/packages/server/src/templates/typebot/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/typebot/docker-compose.yml rename to packages/server/src/templates/typebot/docker-compose.yml diff --git a/packages/builders/src/templates/typebot/index.ts b/packages/server/src/templates/typebot/index.ts similarity index 100% rename from packages/builders/src/templates/typebot/index.ts rename to packages/server/src/templates/typebot/index.ts diff --git a/packages/builders/src/templates/types/templates-data.type.ts b/packages/server/src/templates/types/templates-data.type.ts similarity index 100% rename from packages/builders/src/templates/types/templates-data.type.ts rename to packages/server/src/templates/types/templates-data.type.ts diff --git a/packages/builders/src/templates/umami/docker-compose.yml b/packages/server/src/templates/umami/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/umami/docker-compose.yml rename to packages/server/src/templates/umami/docker-compose.yml diff --git a/packages/builders/src/templates/umami/index.ts b/packages/server/src/templates/umami/index.ts similarity index 100% rename from packages/builders/src/templates/umami/index.ts rename to packages/server/src/templates/umami/index.ts diff --git a/packages/builders/src/templates/uptime-kuma/docker-compose.yml b/packages/server/src/templates/uptime-kuma/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/uptime-kuma/docker-compose.yml rename to packages/server/src/templates/uptime-kuma/docker-compose.yml diff --git a/packages/builders/src/templates/uptime-kuma/index.ts b/packages/server/src/templates/uptime-kuma/index.ts similarity index 100% rename from packages/builders/src/templates/uptime-kuma/index.ts rename to packages/server/src/templates/uptime-kuma/index.ts diff --git a/packages/builders/src/templates/utils/index.ts b/packages/server/src/templates/utils/index.ts similarity index 100% rename from packages/builders/src/templates/utils/index.ts rename to packages/server/src/templates/utils/index.ts diff --git a/packages/builders/src/templates/wordpress/docker-compose.yml b/packages/server/src/templates/wordpress/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/wordpress/docker-compose.yml rename to packages/server/src/templates/wordpress/docker-compose.yml diff --git a/packages/builders/src/templates/wordpress/index.ts b/packages/server/src/templates/wordpress/index.ts similarity index 100% rename from packages/builders/src/templates/wordpress/index.ts rename to packages/server/src/templates/wordpress/index.ts diff --git a/packages/builders/src/templates/zipline/docker-compose.yml b/packages/server/src/templates/zipline/docker-compose.yml similarity index 100% rename from packages/builders/src/templates/zipline/docker-compose.yml rename to packages/server/src/templates/zipline/docker-compose.yml diff --git a/packages/builders/src/templates/zipline/index.ts b/packages/server/src/templates/zipline/index.ts similarity index 100% rename from packages/builders/src/templates/zipline/index.ts rename to packages/server/src/templates/zipline/index.ts diff --git a/packages/builders/src/types/with.ts b/packages/server/src/types/with.ts similarity index 100% rename from packages/builders/src/types/with.ts rename to packages/server/src/types/with.ts diff --git a/packages/builders/src/utils/access-log/handler.ts b/packages/server/src/utils/access-log/handler.ts similarity index 100% rename from packages/builders/src/utils/access-log/handler.ts rename to packages/server/src/utils/access-log/handler.ts index 64fe013b..0e2c659c 100644 --- a/packages/builders/src/utils/access-log/handler.ts +++ b/packages/server/src/utils/access-log/handler.ts @@ -1,5 +1,5 @@ -import { findAdmin, updateAdmin } from "@/server/services/admin"; import { IS_CLOUD, paths } from "@/server/constants"; +import { findAdmin, updateAdmin } from "@/server/services/admin"; import { type RotatingFileStream, createStream } from "rotating-file-stream"; import { execAsync } from "../process/execAsync"; diff --git a/packages/builders/src/utils/access-log/types.ts b/packages/server/src/utils/access-log/types.ts similarity index 100% rename from packages/builders/src/utils/access-log/types.ts rename to packages/server/src/utils/access-log/types.ts diff --git a/packages/builders/src/utils/access-log/utils.ts b/packages/server/src/utils/access-log/utils.ts similarity index 100% rename from packages/builders/src/utils/access-log/utils.ts rename to packages/server/src/utils/access-log/utils.ts diff --git a/packages/builders/src/utils/backups/index.ts b/packages/server/src/utils/backups/index.ts similarity index 100% rename from packages/builders/src/utils/backups/index.ts rename to packages/server/src/utils/backups/index.ts diff --git a/packages/builders/src/utils/backups/mariadb.ts b/packages/server/src/utils/backups/mariadb.ts similarity index 100% rename from packages/builders/src/utils/backups/mariadb.ts rename to packages/server/src/utils/backups/mariadb.ts diff --git a/packages/builders/src/utils/backups/mongo.ts b/packages/server/src/utils/backups/mongo.ts similarity index 100% rename from packages/builders/src/utils/backups/mongo.ts rename to packages/server/src/utils/backups/mongo.ts diff --git a/packages/builders/src/utils/backups/mysql.ts b/packages/server/src/utils/backups/mysql.ts similarity index 100% rename from packages/builders/src/utils/backups/mysql.ts rename to packages/server/src/utils/backups/mysql.ts diff --git a/packages/builders/src/utils/backups/postgres.ts b/packages/server/src/utils/backups/postgres.ts similarity index 100% rename from packages/builders/src/utils/backups/postgres.ts rename to packages/server/src/utils/backups/postgres.ts diff --git a/packages/builders/src/utils/backups/utils.ts b/packages/server/src/utils/backups/utils.ts similarity index 100% rename from packages/builders/src/utils/backups/utils.ts rename to packages/server/src/utils/backups/utils.ts diff --git a/packages/builders/src/utils/builders/compose.ts b/packages/server/src/utils/builders/compose.ts similarity index 100% rename from packages/builders/src/utils/builders/compose.ts rename to packages/server/src/utils/builders/compose.ts diff --git a/packages/builders/src/utils/builders/docker-file.ts b/packages/server/src/utils/builders/docker-file.ts similarity index 100% rename from packages/builders/src/utils/builders/docker-file.ts rename to packages/server/src/utils/builders/docker-file.ts diff --git a/packages/builders/src/utils/builders/drop.ts b/packages/server/src/utils/builders/drop.ts similarity index 100% rename from packages/builders/src/utils/builders/drop.ts rename to packages/server/src/utils/builders/drop.ts index ef888670..14307886 100644 --- a/packages/builders/src/utils/builders/drop.ts +++ b/packages/server/src/utils/builders/drop.ts @@ -1,8 +1,8 @@ import fs from "node:fs/promises"; import path, { join } from "node:path"; +import { paths } from "@/server/constants"; import type { Application } from "@/server/services/application"; import { findServerById } from "@/server/services/server"; -import { paths } from "@/server/constants"; import AdmZip from "adm-zip"; import { Client, type SFTPWrapper } from "ssh2"; import { diff --git a/packages/builders/src/utils/builders/heroku.ts b/packages/server/src/utils/builders/heroku.ts similarity index 100% rename from packages/builders/src/utils/builders/heroku.ts rename to packages/server/src/utils/builders/heroku.ts diff --git a/packages/builders/src/utils/builders/index.ts b/packages/server/src/utils/builders/index.ts similarity index 100% rename from packages/builders/src/utils/builders/index.ts rename to packages/server/src/utils/builders/index.ts diff --git a/packages/builders/src/utils/builders/nixpacks.ts b/packages/server/src/utils/builders/nixpacks.ts similarity index 100% rename from packages/builders/src/utils/builders/nixpacks.ts rename to packages/server/src/utils/builders/nixpacks.ts diff --git a/packages/builders/src/utils/builders/paketo.ts b/packages/server/src/utils/builders/paketo.ts similarity index 100% rename from packages/builders/src/utils/builders/paketo.ts rename to packages/server/src/utils/builders/paketo.ts diff --git a/packages/builders/src/utils/builders/static.ts b/packages/server/src/utils/builders/static.ts similarity index 100% rename from packages/builders/src/utils/builders/static.ts rename to packages/server/src/utils/builders/static.ts diff --git a/packages/builders/src/utils/builders/utils.ts b/packages/server/src/utils/builders/utils.ts similarity index 100% rename from packages/builders/src/utils/builders/utils.ts rename to packages/server/src/utils/builders/utils.ts diff --git a/packages/builders/src/utils/cluster/upload.ts b/packages/server/src/utils/cluster/upload.ts similarity index 100% rename from packages/builders/src/utils/cluster/upload.ts rename to packages/server/src/utils/cluster/upload.ts diff --git a/packages/builders/src/utils/databases/mariadb.ts b/packages/server/src/utils/databases/mariadb.ts similarity index 100% rename from packages/builders/src/utils/databases/mariadb.ts rename to packages/server/src/utils/databases/mariadb.ts diff --git a/packages/builders/src/utils/databases/mongo.ts b/packages/server/src/utils/databases/mongo.ts similarity index 100% rename from packages/builders/src/utils/databases/mongo.ts rename to packages/server/src/utils/databases/mongo.ts diff --git a/packages/builders/src/utils/databases/mysql.ts b/packages/server/src/utils/databases/mysql.ts similarity index 100% rename from packages/builders/src/utils/databases/mysql.ts rename to packages/server/src/utils/databases/mysql.ts diff --git a/packages/builders/src/utils/databases/postgres.ts b/packages/server/src/utils/databases/postgres.ts similarity index 100% rename from packages/builders/src/utils/databases/postgres.ts rename to packages/server/src/utils/databases/postgres.ts diff --git a/packages/builders/src/utils/databases/redis.ts b/packages/server/src/utils/databases/redis.ts similarity index 100% rename from packages/builders/src/utils/databases/redis.ts rename to packages/server/src/utils/databases/redis.ts diff --git a/packages/builders/src/utils/docker/compose.ts b/packages/server/src/utils/docker/compose.ts similarity index 100% rename from packages/builders/src/utils/docker/compose.ts rename to packages/server/src/utils/docker/compose.ts diff --git a/packages/builders/src/utils/docker/compose/configs.ts b/packages/server/src/utils/docker/compose/configs.ts similarity index 100% rename from packages/builders/src/utils/docker/compose/configs.ts rename to packages/server/src/utils/docker/compose/configs.ts diff --git a/packages/builders/src/utils/docker/compose/network.ts b/packages/server/src/utils/docker/compose/network.ts similarity index 100% rename from packages/builders/src/utils/docker/compose/network.ts rename to packages/server/src/utils/docker/compose/network.ts diff --git a/packages/builders/src/utils/docker/compose/secrets.ts b/packages/server/src/utils/docker/compose/secrets.ts similarity index 100% rename from packages/builders/src/utils/docker/compose/secrets.ts rename to packages/server/src/utils/docker/compose/secrets.ts diff --git a/packages/builders/src/utils/docker/compose/service.ts b/packages/server/src/utils/docker/compose/service.ts similarity index 100% rename from packages/builders/src/utils/docker/compose/service.ts rename to packages/server/src/utils/docker/compose/service.ts diff --git a/packages/builders/src/utils/docker/compose/volume.ts b/packages/server/src/utils/docker/compose/volume.ts similarity index 100% rename from packages/builders/src/utils/docker/compose/volume.ts rename to packages/server/src/utils/docker/compose/volume.ts diff --git a/packages/builders/src/utils/docker/domain.ts b/packages/server/src/utils/docker/domain.ts similarity index 100% rename from packages/builders/src/utils/docker/domain.ts rename to packages/server/src/utils/docker/domain.ts index d574a172..a2d1e617 100644 --- a/packages/builders/src/utils/docker/domain.ts +++ b/packages/server/src/utils/docker/domain.ts @@ -1,9 +1,9 @@ import fs, { existsSync, readFileSync } from "node:fs"; import { writeFile } from "node:fs/promises"; import { join } from "node:path"; +import { paths } from "@/server/constants"; import type { Compose } from "@/server/services/compose"; import type { Domain } from "@/server/services/domain"; -import { paths } from "@/server/constants"; import { dump, load } from "js-yaml"; import { execAsyncRemote } from "../process/execAsync"; import { diff --git a/packages/builders/src/utils/docker/types.ts b/packages/server/src/utils/docker/types.ts similarity index 100% rename from packages/builders/src/utils/docker/types.ts rename to packages/server/src/utils/docker/types.ts diff --git a/packages/builders/src/utils/docker/utils.ts b/packages/server/src/utils/docker/utils.ts similarity index 100% rename from packages/builders/src/utils/docker/utils.ts rename to packages/server/src/utils/docker/utils.ts diff --git a/packages/builders/src/utils/filesystem/directory.ts b/packages/server/src/utils/filesystem/directory.ts similarity index 100% rename from packages/builders/src/utils/filesystem/directory.ts rename to packages/server/src/utils/filesystem/directory.ts index b63d4b9c..017c74e0 100644 --- a/packages/builders/src/utils/filesystem/directory.ts +++ b/packages/server/src/utils/filesystem/directory.ts @@ -1,7 +1,7 @@ import fs, { promises as fsPromises } from "node:fs"; import path from "node:path"; -import type { Application } from "@/server/services/application"; import { paths } from "@/server/constants"; +import type { Application } from "@/server/services/application"; import { execAsync, execAsyncRemote } from "../process/execAsync"; export const recreateDirectory = async (pathFolder: string): Promise => { diff --git a/packages/builders/src/utils/filesystem/ssh.ts b/packages/server/src/utils/filesystem/ssh.ts similarity index 100% rename from packages/builders/src/utils/filesystem/ssh.ts rename to packages/server/src/utils/filesystem/ssh.ts diff --git a/packages/builders/src/utils/notifications/build-error.ts b/packages/server/src/utils/notifications/build-error.ts similarity index 100% rename from packages/builders/src/utils/notifications/build-error.ts rename to packages/server/src/utils/notifications/build-error.ts index d1f87818..f1a7f3fe 100644 --- a/packages/builders/src/utils/notifications/build-error.ts +++ b/packages/server/src/utils/notifications/build-error.ts @@ -1,6 +1,6 @@ -import BuildFailedEmail from "@/server/emails/emails/build-failed"; import { db } from "@/server/db"; import { notifications } from "@/server/db/schema"; +import BuildFailedEmail from "@/server/emails/emails/build-failed"; import { renderAsync } from "@react-email/components"; import { eq } from "drizzle-orm"; import { diff --git a/packages/builders/src/utils/notifications/build-success.ts b/packages/server/src/utils/notifications/build-success.ts similarity index 100% rename from packages/builders/src/utils/notifications/build-success.ts rename to packages/server/src/utils/notifications/build-success.ts index 2d2dbb96..4bc21086 100644 --- a/packages/builders/src/utils/notifications/build-success.ts +++ b/packages/server/src/utils/notifications/build-success.ts @@ -1,6 +1,6 @@ -import BuildSuccessEmail from "@/server/emails/emails/build-success"; import { db } from "@/server/db"; import { notifications } from "@/server/db/schema"; +import BuildSuccessEmail from "@/server/emails/emails/build-success"; import { renderAsync } from "@react-email/components"; import { eq } from "drizzle-orm"; import { diff --git a/packages/builders/src/utils/notifications/database-backup.ts b/packages/server/src/utils/notifications/database-backup.ts similarity index 100% rename from packages/builders/src/utils/notifications/database-backup.ts rename to packages/server/src/utils/notifications/database-backup.ts index 2431fb93..f631e224 100644 --- a/packages/builders/src/utils/notifications/database-backup.ts +++ b/packages/server/src/utils/notifications/database-backup.ts @@ -1,6 +1,6 @@ -import DatabaseBackupEmail from "@/server/emails/emails/database-backup"; import { db } from "@/server/db"; import { notifications } from "@/server/db/schema"; +import DatabaseBackupEmail from "@/server/emails/emails/database-backup"; import { renderAsync } from "@react-email/components"; import { eq } from "drizzle-orm"; import { diff --git a/packages/builders/src/utils/notifications/docker-cleanup.ts b/packages/server/src/utils/notifications/docker-cleanup.ts similarity index 100% rename from packages/builders/src/utils/notifications/docker-cleanup.ts rename to packages/server/src/utils/notifications/docker-cleanup.ts index 55379b32..6f0f4a6e 100644 --- a/packages/builders/src/utils/notifications/docker-cleanup.ts +++ b/packages/server/src/utils/notifications/docker-cleanup.ts @@ -1,6 +1,6 @@ -import DockerCleanupEmail from "@/server/emails/emails/docker-cleanup"; import { db } from "@/server/db"; import { notifications } from "@/server/db/schema"; +import DockerCleanupEmail from "@/server/emails/emails/docker-cleanup"; import { renderAsync } from "@react-email/components"; import { eq } from "drizzle-orm"; import { diff --git a/packages/builders/src/utils/notifications/dokploy-restart.ts b/packages/server/src/utils/notifications/dokploy-restart.ts similarity index 100% rename from packages/builders/src/utils/notifications/dokploy-restart.ts rename to packages/server/src/utils/notifications/dokploy-restart.ts index 9a2da4e7..cd986d55 100644 --- a/packages/builders/src/utils/notifications/dokploy-restart.ts +++ b/packages/server/src/utils/notifications/dokploy-restart.ts @@ -1,6 +1,6 @@ -import DokployRestartEmail from "@/server/emails/emails/dokploy-restart"; import { db } from "@/server/db"; import { notifications } from "@/server/db/schema"; +import DokployRestartEmail from "@/server/emails/emails/dokploy-restart"; import { renderAsync } from "@react-email/components"; import { eq } from "drizzle-orm"; import { diff --git a/packages/builders/src/utils/notifications/utils.ts b/packages/server/src/utils/notifications/utils.ts similarity index 100% rename from packages/builders/src/utils/notifications/utils.ts rename to packages/server/src/utils/notifications/utils.ts diff --git a/packages/builders/src/utils/process/execAsync.ts b/packages/server/src/utils/process/execAsync.ts similarity index 100% rename from packages/builders/src/utils/process/execAsync.ts rename to packages/server/src/utils/process/execAsync.ts diff --git a/packages/builders/src/utils/process/spawnAsync.ts b/packages/server/src/utils/process/spawnAsync.ts similarity index 100% rename from packages/builders/src/utils/process/spawnAsync.ts rename to packages/server/src/utils/process/spawnAsync.ts diff --git a/packages/builders/src/utils/providers/bitbucket.ts b/packages/server/src/utils/providers/bitbucket.ts similarity index 100% rename from packages/builders/src/utils/providers/bitbucket.ts rename to packages/server/src/utils/providers/bitbucket.ts index 6a09e9a3..8bf421c7 100644 --- a/packages/builders/src/utils/providers/bitbucket.ts +++ b/packages/server/src/utils/providers/bitbucket.ts @@ -1,12 +1,12 @@ import { createWriteStream } from "node:fs"; import { join } from "node:path"; -import { findBitbucketById } from "@/server/services/bitbucket"; -import type { Compose } from "@/server/services/compose"; import { paths } from "@/server/constants"; import type { apiBitbucketTestConnection, apiFindBitbucketBranches, } from "@/server/db/schema"; +import { findBitbucketById } from "@/server/services/bitbucket"; +import type { Compose } from "@/server/services/compose"; import type { InferResultType } from "@/server/types/with"; import { TRPCError } from "@trpc/server"; import { recreateDirectory } from "../filesystem/directory"; diff --git a/packages/builders/src/utils/providers/docker.ts b/packages/server/src/utils/providers/docker.ts similarity index 100% rename from packages/builders/src/utils/providers/docker.ts rename to packages/server/src/utils/providers/docker.ts diff --git a/packages/builders/src/utils/providers/git.ts b/packages/server/src/utils/providers/git.ts similarity index 100% rename from packages/builders/src/utils/providers/git.ts rename to packages/server/src/utils/providers/git.ts index 0869f45d..43173c7d 100644 --- a/packages/builders/src/utils/providers/git.ts +++ b/packages/server/src/utils/providers/git.ts @@ -1,8 +1,8 @@ import { createWriteStream } from "node:fs"; import path, { join } from "node:path"; +import { paths } from "@/server/constants"; import type { Compose } from "@/server/services/compose"; import { updateSSHKeyById } from "@/server/services/ssh-key"; -import { paths } from "@/server/constants"; import { TRPCError } from "@trpc/server"; import { recreateDirectory } from "../filesystem/directory"; import { execAsync, execAsyncRemote } from "../process/execAsync"; diff --git a/packages/builders/src/utils/providers/github.ts b/packages/server/src/utils/providers/github.ts similarity index 100% rename from packages/builders/src/utils/providers/github.ts rename to packages/server/src/utils/providers/github.ts index fb0c9b68..abd704d8 100644 --- a/packages/builders/src/utils/providers/github.ts +++ b/packages/server/src/utils/providers/github.ts @@ -8,9 +8,9 @@ import { Octokit } from "octokit"; import { recreateDirectory } from "../filesystem/directory"; import { spawnAsync } from "../process/spawnAsync"; +import type { apiFindGithubBranches } from "@/server/db/schema"; import type { Compose } from "@/server/services/compose"; import { type Github, findGithubById } from "@/server/services/github"; -import type { apiFindGithubBranches } from "@/server/db/schema"; import { execAsyncRemote } from "../process/execAsync"; export const authGithub = (githubProvider: Github): Octokit => { diff --git a/packages/builders/src/utils/providers/gitlab.ts b/packages/server/src/utils/providers/gitlab.ts similarity index 100% rename from packages/builders/src/utils/providers/gitlab.ts rename to packages/server/src/utils/providers/gitlab.ts index a61e1224..4164ee19 100644 --- a/packages/builders/src/utils/providers/gitlab.ts +++ b/packages/server/src/utils/providers/gitlab.ts @@ -1,13 +1,13 @@ import { createWriteStream } from "node:fs"; import { join } from "node:path"; +import { paths } from "@/server/constants"; +import type { apiGitlabTestConnection } from "@/server/db/schema"; import type { Compose } from "@/server/services/compose"; import { type Gitlab, findGitlabById, updateGitlab, } from "@/server/services/gitlab"; -import { paths } from "@/server/constants"; -import type { apiGitlabTestConnection } from "@/server/db/schema"; import type { InferResultType } from "@/server/types/with"; import { TRPCError } from "@trpc/server"; import { recreateDirectory } from "../filesystem/directory"; diff --git a/packages/builders/src/utils/providers/raw.ts b/packages/server/src/utils/providers/raw.ts similarity index 100% rename from packages/builders/src/utils/providers/raw.ts rename to packages/server/src/utils/providers/raw.ts index 567b28df..bf7c858b 100644 --- a/packages/builders/src/utils/providers/raw.ts +++ b/packages/server/src/utils/providers/raw.ts @@ -1,8 +1,8 @@ import { createWriteStream } from "node:fs"; import { writeFile } from "node:fs/promises"; import { join } from "node:path"; -import type { Compose } from "@/server/services/compose"; import { paths } from "@/server/constants"; +import type { Compose } from "@/server/services/compose"; import { encodeBase64 } from "../docker/utils"; import { recreateDirectory } from "../filesystem/directory"; import { execAsyncRemote } from "../process/execAsync"; diff --git a/packages/builders/src/utils/servers/remote-docker.ts b/packages/server/src/utils/servers/remote-docker.ts similarity index 100% rename from packages/builders/src/utils/servers/remote-docker.ts rename to packages/server/src/utils/servers/remote-docker.ts index 8959208b..c129df83 100644 --- a/packages/builders/src/utils/servers/remote-docker.ts +++ b/packages/server/src/utils/servers/remote-docker.ts @@ -1,5 +1,5 @@ -import { findServerById } from "@/server/services/server"; import { docker } from "@/server/constants"; +import { findServerById } from "@/server/services/server"; import Dockerode from "dockerode"; export const getRemoteDocker = async (serverId?: string | null) => { diff --git a/packages/builders/src/utils/traefik/application.ts b/packages/server/src/utils/traefik/application.ts similarity index 100% rename from packages/builders/src/utils/traefik/application.ts rename to packages/server/src/utils/traefik/application.ts index ac86d8b9..66c51cbf 100644 --- a/packages/builders/src/utils/traefik/application.ts +++ b/packages/server/src/utils/traefik/application.ts @@ -1,7 +1,7 @@ import fs, { writeFileSync } from "node:fs"; import path from "node:path"; -import type { Domain } from "@/server/services/domain"; import { paths } from "@/server/constants"; +import type { Domain } from "@/server/services/domain"; import { dump, load } from "js-yaml"; import { encodeBase64 } from "../docker/utils"; import { execAsyncRemote } from "../process/execAsync"; diff --git a/packages/builders/src/utils/traefik/domain.ts b/packages/server/src/utils/traefik/domain.ts similarity index 100% rename from packages/builders/src/utils/traefik/domain.ts rename to packages/server/src/utils/traefik/domain.ts diff --git a/packages/builders/src/utils/traefik/file-types.ts b/packages/server/src/utils/traefik/file-types.ts similarity index 100% rename from packages/builders/src/utils/traefik/file-types.ts rename to packages/server/src/utils/traefik/file-types.ts diff --git a/packages/builders/src/utils/traefik/middleware.ts b/packages/server/src/utils/traefik/middleware.ts similarity index 100% rename from packages/builders/src/utils/traefik/middleware.ts rename to packages/server/src/utils/traefik/middleware.ts diff --git a/packages/builders/src/utils/traefik/redirect.ts b/packages/server/src/utils/traefik/redirect.ts similarity index 100% rename from packages/builders/src/utils/traefik/redirect.ts rename to packages/server/src/utils/traefik/redirect.ts diff --git a/packages/builders/src/utils/traefik/registry.ts b/packages/server/src/utils/traefik/registry.ts similarity index 100% rename from packages/builders/src/utils/traefik/registry.ts rename to packages/server/src/utils/traefik/registry.ts index c942a4ab..e857dd2d 100644 --- a/packages/builders/src/utils/traefik/registry.ts +++ b/packages/server/src/utils/traefik/registry.ts @@ -1,7 +1,7 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs"; import { join } from "node:path"; -import type { Registry } from "@/server/services/registry"; import { paths } from "@/server/constants"; +import type { Registry } from "@/server/services/registry"; import { dump, load } from "js-yaml"; import { removeDirectoryIfExistsContent } from "../filesystem/directory"; import type { FileConfig, HttpRouter } from "./file-types"; diff --git a/packages/builders/src/utils/traefik/security.ts b/packages/server/src/utils/traefik/security.ts similarity index 100% rename from packages/builders/src/utils/traefik/security.ts rename to packages/server/src/utils/traefik/security.ts diff --git a/packages/builders/src/utils/traefik/types.ts b/packages/server/src/utils/traefik/types.ts similarity index 100% rename from packages/builders/src/utils/traefik/types.ts rename to packages/server/src/utils/traefik/types.ts diff --git a/packages/builders/src/utils/traefik/web-server.ts b/packages/server/src/utils/traefik/web-server.ts similarity index 100% rename from packages/builders/src/utils/traefik/web-server.ts rename to packages/server/src/utils/traefik/web-server.ts index 3c87c70e..cd8f8d1a 100644 --- a/packages/builders/src/utils/traefik/web-server.ts +++ b/packages/server/src/utils/traefik/web-server.ts @@ -1,7 +1,7 @@ import { existsSync, readFileSync, writeFileSync } from "node:fs"; import { join } from "node:path"; -import type { Admin } from "@/server/services/admin"; import { paths } from "@/server/constants"; +import type { Admin } from "@/server/services/admin"; import { dump, load } from "js-yaml"; import { loadOrCreateConfig, writeTraefikConfig } from "./application"; import type { FileConfig } from "./file-types"; diff --git a/packages/builders/src/wss/docker-container-logs.ts b/packages/server/src/wss/docker-container-logs.ts similarity index 100% rename from packages/builders/src/wss/docker-container-logs.ts rename to packages/server/src/wss/docker-container-logs.ts index 95028097..e01e82a7 100644 --- a/packages/builders/src/wss/docker-container-logs.ts +++ b/packages/server/src/wss/docker-container-logs.ts @@ -1,8 +1,8 @@ import type http from "node:http"; +import { findServerById } from "@/server/services/server"; import { spawn } from "node-pty"; import { Client } from "ssh2"; import { WebSocketServer } from "ws"; -import { findServerById } from "@/server/services/server"; import { validateWebSocketRequest } from "../auth/auth"; import { getShell } from "./utils"; diff --git a/packages/builders/src/wss/docker-container-terminal.ts b/packages/server/src/wss/docker-container-terminal.ts similarity index 100% rename from packages/builders/src/wss/docker-container-terminal.ts rename to packages/server/src/wss/docker-container-terminal.ts index b2a25a79..0a944df5 100644 --- a/packages/builders/src/wss/docker-container-terminal.ts +++ b/packages/server/src/wss/docker-container-terminal.ts @@ -1,8 +1,8 @@ import type http from "node:http"; +import { findServerById } from "@/server/services/server"; import { spawn } from "node-pty"; import { Client } from "ssh2"; import { WebSocketServer } from "ws"; -import { findServerById } from "@/server/services/server"; import { validateWebSocketRequest } from "../auth/auth"; import { getShell } from "./utils"; diff --git a/packages/builders/src/wss/docker-stats.ts b/packages/server/src/wss/docker-stats.ts similarity index 100% rename from packages/builders/src/wss/docker-stats.ts rename to packages/server/src/wss/docker-stats.ts diff --git a/packages/builders/src/wss/listen-deployment.ts b/packages/server/src/wss/listen-deployment.ts similarity index 100% rename from packages/builders/src/wss/listen-deployment.ts rename to packages/server/src/wss/listen-deployment.ts index 15561e9c..0ff633b5 100644 --- a/packages/builders/src/wss/listen-deployment.ts +++ b/packages/server/src/wss/listen-deployment.ts @@ -1,8 +1,8 @@ import { spawn } from "node:child_process"; import type http from "node:http"; +import { findServerById } from "@/server/services/server"; import { Client } from "ssh2"; import { WebSocketServer } from "ws"; -import { findServerById } from "@/server/services/server"; import { validateWebSocketRequest } from "../auth/auth"; export const setupDeploymentLogsWebSocketServer = ( diff --git a/packages/builders/src/wss/terminal.ts b/packages/server/src/wss/terminal.ts similarity index 100% rename from packages/builders/src/wss/terminal.ts rename to packages/server/src/wss/terminal.ts index 1113fe4a..019efd43 100644 --- a/packages/builders/src/wss/terminal.ts +++ b/packages/server/src/wss/terminal.ts @@ -1,9 +1,9 @@ import type http from "node:http"; import path from "node:path"; +import { findServerById } from "@/server/services/server"; import { spawn } from "node-pty"; import { publicIpv4, publicIpv6 } from "public-ip"; import { WebSocketServer } from "ws"; -import { findServerById } from "@/server/services/server"; import { validateWebSocketRequest } from "../auth/auth"; import { paths } from "../constants"; diff --git a/packages/builders/src/wss/utils.ts b/packages/server/src/wss/utils.ts similarity index 100% rename from packages/builders/src/wss/utils.ts rename to packages/server/src/wss/utils.ts diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json new file mode 100644 index 00000000..1f75de81 --- /dev/null +++ b/packages/server/tsconfig.json @@ -0,0 +1,43 @@ +{ + "compilerOptions": { + /* Base Options: */ + "esModuleInterop": true, + "skipLibCheck": true, + "target": "es2022", + "allowJs": true, + "resolveJsonModule": true, + "moduleDetection": "force", + "isolatedModules": true, + /* Strictness */ + "strict": true, + "noUncheckedIndexedAccess": true, + "checkJs": true, + + /* Bundled projects */ + "lib": ["dom", "dom.iterable", "ES2022"], + "noEmit": true, + "module": "ESNext", + "moduleResolution": "Bundler", + "jsx": "preserve", + "plugins": [{ "name": "next" }], + "incremental": true, + "outDir": "./dist", + /* Path Aliases */ + "baseUrl": ".", + "paths": { + "@/server/*": ["./src/*"] + } + }, + + "include": ["next-env.d.ts", "./src/**/*.ts"], + "exclude": [ + "tsup.ts", + "node_modules", + "dokploy", + "config", + "dist", + "webpack.config.server.js", + "migration.ts", + "setup.ts" + ] +} diff --git a/packages/server/tsconfig.server.json b/packages/server/tsconfig.server.json new file mode 100644 index 00000000..0de10162 --- /dev/null +++ b/packages/server/tsconfig.server.json @@ -0,0 +1,25 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "module": "ESNext", + "outDir": "dist/", + "target": "ESNext", + "isolatedModules": false, + "noEmit": false, + "declaration": true, + "moduleResolution": "Node", + "rootDir": "./src", + "baseUrl": ".", + "incremental": false, + "jsx": "react-jsx", + "paths": { + "@/server/*": ["src/*"] + } + }, + "include": ["next-env.d.ts", "./src/**/*"], + "exclude": ["**/dist", "tsup.ts"], + "tsc-alias": { + "resolveFullPaths": true, + "verbose": false + } +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index eec9b3d5..30227904 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -42,9 +42,9 @@ importers: apps/api: dependencies: - '@dokploy/builders': + '@dokploy/server': specifier: workspace:* - version: link:../../packages/builders + version: link:../../packages/server '@hono/node-server': specifier: ^1.12.1 version: 1.12.1 @@ -158,9 +158,9 @@ importers: '@codemirror/view': specifier: 6.29.0 version: 6.29.0 - '@dokploy/builders': + '@dokploy/server': specifier: workspace:* - version: link:../../packages/builders + version: link:../../packages/server '@dokploy/trpc-openapi': specifier: 0.0.4 version: 0.0.4(@trpc/server@10.45.2)(zod@3.23.8) @@ -447,9 +447,9 @@ importers: apps/schedules: dependencies: - '@dokploy/builders': + '@dokploy/server': specifier: workspace:* - version: link:../../packages/builders + version: link:../../packages/server '@hono/node-server': specifier: ^1.12.1 version: 1.12.1 @@ -582,7 +582,7 @@ importers: specifier: ^0.5.2 version: 0.5.14(prettier@3.3.3) - packages/builders: + packages/server: dependencies: '@faker-js/faker': specifier: ^8.4.1 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index f2d5248a..fce6ea90 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -5,4 +5,4 @@ packages: - "apps/api" - "apps/schedules" - "apps/models" - - "packages/builders" + - "packages/server"