feat: mark boxed http body as sync (#285)#291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
4t145 merged 1 commit into from
Jul 1, 2025
Merged

feat: mark boxed http body as sync (#285) #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 15 additions & 20 deletions crates/rmcp/src/transport/common/server_side_http.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use std::{convert::Infallible, fmt::Display, sync::Arc, time::Duration};
use bytes::{Buf, Bytes};
use http::Response;
use http_body::Body;
use http_body_util::{BodyExt, Empty, Full, combinators::UnsyncBoxBody};
use http_body_util::{BodyExt, Empty, Full, combinators::BoxBody};
use sse_stream::{KeepAlive, Sse, SseBody};

use super::http_header::EVENT_STREAM_MIME_TYPE;
Expand All@@ -18,12 +18,12 @@ pub fn session_id() -> SessionId {

pub const DEFAULT_AUTO_PING_INTERVAL: Duration = Duration::from_secs(15);

pub(crate) type BoxResponse = Response<UnsyncBoxBody<Bytes, Infallible>>;
pub(crate) type BoxResponse = Response<BoxBody<Bytes, Infallible>>;

pub(crate) fn accepted_response() -> Response<UnsyncBoxBody<Bytes, Infallible>> {
pub(crate) fn accepted_response() -> Response<BoxBody<Bytes, Infallible>> {
Response::builder()
.status(http::StatusCode::ACCEPTED)
.body(Empty::new().boxed_unsync())
.body(Empty::new().boxed())
.expect("valid response")
}
pin_project_lite::pin_project! {
Expand DownExpand Up@@ -63,9 +63,9 @@ pub struct ServerSseMessage {
}

pub(crate) fn sse_stream_response(
stream: impl futures::Stream<Item = ServerSseMessage> + Send + 'static,
stream: impl futures::Stream<Item = ServerSseMessage> + Send + Sync + 'static,
keep_alive: Option<Duration>,
) -> Response<UnsyncBoxBody<Bytes, Infallible>> {
) -> Response<BoxBody<Bytes, Infallible>> {
use futures::StreamExt;
let stream = SseBody::new(stream.map(|message| {
let data = serde_json::to_string(&message.message).expect("valid message");
Expand All@@ -76,8 +76,8 @@ pub(crate) fn sse_stream_response(
let stream = match keep_alive {
Some(duration) => stream
.with_keep_alive::<TokioTimer>(KeepAlive::new().interval(duration))
.boxed_unsync(),
None => stream.boxed_unsync(),
.boxed(),
None => stream.boxed(),
};
Response::builder()
.status(http::StatusCode::OK)
Expand All@@ -89,7 +89,7 @@ pub(crate) fn sse_stream_response(

pub(crate) const fn internal_error_response<E: Display>(
context: &str,
) -> impl FnOnce(E) -> Response<UnsyncBoxBody<Bytes, Infallible>> {
) -> impl FnOnce(E) -> Response<BoxBody<Bytes, Infallible>> {
move |error| {
tracing::error!("Internal server error when {context}: {error}");
Response::builder()
Expand All@@ -98,24 +98,22 @@ pub(crate) const fn internal_error_response<E: Display>(
Full::new(Bytes::from(format!(
"Encounter an error when {context}: {error}"
)))
.boxed_unsync(),
.boxed(),
)
.expect("valid response")
}
}

pub(crate) fn unexpected_message_response(
expect: &str,
) -> Response<UnsyncBoxBody<Bytes, Infallible>> {
pub(crate) fn unexpected_message_response(expect: &str) -> Response<BoxBody<Bytes, Infallible>> {
Response::builder()
.status(http::StatusCode::UNPROCESSABLE_ENTITY)
.body(Full::new(Bytes::from(format!("Unexpected message, expect {expect}"))).boxed_unsync())
.body(Full::new(Bytes::from(format!("Unexpected message, expect {expect}"))).boxed())
.expect("valid response")
}

pub(crate) async fn expect_json<B>(
body: B,
) -> Result<ClientJsonRpcMessage, Response<UnsyncBoxBody<Bytes, Infallible>>>
) -> Result<ClientJsonRpcMessage, Response<BoxBody<Bytes, Infallible>>>
where
B: Body + Send + 'static,
B::Error: Display,
Expand All@@ -129,7 +127,7 @@ where
.status(http::StatusCode::UNSUPPORTED_MEDIA_TYPE)
.body(
Full::new(Bytes::from(format!("fail to deserialize request body {e}")))
.boxed_unsync(),
.boxed(),
)
.expect("valid response");
Err(response)
Expand All@@ -139,10 +137,7 @@ where
Err(e) => {
let response = Response::builder()
.status(http::StatusCode::INTERNAL_SERVER_ERROR)
.body(
Full::new(Bytes::from(format!("Failed to read request body: {e}")))
.boxed_unsync(),
)
.body(Full::new(Bytes::from(format!("Failed to read request body: {e}"))).boxed())
.expect("valid response");
Err(response)
}
Expand Down
6 changes: 3 additions & 3 deletions crates/rmcp/src/transport/streamable_http_server/session.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ pub trait SessionManager: Send + Sync + 'static {
id: &SessionId,
message: ClientJsonRpcMessage,
) -> impl Future<
Output = Result<impl Stream<Item = ServerSseMessage> + Send + 'static, Self::Error>,
Output = Result<impl Stream<Item = ServerSseMessage> + Send + Sync + 'static, Self::Error>,
> + Send;
fn accept_message(
&self,
Expand All@@ -42,13 +42,13 @@ pub trait SessionManager: Send + Sync + 'static {
&self,
id: &SessionId,
) -> impl Future<
Output = Result<impl Stream<Item = ServerSseMessage> + Send + 'static, Self::Error>,
Output = Result<impl Stream<Item = ServerSseMessage> + Send + Sync + 'static, Self::Error>,
> + Send;
fn resume(
&self,
id: &SessionId,
last_event_id: String,
) -> impl Future<
Output = Result<impl Stream<Item = ServerSseMessage> + Send + 'static, Self::Error>,
Output = Result<impl Stream<Item = ServerSseMessage> + Send + Sync + 'static, Self::Error>,
> + Send;
}
31 changes: 12 additions & 19 deletions crates/rmcp/src/transport/streamable_http_server/tower.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use bytes::Bytes;
use futures::{StreamExt, future::BoxFuture};
use http::{Method, Request, Response, header::ALLOW};
use http_body::Body;
use http_body_util::{BodyExt, Full, combinators::UnsyncBoxBody};
use http_body_util::{BodyExt, Full, combinators::BoxBody};
use tokio_stream::wrappers::ReceiverStream;

use super::session::SessionManager;
Expand DownExpand Up@@ -105,7 +105,7 @@ where
fn get_service(&self) -> Result<S, std::io::Error> {
(self.service_factory)()
}
pub async fn handle<B>(&self, request: Request<B>) -> Response<UnsyncBoxBody<Bytes, Infallible>>
pub async fn handle<B>(&self, request: Request<B>) -> Response<BoxBody<Bytes, Infallible>>
where
B: Body + Send + 'static,
B::Error: Display,
Expand All@@ -120,7 +120,7 @@ where
let response = Response::builder()
.status(http::StatusCode::METHOD_NOT_ALLOWED)
.header(ALLOW, "GET, POST, DELETE")
.body(Full::new(Bytes::from("Method Not Allowed")).boxed_unsync())
.body(Full::new(Bytes::from("Method Not Allowed")).boxed())
.expect("valid response");
return response;
}
Expand DownExpand Up@@ -148,7 +148,7 @@ where
Full::new(Bytes::from(
"Not Acceptable: Client must accept text/event-stream",
))
.boxed_unsync(),
.boxed(),
)
.expect("valid response"));
}
Expand All@@ -162,7 +162,7 @@ where
// unauthorized
return Ok(Response::builder()
.status(http::StatusCode::UNAUTHORIZED)
.body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed_unsync())
.body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed())
.expect("valid response"));
};
// check if session exists
Expand All@@ -175,7 +175,7 @@ where
// unauthorized
return Ok(Response::builder()
.status(http::StatusCode::UNAUTHORIZED)
.body(Full::new(Bytes::from("Unauthorized: Session not found")).boxed_unsync())
.body(Full::new(Bytes::from("Unauthorized: Session not found")).boxed())
.expect("valid response"));
}
// check if last event id is provided
Expand DownExpand Up@@ -219,7 +219,7 @@ where
{
return Ok(Response::builder()
.status(http::StatusCode::NOT_ACCEPTABLE)
.body(Full::new(Bytes::from("Not Acceptable: Client must accept both application/json and text/event-stream")).boxed_unsync())
.body(Full::new(Bytes::from("Not Acceptable: Client must accept both application/json and text/event-stream")).boxed())
.expect("valid response"));
}

Expand All@@ -236,7 +236,7 @@ where
Full::new(Bytes::from(
"Unsupported Media Type: Content-Type must be application/json",
))
.boxed_unsync(),
.boxed(),
)
.expect("valid response"));
}
Expand DownExpand Up@@ -265,10 +265,7 @@ where
// unauthorized
return Ok(Response::builder()
.status(http::StatusCode::UNAUTHORIZED)
.body(
Full::new(Bytes::from("Unauthorized: Session not found"))
.boxed_unsync(),
)
.body(Full::new(Bytes::from("Unauthorized: Session not found")).boxed())
.expect("valid response"));
}

