Merge branch 'canary' into 139-multi-server-feature

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

@@ -25,7 +25,7 @@ export const domainRouter = createTRPCRouter({
 		.input(apiCreateDomain)
 		.mutation(async ({ input }) => {
 			try {
-				await createDomain(input);
+				return await createDomain(input);
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",

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

@@ -424,18 +424,28 @@ export const settingsRouter = createTRPCRouter({
 			return false;
 		}),
 
-	readStatsLogs: adminProcedure.input(apiReadStatsLogs).query(({ input }) => {
-		const rawConfig = readMonitoringConfig();
-		const parsedConfig = parseRawConfig(
-			rawConfig as string,
-			input.page,
-			input.sort,
-			input.search,
-			input.status,
-		);
+	readStatsLogs: adminProcedure
+		.meta({
+			openapi: {
+				path: "/read-stats-logs",
+				method: "POST",
+				override: true,
+				enabled: false,
+			},
+		})
+		.input(apiReadStatsLogs)
+		.query(({ input }) => {
+			const rawConfig = readMonitoringConfig();
+			const parsedConfig = parseRawConfig(
+				rawConfig as string,
+				input.page,
+				input.sort,
+				input.search,
+				input.status,
+			);
 
-		return parsedConfig;
-	}),
+			return parsedConfig;
+		}),
 	readStats: adminProcedure.query(() => {
 		const rawConfig = readMonitoringConfig();
 		const processedLogs = processLogs(rawConfig as string);

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

@@ -11,7 +11,7 @@ import { findServerById } from "./server";
 export type Domain = typeof domains.$inferSelect;
 
 export const createDomain = async (input: typeof apiCreateDomain._type) => {
-	await db.transaction(async (tx) => {
+	const result = await db.transaction(async (tx) => {
 		const domain = await tx
 			.insert(domains)
 			.values({
@@ -23,7 +23,7 @@ export const createDomain = async (input: typeof apiCreateDomain._type) => {
 		if (!domain) {
 			throw new TRPCError({
 				code: "BAD_REQUEST",
-				message: "Error to create the domain",
+				message: "Error creating domain",
 			});
 		}
 
@@ -31,7 +31,11 @@ export const createDomain = async (input: typeof apiCreateDomain._type) => {
 			const application = await findApplicationById(domain.applicationId);
 			await manageDomain(application, domain);
 		}
+
+		return domain;
 	});
+
+	return result;
 };
 
 export const generateTraefikMeDomain = async (

apps/dokploy/server/utils/builders/compose.ts

@@ -58,6 +58,10 @@ Compose Type: ${composeType} ✅`;
 			},
 			{
 				cwd: projectPath,
+				env: {
+					NODE_ENV: process.env.NODE_ENV,
+					PATH: process.env.PATH,
+				},
 			},
 		);