Merge remote-tracking branch 'origin/canary' into feature/pushover-notifications

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

@@ -285,6 +285,7 @@ export const backupRouter = createTRPCRouter({
 		.mutation(async ({ input }) => {
 			const backup = await findBackupById(input.backupId);
 			await runWebServerBackup(backup);
+			await keepLatestNBackups(backup);
 			return true;
 		}),
 	listBackupFiles: protectedProcedure

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

@@ -430,7 +430,11 @@ export const composeRouter = createTRPCRouter({
 					removeOnFail: true,
 				},
 			);
-			return { success: true, message: "Deployment queued" };
+			return {
+				success: true,
+				message: "Deployment queued",
+				composeId: compose.composeId,
+			};
 		}),
 	redeploy: protectedProcedure
 		.input(apiRedeployCompose)
@@ -468,7 +472,11 @@ export const composeRouter = createTRPCRouter({
 					removeOnFail: true,
 				},
 			);
-			return { success: true, message: "Redeployment queued" };
+			return {
+				success: true,
+				message: "Redeployment queued",
+				composeId: compose.composeId,
+			};
 		}),
 	stop: protectedProcedure
 		.input(apiFindCompose)

apps/dokploy/server/api/routers/preview-deployment.ts

@@ -2,11 +2,15 @@ import {
 	findApplicationById,
 	findPreviewDeploymentById,
 	findPreviewDeploymentsByApplicationId,
+	IS_CLOUD,
 	removePreviewDeployment,
 } from "@dokploy/server";
 import { TRPCError } from "@trpc/server";
 import { z } from "zod";
 import { apiFindAllByApplication } from "@/server/db/schema";
+import type { DeploymentJob } from "@/server/queues/queue-types";
+import { myQueue } from "@/server/queues/queueSetup";
+import { deploy } from "@/server/utils/deploy";
 import { createTRPCRouter, protectedProcedure } from "../trpc";
 
 export const previewDeploymentRouter = createTRPCRouter({
@@ -60,4 +64,55 @@ export const previewDeploymentRouter = createTRPCRouter({
 			}
 			return previewDeployment;
 		}),
+	redeploy: protectedProcedure
+		.input(
+			z.object({
+				previewDeploymentId: z.string(),
+				title: z.string().optional(),
+				description: z.string().optional(),
+			}),
+		)
+		.mutation(async ({ input, ctx }) => {
+			const previewDeployment = await findPreviewDeploymentById(
+				input.previewDeploymentId,
+			);
+			if (
+				previewDeployment.application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
+				throw new TRPCError({
+					code: "UNAUTHORIZED",
+					message: "You are not authorized to redeploy this preview deployment",
+				});
+			}
+			const application = await findApplicationById(
+				previewDeployment.applicationId,
+			);
+			const jobData: DeploymentJob = {
+				applicationId: previewDeployment.applicationId,
+				titleLog: input.title || "Rebuild Preview Deployment",
+				descriptionLog: input.description || "",
+				type: "redeploy",
+				applicationType: "application-preview",
+				previewDeploymentId: input.previewDeploymentId,
+				server: !!application.serverId,
+			};
+
+			if (IS_CLOUD && application.serverId) {
+				jobData.serverId = application.serverId;
+				deploy(jobData).catch((error) => {
+					console.error("Background deployment failed:", error);
+				});
+				return true;
+			}
+			await myQueue.add(
+				"deployments",
+				{ ...jobData },
+				{
+					removeOnComplete: true,
+					removeOnFail: true,
+				},
+			);
+			return true;
+		}),
 });

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

@@ -88,7 +88,7 @@ export const settingsRouter = createTRPCRouter({
 		if (IS_CLOUD) {
 			return true;
 		}
-		await reloadDockerResource("dokploy");
+		await reloadDockerResource("dokploy", undefined, packageInfo.version);
 		return true;
 	}),
 	cleanRedis: adminProcedure.mutation(async () => {
@@ -399,7 +399,7 @@ export const settingsRouter = createTRPCRouter({
 			return DEFAULT_UPDATE_DATA;
 		}
 
-		return await getUpdateData();
+		return await getUpdateData(packageInfo.version);
 	}),
 	updateServer: adminProcedure.mutation(async () => {
 		if (IS_CLOUD) {

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

@@ -81,6 +81,7 @@ export const stripeRouter = createTRPCRouter({
 				metadata: {
 					adminId: owner.id,
 				},
+				customer_email: owner.email,
 				allow_promotion_codes: true,
 				success_url: `${WEBSITE_URL}/dashboard/settings/servers?success=true`,
 				cancel_url: `${WEBSITE_URL}/dashboard/settings/billing`,
@@ -128,4 +129,39 @@ export const stripeRouter = createTRPCRouter({
 
 		return servers.length < user.serversQuantity;
 	}),
+
+	getInvoices: adminProcedure.query(async ({ ctx }) => {
+		const user = await findUserById(ctx.user.ownerId);
+		const stripeCustomerId = user.stripeCustomerId;
+
+		if (!stripeCustomerId) {
+			return [];
+		}
+
+		const stripe = new Stripe(process.env.STRIPE_SECRET_KEY!, {
+			apiVersion: "2024-09-30.acacia",
+		});
+
+		try {
+			const invoices = await stripe.invoices.list({
+				customer: stripeCustomerId,
+				limit: 100,
+			});
+
+			return invoices.data.map((invoice) => ({
+				id: invoice.id,
+				number: invoice.number,
+				status: invoice.status,
+				amountDue: invoice.amount_due,
+				amountPaid: invoice.amount_paid,
+				currency: invoice.currency,
+				created: invoice.created,
+				dueDate: invoice.due_date,
+				hostedInvoiceUrl: invoice.hosted_invoice_url,
+				invoicePdf: invoice.invoice_pdf,
+			}));
+		} catch (_) {
+			return [];
+		}
+	}),
 });

apps/dokploy/server/queues/deployments-queue.ts

@@ -4,6 +4,7 @@ import {
 	deployPreviewApplication,
 	rebuildApplication,
 	rebuildCompose,
+	rebuildPreviewApplication,
 	updateApplicationStatus,
 	updateCompose,
 	updatePreviewDeployment,
@@ -54,7 +55,14 @@ export const deploymentWorker = new Worker(
 					previewStatus: "running",
 				});
 
-				if (job.data.type === "deploy") {
+				if (job.data.type === "redeploy") {
+					await rebuildPreviewApplication({
+						applicationId: job.data.applicationId,
+						titleLog: job.data.titleLog,
+						descriptionLog: job.data.descriptionLog,
+						previewDeploymentId: job.data.previewDeploymentId,
+					});
+				} else if (job.data.type === "deploy") {
 					await deployPreviewApplication({
 						applicationId: job.data.applicationId,
 						titleLog: job.data.titleLog,

apps/dokploy/server/queues/queue-types.ts

@@ -22,7 +22,7 @@ type DeployJob =
 			titleLog: string;
 			descriptionLog: string;
 			server?: boolean;
-			type: "deploy";
+			type: "deploy" | "redeploy";
 			applicationType: "application-preview";
 			previewDeploymentId: string;
 			serverId?: string;