* fix(model): deprecate ServerInfo and ClientInfo aliases Those names collide with the protocol's serverInfo/clientInfo fields, which are only Implementation identity. Prefer InitializeResult and InitializeRequestParams. Handler trait signatures, the tool_handler macro output, tests, examples and docs now use the canonical types; the aliases remain as deprecated shims for the rest of 3.x. Fixes #1082 * fix(model): keep public signatures on the deprecated aliases The public API check compares rendered signatures, and rustdoc records a type alias by the name it was written with. Respelling `ServerHandler::get_info`, `ClientHandler::get_info`, `DiscoverResult::from_server_info` and `impl ClientHandler for ClientInfo` onto `InitializeResult`/`InitializeRequestParams` therefore reads as changed public items even though the aliases resolve to those exact types and nothing downstream breaks. Put those four signatures back on the aliases so the published API is byte-identical, and note why at the alias definitions. The deprecation still steers new code, and the macro output, tests, examples and docs keep using the canonical names. * fix(model): migrate leftover ClientInfo test sites Two tests landed on main after the alias deprecation and still named ClientInfo. Clippy -D warnings and the no-local feature test job both failed on them.
190 lines
6.2 KiB
Rust
190 lines
6.2 KiB
Rust
// Sampling/Roots/Logging are SEP-2577-deprecated; this test handler exercises them.
|
|
#![expect(deprecated)]
|
|
use std::{
|
|
future::Future,
|
|
sync::{Arc, Mutex},
|
|
};
|
|
|
|
#[cfg(feature = "client")]
|
|
use rmcp::service::NotificationContext;
|
|
#[cfg(feature = "client")]
|
|
use rmcp::{ClientHandler, RoleClient};
|
|
use rmcp::{
|
|
ErrorData as McpError, RoleServer, ServerHandler,
|
|
model::*,
|
|
service::{MaybeSendFuture, RequestContext},
|
|
};
|
|
#[cfg(feature = "client")]
|
|
use serde_json::json;
|
|
use tokio::sync::Notify;
|
|
|
|
#[derive(Clone)]
|
|
#[allow(dead_code)]
|
|
pub struct TestClientHandler {
|
|
pub honor_this_server: bool,
|
|
pub honor_all_servers: bool,
|
|
pub receive_signal: Arc<Notify>,
|
|
pub received_messages: Arc<Mutex<Vec<LoggingMessageNotificationParam>>>,
|
|
}
|
|
|
|
impl TestClientHandler {
|
|
#[allow(dead_code)]
|
|
pub fn new(honor_this_server: bool, honor_all_servers: bool) -> Self {
|
|
Self {
|
|
honor_this_server,
|
|
honor_all_servers,
|
|
receive_signal: Arc::new(Notify::new()),
|
|
received_messages: Arc::new(Mutex::new(Vec::new())),
|
|
}
|
|
}
|
|
|
|
#[allow(dead_code)]
|
|
pub fn with_notification(
|
|
honor_this_server: bool,
|
|
honor_all_servers: bool,
|
|
receive_signal: Arc<Notify>,
|
|
received_messages: Arc<Mutex<Vec<LoggingMessageNotificationParam>>>,
|
|
) -> Self {
|
|
Self {
|
|
honor_this_server,
|
|
honor_all_servers,
|
|
receive_signal,
|
|
received_messages,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "client")]
|
|
impl ClientHandler for TestClientHandler {
|
|
async fn create_message(
|
|
&self,
|
|
params: CreateMessageRequestParams,
|
|
_context: RequestContext<RoleClient>,
|
|
) -> Result<CreateMessageResult, McpError> {
|
|
// First validate that there's at least one User message
|
|
if !params.messages.iter().any(|msg| msg.role == Role::User) {
|
|
return Err(McpError::invalid_request(
|
|
"Message sequence must contain at least one user message",
|
|
Some(json!({"messages": params.messages})),
|
|
));
|
|
}
|
|
|
|
// Create response based on context inclusion
|
|
let response = match params.include_context {
|
|
Some(ContextInclusion::ThisServer) if self.honor_this_server => {
|
|
"Test response with context: test context"
|
|
}
|
|
Some(ContextInclusion::AllServers) if self.honor_all_servers => {
|
|
"Test response with context: test context"
|
|
}
|
|
_ => "Test response without context",
|
|
};
|
|
|
|
Ok(CreateMessageResult::new(
|
|
SamplingMessage::assistant_text(response.to_string()),
|
|
"test-model".to_string(),
|
|
)
|
|
.with_stop_reason(CreateMessageResult::STOP_REASON_END_TURN))
|
|
}
|
|
|
|
fn on_logging_message(
|
|
&self,
|
|
params: LoggingMessageNotificationParam,
|
|
_context: NotificationContext<RoleClient>,
|
|
) -> impl Future<Output = ()> + MaybeSendFuture + '_ {
|
|
let receive_signal = self.receive_signal.clone();
|
|
let received_messages = self.received_messages.clone();
|
|
|
|
async move {
|
|
println!("Client: Received log message: {:?}", params);
|
|
let mut messages = received_messages.lock().unwrap();
|
|
messages.push(params);
|
|
receive_signal.notify_one();
|
|
}
|
|
}
|
|
}
|
|
|
|
pub struct TestServer {}
|
|
|
|
impl TestServer {
|
|
#[allow(dead_code)]
|
|
pub fn new() -> Self {
|
|
Self {}
|
|
}
|
|
}
|
|
|
|
impl ServerHandler for TestServer {
|
|
#[allow(deprecated)]
|
|
fn get_info(&self) -> InitializeResult {
|
|
InitializeResult::new(ServerCapabilities::builder().enable_logging().build())
|
|
}
|
|
|
|
#[allow(deprecated)]
|
|
fn set_level(
|
|
&self,
|
|
request: SetLevelRequestParams,
|
|
context: RequestContext<RoleServer>,
|
|
) -> impl Future<Output = Result<(), McpError>> + MaybeSendFuture + '_ {
|
|
let peer = context.peer;
|
|
async move {
|
|
let (data, logger) = match request.level {
|
|
LoggingLevel::Error => (
|
|
serde_json::json!({
|
|
"message": "Failed to process request",
|
|
"error_code": "E1001",
|
|
"error_details": "Connection timeout",
|
|
"timestamp": chrono::Utc::now().to_rfc3339(),
|
|
}),
|
|
Some("error_handler".to_string()),
|
|
),
|
|
LoggingLevel::Debug => (
|
|
serde_json::json!({
|
|
"message": "Processing request",
|
|
"function": "handle_request",
|
|
"line": 42,
|
|
"context": {
|
|
"request_id": "req-123",
|
|
"user_id": "user-456"
|
|
},
|
|
"timestamp": chrono::Utc::now().to_rfc3339(),
|
|
}),
|
|
Some("debug_logger".to_string()),
|
|
),
|
|
LoggingLevel::Info => (
|
|
serde_json::json!({
|
|
"message": "System status update",
|
|
"status": "healthy",
|
|
"metrics": {
|
|
"requests_per_second": 150,
|
|
"average_latency_ms": 45,
|
|
"error_rate": 0.01
|
|
},
|
|
"timestamp": chrono::Utc::now().to_rfc3339(),
|
|
}),
|
|
Some("monitoring".to_string()),
|
|
),
|
|
_ => (
|
|
serde_json::json!({
|
|
"message": format!("Message at level {:?}", request.level),
|
|
"timestamp": chrono::Utc::now().to_rfc3339(),
|
|
}),
|
|
None,
|
|
),
|
|
};
|
|
|
|
if let Err(e) = peer
|
|
.notify_logging_message({
|
|
let mut param = LoggingMessageNotificationParam::new(request.level, data);
|
|
if let Some(l) = logger {
|
|
param = param.with_logger(l);
|
|
}
|
|
param
|
|
})
|
|
.await
|
|
{
|
|
panic!("Failed to send notification: {}", e);
|
|
}
|
|
Ok(())
|
|
}
|
|
}
|
|
}
|