wushenghua/hapi
1
0
Fork 0
mirror of https://github.com/wu736139669/hapi.git synced 2026-08-07 06:52:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(terminal): prevent infinite reconnect loop on Windows hosts (#336)

Browse Source
This commit is contained in:
lifu963
2026-03-21 21:45:40 +08:00
committed by GitHub
parent ae39fc5e77
commit 895654ddf6
12 changed files with 165 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/routes/sessions/terminal.tsx
+20 -13
View File
@@ -11,6 +11,7 @@ import { useTranslation } from '@/lib/use-translation'
import { TerminalView } from '@/components/Terminal/TerminalView'
import { LoadingState } from '@/components/LoadingState'
import { Button } from '@/components/ui/button'
import { isRemoteTerminalSupported } from '@/utils/terminalSupport'
import {
Dialog,
DialogContent,
@@ -184,6 +185,7 @@ export default function TerminalPage() {
const { api, token, baseUrl } = useAppContext()
const goBack = useAppGoBack()
const { session } = useSession(api, sessionId)
const terminalSupported = isRemoteTerminalSupported(session?.metadata)
const terminalId = useMemo(() => {
if (typeof crypto?.randomUUID === 'function') {
return crypto.randomUUID()
@@ -226,7 +228,6 @@ export default function TerminalPage() {
onExit((code, signal) => {
setExitInfo({ code, signal })
terminalRef.current?.write(`\r\n[process exited${code !== null ? ` with code ${code}` : ''}]`)
connectOnceRef.current = false
})
}, [onExit])
@@ -264,7 +265,7 @@ export default function TerminalPage() {
const handleResize = useCallback(
(cols: number, rows: number) => {
lastSizeRef.current = { cols, rows }
if (!session?.active) {
if (!session?.active || !terminalSupported) {
return
}
if (!connectOnceRef.current) {
@@ -274,11 +275,11 @@ export default function TerminalPage() {
resize(cols, rows)
}
},
[session?.active, connect, resize]
[session?.active, terminalSupported, connect, resize]
)
useEffect(() => {
if (!session?.active) {
if (!session?.active || !terminalSupported) {
return
}
if (connectOnceRef.current) {
@@ -290,7 +291,7 @@ export default function TerminalPage() {
}
connectOnceRef.current = true
connect(size.cols, size.rows)
}, [session?.active, connect])
}, [session?.active, terminalSupported, connect])
useEffect(() => {
connectOnceRef.current = false
@@ -307,17 +308,13 @@ export default function TerminalPage() {
}, [disconnect])
useEffect(() => {
if (session?.active === false) {
if (session?.active === false || !terminalSupported) {
disconnect()
connectOnceRef.current = false
}
}, [session?.active, disconnect])
}, [session?.active, terminalSupported, disconnect])
useEffect(() => {
if (terminalState.status === 'error') {
connectOnceRef.current = false
return
}
if (terminalState.status === 'connecting' || terminalState.status === 'connected') {
setExitInfo(null)
}
@@ -405,7 +402,11 @@ export default function TerminalPage() {
const subtitle = session.metadata?.path ?? sessionId
const status = terminalState.status
const errorMessage = terminalState.status === 'error' ? terminalState.error : null
const errorMessage = !terminalSupported
? t('terminal.unsupportedWindows')
: terminalState.status === 'error'
? terminalState.error
: null
return (
<div className="flex h-full flex-col">
@@ -453,7 +454,13 @@ export default function TerminalPage() {
<div className="flex-1 overflow-hidden bg-[var(--app-bg)]">
<div className="mx-auto h-full w-full max-w-content p-3">
<TerminalView onMount={handleTerminalMount} onResize={handleResize} className="h-full w-full" />
{terminalSupported ? (
<TerminalView onMount={handleTerminalMount} onResize={handleResize} className="h-full w-full" />
) : (
<div className="flex h-full items-center justify-center rounded-md border border-[var(--app-border)] bg-[var(--app-subtle-bg)] p-4 text-sm text-[var(--app-hint)]">
{t('terminal.unsupportedWindows')}
</div>
)}
</div>
</div>