Skip to content

fix: mcp client now ignores non json rpc bytes #1849

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
chaynabors merged 1 commit into from
May 15, 2025
Merged

fix: mcp client now ignores non json rpc bytes #1849

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions crates/chat-cli/src/mcp_client/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,8 +394,11 @@ where
let mut resp = time::timeout(Duration::from_millis(self.timeout), async {
// we want to ignore all other messages sent by the server at this point and let the
// background loop handle them
// We also want to ignore all messages emitted by the server to its stdout that does
// not deserialize into a valid JsonRpcMessage (they are not supposed to do this but
// too many people complained about this so we are adding this safeguard in)
loop {
if let JsonRpcMessage::Response(resp) = listener.recv().await? {
if let Ok(JsonRpcMessage::Response(resp)) = listener.recv().await {
if resp.id == id {
break Ok::<JsonRpcResponse, TransportError>(resp);
}
Expand Down Expand Up @@ -461,10 +464,8 @@ where
.await
.map_err(send_map_err)??;
let resp = time::timeout(Duration::from_millis(self.timeout), async {
// we want to ignore all other messages sent by the server at this point and let the
// background loop handle them
loop {
if let JsonRpcMessage::Response(resp) = listener.recv().await? {
if let Ok(JsonRpcMessage::Response(resp)) = listener.recv().await {
if resp.id == id {
break Ok::<JsonRpcResponse, TransportError>(resp);
}
Expand Down Expand Up @@ -630,6 +631,8 @@ mod tests {
}

#[tokio::test(flavor = "multi_thread")]
// For some reason this test is quite flakey when ran in the CI but not on developer's
// machines. As a result it is hard to debug, hence we are ignoring it for now.
#[ignore]
async fn test_client_stdio() {
std::process::Command::new("cargo")
Expand Down
Loading