dennii/Termix
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 22 Wiki Activity

fix: prevent session reset when updating host properties (#490)

Browse Source
This commit was merged in pull request #490.
This commit is contained in:
ZacharyZcR
2026-01-12 15:30:01 +08:00
committed by GitHub
parent 5f080be4ee
commit afb66a1098
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/ui/desktop/apps/features/terminal/Terminal.tsx
View File

@@ -618,15 +618,15 @@ export const Terminal = forwardRef<TerminalHandle, SSHTerminalProps>(
? `${window.location.protocol === "https:" ? "wss" : "ws"}://localhost:30002` ? `${window.location.protocol === "https:" ? "wss" : "ws"}://localhost:30002`
: isElectron() : isElectron()
? (() => { ? (() => {
const baseUrl = const baseUrl =
(window as { configuredServerUrl?: string }) (window as { configuredServerUrl?: string })
.configuredServerUrl || "http://127.0.0.1:30001"; .configuredServerUrl || "http://127.0.0.1:30001";
const wsProtocol = baseUrl.startsWith("https://") const wsProtocol = baseUrl.startsWith("https://")
? "wss://" ? "wss://"
: "ws://"; : "ws://";
const wsHost = baseUrl.replace(/^https?:\/\//, ""); const wsHost = baseUrl.replace(/^https?:\/\//, "");
return `${wsProtocol}${wsHost}/ssh/websocket/`; return `${wsProtocol}${wsHost}/ssh/websocket/`;
})() })()
: `${window.location.protocol === "https:" ? "wss" : "ws"}://${window.location.host}/ssh/websocket/`; : `${window.location.protocol === "https:" ? "wss" : "ws"}://${window.location.host}/ssh/websocket/`;
if ( if (
@@ -1387,7 +1387,7 @@ export const Terminal = forwardRef<TerminalHandle, SSHTerminalProps>(
const selectedCommand = const selectedCommand =
autocompleteSuggestionsRef.current[ autocompleteSuggestionsRef.current[
autocompleteSelectedIndexRef.current autocompleteSelectedIndexRef.current
]; ];
const currentCmd = currentAutocompleteCommand.current; const currentCmd = currentAutocompleteCommand.current;
const completion = selectedCommand.substring(currentCmd.length); const completion = selectedCommand.substring(currentCmd.length);
@@ -1548,7 +1548,11 @@ export const Terminal = forwardRef<TerminalHandle, SSHTerminalProps>(
scheduleNotify(terminal.cols, terminal.rows); scheduleNotify(terminal.cols, terminal.rows);
connectToHost(terminal.cols, terminal.rows); connectToHost(terminal.cols, terminal.rows);
} }
}, [terminal, hostConfig, isVisible, isConnected, isConnecting]); // Note: Using hostConfig.id instead of hostConfig object to prevent
// unnecessary reconnections when host properties are updated.
// Only reconnect when switching to a different host.
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [terminal, hostConfig.id, isVisible, isConnected, isConnecting]);
useEffect(() => { useEffect(() => {
if (!terminal || !fitAddonRef.current || !isVisible) return; if (!terminal || !fitAddonRef.current || !isVisible) return;