Skip to content
Merged
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,25 @@ impl StreamableHttpClient for reqwest::Client {
.headers()
.get(reqwest::header::CONTENT_TYPE)
.map(|ct| String::from_utf8_lossy(ct.as_bytes()).to_string());
let content_length = response.content_length();
let session_id = response
.headers()
.get(HEADER_SESSION_ID)
.and_then(|v| v.to_str().ok())
.map(|s| s.to_string());
// Spec requires 202 Accepted for these, but some servers return an empty 200.
// Treat empty success responses as equivalent to Accepted.
if status.is_success()
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the past, we've opted to be pretty strict about non-compliant clients. This does have the benefit of exposing issues that other tools might mask.

But other than that, I think it is probably harmless to accept empty 200s as equivalent to 202s.

I would suggest putting a comment note here though, just to state we're deliberately allowing something outside of the spec.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added a comment

&& content_length == Some(0)
&& matches!(
message,
ClientJsonRpcMessage::Notification(_)
| ClientJsonRpcMessage::Response(_)
| ClientJsonRpcMessage::Error(_)
)
{
return Ok(StreamableHttpPostResponse::Accepted);
}
// Non-success responses may carry valid JSON-RPC error payloads that
// should be surfaced as McpError rather than lost in TransportSend.
if !status.is_success() {
Expand Down
17 changes: 17 additions & 0 deletions crates/rmcp/src/transport/common/unix_socket.rs
Original file line number Diff line number Diff line change
Expand Up @@ -257,12 +257,29 @@ impl StreamableHttpClient for UnixSocketHttpClient {
}

let content_type = response.headers().get(http::header::CONTENT_TYPE).cloned();
let content_length = response
.headers()
.get(http::header::CONTENT_LENGTH)
.and_then(|v| v.to_str().ok())
.and_then(|v| v.parse::<u64>().ok());
let session_id = response
.headers()
.get(HEADER_SESSION_ID)
.and_then(|v| v.to_str().ok())
.map(|s| s.to_string());

if status.is_success()
&& content_length == Some(0)
&& matches!(
message,
ClientJsonRpcMessage::Notification(_)
| ClientJsonRpcMessage::Response(_)
| ClientJsonRpcMessage::Error(_)
)
{
return Ok(StreamableHttpPostResponse::Accepted);
}

match content_type {
Some(ref ct) if ct.as_bytes().starts_with(EVENT_STREAM_MIME_TYPE.as_bytes()) => {
let sse_stream = SseStream::new(response.into_body()).boxed();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#![cfg(all(
feature = "transport-streamable-http-client",
feature = "transport-streamable-http-client-reqwest",
not(feature = "local")
))]

use std::{collections::HashMap, sync::Arc};

use rmcp::{
model::{ClientJsonRpcMessage, ClientNotification, InitializedNotification},
transport::streamable_http_client::{StreamableHttpClient, StreamableHttpPostResponse},
};

async fn spawn_empty_ok_server() -> String {
use axum::{Router, http::StatusCode, routing::post};

let router = Router::new().route("/mcp", post(|| async { StatusCode::OK }));

let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
let addr = listener.local_addr().unwrap();
tokio::spawn(async move {
axum::serve(listener, router).await.unwrap();
});

format!("http://{addr}/mcp")
}

#[tokio::test]
async fn empty_success_response_to_notification_is_accepted() {
let url = spawn_empty_ok_server().await;
let client = reqwest::Client::new();
let result = client
.post_message(
Arc::from(url.as_str()),
ClientJsonRpcMessage::notification(ClientNotification::InitializedNotification(
InitializedNotification::default(),
)),
None,
None,
HashMap::new(),
)
.await;

match result {
Ok(StreamableHttpPostResponse::Accepted) => {}
other => panic!("expected Accepted, got: {other:?}"),
}
}