* fix: accept namespaced discovery server information (#1039) * fix: preserve discovery server-info compatibility
230 lines
6.9 KiB
Rust
230 lines
6.9 KiB
Rust
use rmcp::model::{
|
|
ClientCapabilities, ClientJsonRpcMessage, ClientRequest, DiscoverResult, ErrorCode, ErrorData,
|
|
JsonRpcRequest, JsonRpcResponse, ProtocolVersion, ServerJsonRpcMessage, ServerResult,
|
|
};
|
|
use serde_json::json;
|
|
|
|
#[test]
|
|
fn discover_request_deserializes_with_request_meta() {
|
|
let message: ClientJsonRpcMessage = serde_json::from_value(json!({
|
|
"jsonrpc": "2.0",
|
|
"id": 1,
|
|
"method": "server/discover",
|
|
"params": {
|
|
"_meta": {
|
|
"io.modelcontextprotocol/protocolVersion": "2026-07-28",
|
|
"io.modelcontextprotocol/clientInfo": {
|
|
"name": "test-client",
|
|
"version": "1.0.0"
|
|
},
|
|
"io.modelcontextprotocol/clientCapabilities": {}
|
|
}
|
|
}
|
|
}))
|
|
.expect("discover request should deserialize");
|
|
|
|
let ClientJsonRpcMessage::Request(JsonRpcRequest { request, .. }) = message else {
|
|
panic!("expected request");
|
|
};
|
|
let ClientRequest::DiscoverRequest(request) = request else {
|
|
panic!("expected discover request");
|
|
};
|
|
|
|
assert_eq!(
|
|
request
|
|
.extensions
|
|
.get::<rmcp::model::RequestMetaObject>()
|
|
.and_then(|meta| meta.protocol_version()),
|
|
Some(ProtocolVersion::V_2026_07_28)
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn discover_result_deserializes_to_typed_variant() {
|
|
let message: ServerJsonRpcMessage = serde_json::from_value(json!({
|
|
"jsonrpc": "2.0",
|
|
"id": 1,
|
|
"result": {
|
|
"resultType": "complete",
|
|
"supportedVersions": ["2025-11-25", "2026-07-28"],
|
|
"capabilities": { "tools": {} },
|
|
"serverInfo": {
|
|
"name": "test-server",
|
|
"version": "1.0.0"
|
|
},
|
|
"ttlMs": 0,
|
|
"cacheScope": "private"
|
|
}
|
|
}))
|
|
.expect("discover result should deserialize");
|
|
|
|
let ServerJsonRpcMessage::Response(JsonRpcResponse { result, .. }) = message else {
|
|
panic!("expected response");
|
|
};
|
|
let ServerResult::DiscoverResult(DiscoverResult {
|
|
supported_versions, ..
|
|
}) = result
|
|
else {
|
|
panic!("expected discover result");
|
|
};
|
|
|
|
assert_eq!(
|
|
supported_versions,
|
|
vec![ProtocolVersion::V_2025_11_25, ProtocolVersion::V_2026_07_28]
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn discover_result_accepts_server_info_in_namespaced_metadata() {
|
|
let message: ServerJsonRpcMessage = serde_json::from_value(json!({
|
|
"jsonrpc": "2.0",
|
|
"id": 1,
|
|
"result": {
|
|
"resultType": "complete",
|
|
"supportedVersions": ["2026-07-28"],
|
|
"capabilities": {},
|
|
"ttlMs": 0,
|
|
"cacheScope": "private",
|
|
"_meta": {
|
|
"io.modelcontextprotocol/serverInfo": {
|
|
"name": "conformance-mock-server",
|
|
"version": "1.0.0"
|
|
},
|
|
"unrelated": { "preserved": true }
|
|
}
|
|
}
|
|
}))
|
|
.expect("discovery response with namespaced server info should deserialize");
|
|
|
|
let ServerJsonRpcMessage::Response(JsonRpcResponse { result, .. }) = message else {
|
|
panic!("expected response");
|
|
};
|
|
let ServerResult::DiscoverResult(result) = result else {
|
|
panic!("expected discovery response, not a tool-call result");
|
|
};
|
|
|
|
assert_eq!(result.server_info.name, "conformance-mock-server");
|
|
assert_eq!(result.server_info.version, "1.0.0");
|
|
|
|
let metadata = result.meta.expect("discovery metadata should be preserved");
|
|
assert_eq!(
|
|
metadata.0.get("io.modelcontextprotocol/serverInfo"),
|
|
Some(&json!({
|
|
"name": "conformance-mock-server",
|
|
"version": "1.0.0"
|
|
}))
|
|
);
|
|
assert_eq!(
|
|
metadata.0.get("unrelated"),
|
|
Some(&json!({ "preserved": true }))
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn discover_result_serializes_top_level_server_info() {
|
|
let result = DiscoverResult::new(
|
|
vec![ProtocolVersion::V_2026_07_28],
|
|
rmcp::model::ServerCapabilities::default(),
|
|
rmcp::model::Implementation::new("test-server", "1.0.0"),
|
|
);
|
|
|
|
let serialized = serde_json::to_value(result).expect("serialize discovery result");
|
|
assert_eq!(
|
|
serialized["serverInfo"],
|
|
json!({
|
|
"name": "test-server",
|
|
"version": "1.0.0"
|
|
})
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn discover_result_prefers_top_level_server_info_over_namespaced_metadata() {
|
|
let result: DiscoverResult = serde_json::from_value(json!({
|
|
"resultType": "complete",
|
|
"supportedVersions": ["2026-07-28"],
|
|
"capabilities": {},
|
|
"serverInfo": {
|
|
"name": "top-level-server",
|
|
"version": "2.0.0"
|
|
},
|
|
"ttlMs": 0,
|
|
"cacheScope": "private",
|
|
"_meta": {
|
|
"io.modelcontextprotocol/serverInfo": {
|
|
"name": "metadata-server",
|
|
"version": "1.0.0"
|
|
},
|
|
"unrelated": true
|
|
}
|
|
}))
|
|
.expect("top-level server info should remain supported");
|
|
|
|
assert_eq!(result.server_info.name, "top-level-server");
|
|
assert_eq!(result.server_info.version, "2.0.0");
|
|
assert_eq!(
|
|
result
|
|
.meta
|
|
.as_ref()
|
|
.and_then(|metadata| metadata.0.get("unrelated")),
|
|
Some(&json!(true))
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn discover_result_requires_valid_top_level_or_namespaced_server_info() {
|
|
let result = json!({
|
|
"resultType": "complete",
|
|
"supportedVersions": ["2026-07-28"],
|
|
"capabilities": {},
|
|
"ttlMs": 0,
|
|
"cacheScope": "private",
|
|
"_meta": { "unrelated": true }
|
|
});
|
|
|
|
assert!(serde_json::from_value::<DiscoverResult>(result).is_err());
|
|
|
|
let malformed_server_info = json!({
|
|
"resultType": "complete",
|
|
"supportedVersions": ["2026-07-28"],
|
|
"capabilities": {},
|
|
"ttlMs": 0,
|
|
"cacheScope": "private",
|
|
"_meta": { "io.modelcontextprotocol/serverInfo": { "name": "missing-version" } }
|
|
});
|
|
|
|
assert!(serde_json::from_value::<DiscoverResult>(malformed_server_info).is_err());
|
|
}
|
|
|
|
#[test]
|
|
fn unsupported_protocol_version_error_matches_draft_schema() {
|
|
let error = ErrorData::unsupported_protocol_version(
|
|
ProtocolVersion::V_2026_07_28,
|
|
&[ProtocolVersion::V_2025_11_25],
|
|
);
|
|
|
|
assert_eq!(error.code, ErrorCode::UNSUPPORTED_PROTOCOL_VERSION);
|
|
assert_eq!(
|
|
error.data,
|
|
Some(json!({
|
|
"requested": "2026-07-28",
|
|
"supported": ["2025-11-25"]
|
|
}))
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn missing_required_capability_error_matches_draft_schema() {
|
|
let required = ClientCapabilities::builder().enable_elicitation().build();
|
|
let error = ErrorData::missing_required_client_capability(required);
|
|
|
|
assert_eq!(error.code, ErrorCode::MISSING_REQUIRED_CLIENT_CAPABILITY);
|
|
assert_eq!(
|
|
error.data,
|
|
Some(json!({
|
|
"requiredCapabilities": {
|
|
"elicitation": {}
|
|
}
|
|
}))
|
|
);
|
|
}
|