From 0465a71d869e67158307f946cc8d0a346d34f9ef Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sat, 21 Sep 2024 23:49:00 -0600
Subject: [PATCH] feat(multi-server): enable docker terminal inside of
 containers

---
 .../dashboard/application/general/show.tsx    |   3 -
 .../dashboard/compose/general/actions.tsx     |   5 +-
 .../dashboard/docker/show/colums.tsx          |   5 +-
 .../mariadb/general/show-general-mariadb.tsx  |   5 +-
 .../mongo/general/show-general-mongo.tsx      |   5 +-
 .../mysql/general/show-general-mysql.tsx      |   5 +-
 .../general/show-general-postgres.tsx         |   5 +-
 .../redis/general/show-general-redis.tsx      |   5 +-
 .../server/wss/docker-container-terminal.ts   | 158 ++++++------------
 9 files changed, 80 insertions(+), 116 deletions(-)

diff --git a/apps/dokploy/components/dashboard/application/general/show.tsx b/apps/dokploy/components/dashboard/application/general/show.tsx
index de93309f..277ae1eb 100644
--- a/apps/dokploy/components/dashboard/application/general/show.tsx
+++ b/apps/dokploy/components/dashboard/application/general/show.tsx
@@ -1,6 +1,5 @@
 import { ShowBuildChooseForm } from "@/components/dashboard/application/build/show";
 import { ShowProviderForm } from "@/components/dashboard/application/general/generic/show";
-import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Toggle } from "@/components/ui/toggle";
@@ -76,8 +75,6 @@ export const ShowGeneralApplication = ({ applicationId }: Props) => {
 							Open Terminal
 						</Button>
 					</DockerTerminalModal>
-
-					{/* {data?.server?.name || "No Server"} */}
 				</CardContent>
 			</Card>
 			<ShowProviderForm applicationId={applicationId} />
diff --git a/apps/dokploy/components/dashboard/compose/general/actions.tsx b/apps/dokploy/components/dashboard/compose/general/actions.tsx
index 5e0d9547..21957a95 100644
--- a/apps/dokploy/components/dashboard/compose/general/actions.tsx
+++ b/apps/dokploy/components/dashboard/compose/general/actions.tsx
@@ -75,7 +75,10 @@ export const ComposeActions = ({ composeId }: Props) => {
 				<StopCompose composeId={composeId} />
 			)}
 
-			<DockerTerminalModal appName={data?.appName || ""}>
+			<DockerTerminalModal
+				appName={data?.appName || ""}
+				serverId={data?.serverId || ""}
+			>
 				<Button variant="outline">
 					<Terminal />
 					Open Terminal
diff --git a/apps/dokploy/components/dashboard/docker/show/colums.tsx b/apps/dokploy/components/dashboard/docker/show/colums.tsx
index 1989fc92..3feae176 100644
--- a/apps/dokploy/components/dashboard/docker/show/colums.tsx
+++ b/apps/dokploy/components/dashboard/docker/show/colums.tsx
@@ -124,7 +124,10 @@ export const columns: ColumnDef<Container>[] = [
 							containerId={container.containerId}
 							serverId={container.serverId || ""}
 						/>
-						<DockerTerminalModal containerId={container.containerId}>
+						<DockerTerminalModal
+							containerId={container.containerId}
+							serverId={container.serverId || ""}
+						>
 							Terminal
 						</DockerTerminalModal>
 					</DropdownMenuContent>
diff --git a/apps/dokploy/components/dashboard/mariadb/general/show-general-mariadb.tsx b/apps/dokploy/components/dashboard/mariadb/general/show-general-mariadb.tsx
index 44b6e39c..925e213d 100644
--- a/apps/dokploy/components/dashboard/mariadb/general/show-general-mariadb.tsx
+++ b/apps/dokploy/components/dashboard/mariadb/general/show-general-mariadb.tsx
@@ -36,7 +36,10 @@ export const ShowGeneralMariadb = ({ mariadbId }: Props) => {
 						) : (
 							<StopMariadb mariadbId={mariadbId} />
 						)}
-						<DockerTerminalModal appName={data?.appName || ""}>
+						<DockerTerminalModal
+							appName={data?.appName || ""}
+							serverId={data?.serverId || ""}
+						>
 							<Button variant="outline">
 								<Terminal />
 								Open Terminal
