modelcontextprotocol/rust-sdk
Watch
1
0
Fork
You've already forked rust-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

feat: handle JsonRpcMessage::Error messages to propagate to the user

Browse source
This commit is contained in:
Kalvin Chau 2025-02-20 10:37:16 -08:00
commit 22b11ea127
2 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/mcp-client/src/transport/sse.rs
View file

@ -111,13 +111,23 @@ impl SseActor {
// Attempt to parse the SSE data as a JsonRpcMessage // Attempt to parse the SSE data as a JsonRpcMessage
match serde_json::from_str::<JsonRpcMessage>(&e.data) { match serde_json::from_str::<JsonRpcMessage>(&e.data) {
Ok(message) => { Ok(message) => {
// If it's a response, complete the pending request match &message {
if let JsonRpcMessage::Response(resp) = &message { JsonRpcMessage::Response(response) => {
if let Some(id) = &resp.id { if let Some(id) = &response.id {
pending_requests.respond(&id.to_string(), Ok(message)).await; pending_requests
.respond(&id.to_string(), Ok(message))
.await;
}
} }
JsonRpcMessage::Error(error) => {
if let Some(id) = &error.id {
pending_requests
.respond(&id.to_string(), Ok(message))
.await;
}
}
_ => {} // TODO: Handle other variants (Request, etc.)
} }
// If it's something else (notification, etc.), handle as needed
} }
Err(err) => { Err(err) => {
warn!("Failed to parse SSE message: {err}"); warn!("Failed to parse SSE message: {err}");

14
crates/mcp-client/src/transport/stdio.rs
View file

@ -87,10 +87,18 @@ impl StdioActor {
"Received incoming message" "Received incoming message"
); );
if let JsonRpcMessage::Response(response) = &message { match &message {
if let Some(id) = &response.id { JsonRpcMessage::Response(response) => {
pending_requests.respond(&id.to_string(), Ok(message)).await; if let Some(id) = &response.id {
pending_requests.respond(&id.to_string(), Ok(message)).await;
}
} }
JsonRpcMessage::Error(error) => {
if let Some(id) = &error.id {
pending_requests.respond(&id.to_string(), Ok(message)).await;
}
}
_ => {} // TODO: Handle other variants (Request, etc.)
} }
} }
line.clear(); line.clear();