Expand DownExpand Up@@ -307,8 +304,7 @@ where
_ => Ok(Response::builder()
.status(http::StatusCode::NOT_IMPLEMENTED)
.body(
Full::new(Bytes::from("Batch requests are not supported yet"))
.boxed_unsync(),
Full::new(Bytes::from("Batch requests are not supported yet")).boxed(),
)
.expect("valid response")),
}
Expand DownExpand Up@@ -415,10 +411,7 @@ where
ClientJsonRpcMessage::Error(_json_rpc_error) => Ok(accepted_response()),
_ => Ok(Response::builder()
.status(http::StatusCode::NOT_IMPLEMENTED)
.body(
Full::new(Bytes::from("Batch requests are not supported yet"))
.boxed_unsync(),
)
.body(Full::new(Bytes::from("Batch requests are not supported yet")).boxed())
.expect("valid response")),
}
}
Expand All@@ -439,7 +432,7 @@ where
// unauthorized
return Ok(Response::builder()
.status(http::StatusCode::UNAUTHORIZED)
.body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed_unsync())
.body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed())
.expect("valid response"));
};
// close session
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feat: mark boxed http body as sync (#285)#291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

4t145
merged 1 commit into

from

Jul 1, 2025
 Merged


feat: mark boxed http body as sync (#285)
#291
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


35 changes: 15 additions & 20 deletions
crates/rmcp/src/transport/common/server_side_http.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use std::{convert::Infallible, fmt::Display, sync::Arc, time::Duration};
use bytes::{Buf, Bytes};
use http::Response;
use http_body::Body;
use http_body_util::{BodyExt, Empty, Full, combinators::UnsyncBoxBody};
use http_body_util::{BodyExt, Empty, Full, combinators::BoxBody};
use sse_stream::{KeepAlive, Sse, SseBody};

use super::http_header::EVENT_STREAM_MIME_TYPE;
Expand All@@ -18,12 +18,12 @@ pub fn session_id() -> SessionId {

pub const DEFAULT_AUTO_PING_INTERVAL: Duration = Duration::from_secs(15);

pub(crate) type BoxResponse = Response<UnsyncBoxBody<Bytes, Infallible>>;
pub(crate) type BoxResponse = Response<BoxBody<Bytes, Infallible>>;

pub(crate) fn accepted_response() -> Response<UnsyncBoxBody<Bytes, Infallible>> {
pub(crate) fn accepted_response() -> Response<BoxBody<Bytes, Infallible>> {
 Response::builder()
 .status(http::StatusCode::ACCEPTED)
 .body(Empty::new().boxed_unsync())
 .body(Empty::new().boxed())
 .expect("valid response")
}
pin_project_lite::pin_project! {
Expand DownExpand Up@@ -63,9 +63,9 @@ pub struct ServerSseMessage {
}

pub(crate) fn sse_stream_response(
 stream: impl futures::Stream<Item = ServerSseMessage> + Send + 'static,
 stream: impl futures::Stream<Item = ServerSseMessage> + Send + Sync + 'static,
 keep_alive: Option<Duration>,
) -> Response<UnsyncBoxBody<Bytes, Infallible>> {
) -> Response<BoxBody<Bytes, Infallible>> {
 use futures::StreamExt;
 let stream = SseBody::new(stream.map(|message| {
 let data = serde_json::to_string(&message.message).expect("valid message");
Expand All@@ -76,8 +76,8 @@ pub(crate) fn sse_stream_response(
 let stream = match keep_alive {
 Some(duration) => stream
 .with_keep_alive::<TokioTimer>(KeepAlive::new().interval(duration))
 .boxed_unsync(),
 None => stream.boxed_unsync(),
 .boxed(),
 None => stream.boxed(),
 };
 Response::builder()
 .status(http::StatusCode::OK)
Expand All@@ -89,7 +89,7 @@ pub(crate) fn sse_stream_response(

pub(crate) const fn internal_error_response<E: Display>(
 context: &str,
) -> impl FnOnce(E) -> Response<UnsyncBoxBody<Bytes, Infallible>> {
) -> impl FnOnce(E) -> Response<BoxBody<Bytes, Infallible>> {
 move |error| {
 tracing::error!("Internal server error when {context}: {error}");
 Response::builder()
Expand All@@ -98,24 +98,22 @@ pub(crate) const fn internal_error_response<E: Display>(
 Full::new(Bytes::from(format!(
 "Encounter an error when {context}: {error}"
 )))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response")
 }
}

pub(crate) fn unexpected_message_response(
 expect: &str,
) -> Response<UnsyncBoxBody<Bytes, Infallible>> {
pub(crate) fn unexpected_message_response(expect: &str) -> Response<BoxBody<Bytes, Infallible>> {
 Response::builder()
 .status(http::StatusCode::UNPROCESSABLE_ENTITY)
 .body(Full::new(Bytes::from(format!("Unexpected message, expect {expect}"))).boxed_unsync())
 .body(Full::new(Bytes::from(format!("Unexpected message, expect {expect}"))).boxed())
 .expect("valid response")
}

pub(crate) async fn expect_json<B>(
 body: B,
) -> Result<ClientJsonRpcMessage, Response<UnsyncBoxBody<Bytes, Infallible>>>
) -> Result<ClientJsonRpcMessage, Response<BoxBody<Bytes, Infallible>>>
where
 B: Body + Send + 'static,
 B::Error: Display,
Expand All@@ -129,7 +127,7 @@ where
 .status(http::StatusCode::UNSUPPORTED_MEDIA_TYPE)
 .body(
 Full::new(Bytes::from(format!("fail to deserialize request body {e}")))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response");
 Err(response)
Expand All@@ -139,10 +137,7 @@ where
 Err(e) => {
 let response = Response::builder()
 .status(http::StatusCode::INTERNAL_SERVER_ERROR)
 .body(
 Full::new(Bytes::from(format!("Failed to read request body: {e}")))
 .boxed_unsync(),
 )
 .body(Full::new(Bytes::from(format!("Failed to read request body: {e}"))).boxed())
 .expect("valid response");
 Err(response)
 }
Expand Down

6 changes: 3 additions & 3 deletions
crates/rmcp/src/transport/streamable_http_server/session.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ pub trait SessionManager: Send + Sync + 'static {
 id: &SessionId,
 message: ClientJsonRpcMessage,
 ) -> impl Future<
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + 'static, Self::Error>,
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + Sync + 'static, Self::Error>,
 > + Send;
 fn accept_message(
 &self,
Expand All@@ -42,13 +42,13 @@ pub trait SessionManager: Send + Sync + 'static {
 &self,
 id: &SessionId,
 ) -> impl Future<
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + 'static, Self::Error>,
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + Sync + 'static, Self::Error>,
 > + Send;
 fn resume(
 &self,
 id: &SessionId,
 last_event_id: String,
 ) -> impl Future<
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + 'static, Self::Error>,
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + Sync + 'static, Self::Error>,
 > + Send;
}

31 changes: 12 additions & 19 deletions
crates/rmcp/src/transport/streamable_http_server/tower.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use bytes::Bytes;
use futures::{StreamExt, future::BoxFuture};
use http::{Method, Request, Response, header::ALLOW};
use http_body::Body;
use http_body_util::{BodyExt, Full, combinators::UnsyncBoxBody};
use http_body_util::{BodyExt, Full, combinators::BoxBody};
use tokio_stream::wrappers::ReceiverStream;

use super::session::SessionManager;
Expand DownExpand Up@@ -105,7 +105,7 @@ where
 fn get_service(&self) -> Result<S, std::io::Error> {
 (self.service_factory)()
 }
 pub async fn handle<B>(&self, request: Request<B>) -> Response<UnsyncBoxBody<Bytes, Infallible>>
 pub async fn handle<B>(&self, request: Request<B>) -> Response<BoxBody<Bytes, Infallible>>
 where
 B: Body + Send + 'static,
 B::Error: Display,
Expand All@@ -120,7 +120,7 @@ where
 let response = Response::builder()
 .status(http::StatusCode::METHOD_NOT_ALLOWED)
 .header(ALLOW, "GET, POST, DELETE")
 .body(Full::new(Bytes::from("Method Not Allowed")).boxed_unsync())
 .body(Full::new(Bytes::from("Method Not Allowed")).boxed())
 .expect("valid response");
 return response;
 }
Expand DownExpand Up@@ -148,7 +148,7 @@ where
 Full::new(Bytes::from(
 "Not Acceptable: Client must accept text/event-stream",
 ))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response"));
 }
Expand All@@ -162,7 +162,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed_unsync())
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed())
 .expect("valid response"));
 };
 // check if session exists
Expand All@@ -175,7 +175,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(Full::new(Bytes::from("Unauthorized: Session not found")).boxed_unsync())
 .body(Full::new(Bytes::from("Unauthorized: Session not found")).boxed())
 .expect("valid response"));
 }
 // check if last event id is provided
Expand DownExpand Up@@ -219,7 +219,7 @@ where
 {
 return Ok(Response::builder()
 .status(http::StatusCode::NOT_ACCEPTABLE)
 .body(Full::new(Bytes::from("Not Acceptable: Client must accept both application/json and text/event-stream")).boxed_unsync())
 .body(Full::new(Bytes::from("Not Acceptable: Client must accept both application/json and text/event-stream")).boxed())
 .expect("valid response"));
 }

Expand All@@ -236,7 +236,7 @@ where
 Full::new(Bytes::from(
 "Unsupported Media Type: Content-Type must be application/json",
 ))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response"));
 }
Expand DownExpand Up@@ -265,10 +265,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(
 Full::new(Bytes::from("Unauthorized: Session not found"))
 .boxed_unsync(),
 )
 .body(Full::new(Bytes::from("Unauthorized: Session not found")).boxed())
 .expect("valid response"));
 }

Expand DownExpand Up@@ -307,8 +304,7 @@ where
 _ => Ok(Response::builder()
 .status(http::StatusCode::NOT_IMPLEMENTED)
 .body(
 Full::new(Bytes::from("Batch requests are not supported yet"))
 .boxed_unsync(),
 Full::new(Bytes::from("Batch requests are not supported yet")).boxed(),
 )
 .expect("valid response")),
 }