diff --git a/apps/dokploy/components/dashboard/mongo/general/show-general-mongo.tsx b/apps/dokploy/components/dashboard/mongo/general/show-general-mongo.tsx
index 2e181c5f..c8ae007a 100644
--- a/apps/dokploy/components/dashboard/mongo/general/show-general-mongo.tsx
+++ b/apps/dokploy/components/dashboard/mongo/general/show-general-mongo.tsx
@@ -34,7 +34,10 @@ export const ShowGeneralMongo = ({ mongoId }: Props) => {
 						) : (
 							<StopMongo mongoId={mongoId} />
 						)}
-						<DockerTerminalModal appName={data?.appName || ""}>
+						<DockerTerminalModal
+							appName={data?.appName || ""}
+							serverId={data?.serverId || ""}
+						>
 							<Button variant="outline">
 								<Terminal />
 								Open Terminal
diff --git a/apps/dokploy/components/dashboard/mysql/general/show-general-mysql.tsx b/apps/dokploy/components/dashboard/mysql/general/show-general-mysql.tsx
index 1a5d723a..f9928cb1 100644
--- a/apps/dokploy/components/dashboard/mysql/general/show-general-mysql.tsx
+++ b/apps/dokploy/components/dashboard/mysql/general/show-general-mysql.tsx
@@ -35,7 +35,10 @@ export const ShowGeneralMysql = ({ mysqlId }: Props) => {
 							<StopMysql mysqlId={mysqlId} />
 						)}
 
-						<DockerTerminalModal appName={data?.appName || ""}>
+						<DockerTerminalModal
+							appName={data?.appName || ""}
+							serverId={data?.serverId || ""}
+						>
 							<Button variant="outline">
 								<Terminal />
 								Open Terminal
diff --git a/apps/dokploy/components/dashboard/postgres/general/show-general-postgres.tsx b/apps/dokploy/components/dashboard/postgres/general/show-general-postgres.tsx
index a2aa17cb..781080ee 100644
--- a/apps/dokploy/components/dashboard/postgres/general/show-general-postgres.tsx
+++ b/apps/dokploy/components/dashboard/postgres/general/show-general-postgres.tsx
@@ -38,7 +38,10 @@ export const ShowGeneralPostgres = ({ postgresId }: Props) => {
 						<StopPostgres postgresId={postgresId} />
 					)}
 
-					<DockerTerminalModal appName={data?.appName || ""}>
+					<DockerTerminalModal
+						appName={data?.appName || ""}
+						serverId={data?.serverId || ""}
+					>
 						<Button variant="outline">
 							<Terminal />
 							Open Terminal
diff --git a/apps/dokploy/components/dashboard/redis/general/show-general-redis.tsx b/apps/dokploy/components/dashboard/redis/general/show-general-redis.tsx
index 555451d9..696b2143 100644
--- a/apps/dokploy/components/dashboard/redis/general/show-general-redis.tsx
+++ b/apps/dokploy/components/dashboard/redis/general/show-general-redis.tsx
@@ -37,7 +37,10 @@ export const ShowGeneralRedis = ({ redisId }: Props) => {
 							<StopRedis redisId={redisId} />
 						)}
 
-						<DockerTerminalModal appName={data?.appName || ""}>
+						<DockerTerminalModal
+							appName={data?.appName || ""}
+							serverId={data?.serverId || ""}
+						>
 							<Button variant="outline">
 								<Terminal />
 								Open Terminal
