Fix operator terminal SSR crash

This commit is contained in:
Mark McKeen
2026-04-08 15:24:12 -06:00
parent 35675f6dc5
commit 4d15ce4388
+28 -6
View File
@@ -3,8 +3,6 @@
import Link from 'next/link' import Link from 'next/link'
import { useSearchParams } from 'next/navigation' import { useSearchParams } from 'next/navigation'
import { useCallback, useEffect, useMemo, useRef, useState } from 'react' import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
import { Terminal } from 'xterm'
import { FitAddon } from 'xterm-addon-fit'
import 'xterm/css/xterm.css' import 'xterm/css/xterm.css'
interface ReadinessPodSummary { interface ReadinessPodSummary {
@@ -47,6 +45,11 @@ interface LiveTerminalSession {
websocketUrl: string websocketUrl: string
} }
type XTermModule = typeof import('xterm')
type FitAddonModule = typeof import('xterm-addon-fit')
type XTermInstance = InstanceType<XTermModule['Terminal']>
type FitAddonInstance = InstanceType<FitAddonModule['FitAddon']>
type LoadState = 'idle' | 'loading' | 'ready' | 'error' type LoadState = 'idle' | 'loading' | 'ready' | 'error'
const defaultAlias = (sandboxId: string | null) => `ssh openshell-${sandboxId || 'my-assistant'}` const defaultAlias = (sandboxId: string | null) => `ssh openshell-${sandboxId || 'my-assistant'}`
@@ -66,8 +69,8 @@ export default function OperatorTerminalPage() {
const [liveSession, setLiveSession] = useState<LiveTerminalSession | null>(null) const [liveSession, setLiveSession] = useState<LiveTerminalSession | null>(null)
const terminalContainerRef = useRef<HTMLDivElement | null>(null) const terminalContainerRef = useRef<HTMLDivElement | null>(null)
const terminalRef = useRef<Terminal | null>(null) const terminalRef = useRef<XTermInstance | null>(null)
const fitAddonRef = useRef<FitAddon | null>(null) const fitAddonRef = useRef<FitAddonInstance | null>(null)
const socketRef = useRef<WebSocket | null>(null) const socketRef = useRef<WebSocket | null>(null)
const refreshReadiness = useCallback(async () => { const refreshReadiness = useCallback(async () => {
@@ -148,6 +151,19 @@ export default function OperatorTerminalPage() {
return return
} }
let disposed = false
let cleanupResize: (() => void) | null = null
;(async () => {
const [{ Terminal }, { FitAddon }] = await Promise.all([
import('xterm'),
import('xterm-addon-fit'),
])
if (disposed || !terminalContainerRef.current) {
return
}
const term = new Terminal({ const term = new Terminal({
cursorBlink: true, cursorBlink: true,
fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace', fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace',
@@ -180,11 +196,17 @@ export default function OperatorTerminalPage() {
} }
window.addEventListener('resize', handleResize) window.addEventListener('resize', handleResize)
cleanupResize = () => window.removeEventListener('resize', handleResize)
})().catch((error) => {
setTerminalState('error')
setTerminalStatus(error instanceof Error ? error.message : 'Failed to load terminal renderer.')
})
return () => { return () => {
window.removeEventListener('resize', handleResize) disposed = true
cleanupResize?.()
socketRef.current?.close() socketRef.current?.close()
term.dispose() terminalRef.current?.dispose()
terminalRef.current = null terminalRef.current = null
fitAddonRef.current = null fitAddonRef.current = null
} }