Expand DownExpand Up@@ -415,10 +411,7 @@ where
 ClientJsonRpcMessage::Error(_json_rpc_error) => Ok(accepted_response()),
 _ => Ok(Response::builder()
 .status(http::StatusCode::NOT_IMPLEMENTED)
 .body(
 Full::new(Bytes::from("Batch requests are not supported yet"))
 .boxed_unsync(),
 )
 .body(Full::new(Bytes::from("Batch requests are not supported yet")).boxed())
 .expect("valid response")),
 }
 }
Expand All@@ -439,7 +432,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed_unsync())
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed())
 .expect("valid response"));
 };
 // close session
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: mark boxed http body as sync (#285)#291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

4t145
merged 1 commit into

from

Jul 1, 2025
 Merged


feat: mark boxed http body as sync (#285)
#291
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


35 changes: 15 additions & 20 deletions
crates/rmcp/src/transport/common/server_side_http.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use std::{convert::Infallible, fmt::Display, sync::Arc, time::Duration};
use bytes::{Buf, Bytes};
use http::Response;
use http_body::Body;
use http_body_util::{BodyExt, Empty, Full, combinators::UnsyncBoxBody};
use http_body_util::{BodyExt, Empty, Full, combinators::BoxBody};
use sse_stream::{KeepAlive, Sse, SseBody};

use super::http_header::EVENT_STREAM_MIME_TYPE;
Expand All@@ -18,12 +18,12 @@ pub fn session_id() -> SessionId {

pub const DEFAULT_AUTO_PING_INTERVAL: Duration = Duration::from_secs(15);

pub(crate) type BoxResponse = Response<UnsyncBoxBody<Bytes, Infallible>>;
pub(crate) type BoxResponse = Response<BoxBody<Bytes, Infallible>>;

pub(crate) fn accepted_response() -> Response<UnsyncBoxBody<Bytes, Infallible>> {
pub(crate) fn accepted_response() -> Response<BoxBody<Bytes, Infallible>> {
 Response::builder()
 .status(http::StatusCode::ACCEPTED)
 .body(Empty::new().boxed_unsync())
 .body(Empty::new().boxed())
 .expect("valid response")
}
pin_project_lite::pin_project! {
Expand DownExpand Up@@ -63,9 +63,9 @@ pub struct ServerSseMessage {
}

pub(crate) fn sse_stream_response(
 stream: impl futures::Stream<Item = ServerSseMessage> + Send + 'static,
 stream: impl futures::Stream<Item = ServerSseMessage> + Send + Sync + 'static,
 keep_alive: Option<Duration>,
) -> Response<UnsyncBoxBody<Bytes, Infallible>> {
) -> Response<BoxBody<Bytes, Infallible>> {
 use futures::StreamExt;
 let stream = SseBody::new(stream.map(|message| {
 let data = serde_json::to_string(&message.message).expect("valid message");
Expand All@@ -76,8 +76,8 @@ pub(crate) fn sse_stream_response(
 let stream = match keep_alive {
 Some(duration) => stream
 .with_keep_alive::<TokioTimer>(KeepAlive::new().interval(duration))
 .boxed_unsync(),
 None => stream.boxed_unsync(),
 .boxed(),
 None => stream.boxed(),
 };
 Response::builder()
 .status(http::StatusCode::OK)
Expand All@@ -89,7 +89,7 @@ pub(crate) fn sse_stream_response(

pub(crate) const fn internal_error_response<E: Display>(
 context: &str,
) -> impl FnOnce(E) -> Response<UnsyncBoxBody<Bytes, Infallible>> {
) -> impl FnOnce(E) -> Response<BoxBody<Bytes, Infallible>> {
 move |error| {
 tracing::error!("Internal server error when {context}: {error}");
 Response::builder()
Expand All@@ -98,24 +98,22 @@ pub(crate) const fn internal_error_response<E: Display>(
 Full::new(Bytes::from(format!(
 "Encounter an error when {context}: {error}"
 )))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response")
 }
}

pub(crate) fn unexpected_message_response(
 expect: &str,
) -> Response<UnsyncBoxBody<Bytes, Infallible>> {
pub(crate) fn unexpected_message_response(expect: &str) -> Response<BoxBody<Bytes, Infallible>> {
 Response::builder()
 .status(http::StatusCode::UNPROCESSABLE_ENTITY)
 .body(Full::new(Bytes::from(format!("Unexpected message, expect {expect}"))).boxed_unsync())
 .body(Full::new(Bytes::from(format!("Unexpected message, expect {expect}"))).boxed())
 .expect("valid response")
}

pub(crate) async fn expect_json<B>(
 body: B,
) -> Result<ClientJsonRpcMessage, Response<UnsyncBoxBody<Bytes, Infallible>>>
) -> Result<ClientJsonRpcMessage, Response<BoxBody<Bytes, Infallible>>>
where
 B: Body + Send + 'static,
 B::Error: Display,
Expand All@@ -129,7 +127,7 @@ where
 .status(http::StatusCode::UNSUPPORTED_MEDIA_TYPE)
 .body(
 Full::new(Bytes::from(format!("fail to deserialize request body {e}")))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response");
 Err(response)
Expand All@@ -139,10 +137,7 @@ where
 Err(e) => {
 let response = Response::builder()
 .status(http::StatusCode::INTERNAL_SERVER_ERROR)
 .body(
 Full::new(Bytes::from(format!("Failed to read request body: {e}")))
 .boxed_unsync(),
 )
 .body(Full::new(Bytes::from(format!("Failed to read request body: {e}"))).boxed())
 .expect("valid response");
 Err(response)
 }
Expand Down

6 changes: 3 additions & 3 deletions
crates/rmcp/src/transport/streamable_http_server/session.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ pub trait SessionManager: Send + Sync + 'static {
 id: &SessionId,
 message: ClientJsonRpcMessage,
 ) -> impl Future<
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + 'static, Self::Error>,
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + Sync + 'static, Self::Error>,
 > + Send;
 fn accept_message(
 &self,
Expand All@@ -42,13 +42,13 @@ pub trait SessionManager: Send + Sync + 'static {
 &self,
 id: &SessionId,
 ) -> impl Future<
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + 'static, Self::Error>,
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + Sync + 'static, Self::Error>,
 > + Send;
 fn resume(
 &self,
 id: &SessionId,
 last_event_id: String,
 ) -> impl Future<
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + 'static, Self::Error>,
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + Sync + 'static, Self::Error>,
 > + Send;
}

31 changes: 12 additions & 19 deletions
crates/rmcp/src/transport/streamable_http_server/tower.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use bytes::Bytes;
use futures::{StreamExt, future::BoxFuture};
use http::{Method, Request, Response, header::ALLOW};
use http_body::Body;
use http_body_util::{BodyExt, Full, combinators::UnsyncBoxBody};
use http_body_util::{BodyExt, Full, combinators::BoxBody};
use tokio_stream::wrappers::ReceiverStream;

use super::session::SessionManager;
Expand DownExpand Up@@ -105,7 +105,7 @@ where
 fn get_service(&self) -> Result<S, std::io::Error> {
 (self.service_factory)()
 }
 pub async fn handle<B>(&self, request: Request<B>) -> Response<UnsyncBoxBody<Bytes, Infallible>>
 pub async fn handle<B>(&self, request: Request<B>) -> Response<BoxBody<Bytes, Infallible>>
 where
 B: Body + Send + 'static,
 B::Error: Display,
Expand All@@ -120,7 +120,7 @@ where
 let response = Response::builder()
 .status(http::StatusCode::METHOD_NOT_ALLOWED)
 .header(ALLOW, "GET, POST, DELETE")
 .body(Full::new(Bytes::from("Method Not Allowed")).boxed_unsync())
 .body(Full::new(Bytes::from("Method Not Allowed")).boxed())
 .expect("valid response");
 return response;
 }
Expand DownExpand Up@@ -148,7 +148,7 @@ where
 Full::new(Bytes::from(
 "Not Acceptable: Client must accept text/event-stream",
 ))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response"));
 }
Expand All@@ -162,7 +162,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed_unsync())
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed())
 .expect("valid response"));
 };
 // check if session exists
Expand All@@ -175,7 +175,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(Full::new(Bytes::from("Unauthorized: Session not found")).boxed_unsync())
 .body(Full::new(Bytes::from("Unauthorized: Session not found")).boxed())
 .expect("valid response"));
 }
 // check if last event id is provided
Expand DownExpand Up@@ -219,7 +219,7 @@ where
 {
 return Ok(Response::builder()
 .status(http::StatusCode::NOT_ACCEPTABLE)
 .body(Full::new(Bytes::from("Not Acceptable: Client must accept both application/json and text/event-stream")).boxed_unsync())
 .body(Full::new(Bytes::from("Not Acceptable: Client must accept both application/json and text/event-stream")).boxed())
 .expect("valid response"));
 }

Expand All@@ -236,7 +236,7 @@ where
 Full::new(Bytes::from(
 "Unsupported Media Type: Content-Type must be application/json",
 ))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response"));
 }
Expand DownExpand Up@@ -265,10 +265,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(
 Full::new(Bytes::from("Unauthorized: Session not found"))
 .boxed_unsync(),
 )
 .body(Full::new(Bytes::from("Unauthorized: Session not found")).boxed())
 .expect("valid response"));
 }

Expand DownExpand Up@@ -307,8 +304,7 @@ where
 _ => Ok(Response::builder()
 .status(http::StatusCode::NOT_IMPLEMENTED)
 .body(
 Full::new(Bytes::from("Batch requests are not supported yet"))
 .boxed_unsync(),
 Full::new(Bytes::from("Batch requests are not supported yet")).boxed(),
 )
 .expect("valid response")),
 }
Expand DownExpand Up@@ -415,10 +411,7 @@ where
 ClientJsonRpcMessage::Error(_json_rpc_error) => Ok(accepted_response()),
 _ => Ok(Response::builder()
 .status(http::StatusCode::NOT_IMPLEMENTED)
 .body(
 Full::new(Bytes::from("Batch requests are not supported yet"))
 .boxed_unsync(),
 )
 .body(Full::new(Bytes::from("Batch requests are not supported yet")).boxed())
 .expect("valid response")),
 }
 }