diff --git a/apps/dokploy/server/wss/docker-container-terminal.ts b/apps/dokploy/server/wss/docker-container-terminal.ts
index ad7c8137..c67fa107 100644
--- a/apps/dokploy/server/wss/docker-container-terminal.ts
+++ b/apps/dokploy/server/wss/docker-container-terminal.ts
@@ -55,115 +55,61 @@ export const setupDockerContainerTerminalWebSocketServer = (
 				const conn = new Client();
 				let stdout = "";
 				let stderr = "";
-				// conn
-				// 	.once("ready", () => {
-				// 		console.log("Client :: ready");
-				// 		conn.exec(
-				// 			`docker run -i ${containerId} ${activeWay}`,
-				// 			(err, stream) => {
-				// 				if (err) throw err;
+				conn
+					.once("ready", () => {
+						conn.exec(
+							`docker exec -it ${containerId} ${activeWay}`,
+							{ pty: true },
+							(err, stream) => {
+								if (err) throw err;
 
-				// 				stream
-				// 					.on("close", (code: number, signal: string) => {
-				// 						console.log(
-				// 							`Stream :: close :: code: ${code}, signal: ${signal}`,
-				// 						);
-				// 						conn.end();
-				// 					})
-				// 					.on("data", (data: string) => {
-				// 						stdout += data.toString();
-				// 						ws.send(data.toString());
-				// 					})
-				// 					.stderr.on("data", (data) => {
-				// 						stderr += data.toString();
-				// 						ws.send(data.toString());
-				// 						console.error("Error: ", data.toString());
-				// 					});
+								stream
+									.on("close", (code: number, signal: string) => {
+										console.log(
+											`Stream :: close :: code: ${code}, signal: ${signal}`,
+										);
+										ws.send(`\nContainer closed with code: ${code}\n`);
+										conn.end();
+									})
+									.on("data", (data: string) => {
+										stdout += data.toString();
+										ws.send(data.toString());
+									})
+									.stderr.on("data", (data) => {
+										stderr += data.toString();
+										ws.send(data.toString());
+										console.error("Error: ", data.toString());
+									});
 
-				// 				// Maneja la entrada de comandos desde WebSocket
-				// 				ws.on("message", (message) => {
-				// 					try {
-				// 						let command: string | Buffer[] | Buffer | ArrayBuffer;
-				// 						if (Buffer.isBuffer(message)) {
-				// 							command = message.toString("utf8");
-				// 						} else {
-				// 							command = message;
-				// 						}
-				// 						stream.write(command.toString());
-				// 					} catch (error) {
-				// 						// @ts-ignore
-				// 						const errorMessage = error?.message as unknown as string;
-				// 						ws.send(errorMessage);
-				// 					}
-				// 				});
+								ws.on("message", (message) => {
+									try {
+										let command: string | Buffer[] | Buffer | ArrayBuffer;
+										if (Buffer.isBuffer(message)) {
+											command = message.toString("utf8");
+										} else {
+											command = message;
+										}
+										stream.write(command.toString());
+									} catch (error) {
+										// @ts-ignore
+										const errorMessage = error?.message as unknown as string;
+										ws.send(errorMessage);
+									}
+								});
 
-				// 				// Cuando se cierra la conexión WebSocket
-				// 				ws.on("close", () => {
-				// 					stream.end();
-				// 				});
-				// 			},
-				// 		);
-				// 	})p
-				// 	.connect({
-				// 		host: server.ipAddress,
-				// 		port: server.port,
-				// 		username: server.username,
-				// 		privateKey: keys.privateKey,
-				// 		timeout: 99999,
-				// 	});
-				// conn
-					// .once("ready", () => {
-					// 	console.log("Client :: ready");
-					// 	conn.shell((err, stream) => {
-					// 		if (err) throw err;
-
-					// 		stream
-					// 			.on("close", (code: number, signal: string) => {
-					// 				console.log(
-					// 					`Stream :: close :: code: ${code}, signal: ${signal}`,
-					// 				);
-					// 				conn.end();
-					// 			})
-					// 			.on("data", (data: string) => {
-					// 				stdout += data.toString();
-					// 				ws.send(data.toString());
-					// 			})
-					// 			.stderr.on("data", (data) => {
-					// 				stderr += data.toString();
-					// 				ws.send(data.toString());
-					// 				console.error("Error: ", data.toString());
-					// 			});
-					// 		stream.write(`docker exec -it ${containerId} ${activeWay}\n`);
-					// 		// Maneja la entrada de comandos desde WebSocket
-					// 		ws.on("message", (message) => {
-					// 			try {
-					// 				let command: string | Buffer[] | Buffer | ArrayBuffer;
-					// 				if (Buffer.isBuffer(message)) {
-					// 					command = message.toString("utf8");
-					// 				} else {
-					// 					command = message;
-					// 				}
-					// 				stream.write(command.toString());
-					// 			} catch (error) {
-					// 				// @ts-ignore
-					// 				const errorMessage = error?.message as unknown as string;
-					// 				ws.send(errorMessage);
-					// 			}
-					// 		});
-
-					// 		// Cuando se cierra la conexión WebSocket
-					// 		ws.on("close", () => {
-					// 			stream.end();
-					// 		});
-					// 	});
-					// })
-					// .connect({
-					// 	host: server.ipAddress,
-					// 	port: server.port,
-					// 	username: server.username,
-					// 	privateKey: keys.privateKey,
-					// 	timeout: 99999,
-					// });
+								ws.on("close", () => {
+									stream.end();
+								});
+							},
+						);
+					})
+					.connect({
+						host: server.ipAddress,
+						port: server.port,
+						username: server.username,
+						privateKey: keys.privateKey,
+						timeout: 99999,
+					});
 			} else {
 				const shell = getShell();
 				const ptyProcess = spawn(