refactor: provide http server as tower service#228

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 4 commits into from
May 28, 2025
Merged

refactor: provide http server as tower service #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
59ba72a
refactor: streamable http server as tower service
4t145 May 27, 2025
6347b98
fix: fix typo
4t145 May 27, 2025
b128b89
fix: accept non-request for streamable post handler
4t145 May 27, 2025
e8b0459
fix: remove copied document
4t145 May 27, 2025
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
29 changes: 20 additions & 9 deletions crates/rmcp/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,9 @@ reqwest = { version = "0.12", default-features = false, features = [
"json",
"stream",
], optional = true }
sse-stream = { version = "0.2.0", optional = true }

sse-stream = { version = "0.2", optional = true }

http = { version = "1", optional = true }
url = { version = "2.4", optional = true }

Expand All@@ -57,7 +59,9 @@ axum = { version = "0.8", features = [], optional = true }
rand = { version = "0.9", optional = true }
tokio-stream = { version = "0.1", optional = true }
uuid = { version = "1", features = ["v4"], optional = true }

http-body = { version = "1", optional = true }
http-body-util = { version = "0.1", optional = true }
bytes = { version = "1", optional = true }
# macro
rmcp-macros = { version = "0.1", workspace = true, optional = true }

Expand All@@ -74,7 +78,17 @@ reqwest = ["__reqwest", "reqwest?/rustls-tls"]

reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-tls-no-provider"]

axum = ["dep:axum"]
server-side-http = [
"uuid",
"dep:rand",
"dep:tokio-stream",
"dep:http",
"dep:http-body",
"dep:http-body-util",
"dep:bytes",
"dep:sse-stream",
"tower",
]
# SSE client
client-side-sse = ["dep:sse-stream", "dep:http"]