Expand All@@ -439,7 +432,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed_unsync())
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed())
 .expect("valid response"));
 };
 // close session
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: mark boxed http body as sync (#285)#291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

4t145
merged 1 commit into

from

Jul 1, 2025
 Merged


feat: mark boxed http body as sync (#285)
#291
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


35 changes: 15 additions & 20 deletions
crates/rmcp/src/transport/common/server_side_http.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use std::{convert::Infallible, fmt::Display, sync::Arc, time::Duration};
use bytes::{Buf, Bytes};
use http::Response;
use http_body::Body;
use http_body_util::{BodyExt, Empty, Full, combinators::UnsyncBoxBody};
use http_body_util::{BodyExt, Empty, Full, combinators::BoxBody};
use sse_stream::{KeepAlive, Sse, SseBody};

use super::http_header::EVENT_STREAM_MIME_TYPE;
Expand All@@ -18,12 +18,12 @@ pub fn session_id() -> SessionId {

pub const DEFAULT_AUTO_PING_INTERVAL: Duration = Duration::from_secs(15);

pub(crate) type BoxResponse = Response<UnsyncBoxBody<Bytes, Infallible>>;
pub(crate) type BoxResponse = Response<BoxBody<Bytes, Infallible>>;

pub(crate) fn accepted_response() -> Response<UnsyncBoxBody<Bytes, Infallible>> {
pub(crate) fn accepted_response() -> Response<BoxBody<Bytes, Infallible>> {
 Response::builder()
 .status(http::StatusCode::ACCEPTED)
 .body(Empty::new().boxed_unsync())
 .body(Empty::new().boxed())
 .expect("valid response")
}
pin_project_lite::pin_project! {
Expand DownExpand Up@@ -63,9 +63,9 @@ pub struct ServerSseMessage {
}

pub(crate) fn sse_stream_response(
 stream: impl futures::Stream<Item = ServerSseMessage> + Send + 'static,
 stream: impl futures::Stream<Item = ServerSseMessage> + Send + Sync + 'static,
 keep_alive: Option<Duration>,
) -> Response<UnsyncBoxBody<Bytes, Infallible>> {
) -> Response<BoxBody<Bytes, Infallible>> {
 use futures::StreamExt;
 let stream = SseBody::new(stream.map(|message| {
 let data = serde_json::to_string(&message.message).expect("valid message");
Expand All@@ -76,8 +76,8 @@ pub(crate) fn sse_stream_response(
 let stream = match keep_alive {
 Some(duration) => stream
 .with_keep_alive::<TokioTimer>(KeepAlive::new().interval(duration))
 .boxed_unsync(),
 None => stream.boxed_unsync(),
 .boxed(),
 None => stream.boxed(),
 };
 Response::builder()
 .status(http::StatusCode::OK)
Expand All@@ -89,7 +89,7 @@ pub(crate) fn sse_stream_response(

pub(crate) const fn internal_error_response<E: Display>(
 context: &str,
) -> impl FnOnce(E) -> Response<UnsyncBoxBody<Bytes, Infallible>> {
) -> impl FnOnce(E) -> Response<BoxBody<Bytes, Infallible>> {
 move |error| {
 tracing::error!("Internal server error when {context}: {error}");
 Response::builder()
Expand All@@ -98,24 +98,22 @@ pub(crate) const fn internal_error_response<E: Display>(
 Full::new(Bytes::from(format!(
 "Encounter an error when {context}: {error}"
 )))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response")
 }
}

pub(crate) fn unexpected_message_response(
 expect: &str,
) -> Response<UnsyncBoxBody<Bytes, Infallible>> {
pub(crate) fn unexpected_message_response(expect: &str) -> Response<BoxBody<Bytes, Infallible>> {
 Response::builder()
 .status(http::StatusCode::UNPROCESSABLE_ENTITY)
 .body(Full::new(Bytes::from(format!("Unexpected message, expect {expect}"))).boxed_unsync())
 .body(Full::new(Bytes::from(format!("Unexpected message, expect {expect}"))).boxed())
 .expect("valid response")
}

pub(crate) async fn expect_json<B>(
 body: B,
) -> Result<ClientJsonRpcMessage, Response<UnsyncBoxBody<Bytes, Infallible>>>
) -> Result<ClientJsonRpcMessage, Response<BoxBody<Bytes, Infallible>>>
where
 B: Body + Send + 'static,
 B::Error: Display,
Expand All@@ -129,7 +127,7 @@ where
 .status(http::StatusCode::UNSUPPORTED_MEDIA_TYPE)
 .body(
 Full::new(Bytes::from(format!("fail to deserialize request body {e}")))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response");
 Err(response)
Expand All@@ -139,10 +137,7 @@ where
 Err(e) => {
 let response = Response::builder()
 .status(http::StatusCode::INTERNAL_SERVER_ERROR)
 .body(
 Full::new(Bytes::from(format!("Failed to read request body: {e}")))
 .boxed_unsync(),
 )
 .body(Full::new(Bytes::from(format!("Failed to read request body: {e}"))).boxed())
 .expect("valid response");
 Err(response)
 }
Expand Down

6 changes: 3 additions & 3 deletions
crates/rmcp/src/transport/streamable_http_server/session.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ pub trait SessionManager: Send + Sync + 'static {
 id: &SessionId,
 message: ClientJsonRpcMessage,
 ) -> impl Future<
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + 'static, Self::Error>,
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + Sync + 'static, Self::Error>,
 > + Send;
 fn accept_message(
 &self,
Expand All@@ -42,13 +42,13 @@ pub trait SessionManager: Send + Sync + 'static {
 &self,
 id: &SessionId,
 ) -> impl Future<
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + 'static, Self::Error>,
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + Sync + 'static, Self::Error>,
 > + Send;
 fn resume(
 &self,
 id: &SessionId,
 last_event_id: String,
 ) -> impl Future<
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + 'static, Self::Error>,
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + Sync + 'static, Self::Error>,
 > + Send;
}

31 changes: 12 additions & 19 deletions
crates/rmcp/src/transport/streamable_http_server/tower.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use bytes::Bytes;
use futures::{StreamExt, future::BoxFuture};
use http::{Method, Request, Response, header::ALLOW};
use http_body::Body;
use http_body_util::{BodyExt, Full, combinators::UnsyncBoxBody};
use http_body_util::{BodyExt, Full, combinators::BoxBody};
use tokio_stream::wrappers::ReceiverStream;

use super::session::SessionManager;
Expand DownExpand Up@@ -105,7 +105,7 @@ where
 fn get_service(&self) -> Result<S, std::io::Error> {
 (self.service_factory)()
 }
 pub async fn handle<B>(&self, request: Request<B>) -> Response<UnsyncBoxBody<Bytes, Infallible>>
 pub async fn handle<B>(&self, request: Request<B>) -> Response<BoxBody<Bytes, Infallible>>
 where
 B: Body + Send + 'static,
 B::Error: Display,
Expand All@@ -120,7 +120,7 @@ where
 let response = Response::builder()
 .status(http::StatusCode::METHOD_NOT_ALLOWED)
 .header(ALLOW, "GET, POST, DELETE")
 .body(Full::new(Bytes::from("Method Not Allowed")).boxed_unsync())
 .body(Full::new(Bytes::from("Method Not Allowed")).boxed())
 .expect("valid response");
 return response;
 }
Expand DownExpand Up@@ -148,7 +148,7 @@ where
 Full::new(Bytes::from(
 "Not Acceptable: Client must accept text/event-stream",
 ))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response"));
 }
Expand All@@ -162,7 +162,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed_unsync())
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed())
 .expect("valid response"));
 };
 // check if session exists
Expand All@@ -175,7 +175,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(Full::new(Bytes::from("Unauthorized: Session not found")).boxed_unsync())
 .body(Full::new(Bytes::from("Unauthorized: Session not found")).boxed())
 .expect("valid response"));
 }
 // check if last event id is provided
Expand DownExpand Up@@ -219,7 +219,7 @@ where
 {
 return Ok(Response::builder()
 .status(http::StatusCode::NOT_ACCEPTABLE)
 .body(Full::new(Bytes::from("Not Acceptable: Client must accept both application/json and text/event-stream")).boxed_unsync())
 .body(Full::new(Bytes::from("Not Acceptable: Client must accept both application/json and text/event-stream")).boxed())
 .expect("valid response"));
 }

Expand All@@ -236,7 +236,7 @@ where
 Full::new(Bytes::from(
 "Unsupported Media Type: Content-Type must be application/json",
 ))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response"));
 }
Expand DownExpand Up@@ -265,10 +265,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(
 Full::new(Bytes::from("Unauthorized: Session not found"))
 .boxed_unsync(),
 )
 .body(Full::new(Bytes::from("Unauthorized: Session not found")).boxed())
 .expect("valid response"));
 }

Expand DownExpand Up@@ -307,8 +304,7 @@ where
 _ => Ok(Response::builder()
 .status(http::StatusCode::NOT_IMPLEMENTED)
 .body(
 Full::new(Bytes::from("Batch requests are not supported yet"))
 .boxed_unsync(),
 Full::new(Bytes::from("Batch requests are not supported yet")).boxed(),
 )
 .expect("valid response")),
 }
Expand DownExpand Up@@ -415,10 +411,7 @@ where
 ClientJsonRpcMessage::Error(_json_rpc_error) => Ok(accepted_response()),
 _ => Ok(Response::builder()
 .status(http::StatusCode::NOT_IMPLEMENTED)
 .body(
 Full::new(Bytes::from("Batch requests are not supported yet"))
 .boxed_unsync(),
 )
 .body(Full::new(Bytes::from("Batch requests are not supported yet")).boxed())
 .expect("valid response")),
 }
 }
