Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions packages/core/src/relay.ts
Original file line number Diff line number Diff line change
Expand Up @@ -808,6 +808,23 @@ class PersistentRelaySession {
return
}
if (message.type === 'error') {
// If an optimistic response is already streaming (responseStartedAt is
// set), the pending promise was already resolved — calling failPending
// would reject a settled promise and leave the stream hanging. Instead,
// inject an SSE error event and close cleanly.
if (pending.optimisticResponse && pending.responseStartedAt != null) {
relayLog(
`websocket relay error during optimistic response session=${shortAffinity(this.affinity)} request=${pending.payload.id} status=${message.status} message=${message.message || 'unknown'}`,
)
pending.streamController?.enqueue(
new TextEncoder().encode(
`event: error\ndata: ${JSON.stringify({ type: 'error', error: { type: 'relay_error', message: message.message || 'relay error' } })}\n\n`,
),
)
this.finishPending()
this.socket?.close()
return
}
if (
message.status === 409 &&
this.retryPendingBeforeResponse(
Expand Down