Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion crates/rust-mcp-sdk/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,19 @@ pub enum McpSdkError {
#[cfg(feature = "hyper-server")]
#[error("{0}")]
TransportServerError(#[from] TransportServerError),
#[error("Incompatible mcp protocol version!\n client:{0}\nserver:{1}")]
#[error("Incompatible mcp protocol version: client:{0} server:{1}")]
IncompatibleProtocolVersion(String, String),
}

impl McpSdkError {
/// Returns the RPC error message if the error is of type `McpSdkError::RpcError`.
pub fn rpc_error_message(&self) -> Option<&String> {
if let McpSdkError::RpcError(rpc_error) = self {
return Some(&rpc_error.message);
}
None
}
}

#[deprecated(since = "0.2.0", note = "Use `McpSdkError` instead.")]
pub type MCPSdkError = McpSdkError;
20 changes: 13 additions & 7 deletions crates/rust-mcp-sdk/src/mcp_handlers/mcp_server_handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,28 @@ pub trait ServerHandler: Send + Sync + 'static {
initialize_request: InitializeRequest,
runtime: &dyn McpServer,
) -> std::result::Result<InitializeResult, RpcError> {
runtime
.set_client_details(initialize_request.params.clone())
.map_err(|err| RpcError::internal_error().with_message(format!("{err}")))?;

let mut server_info = runtime.server_info().to_owned();
// Provide compatibility for clients using older MCP protocol versions.

if let Some(updated_protocol_version) = enforce_compatible_protocol_version(
&initialize_request.params.protocol_version,
&server_info.protocol_version,
)
.map_err(|err| RpcError::internal_error().with_message(err.to_string()))?
{
server_info.protocol_version = initialize_request.params.protocol_version;
.map_err(|err| {
tracing::error!(
"Incompatible protocol version : client: {} server: {}",
&initialize_request.params.protocol_version,
&server_info.protocol_version
);
RpcError::internal_error().with_message(err.to_string())
})? {
server_info.protocol_version = updated_protocol_version;
}

runtime
.set_client_details(initialize_request.params.clone())
.map_err(|err| RpcError::internal_error().with_message(format!("{err}")))?;

Ok(server_info)
}

Expand Down
9 changes: 8 additions & 1 deletion crates/rust-mcp-sdk/src/mcp_runtimes/server_runtime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,14 @@ impl McpServer for ServerRuntime {
// create a response to send back to the client
let response: MessageFromServer = match result {
Ok(success_value) => success_value.into(),
Err(error_value) => MessageFromServer::Error(error_value),
Err(error_value) => {
// Error occurred during initialization.
// A likely cause could be an unsupported protocol version.
if !self.is_initialized() {
return Err(error_value.into());
}
MessageFromServer::Error(error_value)
}
};

// send the response back with corresponding request id
Expand Down
10 changes: 9 additions & 1 deletion examples/hello-world-mcp-server-core/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,13 @@ async fn main() -> SdkResult<()> {
let server = server_runtime_core::create_server(server_details, transport, handler);

// STEP 5: Start the server
server.start().await
if let Err(start_error) = server.start().await {
eprintln!(
"{}",
start_error
.rpc_error_message()
.unwrap_or(&start_error.to_string())
);
};
Ok(())
}
10 changes: 9 additions & 1 deletion examples/hello-world-mcp-server/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,13 @@ async fn main() -> SdkResult<()> {
let server: ServerRuntime = server_runtime::create_server(server_details, transport, handler);

// STEP 5: Start the server
server.start().await
if let Err(start_error) = server.start().await {
eprintln!(
"{}",
start_error
.rpc_error_message()
.unwrap_or(&start_error.to_string())
);
};
Ok(())
}
12 changes: 9 additions & 3 deletions examples/hello-world-server-core-sse/src/handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,15 @@ impl ServerHandlerCore for MyServerHandler {
&initialize_request.params.protocol_version,
&server_info.protocol_version,
)
.map_err(|err| RpcError::internal_error().with_message(err.to_string()))?
{
server_info.protocol_version = initialize_request.params.protocol_version;
.map_err(|err| {
tracing::error!(
"Incompatible protocol version :\nclient: {}\nserver: {}",
&initialize_request.params.protocol_version,
&server_info.protocol_version
);
RpcError::internal_error().with_message(err.to_string())
})? {
server_info.protocol_version = updated_protocol_version;
}

return Ok(server_info.into());
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.87.0"
channel = "1.88.0"
components = ["rustfmt", "clippy"]