Expand All@@ -439,7 +432,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed_unsync())
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed())
 .expect("valid response"));
 };
 // close session
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
feat: mark boxed http body as sync (#285)#291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

4t145
merged 1 commit into

from

Jul 1, 2025
 Merged


feat: mark boxed http body as sync (#285)
#291
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


35 changes: 15 additions & 20 deletions
crates/rmcp/src/transport/common/server_side_http.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use std::{convert::Infallible, fmt::Display, sync::Arc, time::Duration};
use bytes::{Buf, Bytes};
use http::Response;
use http_body::Body;
use http_body_util::{BodyExt, Empty, Full, combinators::UnsyncBoxBody};
use http_body_util::{BodyExt, Empty, Full, combinators::BoxBody};
use sse_stream::{KeepAlive, Sse, SseBody};

use super::http_header::EVENT_STREAM_MIME_TYPE;
Expand All@@ -18,12 +18,12 @@ pub fn session_id() -> SessionId {

pub const DEFAULT_AUTO_PING_INTERVAL: Duration = Duration::from_secs(15);

pub(crate) type BoxResponse = Response<UnsyncBoxBody<Bytes, Infallible>>;
pub(crate) type BoxResponse = Response<BoxBody<Bytes, Infallible>>;

pub(crate) fn accepted_response() -> Response<UnsyncBoxBody<Bytes, Infallible>> {
pub(crate) fn accepted_response() -> Response<BoxBody<Bytes, Infallible>> {
 Response::builder()
 .status(http::StatusCode::ACCEPTED)
 .body(Empty::new().boxed_unsync())
 .body(Empty::new().boxed())
 .expect("valid response")
}
pin_project_lite::pin_project! {
Expand DownExpand Up@@ -63,9 +63,9 @@ pub struct ServerSseMessage {
}

pub(crate) fn sse_stream_response(
 stream: impl futures::Stream<Item = ServerSseMessage> + Send + 'static,
 stream: impl futures::Stream<Item = ServerSseMessage> + Send + Sync + 'static,
 keep_alive: Option<Duration>,
) -> Response<UnsyncBoxBody<Bytes, Infallible>> {
) -> Response<BoxBody<Bytes, Infallible>> {
 use futures::StreamExt;
 let stream = SseBody::new(stream.map(|message| {
 let data = serde_json::to_string(&message.message).expect("valid message");
Expand All@@ -76,8 +76,8 @@ pub(crate) fn sse_stream_response(
 let stream = match keep_alive {
 Some(duration) => stream
 .with_keep_alive::<TokioTimer>(KeepAlive::new().interval(duration))
 .boxed_unsync(),
 None => stream.boxed_unsync(),
 .boxed(),
 None => stream.boxed(),
 };
 Response::builder()
 .status(http::StatusCode::OK)
Expand All@@ -89,7 +89,7 @@ pub(crate) fn sse_stream_response(

pub(crate) const fn internal_error_response<E: Display>(
 context: &str,
) -> impl FnOnce(E) -> Response<UnsyncBoxBody<Bytes, Infallible>> {
) -> impl FnOnce(E) -> Response<BoxBody<Bytes, Infallible>> {
 move |error| {
 tracing::error!("Internal server error when {context}: {error}");
 Response::builder()
Expand All@@ -98,24 +98,22 @@ pub(crate) const fn internal_error_response<E: Display>(
 Full::new(Bytes::from(format!(
 "Encounter an error when {context}: {error}"
 )))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response")
 }
}

pub(crate) fn unexpected_message_response(
 expect: &str,
) -> Response<UnsyncBoxBody<Bytes, Infallible>> {
pub(crate) fn unexpected_message_response(expect: &str) -> Response<BoxBody<Bytes, Infallible>> {
 Response::builder()
 .status(http::StatusCode::UNPROCESSABLE_ENTITY)
 .body(Full::new(Bytes::from(format!("Unexpected message, expect {expect}"))).boxed_unsync())
 .body(Full::new(Bytes::from(format!("Unexpected message, expect {expect}"))).boxed())
 .expect("valid response")
}

pub(crate) async fn expect_json<B>(
 body: B,
) -> Result<ClientJsonRpcMessage, Response<UnsyncBoxBody<Bytes, Infallible>>>
) -> Result<ClientJsonRpcMessage, Response<BoxBody<Bytes, Infallible>>>
where
 B: Body + Send + 'static,
 B::Error: Display,
Expand All@@ -129,7 +127,7 @@ where
 .status(http::StatusCode::UNSUPPORTED_MEDIA_TYPE)
 .body(
 Full::new(Bytes::from(format!("fail to deserialize request body {e}")))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response");
 Err(response)
Expand All@@ -139,10 +137,7 @@ where
 Err(e) => {
 let response = Response::builder()
 .status(http::StatusCode::INTERNAL_SERVER_ERROR)
 .body(
 Full::new(Bytes::from(format!("Failed to read request body: {e}")))
 .boxed_unsync(),
 )
 .body(Full::new(Bytes::from(format!("Failed to read request body: {e}"))).boxed())
 .expect("valid response");
 Err(response)
 }
Expand Down

6 changes: 3 additions & 3 deletions
crates/rmcp/src/transport/streamable_http_server/session.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ pub trait SessionManager: Send + Sync + 'static {
 id: &SessionId,
 message: ClientJsonRpcMessage,
 ) -> impl Future<
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + 'static, Self::Error>,
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + Sync + 'static, Self::Error>,
 > + Send;
 fn accept_message(
 &self,
Expand All@@ -42,13 +42,13 @@ pub trait SessionManager: Send + Sync + 'static {
 &self,
 id: &SessionId,
 ) -> impl Future<
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + 'static, Self::Error>,
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + Sync + 'static, Self::Error>,
 > + Send;
 fn resume(
 &self,
 id: &SessionId,
 last_event_id: String,
 ) -> impl Future<
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + 'static, Self::Error>,
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + Sync + 'static, Self::Error>,
 > + Send;
}

31 changes: 12 additions & 19 deletions
crates/rmcp/src/transport/streamable_http_server/tower.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use bytes::Bytes;
use futures::{StreamExt, future::BoxFuture};
use http::{Method, Request, Response, header::ALLOW};
use http_body::Body;
use http_body_util::{BodyExt, Full, combinators::UnsyncBoxBody};
use http_body_util::{BodyExt, Full, combinators::BoxBody};
use tokio_stream::wrappers::ReceiverStream;

use super::session::SessionManager;
Expand DownExpand Up@@ -105,7 +105,7 @@ where
 fn get_service(&self) -> Result<S, std::io::Error> {
 (self.service_factory)()
 }
 pub async fn handle<B>(&self, request: Request<B>) -> Response<UnsyncBoxBody<Bytes, Infallible>>
 pub async fn handle<B>(&self, request: Request<B>) -> Response<BoxBody<Bytes, Infallible>>
 where
 B: Body + Send + 'static,
 B::Error: Display,
Expand All@@ -120,7 +120,7 @@ where
 let response = Response::builder()
 .status(http::StatusCode::METHOD_NOT_ALLOWED)
 .header(ALLOW, "GET, POST, DELETE")
 .body(Full::new(Bytes::from("Method Not Allowed")).boxed_unsync())
 .body(Full::new(Bytes::from("Method Not Allowed")).boxed())
 .expect("valid response");
 return response;
 }
Expand DownExpand Up@@ -148,7 +148,7 @@ where
 Full::new(Bytes::from(
 "Not Acceptable: Client must accept text/event-stream",
 ))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response"));
 }
Expand All@@ -162,7 +162,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed_unsync())
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed())
 .expect("valid response"));
 };
 // check if session exists
Expand All@@ -175,7 +175,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(Full::new(Bytes::from("Unauthorized: Session not found")).boxed_unsync())
 .body(Full::new(Bytes::from("Unauthorized: Session not found")).boxed())
 .expect("valid response"));
 }
 // check if last event id is provided
Expand DownExpand Up@@ -219,7 +219,7 @@ where
 {
 return Ok(Response::builder()
 .status(http::StatusCode::NOT_ACCEPTABLE)
 .body(Full::new(Bytes::from("Not Acceptable: Client must accept both application/json and text/event-stream")).boxed_unsync())
 .body(Full::new(Bytes::from("Not Acceptable: Client must accept both application/json and text/event-stream")).boxed())
 .expect("valid response"));
 }

Expand All@@ -236,7 +236,7 @@ where
 Full::new(Bytes::from(
 "Unsupported Media Type: Content-Type must be application/json",
 ))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response"));
 }
Expand DownExpand Up@@ -265,10 +265,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(
 Full::new(Bytes::from("Unauthorized: Session not found"))
 .boxed_unsync(),
 )
 .body(Full::new(Bytes::from("Unauthorized: Session not found")).boxed())
 .expect("valid response"));
 }

Expand DownExpand Up@@ -307,8 +304,7 @@ where
 _ => Ok(Response::builder()
 .status(http::StatusCode::NOT_IMPLEMENTED)
 .body(
 Full::new(Bytes::from("Batch requests are not supported yet"))
 .boxed_unsync(),
 Full::new(Bytes::from("Batch requests are not supported yet")).boxed(),
 )
 .expect("valid response")),
 }
Expand DownExpand Up@@ -415,10 +411,7 @@ where
 ClientJsonRpcMessage::Error(_json_rpc_error) => Ok(accepted_response()),
 _ => Ok(Response::builder()
 .status(http::StatusCode::NOT_IMPLEMENTED)
 .body(
 Full::new(Bytes::from("Batch requests are not supported yet"))
 .boxed_unsync(),
 )
 .body(Full::new(Bytes::from("Batch requests are not supported yet")).boxed())
 .expect("valid response")),
 }
 }
