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

Merge pull request #614 from Dokploy/611-websocket-pending-for-minutes-after-container-starts

Browse Source 
fix(dokploy): prevent to have pending connections docker logs
This commit is contained in:
Mauricio Siu
2024-10-27 14:14:30 -06:00
committed by GitHub
parent 3808fd83a6 3f40ad3250
commit 9872c4fee3
2 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
apps/dokploy/components/dashboard/docker/logs/docker-logs-id.tsx
View File

@@ -18,24 +18,28 @@ export const DockerLogsId: React.FC<Props> = ({
}) => { }) => {
const [term, setTerm] = React.useState<Terminal>(); const [term, setTerm] = React.useState<Terminal>();
const [lines, setLines] = React.useState<number>(40); const [lines, setLines] = React.useState<number>(40);
const wsRef = useRef<WebSocket | null>(null); // Ref to hold WebSocket instance const wsRef = useRef<WebSocket | null>(null);
useEffect(() => { useEffect(() => {
// if (containerId === "select-a-container") { if (containerId === "select-a-container") {
// return; return;
// } }
if (
wsRef.current &&
(wsRef.current.readyState === WebSocket.OPEN ||
wsRef.current.readyState === WebSocket.CONNECTING)
) {
wsRef.current.close();
wsRef.current = null;
}
const container = document.getElementById(id); const container = document.getElementById(id);
if (container) { if (container) {
container.innerHTML = ""; container.innerHTML = "";
} }
if (wsRef.current) { // Crear nueva instancia de Terminal
console.log(wsRef.current);
if (wsRef.current.readyState === WebSocket.OPEN) {
wsRef.current.close();
}
wsRef.current = null;
}
const termi = new Terminal({ const termi = new Terminal({
cursorBlink: true, cursorBlink: true,
cols: 80, cols: 80,
@@ -45,7 +49,6 @@ export const DockerLogsId: React.FC<Props> = ({
fontSize: 14, fontSize: 14,
fontFamily: fontFamily:
'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace', 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
convertEol: true, convertEol: true,
theme: { theme: {
cursor: "transparent", cursor: "transparent",
@@ -54,10 +57,10 @@ export const DockerLogsId: React.FC<Props> = ({
}); });
const protocol = window.location.protocol === "https:" ? "wss:" : "ws:"; const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
const wsUrl = `${protocol}//${window.location.host}/docker-container-logs?containerId=${containerId}&tail=${lines}${serverId ? `&serverId=${serverId}` : ""}`; const wsUrl = `${protocol}//${window.location.host}/docker-container-logs?containerId=${containerId}&tail=${lines}${serverId ? `&serverId=${serverId}` : ""}`;
const ws = new WebSocket(wsUrl); const ws = new WebSocket(wsUrl);
wsRef.current = ws; wsRef.current = ws;
const fitAddon = new FitAddon(); const fitAddon = new FitAddon();
termi.loadAddon(fitAddon); termi.loadAddon(fitAddon);
// @ts-ignore // @ts-ignore
@@ -76,17 +79,17 @@ export const DockerLogsId: React.FC<Props> = ({
ws.onclose = (e) => { ws.onclose = (e) => {
console.log(e.reason); console.log(e.reason);
termi.write(`Connection closed!\nReason: ${e.reason}\n`); termi.write(`Connection closed!\nReason: ${e.reason}\n`);
wsRef.current = null; wsRef.current = null;
}; };
return () => { return () => {
if (wsRef.current?.readyState === WebSocket.OPEN) { if (wsRef.current?.readyState === WebSocket.OPEN) {
ws.close(); wsRef.current.close();
wsRef.current = null;
} }
wsRef.current = null;
}; };
}, [lines, containerId]); }, [containerId, lines]);
useEffect(() => { useEffect(() => {
term?.clear(); term?.clear();

9
apps/dokploy/server/wss/docker-container-logs.ts
View File

@@ -43,6 +43,15 @@ export const setupDockerContainerLogsWebSocketServer = (
ws.close(); ws.close();
return; return;
} }
const pingInterval = setInterval(() => {
if (ws.readyState === ws.OPEN) {
ws.ping();
}
}, 30000);
ws.on("close", () => clearInterval(pingInterval));
try { try {
if (serverId) { if (serverId) {
const server = await findServerById(serverId); const server = await findServerById(serverId);