Ethica/Termix
1
0 Fork 0
mirror of https://github.com/Termix-SSH/Termix.git synced 2026-10-29 06:35:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ssh-terminal): close owner sockets when presentations unmount (#1501)

Browse Source
This commit is contained in:
ZacharyZcR authored and GitHub committed 2026-09-30 09:46:29 -05:00
1 parent 24def2b613
commit c265758cdd
2 files changed
+98 -29
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

plugins/ssh-terminal/src/frontend/terminal/Terminal.tsx
+23 -29
View File
@@ -412,7 +412,7 @@ const TerminalInner = forwardRef<TerminalHandle, SSHTerminalProps>(
isAttachingSessionRef.current = false;
return () => {};
}, [hostConfig.id]);
}, [hostConfig.id, hostConfig.instanceId]);
const connectionAttemptIdRef = useRef(0);
const totpTimeoutRef = useRef<NodeJS.Timeout | null>(null);
const connectionTimeoutRef = useRef<NodeJS.Timeout | null>(null);
@@ -2886,40 +2886,34 @@ const TerminalInner = forwardRef<TerminalHandle, SSHTerminalProps>(
useEffect(() => {
isMountedRef.current = true;
const currentHostId = hostConfig.id;
return () => {
if (!isMountedRef.current) {
return;
}
if (
currentHostIdRef.current !== currentHostId &&
currentHostIdRef.current !== null
) {
isUnmountingRef.current = true;
shouldNotReconnectRef.current = true;
isReconnectingRef.current = false;
setIsConnecting(false);
if (reconnectTimeoutRef.current)
clearTimeout(reconnectTimeoutRef.current);
if (connectionTimeoutRef.current)
clearTimeout(connectionTimeoutRef.current);
if (totpTimeoutRef.current) clearTimeout(totpTimeoutRef.current);
if (pingIntervalRef.current) {
clearInterval(pingIntervalRef.current);
pingIntervalRef.current = null;
}
if (pongTimeoutRef.current) {
clearTimeout(pongTimeoutRef.current);
pongTimeoutRef.current = null;
}
if (webSocketRef.current) {
webSocketRef.current.close();
}
isMountedRef.current = false;
isUnmountingRef.current = true;
shouldNotReconnectRef.current = true;
isReconnectingRef.current = false;
setIsConnecting(false);
if (reconnectTimeoutRef.current)
clearTimeout(reconnectTimeoutRef.current);
if (connectionTimeoutRef.current)
clearTimeout(connectionTimeoutRef.current);
if (totpTimeoutRef.current) clearTimeout(totpTimeoutRef.current);
if (pingIntervalRef.current) {
clearInterval(pingIntervalRef.current);
pingIntervalRef.current = null;
}
if (pongTimeoutRef.current) {
clearTimeout(pongTimeoutRef.current);
pongTimeoutRef.current = null;
}
if (webSocketRef.current) {
webSocketRef.current.close();
}
isMountedRef.current = false;
};
}, [hostConfig.id, hostConfig.instanceId]);