Expand All@@ -439,7 +432,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed_unsync())
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed())
 .expect("valid response"));
 };
 // close session
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: mark boxed http body as sync (#285)#291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

4t145
merged 1 commit into

from

Jul 1, 2025
 Merged


feat: mark boxed http body as sync (#285)
#291
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


35 changes: 15 additions & 20 deletions
crates/rmcp/src/transport/common/server_side_http.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use std::{convert::Infallible, fmt::Display, sync::Arc, time::Duration};
use bytes::{Buf, Bytes};
use http::Response;
use http_body::Body;
use http_body_util::{BodyExt, Empty, Full, combinators::UnsyncBoxBody};
use http_body_util::{BodyExt, Empty, Full, combinators::BoxBody};
use sse_stream::{KeepAlive, Sse, SseBody};

use super::http_header::EVENT_STREAM_MIME_TYPE;
Expand All@@ -18,12 +18,12 @@ pub fn session_id() -> SessionId {

pub const DEFAULT_AUTO_PING_INTERVAL: Duration = Duration::from_secs(15);

pub(crate) type BoxResponse = Response<UnsyncBoxBody<Bytes, Infallible>>;
pub(crate) type BoxResponse = Response<BoxBody<Bytes, Infallible>>;

pub(crate) fn accepted_response() -> Response<UnsyncBoxBody<Bytes, Infallible>> {
pub(crate) fn accepted_response() -> Response<BoxBody<Bytes, Infallible>> {
 Response::builder()
 .status(http::StatusCode::ACCEPTED)
 .body(Empty::new().boxed_unsync())
 .body(Empty::new().boxed())
 .expect("valid response")
}
pin_project_lite::pin_project! {
Expand DownExpand Up@@ -63,9 +63,9 @@ pub struct ServerSseMessage {
}

pub(crate) fn sse_stream_response(
 stream: impl futures::Stream<Item = ServerSseMessage> + Send + 'static,
 stream: impl futures::Stream<Item = ServerSseMessage> + Send + Sync + 'static,
 keep_alive: Option<Duration>,
) -> Response<UnsyncBoxBody<Bytes, Infallible>> {
) -> Response<BoxBody<Bytes, Infallible>> {
 use futures::StreamExt;
 let stream = SseBody::new(stream.map(|message| {
 let data = serde_json::to_string(&message.message).expect("valid message");
Expand All@@ -76,8 +76,8 @@ pub(crate) fn sse_stream_response(
 let stream = match keep_alive {
 Some(duration) => stream
 .with_keep_alive::<TokioTimer>(KeepAlive::new().interval(duration))
 .boxed_unsync(),
 None => stream.boxed_unsync(),
 .boxed(),
 None => stream.boxed(),
 };
 Response::builder()
 .status(http::StatusCode::OK)
Expand All@@ -89,7 +89,7 @@ pub(crate) fn sse_stream_response(

pub(crate) const fn internal_error_response<E: Display>(
 context: &str,
) -> impl FnOnce(E) -> Response<UnsyncBoxBody<Bytes, Infallible>> {
) -> impl FnOnce(E) -> Response<BoxBody<Bytes, Infallible>> {
 move |error| {
 tracing::error!("Internal server error when {context}: {error}");
 Response::builder()
Expand All@@ -98,24 +98,22 @@ pub(crate) const fn internal_error_response<E: Display>(
 Full::new(Bytes::from(format!(
 "Encounter an error when {context}: {error}"
 )))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response")
 }
}

pub(crate) fn unexpected_message_response(
 expect: &str,
) -> Response<UnsyncBoxBody<Bytes, Infallible>> {
pub(crate) fn unexpected_message_response(expect: &str) -> Response<BoxBody<Bytes, Infallible>> {
 Response::builder()
 .status(http::StatusCode::UNPROCESSABLE_ENTITY)
 .body(Full::new(Bytes::from(format!("Unexpected message, expect {expect}"))).boxed_unsync())
 .body(Full::new(Bytes::from(format!("Unexpected message, expect {expect}"))).boxed())
 .expect("valid response")
}

pub(crate) async fn expect_json<B>(
 body: B,
) -> Result<ClientJsonRpcMessage, Response<UnsyncBoxBody<Bytes, Infallible>>>
) -> Result<ClientJsonRpcMessage, Response<BoxBody<Bytes, Infallible>>>
where
 B: Body + Send + 'static,
 B::Error: Display,
Expand All@@ -129,7 +127,7 @@ where
 .status(http::StatusCode::UNSUPPORTED_MEDIA_TYPE)
 .body(
 Full::new(Bytes::from(format!("fail to deserialize request body {e}")))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response");
 Err(response)
Expand All@@ -139,10 +137,7 @@ where
 Err(e) => {
 let response = Response::builder()
 .status(http::StatusCode::INTERNAL_SERVER_ERROR)
 .body(
 Full::new(Bytes::from(format!("Failed to read request body: {e}")))
 .boxed_unsync(),
 )
 .body(Full::new(Bytes::from(format!("Failed to read request body: {e}"))).boxed())
 .expect("valid response");
 Err(response)
 }
Expand Down

6 changes: 3 additions & 3 deletions
crates/rmcp/src/transport/streamable_http_server/session.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ pub trait SessionManager: Send + Sync + 'static {
 id: &SessionId,
 message: ClientJsonRpcMessage,
 ) -> impl Future<
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + 'static, Self::Error>,
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + Sync + 'static, Self::Error>,
 > + Send;
 fn accept_message(
 &self,
Expand All@@ -42,13 +42,13 @@ pub trait SessionManager: Send + Sync + 'static {
 &self,
 id: &SessionId,
 ) -> impl Future<
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + 'static, Self::Error>,
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + Sync + 'static, Self::Error>,
 > + Send;
 fn resume(
 &self,
 id: &SessionId,
 last_event_id: String,
 ) -> impl Future<
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + 'static, Self::Error>,
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + Sync + 'static, Self::Error>,
 > + Send;
}

31 changes: 12 additions & 19 deletions
crates/rmcp/src/transport/streamable_http_server/tower.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use bytes::Bytes;
use futures::{StreamExt, future::BoxFuture};
use http::{Method, Request, Response, header::ALLOW};
use http_body::Body;
use http_body_util::{BodyExt, Full, combinators::UnsyncBoxBody};
use http_body_util::{BodyExt, Full, combinators::BoxBody};
use tokio_stream::wrappers::ReceiverStream;

use super::session::SessionManager;
Expand DownExpand Up@@ -105,7 +105,7 @@ where
 fn get_service(&self) -> Result<S, std::io::Error> {
 (self.service_factory)()
 }
 pub async fn handle<B>(&self, request: Request<B>) -> Response<UnsyncBoxBody<Bytes, Infallible>>
 pub async fn handle<B>(&self, request: Request<B>) -> Response<BoxBody<Bytes, Infallible>>
 where
 B: Body + Send + 'static,
 B::Error: Display,
Expand All@@ -120,7 +120,7 @@ where
 let response = Response::builder()
 .status(http::StatusCode::METHOD_NOT_ALLOWED)
 .header(ALLOW, "GET, POST, DELETE")
 .body(Full::new(Bytes::from("Method Not Allowed")).boxed_unsync())
 .body(Full::new(Bytes::from("Method Not Allowed")).boxed())
 .expect("valid response");
 return response;
 }
Expand DownExpand Up@@ -148,7 +148,7 @@ where
 Full::new(Bytes::from(
 "Not Acceptable: Client must accept text/event-stream",
 ))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response"));
 }
Expand All@@ -162,7 +162,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed_unsync())
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed())
 .expect("valid response"));
 };
 // check if session exists
Expand All@@ -175,7 +175,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(Full::new(Bytes::from("Unauthorized: Session not found")).boxed_unsync())
 .body(Full::new(Bytes::from("Unauthorized: Session not found")).boxed())
 .expect("valid response"));
 }
 // check if last event id is provided
Expand DownExpand Up@@ -219,7 +219,7 @@ where
 {
 return Ok(Response::builder()
 .status(http::StatusCode::NOT_ACCEPTABLE)
 .body(Full::new(Bytes::from("Not Acceptable: Client must accept both application/json and text/event-stream")).boxed_unsync())
 .body(Full::new(Bytes::from("Not Acceptable: Client must accept both application/json and text/event-stream")).boxed())
 .expect("valid response"));
 }

Expand All@@ -236,7 +236,7 @@ where
 Full::new(Bytes::from(
 "Unsupported Media Type: Content-Type must be application/json",
 ))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response"));
 }
Expand DownExpand Up@@ -265,10 +265,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(
 Full::new(Bytes::from("Unauthorized: Session not found"))
 .boxed_unsync(),
 )
 .body(Full::new(Bytes::from("Unauthorized: Session not found")).boxed())
 .expect("valid response"));
 }

Expand DownExpand Up@@ -307,8 +304,7 @@ where
 _ => Ok(Response::builder()
 .status(http::StatusCode::NOT_IMPLEMENTED)
 .body(
 Full::new(Bytes::from("Batch requests are not supported yet"))
 .boxed_unsync(),
 Full::new(Bytes::from("Batch requests are not supported yet")).boxed(),
 )
 .expect("valid response")),
 }
Expand DownExpand Up@@ -415,10 +411,7 @@ where
 ClientJsonRpcMessage::Error(_json_rpc_error) => Ok(accepted_response()),
 _ => Ok(Response::builder()
 .status(http::StatusCode::NOT_IMPLEMENTED)
 .body(
 Full::new(Bytes::from("Batch requests are not supported yet"))
 .boxed_unsync(),
 )
 .body(Full::new(Bytes::from("Batch requests are not supported yet")).boxed())
 .expect("valid response")),
 }
 }
