Skip to content

Improve SSE response handling and URI construction in SseClientSessio… #251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 9, 2025
Merged

Improve SSE response handling and URI construction in SseClientSessio… #251

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6ef0e3
Improve SSE response handling and URI construction in SseClientSessio…
239573049 Apr 9, 2025
9cfb2e2
Update src/ModelContextProtocol/Protocol/Transport/SseClientSessionTr…
halter73 Apr 9, 2025
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
12 changes: 5 additions & 7 deletions src/ModelContextProtocol/Protocol/Transport/SseClientSessionTransport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public override async Task SendMessageAsync(
if (message is JsonRpcRequest request && request.Method == RequestMethods.Initialize)
{
// If the response is not a JSON-RPC response, it is an SSE message
if (responseContent.Equals("accepted", StringComparison.OrdinalIgnoreCase))
if (string.IsNullOrEmpty(responseContent) || responseContent.Equals("accepted", StringComparison.OrdinalIgnoreCase))
{
_logger.SSETransportPostAccepted(_endpointName, messageId);
// The response will arrive as an SSE message
Expand All @@ -133,7 +133,7 @@ public override async Task SendMessageAsync(
}

// Otherwise, check if the response was accepted (the response will come as an SSE message)
if (responseContent.Equals("accepted", StringComparison.OrdinalIgnoreCase))
if (string.IsNullOrEmpty(responseContent) || responseContent.Equals("accepted", StringComparison.OrdinalIgnoreCase))
{
_logger.SSETransportPostAccepted(_endpointName, messageId);
}
Expand Down Expand Up @@ -294,13 +294,11 @@ private void HandleEndpointEvent(string data)
else
{
// If the endpoint is a relative URI, we need to combine it with the relative path of the SSE endpoint
var hostUrl = _sseEndpoint.AbsoluteUri;
if (hostUrl.EndsWith("/sse", StringComparison.Ordinal))
hostUrl = hostUrl[..^4];
var baseUriBuilder = new UriBuilder(_sseEndpoint);

var endpointUri = $"{hostUrl.TrimEnd('/')}/{data.TrimStart('/')}";

_messageEndpoint = new Uri(endpointUri);
// Instead of manually concatenating strings, use the Uri class's composition capabilities
_messageEndpoint = new Uri(baseUriBuilder.Uri, data);
}

// Set connected state
Expand Down