From cede9d757aba1baa6a942dff786552a9fb822f19 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Tue, 22 Jul 2025 13:10:06 -0600 Subject: [PATCH] Eliciting better --- crates/context_server/src/client.rs | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/crates/context_server/src/client.rs b/crates/context_server/src/client.rs index d87de882137be4dc1ec14d1c33a946a84ea688f3..f9a437cb12a482e0381831c5c6e149a73eb7c65e 100644 --- a/crates/context_server/src/client.rs +++ b/crates/context_server/src/client.rs @@ -262,15 +262,7 @@ impl Client { while let Some(message) = receiver.next().await { log::trace!("recv: {}", &message); - if let Ok(response) = serde_json::from_str::(&message) { - dbg!("here!"); - if let Some(handlers) = response_handlers.lock().as_mut() { - if let Some(handler) = handlers.remove(&response.id) { - handler(Ok(message.to_string())); - } - } - } else if let Some(request) = serde_json::from_str::(&message).log_err() { - dbg!("here!"); + if let Ok(request) = serde_json::from_str::(&message) { let mut request_handlers = request_handlers.lock(); if let Some(handler) = request_handlers.get_mut(request.method) { handler( @@ -279,14 +271,19 @@ impl Client { cx.clone(), ); } + } else if let Ok(response) = serde_json::from_str::(&message) { + if let Some(handlers) = response_handlers.lock().as_mut() { + if let Some(handler) = handlers.remove(&response.id) { + handler(Ok(message.to_string())); + } + } } else if let Ok(notification) = serde_json::from_str::(&message) { - dbg!("here!"); let mut notification_handlers = notification_handlers.lock(); if let Some(handler) = notification_handlers.get_mut(notification.method.as_str()) { handler(notification.params.unwrap_or(Value::Null), cx.clone()); } } else { - dbg!("WTF", &message); + log::error!("Unhandled JSON from context_server: {}", message); } }