Expand All@@ -439,7 +432,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed_unsync())
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed())
 .expect("valid response"));
 };
 // close session
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: mark boxed http body as sync (#285)#291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

4t145
merged 1 commit into

from

Jul 1, 2025
 Merged


feat: mark boxed http body as sync (#285)
#291
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


35 changes: 15 additions & 20 deletions
crates/rmcp/src/transport/common/server_side_http.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use std::{convert::Infallible, fmt::Display, sync::Arc, time::Duration};
use bytes::{Buf, Bytes};
use http::Response;
use http_body::Body;
use http_body_util::{BodyExt, Empty, Full, combinators::UnsyncBoxBody};
use http_body_util::{BodyExt, Empty, Full, combinators::BoxBody};
use sse_stream::{KeepAlive, Sse, SseBody};

use super::http_header::EVENT_STREAM_MIME_TYPE;
Expand All@@ -18,12 +18,12 @@ pub fn session_id() -> SessionId {

pub const DEFAULT_AUTO_PING_INTERVAL: Duration = Duration::from_secs(15);

pub(crate) type BoxResponse = Response<UnsyncBoxBody<Bytes, Infallible>>;
pub(crate) type BoxResponse = Response<BoxBody<Bytes, Infallible>>;

pub(crate) fn accepted_response() -> Response<UnsyncBoxBody<Bytes, Infallible>> {
pub(crate) fn accepted_response() -> Response<BoxBody<Bytes, Infallible>> {
 Response::builder()
 .status(http::StatusCode::ACCEPTED)
 .body(Empty::new().boxed_unsync())
 .body(Empty::new().boxed())
 .expect("valid response")
}
pin_project_lite::pin_project! {
Expand DownExpand Up@@ -63,9 +63,9 @@ pub struct ServerSseMessage {
}

pub(crate) fn sse_stream_response(
 stream: impl futures::Stream<Item = ServerSseMessage> + Send + 'static,
 stream: impl futures::Stream<Item = ServerSseMessage> + Send + Sync + 'static,
 keep_alive: Option<Duration>,
) -> Response<UnsyncBoxBody<Bytes, Infallible>> {
) -> Response<BoxBody<Bytes, Infallible>> {
 use futures::StreamExt;
 let stream = SseBody::new(stream.map(|message| {
 let data = serde_json::to_string(&message.message).expect("valid message");
Expand All@@ -76,8 +76,8 @@ pub(crate) fn sse_stream_response(
 let stream = match keep_alive {
 Some(duration) => stream
 .with_keep_alive::<TokioTimer>(KeepAlive::new().interval(duration))
 .boxed_unsync(),
 None => stream.boxed_unsync(),
 .boxed(),
 None => stream.boxed(),
 };
 Response::builder()
 .status(http::StatusCode::OK)
Expand All@@ -89,7 +89,7 @@ pub(crate) fn sse_stream_response(

pub(crate) const fn internal_error_response<E: Display>(
 context: &str,
) -> impl FnOnce(E) -> Response<UnsyncBoxBody<Bytes, Infallible>> {
) -> impl FnOnce(E) -> Response<BoxBody<Bytes, Infallible>> {
 move |error| {
 tracing::error!("Internal server error when {context}: {error}");
 Response::builder()
Expand All@@ -98,24 +98,22 @@ pub(crate) const fn internal_error_response<E: Display>(
 Full::new(Bytes::from(format!(
 "Encounter an error when {context}: {error}"
 )))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response")
 }
}

pub(crate) fn unexpected_message_response(
 expect: &str,
) -> Response<UnsyncBoxBody<Bytes, Infallible>> {
pub(crate) fn unexpected_message_response(expect: &str) -> Response<BoxBody<Bytes, Infallible>> {
 Response::builder()
 .status(http::StatusCode::UNPROCESSABLE_ENTITY)
 .body(Full::new(Bytes::from(format!("Unexpected message, expect {expect}"))).boxed_unsync())
 .body(Full::new(Bytes::from(format!("Unexpected message, expect {expect}"))).boxed())
 .expect("valid response")
}

pub(crate) async fn expect_json<B>(
 body: B,
) -> Result<ClientJsonRpcMessage, Response<UnsyncBoxBody<Bytes, Infallible>>>
) -> Result<ClientJsonRpcMessage, Response<BoxBody<Bytes, Infallible>>>
where
 B: Body + Send + 'static,
 B::Error: Display,
Expand All@@ -129,7 +127,7 @@ where
 .status(http::StatusCode::UNSUPPORTED_MEDIA_TYPE)
 .body(
 Full::new(Bytes::from(format!("fail to deserialize request body {e}")))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response");
 Err(response)
Expand All@@ -139,10 +137,7 @@ where
 Err(e) => {
 let response = Response::builder()
 .status(http::StatusCode::INTERNAL_SERVER_ERROR)
 .body(
 Full::new(Bytes::from(format!("Failed to read request body: {e}")))
 .boxed_unsync(),
 )
 .body(Full::new(Bytes::from(format!("Failed to read request body: {e}"))).boxed())
 .expect("valid response");
 Err(response)
 }
Expand Down

6 changes: 3 additions & 3 deletions
crates/rmcp/src/transport/streamable_http_server/session.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ pub trait SessionManager: Send + Sync + 'static {
 id: &SessionId,
 message: ClientJsonRpcMessage,
 ) -> impl Future<
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + 'static, Self::Error>,
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + Sync + 'static, Self::Error>,
 > + Send;
 fn accept_message(
 &self,
Expand All@@ -42,13 +42,13 @@ pub trait SessionManager: Send + Sync + 'static {
 &self,
 id: &SessionId,
 ) -> impl Future<
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + 'static, Self::Error>,
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + Sync + 'static, Self::Error>,
 > + Send;
 fn resume(
 &self,
 id: &SessionId,
 last_event_id: String,
 ) -> impl Future<
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + 'static, Self::Error>,
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + Sync + 'static, Self::Error>,
 > + Send;
}

31 changes: 12 additions & 19 deletions
crates/rmcp/src/transport/streamable_http_server/tower.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use bytes::Bytes;
use futures::{StreamExt, future::BoxFuture};
use http::{Method, Request, Response, header::ALLOW};
use http_body::Body;
use http_body_util::{BodyExt, Full, combinators::UnsyncBoxBody};
use http_body_util::{BodyExt, Full, combinators::BoxBody};
use tokio_stream::wrappers::ReceiverStream;

use super::session::SessionManager;
Expand DownExpand Up@@ -105,7 +105,7 @@ where
 fn get_service(&self) -> Result<S, std::io::Error> {
 (self.service_factory)()
 }
 pub async fn handle<B>(&self, request: Request<B>) -> Response<UnsyncBoxBody<Bytes, Infallible>>
 pub async fn handle<B>(&self, request: Request<B>) -> Response<BoxBody<Bytes, Infallible>>
 where
 B: Body + Send + 'static,
 B::Error: Display,
Expand All@@ -120,7 +120,7 @@ where
 let response = Response::builder()
 .status(http::StatusCode::METHOD_NOT_ALLOWED)
 .header(ALLOW, "GET, POST, DELETE")
 .body(Full::new(Bytes::from("Method Not Allowed")).boxed_unsync())
 .body(Full::new(Bytes::from("Method Not Allowed")).boxed())
 .expect("valid response");
 return response;
 }
Expand DownExpand Up@@ -148,7 +148,7 @@ where
 Full::new(Bytes::from(
 "Not Acceptable: Client must accept text/event-stream",
 ))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response"));
 }
Expand All@@ -162,7 +162,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed_unsync())
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed())
 .expect("valid response"));
 };
 // check if session exists
Expand All@@ -175,7 +175,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(Full::new(Bytes::from("Unauthorized: Session not found")).boxed_unsync())
 .body(Full::new(Bytes::from("Unauthorized: Session not found")).boxed())
 .expect("valid response"));
 }
 // check if last event id is provided
Expand DownExpand Up@@ -219,7 +219,7 @@ where
 {
 return Ok(Response::builder()
 .status(http::StatusCode::NOT_ACCEPTABLE)
 .body(Full::new(Bytes::from("Not Acceptable: Client must accept both application/json and text/event-stream")).boxed_unsync())
 .body(Full::new(Bytes::from("Not Acceptable: Client must accept both application/json and text/event-stream")).boxed())
 .expect("valid response"));
 }

Expand All@@ -236,7 +236,7 @@ where
 Full::new(Bytes::from(
 "Unsupported Media Type: Content-Type must be application/json",
 ))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response"));
 }
Expand DownExpand Up@@ -265,10 +265,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(
 Full::new(Bytes::from("Unauthorized: Session not found"))
 .boxed_unsync(),
 )
 .body(Full::new(Bytes::from("Unauthorized: Session not found")).boxed())
 .expect("valid response"));
 }

Expand DownExpand Up@@ -307,8 +304,7 @@ where
 _ => Ok(Response::builder()
 .status(http::StatusCode::NOT_IMPLEMENTED)
 .body(
 Full::new(Bytes::from("Batch requests are not supported yet"))
 .boxed_unsync(),
 Full::new(Bytes::from("Batch requests are not supported yet")).boxed(),
 )
 .expect("valid response")),
 }
Expand DownExpand Up@@ -415,10 +411,7 @@ where
 ClientJsonRpcMessage::Error(_json_rpc_error) => Ok(accepted_response()),
 _ => Ok(Response::builder()
 .status(http::StatusCode::NOT_IMPLEMENTED)
 .body(
 Full::new(Bytes::from("Batch requests are not supported yet"))
 .boxed_unsync(),
 )
 .body(Full::new(Bytes::from("Batch requests are not supported yet")).boxed())
 .expect("valid response")),
 }
 }
