LukeParke/dokploy
1
0
Fork 0
mirror of https://github.com/LukeHagar/dokploy.git synced 2025-12-06 04:19:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: rename builders to server

Browse Source
This commit is contained in:
Mauricio Siu
2024-10-05 22:15:47 -06:00
parent 43555cdabe
commit f3ce69b656
361 changed files with 551 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/api/package.json
View File

@@ -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",

4
apps/api/src/utils.ts
View File

@@ -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;

4
apps/dokploy/__test__/compose/compose.test.ts
View File

@@ -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";

6
apps/dokploy/__test__/compose/config/config-root.test.ts
View File

@@ -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";

6
apps/dokploy/__test__/compose/config/config-service.test.ts
View File

@@ -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";

9
apps/dokploy/__test__/compose/config/config.test.ts
View File

@@ -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";

4
apps/dokploy/__test__/compose/domain/labels.test.ts
View File

@@ -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", () => {

2
apps/dokploy/__test__/compose/domain/network-root.test.ts
View File

@@ -1,4 +1,4 @@
import { addDokployNetworkToRoot } from "@dokploy/builders";
import { addDokployNetworkToRoot } from "@dokploy/server";
import { describe, expect, it } from "vitest";
describe("addDokployNetworkToRoot", () => {

2
apps/dokploy/__test__/compose/domain/network-service.test.ts
View File

@@ -1,4 +1,4 @@
import { addDokployNetworkToService } from "@dokploy/builders";
import { addDokployNetworkToService } from "@dokploy/server";
import { describe, expect, it } from "vitest";
describe("addDokployNetworkToService", () => {

6
apps/dokploy/__test__/compose/network/network-root.test.ts
View File

@@ -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";

6
apps/dokploy/__test__/compose/network/network-service.test.ts
View File

@@ -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";

8
apps/dokploy/__test__/compose/network/network.test.ts
View File

@@ -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";

6
apps/dokploy/__test__/compose/secrets/secret-root.test.ts
View File

@@ -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";

6
apps/dokploy/__test__/compose/secrets/secret-services.test.ts
View File

@@ -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";

4
apps/dokploy/__test__/compose/secrets/secret.test.ts
View File

@@ -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";

6
apps/dokploy/__test__/compose/service/service-container-name.test.ts
View File

@@ -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";

6
apps/dokploy/__test__/compose/service/service-depends-on.test.ts
View File

@@ -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";

6
apps/dokploy/__test__/compose/service/service-extends.test.ts
View File

@@ -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";

6
apps/dokploy/__test__/compose/service/service-links.test.ts
View File

@@ -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";

6
apps/dokploy/__test__/compose/service/service-names.test.ts
View File

@@ -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";

4
apps/dokploy/__test__/compose/service/service.test.ts
View File

@@ -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";

6
apps/dokploy/__test__/compose/service/sevice-volumes-from.test.ts
View File

@@ -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";

9
apps/dokploy/__test__/compose/volume/volume-2.test.ts
View File

@@ -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";

6
apps/dokploy/__test__/compose/volume/volume-root.test.ts
View File

@@ -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";

6
apps/dokploy/__test__/compose/volume/volume-services.test.ts
View File

@@ -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";

6
apps/dokploy/__test__/compose/volume/volume.test.ts
View File

@@ -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";

6
apps/dokploy/__test__/drop/drop.test.test.ts
View File

@@ -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,

2
apps/dokploy/__test__/requests/request.test.ts
View File

@@ -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"}`;

4
apps/dokploy/__test__/traefik/server/update-server-config.test.ts
View File

@@ -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 = {

8
apps/dokploy/__test__/traefik/traefik.test.ts
View File

@@ -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 = {

4
apps/dokploy/components/layouts/navigation-tabs.tsx
View File

@@ -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;

78
apps/dokploy/next.config.mjs
View File

@@ -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;

2
apps/dokploy/package.json
View File

@@ -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",

2
apps/dokploy/pages/api/[...trpc].ts
View File

@@ -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";

2
apps/dokploy/pages/api/deploy/[refreshToken].ts
View File

@@ -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";

4
apps/dokploy/pages/api/deploy/compose/[refreshToken].ts
View File

@@ -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,

4
apps/dokploy/pages/api/deploy/github.ts
View File

@@ -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,

6
apps/dokploy/pages/api/providers/github/setup.ts
View File

@@ -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";

2
apps/dokploy/pages/api/providers/gitlab/callback.ts
View File

@@ -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(

2
apps/dokploy/pages/dashboard/docker.tsx
View File

@@ -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";

2
apps/dokploy/pages/dashboard/monitoring.tsx
View File

@@ -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";

4
apps/dokploy/pages/dashboard/project/[projectId].tsx
View File

@@ -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 {

2
apps/dokploy/pages/dashboard/project/[projectId]/services/application/[applicationId].tsx
View File

@@ -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 {

2
apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx
View File

@@ -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 {

2
apps/dokploy/pages/dashboard/project/[projectId]/services/mariadb/[mariadbId].tsx
View File

@@ -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,

2
apps/dokploy/pages/dashboard/project/[projectId]/services/mongo/[mongoId].tsx
View File

@@ -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,

2
apps/dokploy/pages/dashboard/project/[projectId]/services/mysql/[mysqlId].tsx
View File

@@ -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,

2
apps/dokploy/pages/dashboard/project/[projectId]/services/postgres/[postgresId].tsx
View File

@@ -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,

2
apps/dokploy/pages/dashboard/project/[projectId]/services/redis/[redisId].tsx
View File

@@ -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,

2
apps/dokploy/pages/dashboard/projects.tsx
View File

@@ -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";

2
apps/dokploy/pages/dashboard/requests.tsx
View File

@@ -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";

2
apps/dokploy/pages/dashboard/settings/appearance.tsx
View File

@@ -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";

2
apps/dokploy/pages/dashboard/settings/certificates.tsx
View File

@@ -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";

2
apps/dokploy/pages/dashboard/settings/cluster.tsx
View File

@@ -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";

2
apps/dokploy/pages/dashboard/settings/destinations.tsx
View File

@@ -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";

2
apps/dokploy/pages/dashboard/settings/git-providers.tsx
View File

@@ -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";

2
apps/dokploy/pages/dashboard/settings/notifications.tsx
View File

@@ -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";

2
apps/dokploy/pages/dashboard/settings/profile.tsx
View File

@@ -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";

2
apps/dokploy/pages/dashboard/settings/registry.tsx
View File

@@ -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";

2
apps/dokploy/pages/dashboard/settings/server.tsx
View File

@@ -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";

2
apps/dokploy/pages/dashboard/settings/servers.tsx
View File

@@ -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";

2
apps/dokploy/pages/dashboard/settings/ssh-keys.tsx
View File

@@ -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";

2
apps/dokploy/pages/dashboard/settings/users.tsx
View File

@@ -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";

2
apps/dokploy/pages/dashboard/traefik.tsx
View File

@@ -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";

2
apps/dokploy/pages/index.tsx
View File

@@ -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";

2
apps/dokploy/pages/invitation.tsx
View File

@@ -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";

4
apps/dokploy/pages/register.tsx
View File

@@ -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({

2
apps/dokploy/pages/swagger.tsx
View File

@@ -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";

6
apps/dokploy/reset-password.ts
View File

@@ -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 {

10
apps/dokploy/server/api/routers/admin.ts
View File

@@ -7,16 +7,16 @@ import {
users,
} from "@/server/db/schema";
import { TRPCError } from "@trpc/server";
import { eq } from "drizzle-orm";
import {
createInvitation,
getUserByToken,
removeUserByAuthId,
findAdminById,
findUserByAuthId,
findUserById,
} from "@dokploy/builders";
getUserByToken,
removeUserByAuthId,
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
import { eq } from "drizzle-orm";
import { adminProcedure, createTRPCRouter, publicProcedure } from "../trpc";
export const adminRouter = createTRPCRouter({

40
apps/dokploy/server/api/routers/application.ts
View File

@@ -24,39 +24,39 @@ import {
cleanQueuesByApplication,
} from "@/server/queues/deployments-queue";
import { myQueue } from "@/server/queues/queueSetup";
import { deploy } from "@/server/utils/deploy";
import { uploadFileSchema } from "@/utils/schema";
import {
unzipDrop,
IS_CLOUD,
addNewService,
checkServiceAccess,
createApplication,
deleteAllMiddlewares,
findApplicationById,
findProjectById,
getApplicationStats,
readConfig,
readRemoteConfig,
removeDeployments,
removeDirectoryCode,
removeMonitoringDirectory,
removeService,
removeTraefikConfig,
startService,
startServiceRemote,
stopService,
stopServiceRemote,
removeDirectoryCode,
removeMonitoringDirectory,
readConfig,
readRemoteConfig,
removeTraefikConfig,
writeConfig,
writeConfigRemote,
deleteAllMiddlewares,
createApplication,
findApplicationById,
getApplicationStats,
unzipDrop,
updateApplication,
updateApplicationStatus,
removeDeployments,
addNewService,
checkServiceAccess,
IS_CLOUD,
findProjectById,
writeConfig,
writeConfigRemote,
// uploadFileSchema
} from "@dokploy/builders";
import { uploadFileSchema } from "@/utils/schema";
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
import { eq } from "drizzle-orm";
import { nanoid } from "nanoid";
import { z } from "zod";
import { deploy } from "@/server/utils/deploy";
export const applicationRouter = createTRPCRouter({
create: protectedProcedure

18
apps/dokploy/server/api/routers/auth.ts
View File

@@ -8,23 +8,23 @@ import {
apiVerify2FA,
apiVerifyLogin2FA,
} from "@/server/db/schema";
import { TRPCError } from "@trpc/server";
import * as bcrypt from "bcrypt";
import { db } from "../../db";
import {
getUserByToken,
IS_CLOUD,
createAdmin,
createUser,
findAuthByEmail,
findAuthById,
generate2FASecret,
updateAuthById,
verify2FA,
getUserByToken,
lucia,
validateRequest,
luciaToken,
IS_CLOUD,
} from "@dokploy/builders";
updateAuthById,
validateRequest,
verify2FA,
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
import * as bcrypt from "bcrypt";
import { db } from "../../db";
import {
adminProcedure,
createTRPCRouter,

20
apps/dokploy/server/api/routers/backup.ts
View File

@@ -7,22 +7,22 @@ import {
} from "@/server/db/schema";
import { removeJob, schedule } from "@/server/utils/backup";
import {
IS_CLOUD,
createBackup,
findBackupById,
removeBackupById,
updateBackupById,
runMariadbBackup,
runMongoBackup,
runMySqlBackup,
runPostgresBackup,
removeScheduleBackup,
scheduleBackup,
findMariadbByBackupId,
findMongoByBackupId,
findMySqlByBackupId,
findPostgresByBackupId,
IS_CLOUD,
} from "@dokploy/builders";
removeBackupById,
removeScheduleBackup,
runMariadbBackup,
runMongoBackup,
runMySqlBackup,
runPostgresBackup,
scheduleBackup,
updateBackupById,
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";

8
apps/dokploy/server/api/routers/bitbucket.ts
View File

@@ -8,14 +8,14 @@ import {
apiUpdateBitbucket,
} from "@/server/db/schema";
import {
IS_CLOUD,
createBitbucket,
findBitbucketById,
getBitbucketBranches,
getBitbucketRepositories,
testBitbucketConnection,
createBitbucket,
findBitbucketById,
updateBitbucket,
IS_CLOUD,
} from "@dokploy/builders";
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
export const bitbucketRouter = createTRPCRouter({

2
apps/dokploy/server/api/routers/certificate.ts
View File

@@ -6,7 +6,7 @@ import {
findCertificateById,
findCertificates,
removeCertificateById,
} from "@dokploy/builders";
} from "@dokploy/server";
export const certificateRouter = createTRPCRouter({
create: adminProcedure

7
apps/dokploy/server/api/routers/cluster.ts
View File

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

38
apps/dokploy/server/api/routers/compose.ts
View File

@@ -28,33 +28,33 @@ import _ from "lodash";
import { nanoid } from "nanoid";
import { createTRPCRouter, protectedProcedure } from "../trpc";
import { deploy } from "@/server/utils/deploy";
import {
createMount,
createCommand,
randomizeComposeFile,
removeComposeDirectory,
IS_CLOUD,
addDomainToCompose,
cloneCompose,
cloneComposeRemote,
addNewService,
checkServiceAccess,
findServerById,
findProjectById,
createDomain,
findDomainsByComposeId,
removeDeploymentsByComposeId,
cloneCompose,
cloneComposeRemote,
createCommand,
createCompose,
createComposeByTemplate,
findComposeById,
loadServices,
removeCompose,
stopCompose,
updateCompose,
createDomain,
createMount,
findAdmin,
findAdminById,
IS_CLOUD,
} from "@dokploy/builders";
import { deploy } from "@/server/utils/deploy";
findComposeById,
findDomainsByComposeId,
findProjectById,
findServerById,
loadServices,
randomizeComposeFile,
removeCompose,
removeComposeDirectory,
removeDeploymentsByComposeId,
stopCompose,
updateCompose,
} from "@dokploy/server";
export const composeRouter = createTRPCRouter({
create: protectedProcedure

4
apps/dokploy/server/api/routers/deployment.ts
View File

@@ -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

6
apps/dokploy/server/api/routers/destination.ts
View File

@@ -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({

4
apps/dokploy/server/api/routers/docker.ts
View File

@@ -1,11 +1,11 @@
import { z } from "zod";
import {
containerRestart,
getConfig,
getContainers,
getContainersByAppLabel,
getContainersByAppNameMatch,
} from "@dokploy/builders";
} from "@dokploy/server";
import { z } from "zod";
import { createTRPCRouter, protectedProcedure } from "../trpc";
export const dockerRouter = createTRPCRouter({

14
apps/dokploy/server/api/routers/domain.ts
View File

@@ -6,21 +6,21 @@ import {
apiFindOneApplication,
apiUpdateDomain,
} from "@/server/db/schema";
import { TRPCError } from "@trpc/server";
import { z } from "zod";
import {
manageDomain,
removeDomain,
findApplicationById,
createDomain,
findApplicationById,
findComposeById,
findDomainById,
findDomainsByApplicationId,
findDomainsByComposeId,
generateTraefikMeDomain,
manageDomain,
removeDomain,
removeDomainById,
updateDomainById,
findComposeById,
} from "@dokploy/builders";
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
import { z } from "zod";
export const domainRouter = createTRPCRouter({
create: protectedProcedure

10
apps/dokploy/server/api/routers/git-provider.ts
View File

@@ -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 }) => {

8
apps/dokploy/server/api/routers/github.ts
View File

@@ -5,15 +5,15 @@ import {
apiFindOneGithub,
apiUpdateGithub,
} from "@/server/db/schema";
import { TRPCError } from "@trpc/server";
import {
IS_CLOUD,
findGithubById,
getGithubBranches,
getGithubRepositories,
findGithubById,
haveGithubRequirements,
updateGitProvider,
IS_CLOUD,
} from "@dokploy/builders";
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
export const githubRouter = createTRPCRouter({
one: protectedProcedure

12
apps/dokploy/server/api/routers/gitlab.ts
View File

@@ -8,18 +8,18 @@ import {
} from "@/server/db/schema";
import { db } from "@/server/db";
import { TRPCError } from "@trpc/server";
import {
IS_CLOUD,
createGitlab,
findGitlabById,
getGitlabBranches,
getGitlabRepositories,
haveGitlabRequirements,
testGitlabConnection,
createGitlab,
findGitlabById,
updateGitlab,
updateGitProvider,
IS_CLOUD,
} from "@dokploy/builders";
updateGitlab,
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
export const gitlabRouter = createTRPCRouter({
create: protectedProcedure

22
apps/dokploy/server/api/routers/mariadb.ts
View File

@@ -9,24 +9,24 @@ import {
apiSaveExternalPortMariaDB,
apiUpdateMariaDB,
} from "@/server/db/schema";
import { TRPCError } from "@trpc/server";
import {
IS_CLOUD,
addNewService,
checkServiceAccess,
createMariadb,
createMount,
deployMariadb,
findMariadbById,
findProjectById,
removeMariadbById,
removeService,
startService,
startServiceRemote,
stopService,
stopServiceRemote,
createMariadb,
deployMariadb,
findMariadbById,
removeMariadbById,
updateMariadbById,
addNewService,
checkServiceAccess,
createMount,
findProjectById,
IS_CLOUD,
} from "@dokploy/builders";
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
export const mariadbRouter = createTRPCRouter({
create: protectedProcedure

12
apps/dokploy/server/api/routers/mongo.ts
View File

@@ -9,24 +9,24 @@ import {
apiSaveExternalPortMongo,
apiUpdateMongo,
} from "@/server/db/schema";
import { TRPCError } from "@trpc/server";
import {
IS_CLOUD,
addNewService,
checkServiceAccess,
createMount,
createMongo,
createMount,
deployMongo,
findMongoById,
findProjectById,
removeMongoById,
updateMongoById,
removeService,
startService,
startServiceRemote,
stopService,
stopServiceRemote,
findProjectById,
IS_CLOUD,
} from "@dokploy/builders";
updateMongoById,
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
export const mongoRouter = createTRPCRouter({
create: protectedProcedure

2
apps/dokploy/server/api/routers/mount.ts
View File

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

10
apps/dokploy/server/api/routers/mysql.ts
View File

@@ -13,22 +13,22 @@ import {
import { TRPCError } from "@trpc/server";
import {
IS_CLOUD,
addNewService,
checkServiceAccess,
createMount,
createMysql,
deployMySql,
findMySqlById,
findProjectById,
removeMySqlById,
updateMySqlById,
createMount,
removeService,
startService,
startServiceRemote,
stopService,
stopServiceRemote,
findProjectById,
IS_CLOUD,
} from "@dokploy/builders";
updateMySqlById,
} from "@dokploy/server";
export const mysqlRouter = createTRPCRouter({
create: protectedProcedure

16
apps/dokploy/server/api/routers/notification.ts
View File

@@ -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({

4
apps/dokploy/server/api/routers/port.ts
View File

@@ -4,13 +4,13 @@ import {
apiFindOnePort,
apiUpdatePort,
} from "@/server/db/schema";
import { TRPCError } from "@trpc/server";
import {
createPort,
finPortById,
removePortById,
updatePortById,
} from "@dokploy/builders";
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
export const portRouter = createTRPCRouter({
create: protectedProcedure

22
apps/dokploy/server/api/routers/postgres.ts
View File

@@ -9,24 +9,24 @@ import {
apiSaveExternalPortPostgres,
apiUpdatePostgres,
} from "@/server/db/schema";
import { TRPCError } from "@trpc/server";
import {
IS_CLOUD,
addNewService,
checkServiceAccess,
createMount,
createPostgres,
deployPostgres,
findPostgresById,
findProjectById,
removePostgresById,
removeService,
startService,
startServiceRemote,
stopService,
stopServiceRemote,
createMount,
addNewService,
checkServiceAccess,
createPostgres,
deployPostgres,
findPostgresById,
removePostgresById,
updatePostgresById,
findProjectById,
IS_CLOUD,
} from "@dokploy/builders";
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
export const postgresRouter = createTRPCRouter({
create: protectedProcedure

18
apps/dokploy/server/api/routers/project.ts
View File

@@ -1,18 +1,18 @@
import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc";
import { db } from "@/server/db";
import {
apiCreateProject,
apiFindOneProject,
apiRemoveProject,
apiUpdateProject,
applications,
compose,
mariadb,
mongo,
mysql,
postgres,
redis,
apiCreateProject,
apiFindOneProject,
apiRemoveProject,
apiUpdateProject,
projects,
redis,
} from "@/server/db/schema";
import { TRPCError } from "@trpc/server";
@@ -20,14 +20,14 @@ import { and, desc, eq, sql } from "drizzle-orm";
import type { AnyPgColumn } from "drizzle-orm/pg-core";
import {
addNewProject,
checkProjectAccess,
createProject,
deleteProject,
findProjectById,
updateProjectById,
addNewProject,
checkProjectAccess,
findUserByAuthId,
} from "@dokploy/builders";
updateProjectById,
} from "@dokploy/server";
export const projectRouter = createTRPCRouter({
create: protectedProcedure

4
apps/dokploy/server/api/routers/redirects.ts
View File

@@ -9,9 +9,9 @@ import {
findRedirectById,
removeRedirectById,
updateRedirectById,
} from "@dokploy/builders";
import { createTRPCRouter, protectedProcedure } from "../trpc";
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
import { createTRPCRouter, protectedProcedure } from "../trpc";
export const redirectsRouter = createTRPCRouter({
create: protectedProcedure

20
apps/dokploy/server/api/routers/redis.ts
View File

@@ -13,22 +13,22 @@ import {
import { TRPCError } from "@trpc/server";
import {
IS_CLOUD,
addNewService,
checkServiceAccess,
createMount,
createRedis,
deployRedis,
findProjectById,
findRedisById,
removeRedisById,
removeService,
startService,
startServiceRemote,
stopService,
stopServiceRemote,
createMount,
addNewService,
checkServiceAccess,
createRedis,
deployRedis,
findRedisById,
removeRedisById,
updateRedisById,
IS_CLOUD,
findProjectById,
} from "@dokploy/builders";
} from "@dokploy/server";
export const redisRouter = createTRPCRouter({
create: protectedProcedure

14
apps/dokploy/server/api/routers/registry.ts
View File

@@ -6,19 +6,19 @@ import {
apiTestRegistry,
apiUpdateRegistry,
} from "@/server/db/schema";
import { TRPCError } from "@trpc/server";
import {
execAsyncRemote,
initializeRegistry,
execAsync,
manageRegistry,
IS_CLOUD,
createRegistry,
execAsync,
execAsyncRemote,
findAllRegistryByAdminId,
findRegistryById,
initializeRegistry,
manageRegistry,
removeRegistry,
updateRegistry,
IS_CLOUD,
} from "@dokploy/builders";
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
import { adminProcedure, createTRPCRouter, protectedProcedure } from "../trpc";
export const registryRouter = createTRPCRouter({

4
apps/dokploy/server/api/routers/security.ts
View File

@@ -9,9 +9,9 @@ import {
findApplicationById,
findSecurityById,
updateSecurityById,
} from "@dokploy/builders";
import { createTRPCRouter, protectedProcedure } from "../trpc";
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
import { createTRPCRouter, protectedProcedure } from "../trpc";
export const securityRouter = createTRPCRouter({
create: protectedProcedure

12
apps/dokploy/server/api/routers/server.ts
View File

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

70
apps/dokploy/server/api/routers/settings.ts
View File

@@ -1,3 +1,4 @@
import { db } from "@/server/db";
import {
apiAssignDomain,
apiEnableDashboard,
@@ -9,61 +10,60 @@ import {
apiTraefikConfig,
apiUpdateDockerCleanup,
} from "@/server/db/schema";
import { db } from "@/server/db";
import { generateOpenApiDocument } from "@dokploy/trpc-openapi";
import { TRPCError } from "@trpc/server";
import { dump, load } from "js-yaml";
import { scheduleJob, scheduledJobs } from "node-schedule";
import { z } from "zod";
import { appRouter } from "../root";
import {
paths,
logRotationManager,
parseRawConfig,
processLogs,
initializeTraefik,
IS_CLOUD,
canAccessToTraefikFiles,
cleanStoppedContainers,
cleanUpDockerBuilder,
cleanUpSystemPrune,
cleanUpUnusedImages,
cleanUpUnusedVolumes,
execAsync,
execAsyncRemote,
findAdmin,
findServerById,
getDokployImage,
initializeTraefik,
logRotationManager,
parseRawConfig,
paths,
prepareEnvironmentVariables,
processLogs,
pullLatestRelease,
readConfig,
readConfigInPath,
readDirectory,
readMainConfig,
readMonitoringConfig,
recreateDirectory,
sendDockerCleanupNotifications,
spawnAsync,
startService,
startServiceRemote,
stopService,
stopServiceRemote,
recreateDirectory,
sendDockerCleanupNotifications,
execAsync,
execAsyncRemote,
spawnAsync,
readConfig,
readConfigInPath,
readMonitoringConfig,
writeConfig,
writeTraefikConfigInPath,
readMainConfig,
updateLetsEncryptEmail,
updateServerTraefik,
writeMainConfig,
findAdmin,
updateAdmin,
findServerById,
updateLetsEncryptEmail,
updateServerById,
canAccessToTraefikFiles,
getDokployImage,
pullLatestRelease,
readDirectory,
IS_CLOUD,
} from "@dokploy/builders";
updateServerTraefik,
writeConfig,
writeMainConfig,
writeTraefikConfigInPath,
} from "@dokploy/server";
import { generateOpenApiDocument } from "@dokploy/trpc-openapi";
import { TRPCError } from "@trpc/server";
import { sql } from "drizzle-orm";
import { dump, load } from "js-yaml";
import { scheduleJob, scheduledJobs } from "node-schedule";
import { z } from "zod";
import packageInfo from "../../../package.json";
import { appRouter } from "../root";
import {
adminProcedure,
createTRPCRouter,
protectedProcedure,
publicProcedure,
} from "../trpc";
import { sql } from "drizzle-orm";
export const settingsRouter = createTRPCRouter({
reloadServer: adminProcedure.mutation(async () => {

8
apps/dokploy/server/api/routers/ssh-key.ts
View File

@@ -8,15 +8,15 @@ import {
apiUpdateSshKey,
sshKeys,
} from "@/server/db/schema";
import { TRPCError } from "@trpc/server";
import {
generateSSHKey,
IS_CLOUD,
createSshKey,
findSSHKeyById,
generateSSHKey,
removeSSHKeyById,
updateSSHKeyById,
IS_CLOUD,
} from "@dokploy/builders";
} from "@dokploy/server";
import { TRPCError } from "@trpc/server";
import { eq } from "drizzle-orm";
export const sshRouter = createTRPCRouter({

4
apps/dokploy/server/api/routers/user.ts
View File

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

Some files were not shown because too many files have changed in this diff Show More