Expand All@@ -97,15 +111,12 @@ transport-child-process = [
transport-sse-server = [
"transport-async-rw",
"transport-worker",
"axum",
"dep:rand",
"dep:tokio-stream",
"uuid",
"server-side-http",
"dep:axum",
]
transport-streamable-http-server = [
"transport-streamable-http-server-session",
"axum",
"uuid",
"server-side-http",
]
transport-streamable-http-server-session = [
"transport-async-rw",
Expand Down
10 changes: 5 additions & 5 deletions crates/rmcp/src/service.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -488,7 +488,7 @@ pub struct RequestContext<R: ServiceRole> {
}

/// Use this function to skip initialization process
pub async fn serve_directly<R, S, T, E, A>(
pub fn serve_directly<R, S, T, E, A>(
service: S,
transport: T,
peer_info: Option<R::PeerInfo>,
Expand All@@ -499,11 +499,11 @@ where
T: IntoTransport<R, E, A>,
E: std::error::Error + Send + Sync + 'static,
{
serve_directly_with_ct(service, transport, peer_info, Default::default()).await
serve_directly_with_ct(service, transport, peer_info, Default::default())
}

/// Use this function to skip initialization process
pub async fn serve_directly_with_ct<R, S, T, E, A>(
pub fn serve_directly_with_ct<R, S, T, E, A>(
service: S,
transport: T,
peer_info: Option<R::PeerInfo>,
Expand All@@ -516,11 +516,11 @@ where
E: std::error::Error + Send + Sync + 'static,
{
let (peer, peer_rx) = Peer::new(Arc::new(AtomicU32RequestIdProvider::default()), peer_info);
serve_inner(service, transport, peer, peer_rx, ct).await
serve_inner(service, transport, peer, peer_rx, ct)
}

#[instrument(skip_all)]
async fn serve_inner<R, S, T, E, A>(
fn serve_inner<R, S, T, E, A>(
service: S,
transport: T,
peer: Peer<R>,
Expand Down
6 changes: 3 additions & 3 deletions crates/rmcp/src/service/client.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,7 @@ pub async fn serve_client<S, T, E, A>(
where
S: Service<RoleClient>,
T: IntoTransport<RoleClient, E, A>,
E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
E: std::error::Error + Send + Sync + 'static,
{
serve_client_with_ct(service, transport, Default::default()).await
}
Expand All@@ -124,7 +124,7 @@ pub async fn serve_client_with_ct<S, T, E, A>(
where
S: Service<RoleClient>,
T: IntoTransport<RoleClient, E, A>,
E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
E: std::error::Error + Send + Sync + 'static,
{
let mut transport = transport.into_transport();
let id_provider = <Arc<AtomicU32RequestIdProvider>>::default();
Expand DownExpand Up@@ -175,7 +175,7 @@ where
context: "send initialized notification".into(),
})?;
let (peer, peer_rx) = Peer::new(id_provider, Some(initialize_result));
Ok(serve_inner(service, transport, peer, peer_rx, ct).await)
Ok(serve_inner(service, transport, peer, peer_rx, ct))
}

macro_rules! method {
Expand Down
8 changes: 4 additions & 4 deletions crates/rmcp/src/service/server.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ impl<S: Service<RoleServer>> ServiceExt<RoleServer> for S {
) -> impl Future<Output = Result<RunningService<RoleServer, Self>, ServerInitializeError<E>>> + Send
where
T: IntoTransport<RoleServer, E, A>,
E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
E: std::error::Error + Send + Sync + 'static,
Self: Sized,
{
serve_server_with_ct(self, transport, ct)
Expand All@@ -84,7 +84,7 @@ pub async fn serve_server<S, T, E, A>(
where
S: Service<RoleServer>,
T: IntoTransport<RoleServer, E, A>,
E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
E: std::error::Error + Send + Sync + 'static,
{
serve_server_with_ct(service, transport, CancellationToken::new()).await
}
Expand DownExpand Up@@ -143,7 +143,7 @@ pub async fn serve_server_with_ct<S, T, E, A>(
where
S: Service<RoleServer>,
T: IntoTransport<RoleServer, E, A>,
E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
E: std::error::Error + Send + Sync + 'static,
{
let mut transport = transport.into_transport();
let id_provider = <Arc<AtomicU32RequestIdProvider>>::default();
Expand DownExpand Up@@ -212,7 +212,7 @@ where
};
let _ = service.handle_notification(notification).await;
// Continue processing service
Ok(serve_inner(service, transport, peer, peer_rx, ct).await)
Ok(serve_inner(service, transport, peer, peer_rx, ct))
}

macro_rules! method {
Expand Down
74 changes: 70 additions & 4 deletions crates/rmcp/src/transport.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
//! | transport | client | server |
//! |:-: |:-: |:-: |
//! | std IO | [`child_process::TokioChildProcess`] | [`io::stdio`] |
//! | streamable http | [`streamable_http_client::StreamableHttpClientTransport`] | [`streamable_http_server::session::create_session`] |
//! | streamable http | [`streamable_http_client::StreamableHttpClientTransport`] | [`streamable_http_server::StreamableHttpService`] |
//! | sse | [`sse_client::SseClientTransport`] | [`sse_server::SseServer`] |
//!
//！## Helper Transport Types
Expand DownExpand Up@@ -64,6 +64,8 @@
//! }
//! ```

use std::sync::Arc;

use crate::service::{RxJsonRpcMessage, ServiceRole, TxJsonRpcMessage};

pub mod sink_stream;
Expand DownExpand Up@@ -122,7 +124,7 @@ pub use auth::{AuthError, AuthorizationManager, AuthorizationSession, Authorized
pub mod streamable_http_server;
#[cfg(feature = "transport-streamable-http-server")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-streamable-http-server")))]
pub use streamable_http_server::axum::StreamableHttpServer;
pub use streamable_http_server::tower::{StreamableHttpServerConfig, StreamableHttpService};

#[cfg(feature = "transport-streamable-http-client")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-streamable-http-client")))]
Expand All@@ -138,7 +140,7 @@ pub trait Transport<R>: Send
where
R: ServiceRole,
{
type Error;
type Error: std::error::Error + Send + Sync + 'static;
/// Send a message to the transport
///
/// Notice that the future returned by this function should be `Send` and `'static`.
Expand DownExpand Up@@ -169,9 +171,73 @@ impl<R, T, E> IntoTransport<R, E, TransportAdapterIdentity> for T
where
T: Transport<R, Error = E> + Send + 'static,
R: ServiceRole,
E: std::error::Error + Send + 'static,
E: std::error::Error + Send + Sync + 'static,
{
fn into_transport(self) -> impl Transport<R, Error = E> + 'static {
self
}
}

/// A transport that can send a single message and then close itself
pub struct OneshotTransport<R>
where
R: ServiceRole,
{
message: Option<RxJsonRpcMessage<R>>,
sender: tokio::sync::mpsc::Sender<TxJsonRpcMessage<R>>,
finished_signal: Arc<tokio::sync::Notify>,
}

impl<R> OneshotTransport<R>
where
R: ServiceRole,
{
pub fn new(
message: RxJsonRpcMessage<R>,
) -> (Self, tokio::sync::mpsc::Receiver<TxJsonRpcMessage<R>>) {
let (sender, receiver) = tokio::sync::mpsc::channel(16);
(
Self {
message: Some(message),
sender,
finished_signal: Arc::new(tokio::sync::Notify::new()),
},
receiver,
)
}
}

impl<R> Transport<R> for OneshotTransport<R>
where
R: ServiceRole,
{
type Error = tokio::sync::mpsc::error::SendError<TxJsonRpcMessage<R>>;

fn send(
&mut self,
item: TxJsonRpcMessage<R>,
) -> impl Future<Output = Result<(), Self::Error>> + Send + 'static {
let sender = self.sender.clone();
let terminate = matches!(item, TxJsonRpcMessage::<R>::Response(_));
let signal = self.finished_signal.clone();
async move {
sender.send(item).await?;
if terminate {
signal.notify_waiters();
}
Ok(())
}
}

async fn receive(&mut self) -> Option<RxJsonRpcMessage<R>> {
if self.message.is_none() {
self.finished_signal.notified().await;
}
self.message.take()
}

fn close(&mut self) -> impl Future<Output = Result<(), Self::Error>> + Send {
self.message.take();
std::future::ready(Ok(()))
}
}
2 changes: 1 addition & 1 deletion crates/rmcp/src/transport/common.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
feature = "transport-streamable-http-server",
feature = "transport-sse-server"
))]
pub mod axum;
pub mod server_side_http;

pub mod http_header;

Expand Down
9 changes: 0 additions & 9 deletions crates/rmcp/src/transport/common/axum.rs
View file
Open in desktop

This file was deleted.

Loading
, '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
refactor: provide http server as tower service#228

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 4 commits into

from

May 28, 2025
 Merged


refactor: provide http server as tower service
#228
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
59ba72a

refactor: streamable http server as tower service


4t145 May 27, 2025
6347b98

fix: fix typo


4t145 May 27, 2025
b128b89

fix: accept non-request for streamable post handler


4t145 May 27, 2025
e8b0459

fix: remove copied document


4t145 May 27, 2025

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


29 changes: 20 additions & 9 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,9 @@ reqwest = { version = "0.12", default-features = false, features = [
 "json",
 "stream",
], optional = true }
sse-stream = { version = "0.2.0", optional = true }

sse-stream = { version = "0.2", optional = true }

http = { version = "1", optional = true }
url = { version = "2.4", optional = true }

Expand All@@ -57,7 +59,9 @@ axum = { version = "0.8", features = [], optional = true }
rand = { version = "0.9", optional = true }
tokio-stream = { version = "0.1", optional = true }
uuid = { version = "1", features = ["v4"], optional = true }

http-body = { version = "1", optional = true }
http-body-util = { version = "0.1", optional = true }
bytes = { version = "1", optional = true }
# macro
rmcp-macros = { version = "0.1", workspace = true, optional = true }

Expand All@@ -74,7 +78,17 @@ reqwest = ["__reqwest", "reqwest?/rustls-tls"]

reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-tls-no-provider"]

axum = ["dep:axum"]
server-side-http = [
 "uuid",
 "dep:rand",
 "dep:tokio-stream",
 "dep:http",
 "dep:http-body",
 "dep:http-body-util",
 "dep:bytes",
 "dep:sse-stream",
 "tower",
]
# SSE client
client-side-sse = ["dep:sse-stream", "dep:http"]

Expand All@@ -97,15 +111,12 @@ transport-child-process = [
transport-sse-server = [
 "transport-async-rw",
 "transport-worker",
 "axum",
 "dep:rand",
 "dep:tokio-stream",
 "uuid",
 "server-side-http",
 "dep:axum",
]
transport-streamable-http-server = [
 "transport-streamable-http-server-session",
 "axum",
 "uuid",
 "server-side-http",
]
transport-streamable-http-server-session = [
 "transport-async-rw",
Expand Down

10 changes: 5 additions & 5 deletions
crates/rmcp/src/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -488,7 +488,7 @@ pub struct RequestContext<R: ServiceRole> {
}

/// Use this function to skip initialization process
pub async fn serve_directly<R, S, T, E, A>(
pub fn serve_directly<R, S, T, E, A>(
 service: S,
 transport: T,
 peer_info: Option<R::PeerInfo>,
Expand All@@ -499,11 +499,11 @@ where
 T: IntoTransport<R, E, A>,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_directly_with_ct(service, transport, peer_info, Default::default()).await
 serve_directly_with_ct(service, transport, peer_info, Default::default())
}

/// Use this function to skip initialization process
pub async fn serve_directly_with_ct<R, S, T, E, A>(
pub fn serve_directly_with_ct<R, S, T, E, A>(
 service: S,
 transport: T,
 peer_info: Option<R::PeerInfo>,
Expand All@@ -516,11 +516,11 @@ where
 E: std::error::Error + Send + Sync + 'static,
{
 let (peer, peer_rx) = Peer::new(Arc::new(AtomicU32RequestIdProvider::default()), peer_info);
 serve_inner(service, transport, peer, peer_rx, ct).await
 serve_inner(service, transport, peer, peer_rx, ct)
}

#[instrument(skip_all)]
async fn serve_inner<R, S, T, E, A>(
fn serve_inner<R, S, T, E, A>(
 service: S,
 transport: T,
 peer: Peer<R>,
Expand Down

6 changes: 3 additions & 3 deletions
crates/rmcp/src/service/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,7 @@ pub async fn serve_client<S, T, E, A>(
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_client_with_ct(service, transport, Default::default()).await
}
Expand All@@ -124,7 +124,7 @@ pub async fn serve_client_with_ct<S, T, E, A>(
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 let mut transport = transport.into_transport();
 let id_provider = <Arc<AtomicU32RequestIdProvider>>::default();
Expand DownExpand Up@@ -175,7 +175,7 @@ where
 context: "send initialized notification".into(),
 })?;
 let (peer, peer_rx) = Peer::new(id_provider, Some(initialize_result));
 Ok(serve_inner(service, transport, peer, peer_rx, ct).await)
 Ok(serve_inner(service, transport, peer, peer_rx, ct))
}

macro_rules! method {
Expand Down

8 changes: 4 additions & 4 deletions
crates/rmcp/src/service/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ impl<S: Service<RoleServer>> ServiceExt<RoleServer> for S {
 ) -> impl Future<Output = Result<RunningService<RoleServer, Self>, ServerInitializeError<E>>> + Send
 where
 T: IntoTransport<RoleServer, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
 Self: Sized,
 {
 serve_server_with_ct(self, transport, ct)
Expand All@@ -84,7 +84,7 @@ pub async fn serve_server<S, T, E, A>(
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_server_with_ct(service, transport, CancellationToken::new()).await
}
Expand DownExpand Up@@ -143,7 +143,7 @@ pub async fn serve_server_with_ct<S, T, E, A>(
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 let mut transport = transport.into_transport();
 let id_provider = <Arc<AtomicU32RequestIdProvider>>::default();
Expand DownExpand Up@@ -212,7 +212,7 @@ where
 };
 let _ = service.handle_notification(notification).await;
 // Continue processing service
 Ok(serve_inner(service, transport, peer, peer_rx, ct).await)
 Ok(serve_inner(service, transport, peer, peer_rx, ct))
}

macro_rules! method {
Expand Down

74 changes: 70 additions & 4 deletions
crates/rmcp/src/transport.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
//! | transport | client | server |
//! |:-: |:-: |:-: |
//! | std IO | [`child_process::TokioChildProcess`] | [`io::stdio`] |
//! | streamable http | [`streamable_http_client::StreamableHttpClientTransport`] | [`streamable_http_server::session::create_session`] |
//! | streamable http | [`streamable_http_client::StreamableHttpClientTransport`] | [`streamable_http_server::StreamableHttpService`]  |
//! | sse | [`sse_client::SseClientTransport`] | [`sse_server::SseServer`] |
//!
//！## Helper Transport Types
Expand DownExpand Up@@ -64,6 +64,8 @@
//! }
//! ```

use std::sync::Arc;

use crate::service::{RxJsonRpcMessage, ServiceRole, TxJsonRpcMessage};

pub mod sink_stream;
Expand DownExpand Up@@ -122,7 +124,7 @@ pub use auth::{AuthError, AuthorizationManager, AuthorizationSession, Authorized
pub mod streamable_http_server;
#[cfg(feature = "transport-streamable-http-server")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-streamable-http-server")))]
pub use streamable_http_server::axum::StreamableHttpServer;
pub use streamable_http_server::tower::{StreamableHttpServerConfig, StreamableHttpService};

#[cfg(feature = "transport-streamable-http-client")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-streamable-http-client")))]
Expand All@@ -138,7 +140,7 @@ pub trait Transport<R>: Send
where
 R: ServiceRole,
{
 type Error;
 type Error: std::error::Error + Send + Sync + 'static;
 /// Send a message to the transport
 ///
 /// Notice that the future returned by this function should be `Send` and `'static`.
Expand DownExpand Up@@ -169,9 +171,73 @@ impl<R, T, E> IntoTransport<R, E, TransportAdapterIdentity> for T
where
 T: Transport<R, Error = E> + Send + 'static,
 R: ServiceRole,
 E: std::error::Error + Send + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 fn into_transport(self) -> impl Transport<R, Error = E> + 'static {
 self
 }
}

/// A transport that can send a single message and then close itself
pub struct OneshotTransport<R>
where
 R: ServiceRole,
{
 message: Option<RxJsonRpcMessage<R>>,
 sender: tokio::sync::mpsc::Sender<TxJsonRpcMessage<R>>,
 finished_signal: Arc<tokio::sync::Notify>,
}

impl<R> OneshotTransport<R>
where
 R: ServiceRole,
{
 pub fn new(
 message: RxJsonRpcMessage<R>,
 ) -> (Self, tokio::sync::mpsc::Receiver<TxJsonRpcMessage<R>>) {
 let (sender, receiver) = tokio::sync::mpsc::channel(16);
 (
 Self {
 message: Some(message),
 sender,
 finished_signal: Arc::new(tokio::sync::Notify::new()),
 },
 receiver,
 )
 }
}

impl<R> Transport<R> for OneshotTransport<R>
where
 R: ServiceRole,
{
 type Error = tokio::sync::mpsc::error::SendError<TxJsonRpcMessage<R>>;

 fn send(
 &mut self,
 item: TxJsonRpcMessage<R>,
 ) -> impl Future<Output = Result<(), Self::Error>> + Send + 'static {
 let sender = self.sender.clone();
 let terminate = matches!(item, TxJsonRpcMessage::<R>::Response(_));
 let signal = self.finished_signal.clone();
 async move {
 sender.send(item).await?;
 if terminate {
 signal.notify_waiters();
 }
 Ok(())
 }
 }

 async fn receive(&mut self) -> Option<RxJsonRpcMessage<R>> {
 if self.message.is_none() {
 self.finished_signal.notified().await;
 }
 self.message.take()
 }

 fn close(&mut self) -> impl Future<Output = Result<(), Self::Error>> + Send {
 self.message.take();
 std::future::ready(Ok(()))
 }
}

2 changes: 1 addition & 1 deletion
crates/rmcp/src/transport/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
 feature = "transport-streamable-http-server",
 feature = "transport-sse-server"
))]
pub mod axum;
pub mod server_side_http;

pub mod http_header;

Expand Down

9 changes: 0 additions & 9 deletions
crates/rmcp/src/transport/common/axum.rs

View file


Open in desktop


This file was deleted.

Loading

, '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
refactor: provide http server as tower service#228

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 4 commits into

from

May 28, 2025
 Merged


refactor: provide http server as tower service
#228
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
59ba72a

refactor: streamable http server as tower service


4t145 May 27, 2025
6347b98

fix: fix typo


4t145 May 27, 2025
b128b89

fix: accept non-request for streamable post handler


4t145 May 27, 2025
e8b0459

fix: remove copied document


4t145 May 27, 2025

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


29 changes: 20 additions & 9 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,9 @@ reqwest = { version = "0.12", default-features = false, features = [
 "json",
 "stream",
], optional = true }
sse-stream = { version = "0.2.0", optional = true }

sse-stream = { version = "0.2", optional = true }

http = { version = "1", optional = true }
url = { version = "2.4", optional = true }

Expand All@@ -57,7 +59,9 @@ axum = { version = "0.8", features = [], optional = true }
rand = { version = "0.9", optional = true }
tokio-stream = { version = "0.1", optional = true }
uuid = { version = "1", features = ["v4"], optional = true }

http-body = { version = "1", optional = true }
http-body-util = { version = "0.1", optional = true }
bytes = { version = "1", optional = true }
# macro
rmcp-macros = { version = "0.1", workspace = true, optional = true }

Expand All@@ -74,7 +78,17 @@ reqwest = ["__reqwest", "reqwest?/rustls-tls"]

reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-tls-no-provider"]

axum = ["dep:axum"]
server-side-http = [
 "uuid",
 "dep:rand",
 "dep:tokio-stream",
 "dep:http",
 "dep:http-body",
 "dep:http-body-util",
 "dep:bytes",
 "dep:sse-stream",
 "tower",
]
# SSE client
client-side-sse = ["dep:sse-stream", "dep:http"]

Expand All@@ -97,15 +111,12 @@ transport-child-process = [
transport-sse-server = [
 "transport-async-rw",
 "transport-worker",
 "axum",
 "dep:rand",
 "dep:tokio-stream",
 "uuid",
 "server-side-http",
 "dep:axum",
]
transport-streamable-http-server = [
 "transport-streamable-http-server-session",
 "axum",
 "uuid",
 "server-side-http",
]
transport-streamable-http-server-session = [
 "transport-async-rw",
Expand Down

10 changes: 5 additions & 5 deletions
crates/rmcp/src/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -488,7 +488,7 @@ pub struct RequestContext<R: ServiceRole> {
}

/// Use this function to skip initialization process
pub async fn serve_directly<R, S, T, E, A>(
pub fn serve_directly<R, S, T, E, A>(
 service: S,
 transport: T,
 peer_info: Option<R::PeerInfo>,
Expand All@@ -499,11 +499,11 @@ where
 T: IntoTransport<R, E, A>,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_directly_with_ct(service, transport, peer_info, Default::default()).await
 serve_directly_with_ct(service, transport, peer_info, Default::default())
}

/// Use this function to skip initialization process
pub async fn serve_directly_with_ct<R, S, T, E, A>(
pub fn serve_directly_with_ct<R, S, T, E, A>(
 service: S,
 transport: T,
 peer_info: Option<R::PeerInfo>,
Expand All@@ -516,11 +516,11 @@ where
 E: std::error::Error + Send + Sync + 'static,
{
 let (peer, peer_rx) = Peer::new(Arc::new(AtomicU32RequestIdProvider::default()), peer_info);
 serve_inner(service, transport, peer, peer_rx, ct).await
 serve_inner(service, transport, peer, peer_rx, ct)
}

#[instrument(skip_all)]
async fn serve_inner<R, S, T, E, A>(
fn serve_inner<R, S, T, E, A>(
 service: S,
 transport: T,
 peer: Peer<R>,
Expand Down

6 changes: 3 additions & 3 deletions
crates/rmcp/src/service/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,7 @@ pub async fn serve_client<S, T, E, A>(
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_client_with_ct(service, transport, Default::default()).await
}
Expand All@@ -124,7 +124,7 @@ pub async fn serve_client_with_ct<S, T, E, A>(
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 let mut transport = transport.into_transport();
 let id_provider = <Arc<AtomicU32RequestIdProvider>>::default();
Expand DownExpand Up@@ -175,7 +175,7 @@ where
 context: "send initialized notification".into(),
 })?;
 let (peer, peer_rx) = Peer::new(id_provider, Some(initialize_result));
 Ok(serve_inner(service, transport, peer, peer_rx, ct).await)
 Ok(serve_inner(service, transport, peer, peer_rx, ct))
}

macro_rules! method {
Expand Down

8 changes: 4 additions & 4 deletions
crates/rmcp/src/service/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ impl<S: Service<RoleServer>> ServiceExt<RoleServer> for S {
 ) -> impl Future<Output = Result<RunningService<RoleServer, Self>, ServerInitializeError<E>>> + Send
 where
 T: IntoTransport<RoleServer, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
 Self: Sized,
 {
 serve_server_with_ct(self, transport, ct)
Expand All@@ -84,7 +84,7 @@ pub async fn serve_server<S, T, E, A>(
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_server_with_ct(service, transport, CancellationToken::new()).await
}
Expand DownExpand Up@@ -143,7 +143,7 @@ pub async fn serve_server_with_ct<S, T, E, A>(
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 let mut transport = transport.into_transport();
 let id_provider = <Arc<AtomicU32RequestIdProvider>>::default();
Expand DownExpand Up@@ -212,7 +212,7 @@ where
 };
 let _ = service.handle_notification(notification).await;
 // Continue processing service
 Ok(serve_inner(service, transport, peer, peer_rx, ct).await)
 Ok(serve_inner(service, transport, peer, peer_rx, ct))
}

macro_rules! method {
Expand Down

74 changes: 70 additions & 4 deletions
crates/rmcp/src/transport.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
//! | transport | client | server |
//! |:-: |:-: |:-: |
//! | std IO | [`child_process::TokioChildProcess`] | [`io::stdio`] |
//! | streamable http | [`streamable_http_client::StreamableHttpClientTransport`] | [`streamable_http_server::session::create_session`] |
//! | streamable http | [`streamable_http_client::StreamableHttpClientTransport`] | [`streamable_http_server::StreamableHttpService`]  |
//! | sse | [`sse_client::SseClientTransport`] | [`sse_server::SseServer`] |
//!
//！## Helper Transport Types
Expand DownExpand Up@@ -64,6 +64,8 @@
//! }
//! ```

use std::sync::Arc;

use crate::service::{RxJsonRpcMessage, ServiceRole, TxJsonRpcMessage};

pub mod sink_stream;
Expand DownExpand Up@@ -122,7 +124,7 @@ pub use auth::{AuthError, AuthorizationManager, AuthorizationSession, Authorized
pub mod streamable_http_server;
#[cfg(feature = "transport-streamable-http-server")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-streamable-http-server")))]
pub use streamable_http_server::axum::StreamableHttpServer;
pub use streamable_http_server::tower::{StreamableHttpServerConfig, StreamableHttpService};

#[cfg(feature = "transport-streamable-http-client")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-streamable-http-client")))]
Expand All@@ -138,7 +140,7 @@ pub trait Transport<R>: Send
where
 R: ServiceRole,
{
 type Error;
 type Error: std::error::Error + Send + Sync + 'static;
 /// Send a message to the transport
 ///
 /// Notice that the future returned by this function should be `Send` and `'static`.
Expand DownExpand Up@@ -169,9 +171,73 @@ impl<R, T, E> IntoTransport<R, E, TransportAdapterIdentity> for T
where
 T: Transport<R, Error = E> + Send + 'static,
 R: ServiceRole,
 E: std::error::Error + Send + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 fn into_transport(self) -> impl Transport<R, Error = E> + 'static {
 self
 }
}

/// A transport that can send a single message and then close itself
pub struct OneshotTransport<R>
where
 R: ServiceRole,
{
 message: Option<RxJsonRpcMessage<R>>,
 sender: tokio::sync::mpsc::Sender<TxJsonRpcMessage<R>>,
 finished_signal: Arc<tokio::sync::Notify>,
}

impl<R> OneshotTransport<R>
where
 R: ServiceRole,
{
 pub fn new(
 message: RxJsonRpcMessage<R>,
 ) -> (Self, tokio::sync::mpsc::Receiver<TxJsonRpcMessage<R>>) {
 let (sender, receiver) = tokio::sync::mpsc::channel(16);
 (
 Self {
 message: Some(message),
 sender,
 finished_signal: Arc::new(tokio::sync::Notify::new()),
 },
 receiver,
 )
 }
}

impl<R> Transport<R> for OneshotTransport<R>
where
 R: ServiceRole,
{
 type Error = tokio::sync::mpsc::error::SendError<TxJsonRpcMessage<R>>;

 fn send(
 &mut self,
 item: TxJsonRpcMessage<R>,
 ) -> impl Future<Output = Result<(), Self::Error>> + Send + 'static {
 let sender = self.sender.clone();
 let terminate = matches!(item, TxJsonRpcMessage::<R>::Response(_));
 let signal = self.finished_signal.clone();
 async move {
 sender.send(item).await?;
 if terminate {
 signal.notify_waiters();
 }
 Ok(())
 }
 }

 async fn receive(&mut self) -> Option<RxJsonRpcMessage<R>> {
 if self.message.is_none() {
 self.finished_signal.notified().await;
 }
 self.message.take()
 }

 fn close(&mut self) -> impl Future<Output = Result<(), Self::Error>> + Send {
 self.message.take();
 std::future::ready(Ok(()))
 }
}

2 changes: 1 addition & 1 deletion
crates/rmcp/src/transport/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
 feature = "transport-streamable-http-server",
 feature = "transport-sse-server"
))]
pub mod axum;
pub mod server_side_http;

pub mod http_header;

Expand Down

9 changes: 0 additions & 9 deletions
crates/rmcp/src/transport/common/axum.rs

View file


Open in desktop


This file was deleted.

Loading

, '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
refactor: provide http server as tower service#228

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 4 commits into

from

May 28, 2025
 Merged


refactor: provide http server as tower service
#228
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
59ba72a

refactor: streamable http server as tower service


4t145 May 27, 2025
6347b98

fix: fix typo


4t145 May 27, 2025
b128b89

fix: accept non-request for streamable post handler


4t145 May 27, 2025
e8b0459

fix: remove copied document


4t145 May 27, 2025

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


29 changes: 20 additions & 9 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,9 @@ reqwest = { version = "0.12", default-features = false, features = [
 "json",
 "stream",
], optional = true }
sse-stream = { version = "0.2.0", optional = true }

sse-stream = { version = "0.2", optional = true }

http = { version = "1", optional = true }
url = { version = "2.4", optional = true }

Expand All@@ -57,7 +59,9 @@ axum = { version = "0.8", features = [], optional = true }
rand = { version = "0.9", optional = true }
tokio-stream = { version = "0.1", optional = true }
uuid = { version = "1", features = ["v4"], optional = true }

http-body = { version = "1", optional = true }
http-body-util = { version = "0.1", optional = true }
bytes = { version = "1", optional = true }
# macro
rmcp-macros = { version = "0.1", workspace = true, optional = true }

Expand All@@ -74,7 +78,17 @@ reqwest = ["__reqwest", "reqwest?/rustls-tls"]

reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-tls-no-provider"]

axum = ["dep:axum"]
server-side-http = [
 "uuid",
 "dep:rand",
 "dep:tokio-stream",
 "dep:http",
 "dep:http-body",
 "dep:http-body-util",
 "dep:bytes",
 "dep:sse-stream",
 "tower",
]
# SSE client
client-side-sse = ["dep:sse-stream", "dep:http"]

Expand All@@ -97,15 +111,12 @@ transport-child-process = [
transport-sse-server = [
 "transport-async-rw",
 "transport-worker",
 "axum",
 "dep:rand",
 "dep:tokio-stream",
 "uuid",
 "server-side-http",
 "dep:axum",
]
transport-streamable-http-server = [
 "transport-streamable-http-server-session",
 "axum",
 "uuid",
 "server-side-http",
]
transport-streamable-http-server-session = [
 "transport-async-rw",
Expand Down

10 changes: 5 additions & 5 deletions
crates/rmcp/src/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -488,7 +488,7 @@ pub struct RequestContext<R: ServiceRole> {
}

/// Use this function to skip initialization process
pub async fn serve_directly<R, S, T, E, A>(
pub fn serve_directly<R, S, T, E, A>(
 service: S,
 transport: T,
 peer_info: Option<R::PeerInfo>,
Expand All@@ -499,11 +499,11 @@ where
 T: IntoTransport<R, E, A>,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_directly_with_ct(service, transport, peer_info, Default::default()).await
 serve_directly_with_ct(service, transport, peer_info, Default::default())
}

/// Use this function to skip initialization process
pub async fn serve_directly_with_ct<R, S, T, E, A>(
pub fn serve_directly_with_ct<R, S, T, E, A>(
 service: S,
 transport: T,
 peer_info: Option<R::PeerInfo>,
Expand All@@ -516,11 +516,11 @@ where
 E: std::error::Error + Send + Sync + 'static,
{
 let (peer, peer_rx) = Peer::new(Arc::new(AtomicU32RequestIdProvider::default()), peer_info);
 serve_inner(service, transport, peer, peer_rx, ct).await
 serve_inner(service, transport, peer, peer_rx, ct)
}

#[instrument(skip_all)]
async fn serve_inner<R, S, T, E, A>(
fn serve_inner<R, S, T, E, A>(
 service: S,
 transport: T,
 peer: Peer<R>,
Expand Down

6 changes: 3 additions & 3 deletions
crates/rmcp/src/service/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,7 @@ pub async fn serve_client<S, T, E, A>(
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_client_with_ct(service, transport, Default::default()).await
}
Expand All@@ -124,7 +124,7 @@ pub async fn serve_client_with_ct<S, T, E, A>(
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 let mut transport = transport.into_transport();
 let id_provider = <Arc<AtomicU32RequestIdProvider>>::default();
Expand DownExpand Up@@ -175,7 +175,7 @@ where
 context: "send initialized notification".into(),
 })?;
 let (peer, peer_rx) = Peer::new(id_provider, Some(initialize_result));
 Ok(serve_inner(service, transport, peer, peer_rx, ct).await)
 Ok(serve_inner(service, transport, peer, peer_rx, ct))
}

macro_rules! method {
Expand Down

8 changes: 4 additions & 4 deletions
crates/rmcp/src/service/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ impl<S: Service<RoleServer>> ServiceExt<RoleServer> for S {
 ) -> impl Future<Output = Result<RunningService<RoleServer, Self>, ServerInitializeError<E>>> + Send
 where
 T: IntoTransport<RoleServer, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
 Self: Sized,
 {
 serve_server_with_ct(self, transport, ct)
Expand All@@ -84,7 +84,7 @@ pub async fn serve_server<S, T, E, A>(
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_server_with_ct(service, transport, CancellationToken::new()).await
}
Expand DownExpand Up@@ -143,7 +143,7 @@ pub async fn serve_server_with_ct<S, T, E, A>(
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 let mut transport = transport.into_transport();
 let id_provider = <Arc<AtomicU32RequestIdProvider>>::default();
Expand DownExpand Up@@ -212,7 +212,7 @@ where
 };
 let _ = service.handle_notification(notification).await;
 // Continue processing service
 Ok(serve_inner(service, transport, peer, peer_rx, ct).await)
 Ok(serve_inner(service, transport, peer, peer_rx, ct))
}

macro_rules! method {
Expand Down

74 changes: 70 additions & 4 deletions
crates/rmcp/src/transport.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
//! | transport | client | server |
//! |:-: |:-: |:-: |
//! | std IO | [`child_process::TokioChildProcess`] | [`io::stdio`] |
//! | streamable http | [`streamable_http_client::StreamableHttpClientTransport`] | [`streamable_http_server::session::create_session`] |
//! | streamable http | [`streamable_http_client::StreamableHttpClientTransport`] | [`streamable_http_server::StreamableHttpService`]  |
//! | sse | [`sse_client::SseClientTransport`] | [`sse_server::SseServer`] |
//!
//！## Helper Transport Types
Expand DownExpand Up@@ -64,6 +64,8 @@
//! }
//! ```

use std::sync::Arc;

use crate::service::{RxJsonRpcMessage, ServiceRole, TxJsonRpcMessage};

pub mod sink_stream;
Expand DownExpand Up@@ -122,7 +124,7 @@ pub use auth::{AuthError, AuthorizationManager, AuthorizationSession, Authorized
pub mod streamable_http_server;
#[cfg(feature = "transport-streamable-http-server")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-streamable-http-server")))]
pub use streamable_http_server::axum::StreamableHttpServer;
pub use streamable_http_server::tower::{StreamableHttpServerConfig, StreamableHttpService};

#[cfg(feature = "transport-streamable-http-client")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-streamable-http-client")))]
Expand All@@ -138,7 +140,7 @@ pub trait Transport<R>: Send
where
 R: ServiceRole,
{
 type Error;
 type Error: std::error::Error + Send + Sync + 'static;
 /// Send a message to the transport
 ///
 /// Notice that the future returned by this function should be `Send` and `'static`.
Expand DownExpand Up@@ -169,9 +171,73 @@ impl<R, T, E> IntoTransport<R, E, TransportAdapterIdentity> for T
where
 T: Transport<R, Error = E> + Send + 'static,
 R: ServiceRole,
 E: std::error::Error + Send + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 fn into_transport(self) -> impl Transport<R, Error = E> + 'static {
 self
 }
}

/// A transport that can send a single message and then close itself
pub struct OneshotTransport<R>
where
 R: ServiceRole,
{
 message: Option<RxJsonRpcMessage<R>>,
 sender: tokio::sync::mpsc::Sender<TxJsonRpcMessage<R>>,
 finished_signal: Arc<tokio::sync::Notify>,
}

impl<R> OneshotTransport<R>
where
 R: ServiceRole,
{
 pub fn new(
 message: RxJsonRpcMessage<R>,
 ) -> (Self, tokio::sync::mpsc::Receiver<TxJsonRpcMessage<R>>) {
 let (sender, receiver) = tokio::sync::mpsc::channel(16);
 (
 Self {
 message: Some(message),
 sender,
 finished_signal: Arc::new(tokio::sync::Notify::new()),
 },
 receiver,
 )
 }
}

impl<R> Transport<R> for OneshotTransport<R>
where
 R: ServiceRole,
{
 type Error = tokio::sync::mpsc::error::SendError<TxJsonRpcMessage<R>>;

 fn send(
 &mut self,
 item: TxJsonRpcMessage<R>,
 ) -> impl Future<Output = Result<(), Self::Error>> + Send + 'static {
 let sender = self.sender.clone();
 let terminate = matches!(item, TxJsonRpcMessage::<R>::Response(_));
 let signal = self.finished_signal.clone();
 async move {
 sender.send(item).await?;
 if terminate {
 signal.notify_waiters();
 }
 Ok(())
 }
 }

 async fn receive(&mut self) -> Option<RxJsonRpcMessage<R>> {
 if self.message.is_none() {
 self.finished_signal.notified().await;
 }
 self.message.take()
 }

 fn close(&mut self) -> impl Future<Output = Result<(), Self::Error>> + Send {
 self.message.take();
 std::future::ready(Ok(()))
 }
}

2 changes: 1 addition & 1 deletion
crates/rmcp/src/transport/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
 feature = "transport-streamable-http-server",
 feature = "transport-sse-server"
))]
pub mod axum;
pub mod server_side_http;

pub mod http_header;

Expand Down

9 changes: 0 additions & 9 deletions
crates/rmcp/src/transport/common/axum.rs

View file


Open in desktop


This file was deleted.

Loading

, '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
refactor: provide http server as tower service#228

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 4 commits into

from

May 28, 2025
 Merged


refactor: provide http server as tower service
#228
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
59ba72a

refactor: streamable http server as tower service


4t145 May 27, 2025
6347b98

fix: fix typo


4t145 May 27, 2025
b128b89

fix: accept non-request for streamable post handler


4t145 May 27, 2025
e8b0459

fix: remove copied document


4t145 May 27, 2025

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


29 changes: 20 additions & 9 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,9 @@ reqwest = { version = "0.12", default-features = false, features = [
 "json",
 "stream",
], optional = true }
sse-stream = { version = "0.2.0", optional = true }

sse-stream = { version = "0.2", optional = true }

http = { version = "1", optional = true }
url = { version = "2.4", optional = true }

Expand All@@ -57,7 +59,9 @@ axum = { version = "0.8", features = [], optional = true }
rand = { version = "0.9", optional = true }
tokio-stream = { version = "0.1", optional = true }
uuid = { version = "1", features = ["v4"], optional = true }

http-body = { version = "1", optional = true }
http-body-util = { version = "0.1", optional = true }
bytes = { version = "1", optional = true }
# macro
rmcp-macros = { version = "0.1", workspace = true, optional = true }

Expand All@@ -74,7 +78,17 @@ reqwest = ["__reqwest", "reqwest?/rustls-tls"]

reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-tls-no-provider"]

axum = ["dep:axum"]
server-side-http = [
 "uuid",
 "dep:rand",
 "dep:tokio-stream",
 "dep:http",
 "dep:http-body",
 "dep:http-body-util",
 "dep:bytes",
 "dep:sse-stream",
 "tower",
]
# SSE client
client-side-sse = ["dep:sse-stream", "dep:http"]

Expand All@@ -97,15 +111,12 @@ transport-child-process = [
transport-sse-server = [
 "transport-async-rw",
 "transport-worker",
 "axum",
 "dep:rand",
 "dep:tokio-stream",
 "uuid",
 "server-side-http",
 "dep:axum",
]
transport-streamable-http-server = [
 "transport-streamable-http-server-session",
 "axum",
 "uuid",
 "server-side-http",
]
transport-streamable-http-server-session = [
 "transport-async-rw",
Expand Down

10 changes: 5 additions & 5 deletions
crates/rmcp/src/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -488,7 +488,7 @@ pub struct RequestContext<R: ServiceRole> {
}

/// Use this function to skip initialization process
pub async fn serve_directly<R, S, T, E, A>(
pub fn serve_directly<R, S, T, E, A>(
 service: S,
 transport: T,
 peer_info: Option<R::PeerInfo>,
Expand All@@ -499,11 +499,11 @@ where
 T: IntoTransport<R, E, A>,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_directly_with_ct(service, transport, peer_info, Default::default()).await
 serve_directly_with_ct(service, transport, peer_info, Default::default())
}

/// Use this function to skip initialization process
pub async fn serve_directly_with_ct<R, S, T, E, A>(
pub fn serve_directly_with_ct<R, S, T, E, A>(
 service: S,
 transport: T,
 peer_info: Option<R::PeerInfo>,
Expand All@@ -516,11 +516,11 @@ where
 E: std::error::Error + Send + Sync + 'static,
{
 let (peer, peer_rx) = Peer::new(Arc::new(AtomicU32RequestIdProvider::default()), peer_info);
 serve_inner(service, transport, peer, peer_rx, ct).await
 serve_inner(service, transport, peer, peer_rx, ct)
}

#[instrument(skip_all)]
async fn serve_inner<R, S, T, E, A>(
fn serve_inner<R, S, T, E, A>(
 service: S,
 transport: T,
 peer: Peer<R>,
Expand Down

6 changes: 3 additions & 3 deletions
crates/rmcp/src/service/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,7 @@ pub async fn serve_client<S, T, E, A>(
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_client_with_ct(service, transport, Default::default()).await
}
Expand All@@ -124,7 +124,7 @@ pub async fn serve_client_with_ct<S, T, E, A>(
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 let mut transport = transport.into_transport();
 let id_provider = <Arc<AtomicU32RequestIdProvider>>::default();
Expand DownExpand Up@@ -175,7 +175,7 @@ where
 context: "send initialized notification".into(),
 })?;
 let (peer, peer_rx) = Peer::new(id_provider, Some(initialize_result));
 Ok(serve_inner(service, transport, peer, peer_rx, ct).await)
 Ok(serve_inner(service, transport, peer, peer_rx, ct))
}

macro_rules! method {
Expand Down

8 changes: 4 additions & 4 deletions
crates/rmcp/src/service/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ impl<S: Service<RoleServer>> ServiceExt<RoleServer> for S {
 ) -> impl Future<Output = Result<RunningService<RoleServer, Self>, ServerInitializeError<E>>> + Send
 where
 T: IntoTransport<RoleServer, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
 Self: Sized,
 {
 serve_server_with_ct(self, transport, ct)
Expand All@@ -84,7 +84,7 @@ pub async fn serve_server<S, T, E, A>(
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_server_with_ct(service, transport, CancellationToken::new()).await
}
Expand DownExpand Up@@ -143,7 +143,7 @@ pub async fn serve_server_with_ct<S, T, E, A>(
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 let mut transport = transport.into_transport();
 let id_provider = <Arc<AtomicU32RequestIdProvider>>::default();
Expand DownExpand Up@@ -212,7 +212,7 @@ where
 };
 let _ = service.handle_notification(notification).await;
 // Continue processing service
 Ok(serve_inner(service, transport, peer, peer_rx, ct).await)
 Ok(serve_inner(service, transport, peer, peer_rx, ct))
}

macro_rules! method {
Expand Down

74 changes: 70 additions & 4 deletions
crates/rmcp/src/transport.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
//! | transport | client | server |
//! |:-: |:-: |:-: |
//! | std IO | [`child_process::TokioChildProcess`] | [`io::stdio`] |
//! | streamable http | [`streamable_http_client::StreamableHttpClientTransport`] | [`streamable_http_server::session::create_session`] |
//! | streamable http | [`streamable_http_client::StreamableHttpClientTransport`] | [`streamable_http_server::StreamableHttpService`]  |
//! | sse | [`sse_client::SseClientTransport`] | [`sse_server::SseServer`] |
//!
//！## Helper Transport Types
Expand DownExpand Up@@ -64,6 +64,8 @@
//! }
//! ```

use std::sync::Arc;

use crate::service::{RxJsonRpcMessage, ServiceRole, TxJsonRpcMessage};

pub mod sink_stream;
Expand DownExpand Up@@ -122,7 +124,7 @@ pub use auth::{AuthError, AuthorizationManager, AuthorizationSession, Authorized
pub mod streamable_http_server;
#[cfg(feature = "transport-streamable-http-server")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-streamable-http-server")))]
pub use streamable_http_server::axum::StreamableHttpServer;
pub use streamable_http_server::tower::{StreamableHttpServerConfig, StreamableHttpService};

#[cfg(feature = "transport-streamable-http-client")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-streamable-http-client")))]
Expand All@@ -138,7 +140,7 @@ pub trait Transport<R>: Send
where
 R: ServiceRole,
{
 type Error;
 type Error: std::error::Error + Send + Sync + 'static;
 /// Send a message to the transport
 ///
 /// Notice that the future returned by this function should be `Send` and `'static`.
Expand DownExpand Up@@ -169,9 +171,73 @@ impl<R, T, E> IntoTransport<R, E, TransportAdapterIdentity> for T
where
 T: Transport<R, Error = E> + Send + 'static,
 R: ServiceRole,
 E: std::error::Error + Send + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 fn into_transport(self) -> impl Transport<R, Error = E> + 'static {
 self
 }
}

/// A transport that can send a single message and then close itself
pub struct OneshotTransport<R>
where
 R: ServiceRole,
{
 message: Option<RxJsonRpcMessage<R>>,
 sender: tokio::sync::mpsc::Sender<TxJsonRpcMessage<R>>,
 finished_signal: Arc<tokio::sync::Notify>,
}

impl<R> OneshotTransport<R>
where
 R: ServiceRole,
{
 pub fn new(
 message: RxJsonRpcMessage<R>,
 ) -> (Self, tokio::sync::mpsc::Receiver<TxJsonRpcMessage<R>>) {
 let (sender, receiver) = tokio::sync::mpsc::channel(16);
 (
 Self {
 message: Some(message),
 sender,
 finished_signal: Arc::new(tokio::sync::Notify::new()),
 },
 receiver,
 )
 }
}

impl<R> Transport<R> for OneshotTransport<R>
where
 R: ServiceRole,
{
 type Error = tokio::sync::mpsc::error::SendError<TxJsonRpcMessage<R>>;

 fn send(
 &mut self,
 item: TxJsonRpcMessage<R>,
 ) -> impl Future<Output = Result<(), Self::Error>> + Send + 'static {
 let sender = self.sender.clone();
 let terminate = matches!(item, TxJsonRpcMessage::<R>::Response(_));
 let signal = self.finished_signal.clone();
 async move {
 sender.send(item).await?;
 if terminate {
 signal.notify_waiters();
 }
 Ok(())
 }
 }

 async fn receive(&mut self) -> Option<RxJsonRpcMessage<R>> {
 if self.message.is_none() {
 self.finished_signal.notified().await;
 }
 self.message.take()
 }

 fn close(&mut self) -> impl Future<Output = Result<(), Self::Error>> + Send {
 self.message.take();
 std::future::ready(Ok(()))
 }
}

2 changes: 1 addition & 1 deletion
crates/rmcp/src/transport/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
 feature = "transport-streamable-http-server",
 feature = "transport-sse-server"
))]
pub mod axum;
pub mod server_side_http;

pub mod http_header;

Expand Down

9 changes: 0 additions & 9 deletions
crates/rmcp/src/transport/common/axum.rs

View file


Open in desktop


This file was deleted.

Loading

, '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
refactor: provide http server as tower service#228

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 4 commits into

from

May 28, 2025
 Merged


refactor: provide http server as tower service
#228
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
59ba72a

refactor: streamable http server as tower service


4t145 May 27, 2025
6347b98

fix: fix typo


4t145 May 27, 2025
b128b89

fix: accept non-request for streamable post handler


4t145 May 27, 2025
e8b0459

fix: remove copied document


4t145 May 27, 2025

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


29 changes: 20 additions & 9 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,9 @@ reqwest = { version = "0.12", default-features = false, features = [
 "json",
 "stream",
], optional = true }
sse-stream = { version = "0.2.0", optional = true }

sse-stream = { version = "0.2", optional = true }

http = { version = "1", optional = true }
url = { version = "2.4", optional = true }

Expand All@@ -57,7 +59,9 @@ axum = { version = "0.8", features = [], optional = true }
rand = { version = "0.9", optional = true }
tokio-stream = { version = "0.1", optional = true }
uuid = { version = "1", features = ["v4"], optional = true }

http-body = { version = "1", optional = true }
http-body-util = { version = "0.1", optional = true }
bytes = { version = "1", optional = true }
# macro
rmcp-macros = { version = "0.1", workspace = true, optional = true }

Expand All@@ -74,7 +78,17 @@ reqwest = ["__reqwest", "reqwest?/rustls-tls"]

reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-tls-no-provider"]

axum = ["dep:axum"]
server-side-http = [
 "uuid",
 "dep:rand",
 "dep:tokio-stream",
 "dep:http",
 "dep:http-body",
 "dep:http-body-util",
 "dep:bytes",
 "dep:sse-stream",
 "tower",
]
# SSE client
client-side-sse = ["dep:sse-stream", "dep:http"]

Expand All@@ -97,15 +111,12 @@ transport-child-process = [
transport-sse-server = [
 "transport-async-rw",
 "transport-worker",
 "axum",
 "dep:rand",
 "dep:tokio-stream",
 "uuid",
 "server-side-http",
 "dep:axum",
]
transport-streamable-http-server = [
 "transport-streamable-http-server-session",
 "axum",
 "uuid",
 "server-side-http",
]
transport-streamable-http-server-session = [
 "transport-async-rw",
Expand Down

10 changes: 5 additions & 5 deletions
crates/rmcp/src/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -488,7 +488,7 @@ pub struct RequestContext<R: ServiceRole> {
}

/// Use this function to skip initialization process
pub async fn serve_directly<R, S, T, E, A>(
pub fn serve_directly<R, S, T, E, A>(
 service: S,
 transport: T,
 peer_info: Option<R::PeerInfo>,
Expand All@@ -499,11 +499,11 @@ where
 T: IntoTransport<R, E, A>,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_directly_with_ct(service, transport, peer_info, Default::default()).await
 serve_directly_with_ct(service, transport, peer_info, Default::default())
}

/// Use this function to skip initialization process
pub async fn serve_directly_with_ct<R, S, T, E, A>(
pub fn serve_directly_with_ct<R, S, T, E, A>(
 service: S,
 transport: T,
 peer_info: Option<R::PeerInfo>,
Expand All@@ -516,11 +516,11 @@ where
 E: std::error::Error + Send + Sync + 'static,
{
 let (peer, peer_rx) = Peer::new(Arc::new(AtomicU32RequestIdProvider::default()), peer_info);
 serve_inner(service, transport, peer, peer_rx, ct).await
 serve_inner(service, transport, peer, peer_rx, ct)
}

#[instrument(skip_all)]
async fn serve_inner<R, S, T, E, A>(
fn serve_inner<R, S, T, E, A>(
 service: S,
 transport: T,
 peer: Peer<R>,
Expand Down

6 changes: 3 additions & 3 deletions
crates/rmcp/src/service/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,7 @@ pub async fn serve_client<S, T, E, A>(
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_client_with_ct(service, transport, Default::default()).await
}
Expand All@@ -124,7 +124,7 @@ pub async fn serve_client_with_ct<S, T, E, A>(
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 let mut transport = transport.into_transport();
 let id_provider = <Arc<AtomicU32RequestIdProvider>>::default();
Expand DownExpand Up@@ -175,7 +175,7 @@ where
 context: "send initialized notification".into(),
 })?;
 let (peer, peer_rx) = Peer::new(id_provider, Some(initialize_result));
 Ok(serve_inner(service, transport, peer, peer_rx, ct).await)
 Ok(serve_inner(service, transport, peer, peer_rx, ct))
}

macro_rules! method {
Expand Down

8 changes: 4 additions & 4 deletions
crates/rmcp/src/service/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ impl<S: Service<RoleServer>> ServiceExt<RoleServer> for S {
 ) -> impl Future<Output = Result<RunningService<RoleServer, Self>, ServerInitializeError<E>>> + Send
 where
 T: IntoTransport<RoleServer, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
 Self: Sized,
 {
 serve_server_with_ct(self, transport, ct)
Expand All@@ -84,7 +84,7 @@ pub async fn serve_server<S, T, E, A>(
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_server_with_ct(service, transport, CancellationToken::new()).await
}
Expand DownExpand Up@@ -143,7 +143,7 @@ pub async fn serve_server_with_ct<S, T, E, A>(
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 let mut transport = transport.into_transport();
 let id_provider = <Arc<AtomicU32RequestIdProvider>>::default();
Expand DownExpand Up@@ -212,7 +212,7 @@ where
 };
 let _ = service.handle_notification(notification).await;
 // Continue processing service
 Ok(serve_inner(service, transport, peer, peer_rx, ct).await)
 Ok(serve_inner(service, transport, peer, peer_rx, ct))
}

macro_rules! method {
Expand Down

74 changes: 70 additions & 4 deletions
crates/rmcp/src/transport.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
//! | transport | client | server |
//! |:-: |:-: |:-: |
//! | std IO | [`child_process::TokioChildProcess`] | [`io::stdio`] |
//! | streamable http | [`streamable_http_client::StreamableHttpClientTransport`] | [`streamable_http_server::session::create_session`] |
//! | streamable http | [`streamable_http_client::StreamableHttpClientTransport`] | [`streamable_http_server::StreamableHttpService`]  |
//! | sse | [`sse_client::SseClientTransport`] | [`sse_server::SseServer`] |
//!
//！## Helper Transport Types
Expand DownExpand Up@@ -64,6 +64,8 @@
//! }
//! ```

use std::sync::Arc;

use crate::service::{RxJsonRpcMessage, ServiceRole, TxJsonRpcMessage};

pub mod sink_stream;
Expand DownExpand Up@@ -122,7 +124,7 @@ pub use auth::{AuthError, AuthorizationManager, AuthorizationSession, Authorized
pub mod streamable_http_server;
#[cfg(feature = "transport-streamable-http-server")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-streamable-http-server")))]
pub use streamable_http_server::axum::StreamableHttpServer;
pub use streamable_http_server::tower::{StreamableHttpServerConfig, StreamableHttpService};

#[cfg(feature = "transport-streamable-http-client")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-streamable-http-client")))]
Expand All@@ -138,7 +140,7 @@ pub trait Transport<R>: Send
where
 R: ServiceRole,
{
 type Error;
 type Error: std::error::Error + Send + Sync + 'static;
 /// Send a message to the transport
 ///
 /// Notice that the future returned by this function should be `Send` and `'static`.
Expand DownExpand Up@@ -169,9 +171,73 @@ impl<R, T, E> IntoTransport<R, E, TransportAdapterIdentity> for T
where
 T: Transport<R, Error = E> + Send + 'static,
 R: ServiceRole,
 E: std::error::Error + Send + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 fn into_transport(self) -> impl Transport<R, Error = E> + 'static {
 self
 }
}

/// A transport that can send a single message and then close itself
pub struct OneshotTransport<R>
where
 R: ServiceRole,
{
 message: Option<RxJsonRpcMessage<R>>,
 sender: tokio::sync::mpsc::Sender<TxJsonRpcMessage<R>>,
 finished_signal: Arc<tokio::sync::Notify>,
}

impl<R> OneshotTransport<R>
where
 R: ServiceRole,
{
 pub fn new(
 message: RxJsonRpcMessage<R>,
 ) -> (Self, tokio::sync::mpsc::Receiver<TxJsonRpcMessage<R>>) {
 let (sender, receiver) = tokio::sync::mpsc::channel(16);
 (
 Self {
 message: Some(message),
 sender,
 finished_signal: Arc::new(tokio::sync::Notify::new()),
 },
 receiver,
 )
 }
}

impl<R> Transport<R> for OneshotTransport<R>
where
 R: ServiceRole,
{
 type Error = tokio::sync::mpsc::error::SendError<TxJsonRpcMessage<R>>;

 fn send(
 &mut self,
 item: TxJsonRpcMessage<R>,
 ) -> impl Future<Output = Result<(), Self::Error>> + Send + 'static {
 let sender = self.sender.clone();
 let terminate = matches!(item, TxJsonRpcMessage::<R>::Response(_));
 let signal = self.finished_signal.clone();
 async move {
 sender.send(item).await?;
 if terminate {
 signal.notify_waiters();
 }
 Ok(())
 }
 }

 async fn receive(&mut self) -> Option<RxJsonRpcMessage<R>> {
 if self.message.is_none() {
 self.finished_signal.notified().await;
 }
 self.message.take()
 }

 fn close(&mut self) -> impl Future<Output = Result<(), Self::Error>> + Send {
 self.message.take();
 std::future::ready(Ok(()))
 }
}

2 changes: 1 addition & 1 deletion
crates/rmcp/src/transport/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
 feature = "transport-streamable-http-server",
 feature = "transport-sse-server"
))]
pub mod axum;
pub mod server_side_http;

pub mod http_header;

Expand Down

9 changes: 0 additions & 9 deletions
crates/rmcp/src/transport/common/axum.rs

View file


Open in desktop


This file was deleted.

Loading

, '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
refactor: provide http server as tower service#228

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 4 commits into

from

May 28, 2025
 Merged


refactor: provide http server as tower service
#228
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
59ba72a

refactor: streamable http server as tower service


4t145 May 27, 2025
6347b98

fix: fix typo


4t145 May 27, 2025
b128b89

fix: accept non-request for streamable post handler


4t145 May 27, 2025
e8b0459

fix: remove copied document


4t145 May 27, 2025

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


29 changes: 20 additions & 9 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,9 @@ reqwest = { version = "0.12", default-features = false, features = [
 "json",
 "stream",
], optional = true }
sse-stream = { version = "0.2.0", optional = true }

sse-stream = { version = "0.2", optional = true }

http = { version = "1", optional = true }
url = { version = "2.4", optional = true }

Expand All@@ -57,7 +59,9 @@ axum = { version = "0.8", features = [], optional = true }
rand = { version = "0.9", optional = true }
tokio-stream = { version = "0.1", optional = true }
uuid = { version = "1", features = ["v4"], optional = true }

http-body = { version = "1", optional = true }
http-body-util = { version = "0.1", optional = true }
bytes = { version = "1", optional = true }
# macro
rmcp-macros = { version = "0.1", workspace = true, optional = true }

Expand All@@ -74,7 +78,17 @@ reqwest = ["__reqwest", "reqwest?/rustls-tls"]

reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-tls-no-provider"]

axum = ["dep:axum"]
server-side-http = [
 "uuid",
 "dep:rand",
 "dep:tokio-stream",
 "dep:http",
 "dep:http-body",
 "dep:http-body-util",
 "dep:bytes",
 "dep:sse-stream",
 "tower",
]
# SSE client
client-side-sse = ["dep:sse-stream", "dep:http"]

Expand All@@ -97,15 +111,12 @@ transport-child-process = [
transport-sse-server = [
 "transport-async-rw",
 "transport-worker",
 "axum",
 "dep:rand",
 "dep:tokio-stream",
 "uuid",
 "server-side-http",
 "dep:axum",
]
transport-streamable-http-server = [
 "transport-streamable-http-server-session",
 "axum",
 "uuid",
 "server-side-http",
]
transport-streamable-http-server-session = [
 "transport-async-rw",
Expand Down

10 changes: 5 additions & 5 deletions
crates/rmcp/src/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -488,7 +488,7 @@ pub struct RequestContext<R: ServiceRole> {
}

/// Use this function to skip initialization process
pub async fn serve_directly<R, S, T, E, A>(
pub fn serve_directly<R, S, T, E, A>(
 service: S,
 transport: T,
 peer_info: Option<R::PeerInfo>,
Expand All@@ -499,11 +499,11 @@ where
 T: IntoTransport<R, E, A>,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_directly_with_ct(service, transport, peer_info, Default::default()).await
 serve_directly_with_ct(service, transport, peer_info, Default::default())
}

/// Use this function to skip initialization process
pub async fn serve_directly_with_ct<R, S, T, E, A>(
pub fn serve_directly_with_ct<R, S, T, E, A>(
 service: S,
 transport: T,
 peer_info: Option<R::PeerInfo>,
Expand All@@ -516,11 +516,11 @@ where
 E: std::error::Error + Send + Sync + 'static,
{
 let (peer, peer_rx) = Peer::new(Arc::new(AtomicU32RequestIdProvider::default()), peer_info);
 serve_inner(service, transport, peer, peer_rx, ct).await
 serve_inner(service, transport, peer, peer_rx, ct)
}

#[instrument(skip_all)]
async fn serve_inner<R, S, T, E, A>(
fn serve_inner<R, S, T, E, A>(
 service: S,
 transport: T,
 peer: Peer<R>,
Expand Down

6 changes: 3 additions & 3 deletions
crates/rmcp/src/service/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,7 @@ pub async fn serve_client<S, T, E, A>(
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_client_with_ct(service, transport, Default::default()).await
}
Expand All@@ -124,7 +124,7 @@ pub async fn serve_client_with_ct<S, T, E, A>(
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 let mut transport = transport.into_transport();
 let id_provider = <Arc<AtomicU32RequestIdProvider>>::default();
Expand DownExpand Up@@ -175,7 +175,7 @@ where
 context: "send initialized notification".into(),
 })?;
 let (peer, peer_rx) = Peer::new(id_provider, Some(initialize_result));
 Ok(serve_inner(service, transport, peer, peer_rx, ct).await)
 Ok(serve_inner(service, transport, peer, peer_rx, ct))
}

macro_rules! method {
Expand Down

8 changes: 4 additions & 4 deletions
crates/rmcp/src/service/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ impl<S: Service<RoleServer>> ServiceExt<RoleServer> for S {
 ) -> impl Future<Output = Result<RunningService<RoleServer, Self>, ServerInitializeError<E>>> + Send
 where
 T: IntoTransport<RoleServer, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
 Self: Sized,
 {
 serve_server_with_ct(self, transport, ct)
Expand All@@ -84,7 +84,7 @@ pub async fn serve_server<S, T, E, A>(
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_server_with_ct(service, transport, CancellationToken::new()).await
}
Expand DownExpand Up@@ -143,7 +143,7 @@ pub async fn serve_server_with_ct<S, T, E, A>(
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 let mut transport = transport.into_transport();
 let id_provider = <Arc<AtomicU32RequestIdProvider>>::default();
Expand DownExpand Up@@ -212,7 +212,7 @@ where
 };
 let _ = service.handle_notification(notification).await;
 // Continue processing service
 Ok(serve_inner(service, transport, peer, peer_rx, ct).await)
 Ok(serve_inner(service, transport, peer, peer_rx, ct))
}

macro_rules! method {
Expand Down

74 changes: 70 additions & 4 deletions
crates/rmcp/src/transport.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
//! | transport | client | server |
//! |:-: |:-: |:-: |
//! | std IO | [`child_process::TokioChildProcess`] | [`io::stdio`] |
//! | streamable http | [`streamable_http_client::StreamableHttpClientTransport`] | [`streamable_http_server::session::create_session`] |
//! | streamable http | [`streamable_http_client::StreamableHttpClientTransport`] | [`streamable_http_server::StreamableHttpService`]  |
//! | sse | [`sse_client::SseClientTransport`] | [`sse_server::SseServer`] |
//!
//！## Helper Transport Types
Expand DownExpand Up@@ -64,6 +64,8 @@
//! }
//! ```

use std::sync::Arc;

use crate::service::{RxJsonRpcMessage, ServiceRole, TxJsonRpcMessage};

pub mod sink_stream;
Expand DownExpand Up@@ -122,7 +124,7 @@ pub use auth::{AuthError, AuthorizationManager, AuthorizationSession, Authorized
pub mod streamable_http_server;
#[cfg(feature = "transport-streamable-http-server")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-streamable-http-server")))]
pub use streamable_http_server::axum::StreamableHttpServer;
pub use streamable_http_server::tower::{StreamableHttpServerConfig, StreamableHttpService};

#[cfg(feature = "transport-streamable-http-client")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-streamable-http-client")))]
Expand All@@ -138,7 +140,7 @@ pub trait Transport<R>: Send
where
 R: ServiceRole,
{
 type Error;
 type Error: std::error::Error + Send + Sync + 'static;
 /// Send a message to the transport
 ///
 /// Notice that the future returned by this function should be `Send` and `'static`.
Expand DownExpand Up@@ -169,9 +171,73 @@ impl<R, T, E> IntoTransport<R, E, TransportAdapterIdentity> for T
where
 T: Transport<R, Error = E> + Send + 'static,
 R: ServiceRole,
 E: std::error::Error + Send + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 fn into_transport(self) -> impl Transport<R, Error = E> + 'static {
 self
 }
}

/// A transport that can send a single message and then close itself
pub struct OneshotTransport<R>
where
 R: ServiceRole,
{
 message: Option<RxJsonRpcMessage<R>>,
 sender: tokio::sync::mpsc::Sender<TxJsonRpcMessage<R>>,
 finished_signal: Arc<tokio::sync::Notify>,
}

impl<R> OneshotTransport<R>
where
 R: ServiceRole,
{
 pub fn new(
 message: RxJsonRpcMessage<R>,
 ) -> (Self, tokio::sync::mpsc::Receiver<TxJsonRpcMessage<R>>) {
 let (sender, receiver) = tokio::sync::mpsc::channel(16);
 (
 Self {
 message: Some(message),
 sender,
 finished_signal: Arc::new(tokio::sync::Notify::new()),
 },
 receiver,
 )
 }
}

impl<R> Transport<R> for OneshotTransport<R>
where
 R: ServiceRole,
{
 type Error = tokio::sync::mpsc::error::SendError<TxJsonRpcMessage<R>>;

 fn send(
 &mut self,
 item: TxJsonRpcMessage<R>,
 ) -> impl Future<Output = Result<(), Self::Error>> + Send + 'static {
 let sender = self.sender.clone();
 let terminate = matches!(item, TxJsonRpcMessage::<R>::Response(_));
 let signal = self.finished_signal.clone();
 async move {
 sender.send(item).await?;
 if terminate {
 signal.notify_waiters();
 }
 Ok(())
 }
 }

 async fn receive(&mut self) -> Option<RxJsonRpcMessage<R>> {
 if self.message.is_none() {
 self.finished_signal.notified().await;
 }
 self.message.take()
 }

 fn close(&mut self) -> impl Future<Output = Result<(), Self::Error>> + Send {
 self.message.take();
 std::future::ready(Ok(()))
 }
}

2 changes: 1 addition & 1 deletion
crates/rmcp/src/transport/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
 feature = "transport-streamable-http-server",
 feature = "transport-sse-server"
))]
pub mod axum;
pub mod server_side_http;

pub mod http_header;

Expand Down

9 changes: 0 additions & 9 deletions
crates/rmcp/src/transport/common/axum.rs

View file


Open in desktop


This file was deleted.

Loading

, '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
refactor: provide http server as tower service#228

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 4 commits into

from

May 28, 2025
 Merged


refactor: provide http server as tower service
#228
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
59ba72a

refactor: streamable http server as tower service


4t145 May 27, 2025
6347b98

fix: fix typo


4t145 May 27, 2025
b128b89

fix: accept non-request for streamable post handler


4t145 May 27, 2025
e8b0459

fix: remove copied document


4t145 May 27, 2025

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


29 changes: 20 additions & 9 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,9 @@ reqwest = { version = "0.12", default-features = false, features = [
 "json",
 "stream",
], optional = true }
sse-stream = { version = "0.2.0", optional = true }

sse-stream = { version = "0.2", optional = true }

http = { version = "1", optional = true }
url = { version = "2.4", optional = true }

Expand All@@ -57,7 +59,9 @@ axum = { version = "0.8", features = [], optional = true }
rand = { version = "0.9", optional = true }
tokio-stream = { version = "0.1", optional = true }
uuid = { version = "1", features = ["v4"], optional = true }

http-body = { version = "1", optional = true }
http-body-util = { version = "0.1", optional = true }
bytes = { version = "1", optional = true }
# macro
rmcp-macros = { version = "0.1", workspace = true, optional = true }

Expand All@@ -74,7 +78,17 @@ reqwest = ["__reqwest", "reqwest?/rustls-tls"]

reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-tls-no-provider"]

axum = ["dep:axum"]
server-side-http = [
 "uuid",
 "dep:rand",
 "dep:tokio-stream",
 "dep:http",
 "dep:http-body",
 "dep:http-body-util",
 "dep:bytes",
 "dep:sse-stream",
 "tower",
]
# SSE client
client-side-sse = ["dep:sse-stream", "dep:http"]

Expand All@@ -97,15 +111,12 @@ transport-child-process = [
transport-sse-server = [
 "transport-async-rw",
 "transport-worker",
 "axum",
 "dep:rand",
 "dep:tokio-stream",
 "uuid",
 "server-side-http",
 "dep:axum",
]
transport-streamable-http-server = [
 "transport-streamable-http-server-session",
 "axum",
 "uuid",
 "server-side-http",
]
transport-streamable-http-server-session = [
 "transport-async-rw",
Expand Down

10 changes: 5 additions & 5 deletions
crates/rmcp/src/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -488,7 +488,7 @@ pub struct RequestContext<R: ServiceRole> {
}

/// Use this function to skip initialization process
pub async fn serve_directly<R, S, T, E, A>(
pub fn serve_directly<R, S, T, E, A>(
 service: S,
 transport: T,
 peer_info: Option<R::PeerInfo>,
Expand All@@ -499,11 +499,11 @@ where
 T: IntoTransport<R, E, A>,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_directly_with_ct(service, transport, peer_info, Default::default()).await
 serve_directly_with_ct(service, transport, peer_info, Default::default())
}

/// Use this function to skip initialization process
pub async fn serve_directly_with_ct<R, S, T, E, A>(
pub fn serve_directly_with_ct<R, S, T, E, A>(
 service: S,
 transport: T,
 peer_info: Option<R::PeerInfo>,
Expand All@@ -516,11 +516,11 @@ where
 E: std::error::Error + Send + Sync + 'static,
{
 let (peer, peer_rx) = Peer::new(Arc::new(AtomicU32RequestIdProvider::default()), peer_info);
 serve_inner(service, transport, peer, peer_rx, ct).await
 serve_inner(service, transport, peer, peer_rx, ct)
}

#[instrument(skip_all)]
async fn serve_inner<R, S, T, E, A>(
fn serve_inner<R, S, T, E, A>(
 service: S,
 transport: T,
 peer: Peer<R>,
Expand Down

6 changes: 3 additions & 3 deletions
crates/rmcp/src/service/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,7 @@ pub async fn serve_client<S, T, E, A>(
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_client_with_ct(service, transport, Default::default()).await
}
Expand All@@ -124,7 +124,7 @@ pub async fn serve_client_with_ct<S, T, E, A>(
where
 S: Service<RoleClient>,
 T: IntoTransport<RoleClient, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 let mut transport = transport.into_transport();
 let id_provider = <Arc<AtomicU32RequestIdProvider>>::default();
Expand DownExpand Up@@ -175,7 +175,7 @@ where
 context: "send initialized notification".into(),
 })?;
 let (peer, peer_rx) = Peer::new(id_provider, Some(initialize_result));
 Ok(serve_inner(service, transport, peer, peer_rx, ct).await)
 Ok(serve_inner(service, transport, peer, peer_rx, ct))
}

macro_rules! method {
Expand Down

8 changes: 4 additions & 4 deletions
crates/rmcp/src/service/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ impl<S: Service<RoleServer>> ServiceExt<RoleServer> for S {
 ) -> impl Future<Output = Result<RunningService<RoleServer, Self>, ServerInitializeError<E>>> + Send
 where
 T: IntoTransport<RoleServer, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
 Self: Sized,
 {
 serve_server_with_ct(self, transport, ct)
Expand All@@ -84,7 +84,7 @@ pub async fn serve_server<S, T, E, A>(
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 serve_server_with_ct(service, transport, CancellationToken::new()).await
}
Expand DownExpand Up@@ -143,7 +143,7 @@ pub async fn serve_server_with_ct<S, T, E, A>(
where
 S: Service<RoleServer>,
 T: IntoTransport<RoleServer, E, A>,
 E: std::error::Error + From<std::io::Error> + Send + Sync + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 let mut transport = transport.into_transport();
 let id_provider = <Arc<AtomicU32RequestIdProvider>>::default();
Expand DownExpand Up@@ -212,7 +212,7 @@ where
 };
 let _ = service.handle_notification(notification).await;
 // Continue processing service
 Ok(serve_inner(service, transport, peer, peer_rx, ct).await)
 Ok(serve_inner(service, transport, peer, peer_rx, ct))
}

macro_rules! method {
Expand Down

74 changes: 70 additions & 4 deletions
crates/rmcp/src/transport.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
//! | transport | client | server |
//! |:-: |:-: |:-: |
//! | std IO | [`child_process::TokioChildProcess`] | [`io::stdio`] |
//! | streamable http | [`streamable_http_client::StreamableHttpClientTransport`] | [`streamable_http_server::session::create_session`] |
//! | streamable http | [`streamable_http_client::StreamableHttpClientTransport`] | [`streamable_http_server::StreamableHttpService`]  |
//! | sse | [`sse_client::SseClientTransport`] | [`sse_server::SseServer`] |
//!
//！## Helper Transport Types
Expand DownExpand Up@@ -64,6 +64,8 @@
//! }
//! ```

use std::sync::Arc;

use crate::service::{RxJsonRpcMessage, ServiceRole, TxJsonRpcMessage};

pub mod sink_stream;
Expand DownExpand Up@@ -122,7 +124,7 @@ pub use auth::{AuthError, AuthorizationManager, AuthorizationSession, Authorized
pub mod streamable_http_server;
#[cfg(feature = "transport-streamable-http-server")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-streamable-http-server")))]
pub use streamable_http_server::axum::StreamableHttpServer;
pub use streamable_http_server::tower::{StreamableHttpServerConfig, StreamableHttpService};

#[cfg(feature = "transport-streamable-http-client")]
#[cfg_attr(docsrs, doc(cfg(feature = "transport-streamable-http-client")))]
Expand All@@ -138,7 +140,7 @@ pub trait Transport<R>: Send
where
 R: ServiceRole,
{
 type Error;
 type Error: std::error::Error + Send + Sync + 'static;
 /// Send a message to the transport
 ///
 /// Notice that the future returned by this function should be `Send` and `'static`.
Expand DownExpand Up@@ -169,9 +171,73 @@ impl<R, T, E> IntoTransport<R, E, TransportAdapterIdentity> for T
where
 T: Transport<R, Error = E> + Send + 'static,
 R: ServiceRole,
 E: std::error::Error + Send + 'static,
 E: std::error::Error + Send + Sync + 'static,
{
 fn into_transport(self) -> impl Transport<R, Error = E> + 'static {
 self
 }
}

/// A transport that can send a single message and then close itself
pub struct OneshotTransport<R>
where
 R: ServiceRole,
{
 message: Option<RxJsonRpcMessage<R>>,
 sender: tokio::sync::mpsc::Sender<TxJsonRpcMessage<R>>,
 finished_signal: Arc<tokio::sync::Notify>,
}

impl<R> OneshotTransport<R>
where
 R: ServiceRole,
{
 pub fn new(
 message: RxJsonRpcMessage<R>,
 ) -> (Self, tokio::sync::mpsc::Receiver<TxJsonRpcMessage<R>>) {
 let (sender, receiver) = tokio::sync::mpsc::channel(16);
 (
 Self {
 message: Some(message),
 sender,
 finished_signal: Arc::new(tokio::sync::Notify::new()),
 },
 receiver,
 )
 }
}

impl<R> Transport<R> for OneshotTransport<R>
where
 R: ServiceRole,
{
 type Error = tokio::sync::mpsc::error::SendError<TxJsonRpcMessage<R>>;

 fn send(
 &mut self,
 item: TxJsonRpcMessage<R>,
 ) -> impl Future<Output = Result<(), Self::Error>> + Send + 'static {
 let sender = self.sender.clone();
 let terminate = matches!(item, TxJsonRpcMessage::<R>::Response(_));
 let signal = self.finished_signal.clone();
 async move {
 sender.send(item).await?;
 if terminate {
 signal.notify_waiters();
 }
 Ok(())
 }
 }

 async fn receive(&mut self) -> Option<RxJsonRpcMessage<R>> {
 if self.message.is_none() {
 self.finished_signal.notified().await;
 }
 self.message.take()
 }

 fn close(&mut self) -> impl Future<Output = Result<(), Self::Error>> + Send {
 self.message.take();
 std::future::ready(Ok(()))
 }
}

2 changes: 1 addition & 1 deletion
crates/rmcp/src/transport/common.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
 feature = "transport-streamable-http-server",
 feature = "transport-sse-server"
))]
pub mod axum;
pub mod server_side_http;

pub mod http_header;

Expand Down

9 changes: 0 additions & 9 deletions
crates/rmcp/src/transport/common/axum.rs

View file


Open in desktop


This file was deleted.

Loading