fix: keep initialize on legacy protocol versions (#1228)
Claude-Session: https://claude.ai/code/session_01EPcBfiUWJJueJn5cve1sjp
This commit is contained in:
parent
4e74499783
commit
ad9832ec21
1 changed files with 369 additions and 120 deletions
|
|
@ -10,7 +10,7 @@ use rmcp::{
|
|||
CreateMessageRequest, CreateMessageRequestParams, CreateMessageResult, ProtocolVersion,
|
||||
SamplingMessage, ServerCapabilities, ServerInfo, ServerRequest,
|
||||
},
|
||||
service::RequestContext,
|
||||
service::{RequestContext, RunningService, serve_directly},
|
||||
};
|
||||
use serde_json::{Value, json};
|
||||
use tokio::{
|
||||
|
|
@ -95,21 +95,44 @@ impl ClientHandler for SamplingClient {
|
|||
}
|
||||
}
|
||||
|
||||
/// Connects the pair on `2026-07-28`. That revision dropped the `initialize`
|
||||
/// handshake, so the version is agreed up front the way a discover-lifecycle
|
||||
/// startup leaves it.
|
||||
fn serve_modern_pair(
|
||||
server: SamplingServer,
|
||||
) -> (
|
||||
RunningService<RoleServer, SamplingServer>,
|
||||
RunningService<RoleClient, SamplingClient>,
|
||||
) {
|
||||
let (server_transport, client_transport) = tokio::io::duplex(4096);
|
||||
let mut server_peer_info = server.get_info();
|
||||
server_peer_info.protocol_version = ProtocolVersion::V_2026_07_28;
|
||||
|
||||
let running_server = serve_directly::<RoleServer, _, _, _, _>(
|
||||
server,
|
||||
server_transport,
|
||||
Some(SamplingClient.get_info()),
|
||||
);
|
||||
let client = serve_directly::<RoleClient, _, _, _, _>(
|
||||
SamplingClient,
|
||||
client_transport,
|
||||
Some(server_peer_info.into()),
|
||||
);
|
||||
(running_server, client)
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn nested_sampling_allowed_standalone_rejected() -> anyhow::Result<()> {
|
||||
let (server_transport, client_transport) = tokio::io::duplex(4096);
|
||||
let (tx, rx) = oneshot::channel();
|
||||
let server = SamplingServer {
|
||||
outside: Arc::new(Mutex::new(Some(tx))),
|
||||
};
|
||||
let (running_server, client) = serve_modern_pair(server);
|
||||
let server_handle = tokio::spawn(async move {
|
||||
let running = server.serve(server_transport).await?;
|
||||
running.waiting().await?;
|
||||
running_server.waiting().await?;
|
||||
anyhow::Ok(())
|
||||
});
|
||||
|
||||
let client = SamplingClient.serve(client_transport).await?;
|
||||
|
||||
let result = client
|
||||
.peer()
|
||||
.call_tool(CallToolRequestParams::new("sample"))
|
||||
|
|
@ -129,19 +152,16 @@ async fn nested_sampling_allowed_standalone_rejected() -> anyhow::Result<()> {
|
|||
|
||||
#[tokio::test]
|
||||
async fn generic_send_request_bypass_rejected() -> anyhow::Result<()> {
|
||||
let (server_transport, client_transport) = tokio::io::duplex(4096);
|
||||
let (tx, rx) = oneshot::channel();
|
||||
let server = SamplingServer {
|
||||
outside: Arc::new(Mutex::new(Some(tx))),
|
||||
};
|
||||
let (running_server, client) = serve_modern_pair(server);
|
||||
let server_handle = tokio::spawn(async move {
|
||||
let running = server.serve(server_transport).await?;
|
||||
running.waiting().await?;
|
||||
running_server.waiting().await?;
|
||||
anyhow::Ok(())
|
||||
});
|
||||
|
||||
let client = SamplingClient.serve(client_transport).await?;
|
||||
|
||||
let result = client
|
||||
.peer()
|
||||
.call_tool(CallToolRequestParams::new("sample_generic"))
|
||||
|
|
|
|||
Loading…
Reference in a new issue