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
43 changes: 41 additions & 2 deletions crates/rmcp/src/model/meta.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ use serde::{Deserialize, Serialize};
use serde_json::Value;

use super::{
ClientNotification, ClientRequest, Extensions, JsonObject, NumberOrString, ProgressToken,
ServerNotification, ServerRequest,
ClientNotification, ClientRequest, Extensions, JsonObject, JsonRpcMessage, NumberOrString,
ProgressToken, ServerNotification, ServerRequest,
};

pub trait GetMeta {
Expand Down Expand Up @@ -153,3 +153,42 @@ impl DerefMut for Meta {
&mut self.0
}
}

impl<Req, Resp, Noti> JsonRpcMessage<Req, Resp, Noti>
where
Req: GetExtensions,
Noti: GetExtensions,
{
pub fn insert_extension<T: Clone + Send + Sync + 'static>(&mut self, value: T) {
match self {
JsonRpcMessage::Request(json_rpc_request) => {
json_rpc_request.request.extensions_mut().insert(value);
}
JsonRpcMessage::Notification(json_rpc_notification) => {
json_rpc_notification
.notification
.extensions_mut()
.insert(value);
}
JsonRpcMessage::BatchRequest(json_rpc_batch_request_items) => {
for item in json_rpc_batch_request_items {
match item {
super::JsonRpcBatchRequestItem::Request(json_rpc_request) => {
json_rpc_request
.request
.extensions_mut()
.insert(value.clone());
}
super::JsonRpcBatchRequestItem::Notification(json_rpc_notification) => {
json_rpc_notification
.notification
.extensions_mut()
.insert(value.clone());
}
}
}
}
_ => {}
}
}
}
6 changes: 4 additions & 2 deletions crates/rmcp/src/transport/sse_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::{collections::HashMap, io, net::SocketAddr, sync::Arc, time::Duration};
use axum::{
Json, Router,
extract::{Query, State},
http::StatusCode,
http::{StatusCode, request::Parts},
response::{
Response,
sse::{Event, KeepAlive, Sse},
Expand Down Expand Up @@ -64,7 +64,8 @@ pub struct PostEventQuery {
async fn post_event_handler(
State(app): State<App>,
Query(PostEventQuery { session_id }): Query<PostEventQuery>,
Json(message): Json<ClientJsonRpcMessage>,
parts: Parts,
Json(mut message): Json<ClientJsonRpcMessage>,
) -> Result<StatusCode, StatusCode> {
tracing::debug!(session_id, ?message, "new client message");
let tx = {
Expand All @@ -73,6 +74,7 @@ async fn post_event_handler(
.ok_or(StatusCode::NOT_FOUND)?
.clone()
};
message.insert_extension(parts);
if tx.send(message).await.is_err() {
tracing::error!("send message error");
return Err(StatusCode::GONE);
Expand Down
12 changes: 8 additions & 4 deletions crates/rmcp/src/transport/streamable_http_server/axum.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::{collections::HashMap, io, net::SocketAddr, sync::Arc, time::Duration};
use axum::{
Json, Router,
extract::State,
http::{HeaderMap, HeaderValue, StatusCode},
http::{HeaderMap, HeaderValue, StatusCode, request::Parts},
response::{
IntoResponse, Response,
sse::{Event, KeepAlive, Sse},
Expand Down Expand Up @@ -68,11 +68,11 @@ fn receiver_as_stream(

async fn post_handler(
State(app): State<App>,
header_map: HeaderMap,
Json(message): Json<ClientJsonRpcMessage>,
parts: Parts,
Json(mut message): Json<ClientJsonRpcMessage>,
) -> Result<Response, Response> {
use futures::StreamExt;
if let Some(session_id) = header_map.get(HEADER_SESSION_ID) {
if let Some(session_id) = parts.headers.get(HEADER_SESSION_ID).cloned() {
let session_id = session_id
.to_str()
.map_err(|e| (StatusCode::BAD_REQUEST, e.to_string()).into_response())?;
Expand All @@ -84,6 +84,8 @@ async fn post_handler(
.ok_or((StatusCode::NOT_FOUND, "session not found").into_response())?;
session.handle().clone()
};
// inject request part
message.insert_extension(parts);
match &message {
ClientJsonRpcMessage::Request(_) | ClientJsonRpcMessage::BatchRequest(_) => {
let receiver = handle.establish_request_wise_channel().await.map_err(|e| {
Expand Down Expand Up @@ -128,6 +130,8 @@ async fn post_handler(
} else {
// expect initialize message
let session_id = session_id();
// inject request part
message.insert_extension(parts);
let (session, transport) =
super::session::create_session(session_id.clone(), Default::default());
let Ok(_) = app.transport_tx.send(transport) else {
Expand Down
14 changes: 14 additions & 0 deletions examples/servers/src/common/counter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ pub struct StructRequest {
pub struct Counter {
counter: Arc<Mutex<i32>>,
}

#[tool(tool_box)]
impl Counter {
#[allow(dead_code)]
Expand Down Expand Up @@ -194,4 +195,17 @@ impl ServerHandler for Counter {
resource_templates: Vec::new(),
})
}

async fn initialize(
&self,
_request: InitializeRequestParam,
context: RequestContext<RoleServer>,
) -> Result<InitializeResult, McpError> {
if let Some(http_request_part) = context.extensions.get::<axum::http::request::Parts>() {
let initialize_headers = &http_request_part.headers;
let initialize_uri = &http_request_part.uri;
tracing::info!(?initialize_headers, %initialize_uri, "initialize from http server");
}
Ok(self.get_info())
}
}
Loading