Expand All@@ -439,7 +432,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed_unsync())
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed())
 .expect("valid response"));
 };
 // close session
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
feat: mark boxed http body as sync (#285)#291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

4t145
merged 1 commit into

from

Jul 1, 2025
 Merged


feat: mark boxed http body as sync (#285)
#291
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


35 changes: 15 additions & 20 deletions
crates/rmcp/src/transport/common/server_side_http.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use std::{convert::Infallible, fmt::Display, sync::Arc, time::Duration};
use bytes::{Buf, Bytes};
use http::Response;
use http_body::Body;
use http_body_util::{BodyExt, Empty, Full, combinators::UnsyncBoxBody};
use http_body_util::{BodyExt, Empty, Full, combinators::BoxBody};
use sse_stream::{KeepAlive, Sse, SseBody};

use super::http_header::EVENT_STREAM_MIME_TYPE;
Expand All@@ -18,12 +18,12 @@ pub fn session_id() -> SessionId {

pub const DEFAULT_AUTO_PING_INTERVAL: Duration = Duration::from_secs(15);

pub(crate) type BoxResponse = Response<UnsyncBoxBody<Bytes, Infallible>>;
pub(crate) type BoxResponse = Response<BoxBody<Bytes, Infallible>>;

pub(crate) fn accepted_response() -> Response<UnsyncBoxBody<Bytes, Infallible>> {
pub(crate) fn accepted_response() -> Response<BoxBody<Bytes, Infallible>> {
 Response::builder()
 .status(http::StatusCode::ACCEPTED)
 .body(Empty::new().boxed_unsync())
 .body(Empty::new().boxed())
 .expect("valid response")
}
pin_project_lite::pin_project! {
Expand DownExpand Up@@ -63,9 +63,9 @@ pub struct ServerSseMessage {
}

pub(crate) fn sse_stream_response(
 stream: impl futures::Stream<Item = ServerSseMessage> + Send + 'static,
 stream: impl futures::Stream<Item = ServerSseMessage> + Send + Sync + 'static,
 keep_alive: Option<Duration>,
) -> Response<UnsyncBoxBody<Bytes, Infallible>> {
) -> Response<BoxBody<Bytes, Infallible>> {
 use futures::StreamExt;
 let stream = SseBody::new(stream.map(|message| {
 let data = serde_json::to_string(&message.message).expect("valid message");
Expand All@@ -76,8 +76,8 @@ pub(crate) fn sse_stream_response(
 let stream = match keep_alive {
 Some(duration) => stream
 .with_keep_alive::<TokioTimer>(KeepAlive::new().interval(duration))
 .boxed_unsync(),
 None => stream.boxed_unsync(),
 .boxed(),
 None => stream.boxed(),
 };
 Response::builder()
 .status(http::StatusCode::OK)
Expand All@@ -89,7 +89,7 @@ pub(crate) fn sse_stream_response(

pub(crate) const fn internal_error_response<E: Display>(
 context: &str,
) -> impl FnOnce(E) -> Response<UnsyncBoxBody<Bytes, Infallible>> {
) -> impl FnOnce(E) -> Response<BoxBody<Bytes, Infallible>> {
 move |error| {
 tracing::error!("Internal server error when {context}: {error}");
 Response::builder()
Expand All@@ -98,24 +98,22 @@ pub(crate) const fn internal_error_response<E: Display>(
 Full::new(Bytes::from(format!(
 "Encounter an error when {context}: {error}"
 )))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response")
 }
}

pub(crate) fn unexpected_message_response(
 expect: &str,
) -> Response<UnsyncBoxBody<Bytes, Infallible>> {
pub(crate) fn unexpected_message_response(expect: &str) -> Response<BoxBody<Bytes, Infallible>> {
 Response::builder()
 .status(http::StatusCode::UNPROCESSABLE_ENTITY)
 .body(Full::new(Bytes::from(format!("Unexpected message, expect {expect}"))).boxed_unsync())
 .body(Full::new(Bytes::from(format!("Unexpected message, expect {expect}"))).boxed())
 .expect("valid response")
}

pub(crate) async fn expect_json<B>(
 body: B,
) -> Result<ClientJsonRpcMessage, Response<UnsyncBoxBody<Bytes, Infallible>>>
) -> Result<ClientJsonRpcMessage, Response<BoxBody<Bytes, Infallible>>>
where
 B: Body + Send + 'static,
 B::Error: Display,
Expand All@@ -129,7 +127,7 @@ where
 .status(http::StatusCode::UNSUPPORTED_MEDIA_TYPE)
 .body(
 Full::new(Bytes::from(format!("fail to deserialize request body {e}")))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response");
 Err(response)
Expand All@@ -139,10 +137,7 @@ where
 Err(e) => {
 let response = Response::builder()
 .status(http::StatusCode::INTERNAL_SERVER_ERROR)
 .body(
 Full::new(Bytes::from(format!("Failed to read request body: {e}")))
 .boxed_unsync(),
 )
 .body(Full::new(Bytes::from(format!("Failed to read request body: {e}"))).boxed())
 .expect("valid response");
 Err(response)
 }
Expand Down

6 changes: 3 additions & 3 deletions
crates/rmcp/src/transport/streamable_http_server/session.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ pub trait SessionManager: Send + Sync + 'static {
 id: &SessionId,
 message: ClientJsonRpcMessage,
 ) -> impl Future<
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + 'static, Self::Error>,
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + Sync + 'static, Self::Error>,
 > + Send;
 fn accept_message(
 &self,
Expand All@@ -42,13 +42,13 @@ pub trait SessionManager: Send + Sync + 'static {
 &self,
 id: &SessionId,
 ) -> impl Future<
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + 'static, Self::Error>,
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + Sync + 'static, Self::Error>,
 > + Send;
 fn resume(
 &self,
 id: &SessionId,
 last_event_id: String,
 ) -> impl Future<
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + 'static, Self::Error>,
 Output = Result<impl Stream<Item = ServerSseMessage> + Send + Sync + 'static, Self::Error>,
 > + Send;
}

31 changes: 12 additions & 19 deletions
crates/rmcp/src/transport/streamable_http_server/tower.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ use bytes::Bytes;
use futures::{StreamExt, future::BoxFuture};
use http::{Method, Request, Response, header::ALLOW};
use http_body::Body;
use http_body_util::{BodyExt, Full, combinators::UnsyncBoxBody};
use http_body_util::{BodyExt, Full, combinators::BoxBody};
use tokio_stream::wrappers::ReceiverStream;

use super::session::SessionManager;
Expand DownExpand Up@@ -105,7 +105,7 @@ where
 fn get_service(&self) -> Result<S, std::io::Error> {
 (self.service_factory)()
 }
 pub async fn handle<B>(&self, request: Request<B>) -> Response<UnsyncBoxBody<Bytes, Infallible>>
 pub async fn handle<B>(&self, request: Request<B>) -> Response<BoxBody<Bytes, Infallible>>
 where
 B: Body + Send + 'static,
 B::Error: Display,
Expand All@@ -120,7 +120,7 @@ where
 let response = Response::builder()
 .status(http::StatusCode::METHOD_NOT_ALLOWED)
 .header(ALLOW, "GET, POST, DELETE")
 .body(Full::new(Bytes::from("Method Not Allowed")).boxed_unsync())
 .body(Full::new(Bytes::from("Method Not Allowed")).boxed())
 .expect("valid response");
 return response;
 }
Expand DownExpand Up@@ -148,7 +148,7 @@ where
 Full::new(Bytes::from(
 "Not Acceptable: Client must accept text/event-stream",
 ))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response"));
 }
Expand All@@ -162,7 +162,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed_unsync())
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed())
 .expect("valid response"));
 };
 // check if session exists
Expand All@@ -175,7 +175,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(Full::new(Bytes::from("Unauthorized: Session not found")).boxed_unsync())
 .body(Full::new(Bytes::from("Unauthorized: Session not found")).boxed())
 .expect("valid response"));
 }
 // check if last event id is provided
Expand DownExpand Up@@ -219,7 +219,7 @@ where
 {
 return Ok(Response::builder()
 .status(http::StatusCode::NOT_ACCEPTABLE)
 .body(Full::new(Bytes::from("Not Acceptable: Client must accept both application/json and text/event-stream")).boxed_unsync())
 .body(Full::new(Bytes::from("Not Acceptable: Client must accept both application/json and text/event-stream")).boxed())
 .expect("valid response"));
 }

Expand All@@ -236,7 +236,7 @@ where
 Full::new(Bytes::from(
 "Unsupported Media Type: Content-Type must be application/json",
 ))
 .boxed_unsync(),
 .boxed(),
 )
 .expect("valid response"));
 }
Expand DownExpand Up@@ -265,10 +265,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(
 Full::new(Bytes::from("Unauthorized: Session not found"))
 .boxed_unsync(),
 )
 .body(Full::new(Bytes::from("Unauthorized: Session not found")).boxed())
 .expect("valid response"));
 }

Expand DownExpand Up@@ -307,8 +304,7 @@ where
 _ => Ok(Response::builder()
 .status(http::StatusCode::NOT_IMPLEMENTED)
 .body(
 Full::new(Bytes::from("Batch requests are not supported yet"))
 .boxed_unsync(),
 Full::new(Bytes::from("Batch requests are not supported yet")).boxed(),
 )
 .expect("valid response")),
 }
Expand DownExpand Up@@ -415,10 +411,7 @@ where
 ClientJsonRpcMessage::Error(_json_rpc_error) => Ok(accepted_response()),
 _ => Ok(Response::builder()
 .status(http::StatusCode::NOT_IMPLEMENTED)
 .body(
 Full::new(Bytes::from("Batch requests are not supported yet"))
 .boxed_unsync(),
 )
 .body(Full::new(Bytes::from("Batch requests are not supported yet")).boxed())
 .expect("valid response")),
 }
 }
Expand All@@ -439,7 +432,7 @@ where
 // unauthorized
 return Ok(Response::builder()
 .status(http::StatusCode::UNAUTHORIZED)
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed_unsync())
 .body(Full::new(Bytes::from("Unauthorized: Session ID is required")).boxed())
 .expect("valid response"));
 };
 // close session
Expand Down