chore: clean up unused variables and improve error handling across codebase

This commit focuses on removing unused variables, adding placeholder error handling, and generally tidying up various files across the Dokploy application. Changes include:

- Removing unused imports and variables
- Adding placeholder error handling in catch blocks
- Cleaning up commented-out code
- Removing deprecated utility files
- Improving type safety and code consistency

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

@@ -33,7 +33,7 @@ import {
 } from "../trpc";
 
 export const authRouter = createTRPCRouter({
-	createAdmin: publicProcedure.mutation(async ({ ctx, input }) => {
+	createAdmin: publicProcedure.mutation(async ({ input }) => {
 		try {
 			if (!IS_CLOUD) {
 				const admin = await db.query.admins.findFirst({});
@@ -72,9 +72,9 @@ export const authRouter = createTRPCRouter({
 			});
 		}
 	}),
-	createUser: publicProcedure.mutation(async ({ ctx, input }) => {
+	createUser: publicProcedure.mutation(async ({ input }) => {
 		try {
-			const token = await getUserByToken(input.token);
+			const _token = await getUserByToken(input.token);
 			// if (token.isExpired) {
 			// 	throw new TRPCError({
 			// 		code: "BAD_REQUEST",
@@ -103,7 +103,7 @@ export const authRouter = createTRPCRouter({
 		}
 	}),
 
-	login: publicProcedure.mutation(async ({ ctx, input }) => {
+	login: publicProcedure.mutation(async ({ input }) => {
 		try {
 			const auth = await findAuthByEmail(input.email);
 
@@ -169,7 +169,7 @@ export const authRouter = createTRPCRouter({
 	}),
 
 	logout: protectedProcedure.mutation(async ({ ctx }) => {
-		const { req, res } = ctx;
+		const { req } = ctx;
 		const { session } = await validateRequest(req);
 		if (!session) return false;
 
@@ -229,7 +229,7 @@ export const authRouter = createTRPCRouter({
 					message: "Password is incorrect",
 				});
 			}
-			const { req, res } = ctx;
+			const { req } = ctx;
 			const { session } = await validateRequest(req);
 			if (!session) return false;
 
@@ -245,7 +245,7 @@ export const authRouter = createTRPCRouter({
 			return true;
 		}),
 
-	generateToken: protectedProcedure.mutation(async ({ ctx, input }) => {
+	generateToken: protectedProcedure.mutation(async ({ ctx }) => {
 		const auth = await findUserById(ctx.user.id);
 		console.log(auth);
 
@@ -276,7 +276,7 @@ export const authRouter = createTRPCRouter({
 				email: z.string().min(1).email(),
 			}),
 		)
-		.mutation(async ({ ctx, input }) => {
+		.mutation(async ({ input }) => {
 			if (!IS_CLOUD) {
 				throw new TRPCError({
 					code: "NOT_FOUND",
@@ -329,7 +329,7 @@ export const authRouter = createTRPCRouter({
 				password: z.string().min(1),
 			}),
 		)
-		.mutation(async ({ ctx, input }) => {
+		.mutation(async ({ input }) => {
 			if (!IS_CLOUD) {
 				throw new TRPCError({
 					code: "NOT_FOUND",
@@ -373,7 +373,7 @@ export const authRouter = createTRPCRouter({
 				confirmationToken: z.string().min(1),
 			}),
 		)
-		.mutation(async ({ ctx, input }) => {
+		.mutation(async ({ input }) => {
 			if (!IS_CLOUD) {
 				throw new TRPCError({
 					code: "NOT_FOUND",

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

@@ -12,6 +12,7 @@ import {
 	mariadb,
 	mongo,
 	mysql,
+	organization,
 	postgres,
 	redis,
 	server,
@@ -102,6 +103,18 @@ export const serverRouter = createTRPCRouter({
 
 		return result;
 	}),
+	count: protectedProcedure.query(async ({ ctx }) => {
+		const organizations = await db.query.organization.findMany({
+			where: eq(organization.ownerId, ctx.user.id),
+			with: {
+				servers: true,
+			},
+		});
+
+		const servers = organizations.flatMap((org) => org.servers);
+
+		return servers.length ?? 0;
+	}),
 	withSSHKey: protectedProcedure.query(async ({ ctx }) => {
 		const result = await db.query.server.findMany({
 			orderBy: desc(server.createdAt),

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

@@ -56,7 +56,7 @@ export const stripeRouter = createTRPCRouter({
 			});
 
 			const items = getStripeItems(input.serverQuantity, input.isAnnual);
-			const user = await findUserById(ctx.user.ownerId);
+			const user = await findUserById(ctx.user.id);
 
 			let stripeCustomerId = user.stripeCustomerId;
 
@@ -78,7 +78,7 @@ export const stripeRouter = createTRPCRouter({
 					customer: stripeCustomerId,
 				}),
 				metadata: {
-					ownerId: user.id,
+					adminId: user.id,
 				},
 				allow_promotion_codes: true,
 				success_url: `${WEBSITE_URL}/dashboard/settings/servers?success=true`,
@@ -88,7 +88,7 @@ export const stripeRouter = createTRPCRouter({
 			return { sessionId: session.id };
 		}),
 	createCustomerPortalSession: adminProcedure.mutation(async ({ ctx }) => {
-		const user = await findUserById(ctx.user.ownerId);
+		const user = await findUserById(ctx.user.id);
 
 		if (!user.stripeCustomerId) {
 			throw new TRPCError({

apps/dokploy/server/db/seed.ts

@@ -1,15 +1,10 @@
-import bc from "bcrypt";
 import { drizzle } from "drizzle-orm/postgres-js";
 import postgres from "postgres";
 
 const connectionString = process.env.DATABASE_URL!;
 
 const pg = postgres(connectionString, { max: 1 });
-const db = drizzle(pg);
-
-function password(txt: string) {
-	return bc.hashSync(txt, 10);
-}
+const _db = drizzle(pg);
 
 async function seed() {
 	console.log("> Seed:", process.env.DATABASE_PATH, "\n");

apps/dokploy/server/utils/docker.ts

@@ -6,7 +6,7 @@ export const isWSL = async () => {
 		const { stdout } = await execAsync("uname -r");
 		const isWSL = stdout.includes("microsoft");
 		return isWSL;
-	} catch (error) {
+	} catch (_error) {
 		return false;
 	}
 };

apps/dokploy/server/wss/docker-container-terminal.ts

@@ -50,8 +50,8 @@ export const setupDockerContainerTerminalWebSocketServer = (
 					throw new Error("No SSH key available for this server");
 
 				const conn = new Client();
-				let stdout = "";
-				let stderr = "";
+				let _stdout = "";
+				let _stderr = "";
 				conn
 					.once("ready", () => {
 						conn.exec(
@@ -61,16 +61,16 @@ export const setupDockerContainerTerminalWebSocketServer = (
 								if (err) throw err;
 
 								stream
-									.on("close", (code: number, signal: string) => {
+									.on("close", (code: number, _signal: string) => {
 										ws.send(`\nContainer closed with code: ${code}\n`);
 										conn.end();
 									})
 									.on("data", (data: string) => {
-										stdout += data.toString();
+										_stdout += data.toString();
 										ws.send(data.toString());
 									})
 									.stderr.on("data", (data) => {
-										stderr += data.toString();
+										_stderr += data.toString();
 										ws.send(data.toString());
 										console.error("Error: ", data.toString());
 									});

apps/dokploy/server/wss/drawer-logs.ts

@@ -32,7 +32,7 @@ export const setupDrawerLogsWebSocketServer = (
 	});
 
 	wssTerm.on("connection", async (ws, req) => {
-		const url = new URL(req.url || "", `http://${req.headers.host}`);
+		const _url = new URL(req.url || "", `http://${req.headers.host}`);
 		const { user, session } = await validateRequest(req);
 
 		if (!user || !session) {

apps/dokploy/server/wss/listen-deployment.ts

@@ -103,7 +103,7 @@ export const setupDeploymentLogsWebSocketServer = (
 					ws.close();
 				});
 			}
-		} catch (error) {
+		} catch (_error) {
 			// @ts-ignore
 			// const errorMessage = error?.message as unknown as string;
 			// ws.send(errorMessage);

apps/dokploy/server/wss/terminal.ts

@@ -144,8 +144,8 @@ export const setupTerminalWebSocketServer = (
 		}
 
 		const conn = new Client();
-		let stdout = "";
-		let stderr = "";
+		let _stdout = "";
+		let _stderr = "";
 
 		ws.send("Connecting...\n");
 
@@ -158,16 +158,16 @@ export const setupTerminalWebSocketServer = (
 					if (err) throw err;
 
 					stream
-						.on("close", (code: number, signal: string) => {
+						.on("close", (code: number, _signal: string) => {
 							ws.send(`\nContainer closed with code: ${code}\n`);
 							conn.end();
 						})
 						.on("data", (data: string) => {
-							stdout += data.toString();
+							_stdout += data.toString();
 							ws.send(data.toString());
 						})
 						.stderr.on("data", (data) => {
-							stderr += data.toString();
+							_stderr += data.toString();
 							ws.send(data.toString());
 							console.error("Error: ", data.toString());
 						});