Fix websocket lifecycle races that can stall terminal output

Guard route client cleanup against stale websocket/session close paths so newer connections keep receiving output after focus/reconnect transitions. Also refresh websocket read deadlines on every inbound message and add regression tests covering both reconnect and stale-session-close race scenarios.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
GitHub Copilot
2026-02-16 23:00:30 +00:00
parent c981c89435
commit b09d8d58ee
2 changed files with 110 additions and 4 deletions
+14 -4
View File
@@ -207,7 +207,10 @@ func (c *localClientConnector) OnMeta(meta map[string]any) {
func (c *localClientConnector) OnClose() {
c.server.sessionManager.OnSessionEnd(c.sessionID)
c.server.stopWSClient(c.routeKey)
if activeSessionID, ok := c.server.sessionManager.GetSessionIDByRouteKey(c.routeKey); ok && activeSessionID != c.sessionID {
return
}
c.server.stopWSClient(c.routeKey, nil)
}
func NewLocalServer(config Config, options ServerOptions) *LocalServer {
@@ -331,15 +334,21 @@ func (s *LocalServer) enqueueWSFrame(routeKey string, messageType int, data []by
}
}
func (s *LocalServer) stopWSClient(routeKey string) {
func (s *LocalServer) stopWSClient(routeKey string, expected *wsClient) {
s.mu.Lock()
client := s.wsClients[routeKey]
if expected != nil && client != expected {
s.mu.Unlock()
return
}
delete(s.wsClients, routeKey)
s.mu.Unlock()
if client == nil {
return
}
client.closed.Store(true)
if client.closed.Swap(true) {
return
}
close(client.send)
<-client.done
}
@@ -480,7 +489,7 @@ func (s *LocalServer) handleWebSocket(w http.ResponseWriter, r *http.Request) {
s.wsClients[routeKey] = client
s.mu.Unlock()
go s.wsSender(client)
defer s.stopWSClient(routeKey)
defer s.stopWSClient(routeKey, client)
// Helper to send JSON through the send channel (avoids concurrent conn writes)
sendJSON := func(v any) {
@@ -526,6 +535,7 @@ func (s *LocalServer) handleWebSocket(w http.ResponseWriter, r *http.Request) {
}
return
}
_ = conn.SetReadDeadline(time.Now().Add(wsReadTimeout))
if messageType != websocket.TextMessage {
continue
}