chore: steal CloseRead

DanielleMaywood · DanielleMaywood · commit 096a85e14958 · 2025-07-10T13:25:19.000Z
diff --git a/agent/agentcontainers/api.go b/agent/agentcontainers/api.go
@@ -561,6 +561,10 @@ func (api *API) watchContainers(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// Here we close the websocket for reading, so that the websocket library will handle pings and
+	// close frames.
+	_ = conn.CloseRead(context.Background())
+
 	ctx, wsNetConn := codersdk.WebsocketNetConn(ctx, conn, websocket.MessageText)
 	defer wsNetConn.Close()
 
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -873,6 +873,10 @@ func (api *API) watchWorkspaceAgentContainers(rw http.ResponseWriter, r *http.Re
 		return
 	}
 
+	// Here we close the websocket for reading, so that the websocket library will handle pings and
+	// close frames.
+	_ = conn.CloseRead(context.Background())
+
 	ctx, wsNetConn := codersdk.WebsocketNetConn(ctx, conn, websocket.MessageText)
 	defer wsNetConn.Close()
 

Original file line number	Diff line number	Diff line change
`@@ -561,6 +561,10 @@ func (api API) watchContainers(rw http.ResponseWriter, r http.Request) {`
`561`	`561`	`return`
`562`	`562`	`}`
`563`	`563`
	`564`	`+ // Here we close the websocket for reading, so that the websocket library will handle pings and`
	`565`	`+ // close frames.`
	`566`	`+ _ = conn.CloseRead(context.Background())`
	`567`	`+`
`564`	`568`	`ctx, wsNetConn := codersdk.WebsocketNetConn(ctx, conn, websocket.MessageText)`
`565`	`569`	`defer wsNetConn.Close()`
`566`	`570`
Original file line number	Diff line number	Diff line change
`@@ -873,6 +873,10 @@ func (api API) watchWorkspaceAgentContainers(rw http.ResponseWriter, r http.Re`
`873`	`873`	`return`
`874`	`874`	`}`
`875`	`875`
	`876`	`+ // Here we close the websocket for reading, so that the websocket library will handle pings and`
	`877`	`+ // close frames.`
	`878`	`+ _ = conn.CloseRead(context.Background())`
	`879`	`+`
`876`	`880`	`ctx, wsNetConn := codersdk.WebsocketNetConn(ctx, conn, websocket.MessageText)`
`877`	`881`	`defer wsNetConn.Close()`
`878`	`882`