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: 14 additions & 3 deletions mod/JunimoServer/Services/Api/ApiService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,12 @@ private async Task HandleRequestAsync(HttpListenerContext context)
await WriteJsonAsync(response, new { error = "Method not allowed" });
}
}
catch (Exception ex) when (request.IsWebSocketRequest)
{
// WebSocket upgrade failed or WebSocket session errored — response is already
// disposed by the upgrade handshake, so we must not attempt to write to it.
Monitor.Log($"WebSocket handling error: {ex}", LogLevel.Warn);
}
catch (Exception ex)
{
Monitor.Log($"Error handling request: {ex}", LogLevel.Warn);
Expand All @@ -691,10 +697,15 @@ private async Task HandleRequestAsync(HttpListenerContext context)
}
finally
{
try { response.Close(); }
catch (Exception closeEx)
// Don't close the response for WebSocket requests — it's already been
// consumed/disposed by the WebSocket upgrade handshake.
if (!request.IsWebSocketRequest)
{
Monitor.Log($"Failed to close response: {closeEx}", LogLevel.Debug);
try { response.Close(); }
catch (Exception closeEx)
{
Monitor.Log($"Failed to close response: {closeEx}", LogLevel.Debug);
}
}
}
}
Expand Down
Loading