Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy synced 2025-06-26 18:27:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: adapt terminal component to pass local server data and add initialized check

Browse Source
This commit is contained in:
UndefinedPony
2024-12-22 16:37:26 +01:00
parent e68d867d31
commit 7e08c8881e
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
apps/dokploy/components/dashboard/settings/web-server/terminal.tsx
View File

@@ -5,6 +5,7 @@ import { FitAddon } from "xterm-addon-fit";
import "@xterm/xterm/css/xterm.css"; import "@xterm/xterm/css/xterm.css";
import { AttachAddon } from "@xterm/addon-attach"; import { AttachAddon } from "@xterm/addon-attach";
import { useTheme } from "next-themes"; import { useTheme } from "next-themes";
import { getLocalServerData } from "./local-server-config";
interface Props { interface Props {
id: string; id: string;
@@ -12,9 +13,16 @@ interface Props {
} }
export const Terminal: React.FC<Props> = ({ id, serverId }) => { export const Terminal: React.FC<Props> = ({ id, serverId }) => {
const termRef = useRef(null); const termRef = useRef<HTMLDivElement>(null);
const initialized = useRef<boolean>(false);
const { resolvedTheme } = useTheme(); const { resolvedTheme } = useTheme();
useEffect(() => { useEffect(() => {
if (initialized.current) {
// Required in strict mode to avoid issues due to double wss connection
return;
}
initialized.current = true;
const container = document.getElementById(id); const container = document.getElementById(id);
if (container) { if (container) {
container.innerHTML = ""; container.innerHTML = "";
@@ -33,7 +41,18 @@ export const Terminal: React.FC<Props> = ({ id, serverId }) => {
const protocol = window.location.protocol === "https:" ? "wss:" : "ws:"; const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
const wsUrl = `${protocol}//${window.location.host}/terminal?serverId=${serverId}`; const isLocalServer = serverId === "local";
const urlParams = new URLSearchParams();
urlParams.set("serverId", serverId);
if (isLocalServer) {
const { port, username } = getLocalServerData();
urlParams.set("port", port.toString());
urlParams.set("username", username);
}
const wsUrl = `${protocol}//${window.location.host}/terminal?${urlParams}`;
const ws = new WebSocket(wsUrl); const ws = new WebSocket(wsUrl);
const addonAttach = new AttachAddon(ws); const addonAttach = new AttachAddon(ws);