feat(transport): support streamable http server#152

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 6 commits into from
May 8, 2025
Merged

feat(transport): support streamable http server #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ef5feb9
feat(transport): support streamable http server
4t145 May 2, 2025
f8ac00a
refactor(transport): add common module for shared transport utilities
4t145 May 7, 2025
58f7826
perf(tracing): add more log for streamable http session
4t145 May 7, 2025
3c3bd3d
fix(test): fix port conflict in test with js
4t145 May 7, 2025
b60f2e3
fix(transport): fix id generating and session management
4t145 May 8, 2025
f7b8e8f
chore(naming): rename sse server to streamable http server
4t145 May 8, 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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -199,6 +199,7 @@ See [examples](examples/README.md)
- `transport-sse-server`: Server SSE transport
- `transport-child-process`: Client stdio transport
- `transport-sse`: Client sse transport
- `transport-streamable-http-server` streamable http server transport

## Related Resources

Expand Down
15 changes: 13 additions & 2 deletions crates/rmcp/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,10 +49,11 @@ tower-service = { version = "0.3", optional = true }
# for ws transport
# tokio-tungstenite ={ version = "0.26", optional = true }

# for sse-server transport
# for http-server transport
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 }

# macro
rmcp-macros = { version = "0.1", workspace = true, optional = true }
Expand All@@ -71,6 +72,16 @@ transport-sse-server = [
"dep:axum",
"dep:rand",
"dep:tokio-stream",
"uuid",
]
transport-streamable-http-server = [
"transport-streamable-http-server-session",
"dep:axum",
"uuid",
]
transport-streamable-http-server-session = [
"transport-async-rw",
"dep:tokio-stream",
]
# transport-ws = ["transport-io", "dep:tokio-tungstenite"]
tower = ["dep:tower-service"]
Expand DownExpand Up@@ -99,7 +110,7 @@ path = "tests/test_with_python.rs"

[[test]]
name = "test_with_js"
required-features = ["server", "client", "transport-sse-server", "transport-child-process"]
required-features = ["server", "client", "transport-sse-server", "transport-child-process", "transport-streamable-http-server"]
path = "tests/test_with_js.rs"

[[test]]
Expand Down
2 changes: 1 addition & 1 deletion crates/rmcp/src/model.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -186,7 +186,7 @@ impl<'de> Deserialize<'de> for NumberOrString {

pub type RequestId = NumberOrString;

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Hash, Eq)]
#[serde(transparent)]
pub struct ProgressToken(pub NumberOrString);
#[derive(Debug, Clone)]
Expand Down
1 change: 1 addition & 0 deletions crates/rmcp/src/model/tool.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ pub struct Tool {
pub description: Option<Cow<'static, str>>,
/// A JSON Schema object defining the expected parameters for the tool
pub input_schema: Arc<JsonObject>,
#[serde(skip_serializing_if = "Option::is_none")]
/// Optional additional tool information.
pub annotations: Option<ToolAnnotations>,
}
Expand Down
6 changes: 3 additions & 3 deletions crates/rmcp/src/service.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -591,7 +591,7 @@ where
}
};

tracing::debug!(?evt, "new event");
tracing::trace!(?evt, "new event");
match evt {
// response and error
Event::ToSink(m) => {
Expand DownExpand Up@@ -657,7 +657,7 @@ where
Event::PeerMessage(JsonRpcMessage::Request(JsonRpcRequest {
id, request, ..
})) => {
tracing::info!(%id, ?request, "received request");
tracing::debug!(%id, ?request, "received request");
{
let service = shared_service.clone();
let sink = sink_proxy_tx.clone();
Expand All@@ -675,7 +675,7 @@ where
let result = service.handle_request(request, context).await;
let response = match result {
Ok(result) => {
tracing::info!(%id, ?result, "response message");
tracing::debug!(%id, ?result, "response message");
JsonRpcMessage::response(result, id)
}
Err(error) => {
Expand Down
7 changes: 7 additions & 0 deletions crates/rmcp/src/transport.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,13 @@ pub use auth::{AuthError, AuthorizationManager, AuthorizationSession, Authorized

// #[cfg(feature = "transport-ws")]
// pub mod ws;
#[cfg(feature = "transport-streamable-http-server-session")]
pub mod streamable_http_server;
#[cfg(feature = "transport-streamable-http-server")]
pub use streamable_http_server::axum::StreamableHttpServer;

/// Common use codes
pub mod common;

pub trait IntoTransport<R, E, A>: Send + 'static
where
Expand Down
5 changes: 5 additions & 0 deletions crates/rmcp/src/transport/common.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
#[cfg(any(
feature = "transport-streamable-http-server",
feature = "transport-sse-server"
))]
pub mod axum;
9 changes: 9 additions & 0 deletions crates/rmcp/src/transport/common/axum.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
use std::{sync::Arc, time::Duration};

pub type SessionId = Arc<str>;

pub fn session_id() -> SessionId {
uuid::Uuid::new_v4().to_string().into()
}

pub const DEFAULT_AUTO_PING_INTERVAL: Duration = Duration::from_secs(15);
10 changes: 2 additions & 8 deletions crates/rmcp/src/transport/sse_server.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,14 +19,13 @@ use crate::{
RoleServer, Service,
model::ClientJsonRpcMessage,
service::{RxJsonRpcMessage, TxJsonRpcMessage},
transport::common::axum::{DEFAULT_AUTO_PING_INTERVAL, SessionId, session_id},
};
type SessionId = Arc<str>;

type TxStore =
Arc<tokio::sync::RwLock<HashMap<SessionId, tokio::sync::mpsc::Sender<ClientJsonRpcMessage>>>>;
pub type TransportReceiver = ReceiverStream<RxJsonRpcMessage<RoleServer>>;

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

#[derive(Clone)]
struct App {
txs: TxStore,
Expand DownExpand Up@@ -56,11 +55,6 @@ impl App {
}
}

fn session_id() -> SessionId {
let id = format!("{:016x}", rand::random::<u128>());
Arc::from(id)
}

#[derive(Debug, serde::Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct PostEventQuery {
Expand Down
3 changes: 3 additions & 0 deletions crates/rmcp/src/transport/streamable_http_server.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
#[cfg(feature = "transport-streamable-http-server")]
pub mod axum;
pub mod session;
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
feat(transport): support streamable http server#152

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

from

May 8, 2025
 Merged


feat(transport): support streamable http server
#152
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ef5feb9

feat(transport): support streamable http server


4t145 May 2, 2025
f8ac00a

refactor(transport): add common module for shared transport utilities


4t145 May 7, 2025
58f7826

perf(tracing): add more log for streamable http session


4t145 May 7, 2025
3c3bd3d

fix(test): fix port conflict in test with js


4t145 May 7, 2025
b60f2e3

fix(transport): fix id generating and session management


4t145 May 8, 2025
f7b8e8f

chore(naming): rename sse server to streamable http server


4t145 May 8, 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


1 change: 1 addition & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,6 +199,7 @@ See [examples](examples/README.md)
- `transport-sse-server`: Server SSE transport
- `transport-child-process`: Client stdio transport
- `transport-sse`: Client sse transport
- `transport-streamable-http-server` streamable http server transport

## Related Resources

Expand Down

15 changes: 13 additions & 2 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,10 +49,11 @@ tower-service = { version = "0.3", optional = true }
# for ws transport
# tokio-tungstenite ={ version = "0.26", optional = true }

# for sse-server transport
# for http-server transport
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 }

# macro
rmcp-macros = { version = "0.1", workspace = true, optional = true }
Expand All@@ -71,6 +72,16 @@ transport-sse-server = [
 "dep:axum",
 "dep:rand",
 "dep:tokio-stream",
 "uuid",
]
transport-streamable-http-server = [
 "transport-streamable-http-server-session",
 "dep:axum",
 "uuid",
]
transport-streamable-http-server-session = [
 "transport-async-rw",
 "dep:tokio-stream",
]
# transport-ws = ["transport-io", "dep:tokio-tungstenite"]
tower = ["dep:tower-service"]
Expand DownExpand Up@@ -99,7 +110,7 @@ path = "tests/test_with_python.rs"

[[test]]
name = "test_with_js"
required-features = ["server", "client", "transport-sse-server", "transport-child-process"]
required-features = ["server", "client", "transport-sse-server", "transport-child-process", "transport-streamable-http-server"]
path = "tests/test_with_js.rs"

[[test]]
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -186,7 +186,7 @@ impl<'de> Deserialize<'de> for NumberOrString {

pub type RequestId = NumberOrString;

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Hash, Eq)]
#[serde(transparent)]
pub struct ProgressToken(pub NumberOrString);
#[derive(Debug, Clone)]
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/model/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ pub struct Tool {
 pub description: Option<Cow<'static, str>>,
 /// A JSON Schema object defining the expected parameters for the tool
 pub input_schema: Arc<JsonObject>,
 #[serde(skip_serializing_if = "Option::is_none")]
 /// Optional additional tool information.
 pub annotations: Option<ToolAnnotations>,
}
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -591,7 +591,7 @@ where
 }
 };

 tracing::debug!(?evt, "new event");
 tracing::trace!(?evt, "new event");
 match evt {
 // response and error
 Event::ToSink(m) => {
Expand DownExpand Up@@ -657,7 +657,7 @@ where
 Event::PeerMessage(JsonRpcMessage::Request(JsonRpcRequest {
 id, request, ..
 })) => {
 tracing::info!(%id, ?request, "received request");
 tracing::debug!(%id, ?request, "received request");
 {
 let service = shared_service.clone();
 let sink = sink_proxy_tx.clone();
Expand All@@ -675,7 +675,7 @@ where
 let result = service.handle_request(request, context).await;
 let response = match result {
 Ok(result) => {
 tracing::info!(%id, ?result, "response message");
 tracing::debug!(%id, ?result, "response message");
 JsonRpcMessage::response(result, id)
 }
 Err(error) => {
Expand Down

7 changes: 7 additions & 0 deletions
crates/rmcp/src/transport.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,13 @@ pub use auth::{AuthError, AuthorizationManager, AuthorizationSession, Authorized

// #[cfg(feature = "transport-ws")]
// pub mod ws;
#[cfg(feature = "transport-streamable-http-server-session")]
pub mod streamable_http_server;
#[cfg(feature = "transport-streamable-http-server")]
pub use streamable_http_server::axum::StreamableHttpServer;

/// Common use codes
pub mod common;

pub trait IntoTransport<R, E, A>: Send + 'static
where
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
#[cfg(any(
 feature = "transport-streamable-http-server",
 feature = "transport-sse-server"
))]
pub mod axum;

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
use std::{sync::Arc, time::Duration};

pub type SessionId = Arc<str>;

pub fn session_id() -> SessionId {
 uuid::Uuid::new_v4().to_string().into()
}

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

10 changes: 2 additions & 8 deletions
crates/rmcp/src/transport/sse_server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,14 +19,13 @@ use crate::{
 RoleServer, Service,
 model::ClientJsonRpcMessage,
 service::{RxJsonRpcMessage, TxJsonRpcMessage},
 transport::common::axum::{DEFAULT_AUTO_PING_INTERVAL, SessionId, session_id},
};
type SessionId = Arc<str>;

type TxStore =
 Arc<tokio::sync::RwLock<HashMap<SessionId, tokio::sync::mpsc::Sender<ClientJsonRpcMessage>>>>;
pub type TransportReceiver = ReceiverStream<RxJsonRpcMessage<RoleServer>>;

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

#[derive(Clone)]
struct App {
 txs: TxStore,
Expand DownExpand Up@@ -56,11 +55,6 @@ impl App {
 }
}

fn session_id() -> SessionId {
 let id = format!("{:016x}", rand::random::<u128>());
 Arc::from(id)
}

#[derive(Debug, serde::Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct PostEventQuery {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
#[cfg(feature = "transport-streamable-http-server")]
pub mod axum;
pub mod session;
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
feat(transport): support streamable http server#152

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

from

May 8, 2025
 Merged


feat(transport): support streamable http server
#152
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ef5feb9

feat(transport): support streamable http server


4t145 May 2, 2025
f8ac00a

refactor(transport): add common module for shared transport utilities


4t145 May 7, 2025
58f7826

perf(tracing): add more log for streamable http session


4t145 May 7, 2025
3c3bd3d

fix(test): fix port conflict in test with js


4t145 May 7, 2025
b60f2e3

fix(transport): fix id generating and session management


4t145 May 8, 2025
f7b8e8f

chore(naming): rename sse server to streamable http server


4t145 May 8, 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


1 change: 1 addition & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,6 +199,7 @@ See [examples](examples/README.md)
- `transport-sse-server`: Server SSE transport
- `transport-child-process`: Client stdio transport
- `transport-sse`: Client sse transport
- `transport-streamable-http-server` streamable http server transport

## Related Resources

Expand Down

15 changes: 13 additions & 2 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,10 +49,11 @@ tower-service = { version = "0.3", optional = true }
# for ws transport
# tokio-tungstenite ={ version = "0.26", optional = true }

# for sse-server transport
# for http-server transport
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 }

# macro
rmcp-macros = { version = "0.1", workspace = true, optional = true }
Expand All@@ -71,6 +72,16 @@ transport-sse-server = [
 "dep:axum",
 "dep:rand",
 "dep:tokio-stream",
 "uuid",
]
transport-streamable-http-server = [
 "transport-streamable-http-server-session",
 "dep:axum",
 "uuid",
]
transport-streamable-http-server-session = [
 "transport-async-rw",
 "dep:tokio-stream",
]
# transport-ws = ["transport-io", "dep:tokio-tungstenite"]
tower = ["dep:tower-service"]
Expand DownExpand Up@@ -99,7 +110,7 @@ path = "tests/test_with_python.rs"

[[test]]
name = "test_with_js"
required-features = ["server", "client", "transport-sse-server", "transport-child-process"]
required-features = ["server", "client", "transport-sse-server", "transport-child-process", "transport-streamable-http-server"]
path = "tests/test_with_js.rs"

[[test]]
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -186,7 +186,7 @@ impl<'de> Deserialize<'de> for NumberOrString {

pub type RequestId = NumberOrString;

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Hash, Eq)]
#[serde(transparent)]
pub struct ProgressToken(pub NumberOrString);
#[derive(Debug, Clone)]
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/model/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ pub struct Tool {
 pub description: Option<Cow<'static, str>>,
 /// A JSON Schema object defining the expected parameters for the tool
 pub input_schema: Arc<JsonObject>,
 #[serde(skip_serializing_if = "Option::is_none")]
 /// Optional additional tool information.
 pub annotations: Option<ToolAnnotations>,
}
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -591,7 +591,7 @@ where
 }
 };

 tracing::debug!(?evt, "new event");
 tracing::trace!(?evt, "new event");
 match evt {
 // response and error
 Event::ToSink(m) => {
Expand DownExpand Up@@ -657,7 +657,7 @@ where
 Event::PeerMessage(JsonRpcMessage::Request(JsonRpcRequest {
 id, request, ..
 })) => {
 tracing::info!(%id, ?request, "received request");
 tracing::debug!(%id, ?request, "received request");
 {
 let service = shared_service.clone();
 let sink = sink_proxy_tx.clone();
Expand All@@ -675,7 +675,7 @@ where
 let result = service.handle_request(request, context).await;
 let response = match result {
 Ok(result) => {
 tracing::info!(%id, ?result, "response message");
 tracing::debug!(%id, ?result, "response message");
 JsonRpcMessage::response(result, id)
 }
 Err(error) => {
Expand Down

7 changes: 7 additions & 0 deletions
crates/rmcp/src/transport.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,13 @@ pub use auth::{AuthError, AuthorizationManager, AuthorizationSession, Authorized

// #[cfg(feature = "transport-ws")]
// pub mod ws;
#[cfg(feature = "transport-streamable-http-server-session")]
pub mod streamable_http_server;
#[cfg(feature = "transport-streamable-http-server")]
pub use streamable_http_server::axum::StreamableHttpServer;

/// Common use codes
pub mod common;

pub trait IntoTransport<R, E, A>: Send + 'static
where
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
#[cfg(any(
 feature = "transport-streamable-http-server",
 feature = "transport-sse-server"
))]
pub mod axum;

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
use std::{sync::Arc, time::Duration};

pub type SessionId = Arc<str>;

pub fn session_id() -> SessionId {
 uuid::Uuid::new_v4().to_string().into()
}

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

10 changes: 2 additions & 8 deletions
crates/rmcp/src/transport/sse_server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,14 +19,13 @@ use crate::{
 RoleServer, Service,
 model::ClientJsonRpcMessage,
 service::{RxJsonRpcMessage, TxJsonRpcMessage},
 transport::common::axum::{DEFAULT_AUTO_PING_INTERVAL, SessionId, session_id},
};
type SessionId = Arc<str>;

type TxStore =
 Arc<tokio::sync::RwLock<HashMap<SessionId, tokio::sync::mpsc::Sender<ClientJsonRpcMessage>>>>;
pub type TransportReceiver = ReceiverStream<RxJsonRpcMessage<RoleServer>>;

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

#[derive(Clone)]
struct App {
 txs: TxStore,
Expand DownExpand Up@@ -56,11 +55,6 @@ impl App {
 }
}

fn session_id() -> SessionId {
 let id = format!("{:016x}", rand::random::<u128>());
 Arc::from(id)
}

#[derive(Debug, serde::Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct PostEventQuery {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
#[cfg(feature = "transport-streamable-http-server")]
pub mod axum;
pub mod session;
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
feat(transport): support streamable http server#152

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

from

May 8, 2025
 Merged


feat(transport): support streamable http server
#152
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ef5feb9

feat(transport): support streamable http server


4t145 May 2, 2025
f8ac00a

refactor(transport): add common module for shared transport utilities


4t145 May 7, 2025
58f7826

perf(tracing): add more log for streamable http session


4t145 May 7, 2025
3c3bd3d

fix(test): fix port conflict in test with js


4t145 May 7, 2025
b60f2e3

fix(transport): fix id generating and session management


4t145 May 8, 2025
f7b8e8f

chore(naming): rename sse server to streamable http server


4t145 May 8, 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


1 change: 1 addition & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,6 +199,7 @@ See [examples](examples/README.md)
- `transport-sse-server`: Server SSE transport
- `transport-child-process`: Client stdio transport
- `transport-sse`: Client sse transport
- `transport-streamable-http-server` streamable http server transport

## Related Resources

Expand Down

15 changes: 13 additions & 2 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,10 +49,11 @@ tower-service = { version = "0.3", optional = true }
# for ws transport
# tokio-tungstenite ={ version = "0.26", optional = true }

# for sse-server transport
# for http-server transport
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 }

# macro
rmcp-macros = { version = "0.1", workspace = true, optional = true }
Expand All@@ -71,6 +72,16 @@ transport-sse-server = [
 "dep:axum",
 "dep:rand",
 "dep:tokio-stream",
 "uuid",
]
transport-streamable-http-server = [
 "transport-streamable-http-server-session",
 "dep:axum",
 "uuid",
]
transport-streamable-http-server-session = [
 "transport-async-rw",
 "dep:tokio-stream",
]
# transport-ws = ["transport-io", "dep:tokio-tungstenite"]
tower = ["dep:tower-service"]
Expand DownExpand Up@@ -99,7 +110,7 @@ path = "tests/test_with_python.rs"

[[test]]
name = "test_with_js"
required-features = ["server", "client", "transport-sse-server", "transport-child-process"]
required-features = ["server", "client", "transport-sse-server", "transport-child-process", "transport-streamable-http-server"]
path = "tests/test_with_js.rs"

[[test]]
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -186,7 +186,7 @@ impl<'de> Deserialize<'de> for NumberOrString {

pub type RequestId = NumberOrString;

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Hash, Eq)]
#[serde(transparent)]
pub struct ProgressToken(pub NumberOrString);
#[derive(Debug, Clone)]
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/model/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ pub struct Tool {
 pub description: Option<Cow<'static, str>>,
 /// A JSON Schema object defining the expected parameters for the tool
 pub input_schema: Arc<JsonObject>,
 #[serde(skip_serializing_if = "Option::is_none")]
 /// Optional additional tool information.
 pub annotations: Option<ToolAnnotations>,
}
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -591,7 +591,7 @@ where
 }
 };

 tracing::debug!(?evt, "new event");
 tracing::trace!(?evt, "new event");
 match evt {
 // response and error
 Event::ToSink(m) => {
Expand DownExpand Up@@ -657,7 +657,7 @@ where
 Event::PeerMessage(JsonRpcMessage::Request(JsonRpcRequest {
 id, request, ..
 })) => {
 tracing::info!(%id, ?request, "received request");
 tracing::debug!(%id, ?request, "received request");
 {
 let service = shared_service.clone();
 let sink = sink_proxy_tx.clone();
Expand All@@ -675,7 +675,7 @@ where
 let result = service.handle_request(request, context).await;
 let response = match result {
 Ok(result) => {
 tracing::info!(%id, ?result, "response message");
 tracing::debug!(%id, ?result, "response message");
 JsonRpcMessage::response(result, id)
 }
 Err(error) => {
Expand Down

7 changes: 7 additions & 0 deletions
crates/rmcp/src/transport.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,13 @@ pub use auth::{AuthError, AuthorizationManager, AuthorizationSession, Authorized

// #[cfg(feature = "transport-ws")]
// pub mod ws;
#[cfg(feature = "transport-streamable-http-server-session")]
pub mod streamable_http_server;
#[cfg(feature = "transport-streamable-http-server")]
pub use streamable_http_server::axum::StreamableHttpServer;

/// Common use codes
pub mod common;

pub trait IntoTransport<R, E, A>: Send + 'static
where
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
#[cfg(any(
 feature = "transport-streamable-http-server",
 feature = "transport-sse-server"
))]
pub mod axum;

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
use std::{sync::Arc, time::Duration};

pub type SessionId = Arc<str>;

pub fn session_id() -> SessionId {
 uuid::Uuid::new_v4().to_string().into()
}

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

10 changes: 2 additions & 8 deletions
crates/rmcp/src/transport/sse_server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,14 +19,13 @@ use crate::{
 RoleServer, Service,
 model::ClientJsonRpcMessage,
 service::{RxJsonRpcMessage, TxJsonRpcMessage},
 transport::common::axum::{DEFAULT_AUTO_PING_INTERVAL, SessionId, session_id},
};
type SessionId = Arc<str>;

type TxStore =
 Arc<tokio::sync::RwLock<HashMap<SessionId, tokio::sync::mpsc::Sender<ClientJsonRpcMessage>>>>;
pub type TransportReceiver = ReceiverStream<RxJsonRpcMessage<RoleServer>>;

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

#[derive(Clone)]
struct App {
 txs: TxStore,
Expand DownExpand Up@@ -56,11 +55,6 @@ impl App {
 }
}

fn session_id() -> SessionId {
 let id = format!("{:016x}", rand::random::<u128>());
 Arc::from(id)
}

#[derive(Debug, serde::Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct PostEventQuery {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
#[cfg(feature = "transport-streamable-http-server")]
pub mod axum;
pub mod session;
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
feat(transport): support streamable http server#152

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

from

May 8, 2025
 Merged


feat(transport): support streamable http server
#152
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ef5feb9

feat(transport): support streamable http server


4t145 May 2, 2025
f8ac00a

refactor(transport): add common module for shared transport utilities


4t145 May 7, 2025
58f7826

perf(tracing): add more log for streamable http session


4t145 May 7, 2025
3c3bd3d

fix(test): fix port conflict in test with js


4t145 May 7, 2025
b60f2e3

fix(transport): fix id generating and session management


4t145 May 8, 2025
f7b8e8f

chore(naming): rename sse server to streamable http server


4t145 May 8, 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


1 change: 1 addition & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,6 +199,7 @@ See [examples](examples/README.md)
- `transport-sse-server`: Server SSE transport
- `transport-child-process`: Client stdio transport
- `transport-sse`: Client sse transport
- `transport-streamable-http-server` streamable http server transport

## Related Resources

Expand Down

15 changes: 13 additions & 2 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,10 +49,11 @@ tower-service = { version = "0.3", optional = true }
# for ws transport
# tokio-tungstenite ={ version = "0.26", optional = true }

# for sse-server transport
# for http-server transport
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 }

# macro
rmcp-macros = { version = "0.1", workspace = true, optional = true }
Expand All@@ -71,6 +72,16 @@ transport-sse-server = [
 "dep:axum",
 "dep:rand",
 "dep:tokio-stream",
 "uuid",
]
transport-streamable-http-server = [
 "transport-streamable-http-server-session",
 "dep:axum",
 "uuid",
]
transport-streamable-http-server-session = [
 "transport-async-rw",
 "dep:tokio-stream",
]
# transport-ws = ["transport-io", "dep:tokio-tungstenite"]
tower = ["dep:tower-service"]
Expand DownExpand Up@@ -99,7 +110,7 @@ path = "tests/test_with_python.rs"

[[test]]
name = "test_with_js"
required-features = ["server", "client", "transport-sse-server", "transport-child-process"]
required-features = ["server", "client", "transport-sse-server", "transport-child-process", "transport-streamable-http-server"]
path = "tests/test_with_js.rs"

[[test]]
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -186,7 +186,7 @@ impl<'de> Deserialize<'de> for NumberOrString {

pub type RequestId = NumberOrString;

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Hash, Eq)]
#[serde(transparent)]
pub struct ProgressToken(pub NumberOrString);
#[derive(Debug, Clone)]
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/model/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ pub struct Tool {
 pub description: Option<Cow<'static, str>>,
 /// A JSON Schema object defining the expected parameters for the tool
 pub input_schema: Arc<JsonObject>,
 #[serde(skip_serializing_if = "Option::is_none")]
 /// Optional additional tool information.
 pub annotations: Option<ToolAnnotations>,
}
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -591,7 +591,7 @@ where
 }
 };

 tracing::debug!(?evt, "new event");
 tracing::trace!(?evt, "new event");
 match evt {
 // response and error
 Event::ToSink(m) => {
Expand DownExpand Up@@ -657,7 +657,7 @@ where
 Event::PeerMessage(JsonRpcMessage::Request(JsonRpcRequest {
 id, request, ..
 })) => {
 tracing::info!(%id, ?request, "received request");
 tracing::debug!(%id, ?request, "received request");
 {
 let service = shared_service.clone();
 let sink = sink_proxy_tx.clone();
Expand All@@ -675,7 +675,7 @@ where
 let result = service.handle_request(request, context).await;
 let response = match result {
 Ok(result) => {
 tracing::info!(%id, ?result, "response message");
 tracing::debug!(%id, ?result, "response message");
 JsonRpcMessage::response(result, id)
 }
 Err(error) => {
Expand Down

7 changes: 7 additions & 0 deletions
crates/rmcp/src/transport.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,13 @@ pub use auth::{AuthError, AuthorizationManager, AuthorizationSession, Authorized

// #[cfg(feature = "transport-ws")]
// pub mod ws;
#[cfg(feature = "transport-streamable-http-server-session")]
pub mod streamable_http_server;
#[cfg(feature = "transport-streamable-http-server")]
pub use streamable_http_server::axum::StreamableHttpServer;

/// Common use codes
pub mod common;

pub trait IntoTransport<R, E, A>: Send + 'static
where
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
#[cfg(any(
 feature = "transport-streamable-http-server",
 feature = "transport-sse-server"
))]
pub mod axum;

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
use std::{sync::Arc, time::Duration};

pub type SessionId = Arc<str>;

pub fn session_id() -> SessionId {
 uuid::Uuid::new_v4().to_string().into()
}

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

10 changes: 2 additions & 8 deletions
crates/rmcp/src/transport/sse_server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,14 +19,13 @@ use crate::{
 RoleServer, Service,
 model::ClientJsonRpcMessage,
 service::{RxJsonRpcMessage, TxJsonRpcMessage},
 transport::common::axum::{DEFAULT_AUTO_PING_INTERVAL, SessionId, session_id},
};
type SessionId = Arc<str>;

type TxStore =
 Arc<tokio::sync::RwLock<HashMap<SessionId, tokio::sync::mpsc::Sender<ClientJsonRpcMessage>>>>;
pub type TransportReceiver = ReceiverStream<RxJsonRpcMessage<RoleServer>>;

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

#[derive(Clone)]
struct App {
 txs: TxStore,
Expand DownExpand Up@@ -56,11 +55,6 @@ impl App {
 }
}

fn session_id() -> SessionId {
 let id = format!("{:016x}", rand::random::<u128>());
 Arc::from(id)
}

#[derive(Debug, serde::Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct PostEventQuery {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
#[cfg(feature = "transport-streamable-http-server")]
pub mod axum;
pub mod session;
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
feat(transport): support streamable http server#152

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

from

May 8, 2025
 Merged


feat(transport): support streamable http server
#152
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ef5feb9

feat(transport): support streamable http server


4t145 May 2, 2025
f8ac00a

refactor(transport): add common module for shared transport utilities


4t145 May 7, 2025
58f7826

perf(tracing): add more log for streamable http session


4t145 May 7, 2025
3c3bd3d

fix(test): fix port conflict in test with js


4t145 May 7, 2025
b60f2e3

fix(transport): fix id generating and session management


4t145 May 8, 2025
f7b8e8f

chore(naming): rename sse server to streamable http server


4t145 May 8, 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


1 change: 1 addition & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,6 +199,7 @@ See [examples](examples/README.md)
- `transport-sse-server`: Server SSE transport
- `transport-child-process`: Client stdio transport
- `transport-sse`: Client sse transport
- `transport-streamable-http-server` streamable http server transport

## Related Resources

Expand Down

15 changes: 13 additions & 2 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,10 +49,11 @@ tower-service = { version = "0.3", optional = true }
# for ws transport
# tokio-tungstenite ={ version = "0.26", optional = true }

# for sse-server transport
# for http-server transport
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 }

# macro
rmcp-macros = { version = "0.1", workspace = true, optional = true }
Expand All@@ -71,6 +72,16 @@ transport-sse-server = [
 "dep:axum",
 "dep:rand",
 "dep:tokio-stream",
 "uuid",
]
transport-streamable-http-server = [
 "transport-streamable-http-server-session",
 "dep:axum",
 "uuid",
]
transport-streamable-http-server-session = [
 "transport-async-rw",
 "dep:tokio-stream",
]
# transport-ws = ["transport-io", "dep:tokio-tungstenite"]
tower = ["dep:tower-service"]
Expand DownExpand Up@@ -99,7 +110,7 @@ path = "tests/test_with_python.rs"

[[test]]
name = "test_with_js"
required-features = ["server", "client", "transport-sse-server", "transport-child-process"]
required-features = ["server", "client", "transport-sse-server", "transport-child-process", "transport-streamable-http-server"]
path = "tests/test_with_js.rs"

[[test]]
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -186,7 +186,7 @@ impl<'de> Deserialize<'de> for NumberOrString {

pub type RequestId = NumberOrString;

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Hash, Eq)]
#[serde(transparent)]
pub struct ProgressToken(pub NumberOrString);
#[derive(Debug, Clone)]
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/model/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ pub struct Tool {
 pub description: Option<Cow<'static, str>>,
 /// A JSON Schema object defining the expected parameters for the tool
 pub input_schema: Arc<JsonObject>,
 #[serde(skip_serializing_if = "Option::is_none")]
 /// Optional additional tool information.
 pub annotations: Option<ToolAnnotations>,
}
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -591,7 +591,7 @@ where
 }
 };

 tracing::debug!(?evt, "new event");
 tracing::trace!(?evt, "new event");
 match evt {
 // response and error
 Event::ToSink(m) => {
Expand DownExpand Up@@ -657,7 +657,7 @@ where
 Event::PeerMessage(JsonRpcMessage::Request(JsonRpcRequest {
 id, request, ..
 })) => {
 tracing::info!(%id, ?request, "received request");
 tracing::debug!(%id, ?request, "received request");
 {
 let service = shared_service.clone();
 let sink = sink_proxy_tx.clone();
Expand All@@ -675,7 +675,7 @@ where
 let result = service.handle_request(request, context).await;
 let response = match result {
 Ok(result) => {
 tracing::info!(%id, ?result, "response message");
 tracing::debug!(%id, ?result, "response message");
 JsonRpcMessage::response(result, id)
 }
 Err(error) => {
Expand Down

7 changes: 7 additions & 0 deletions
crates/rmcp/src/transport.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,13 @@ pub use auth::{AuthError, AuthorizationManager, AuthorizationSession, Authorized

// #[cfg(feature = "transport-ws")]
// pub mod ws;
#[cfg(feature = "transport-streamable-http-server-session")]
pub mod streamable_http_server;
#[cfg(feature = "transport-streamable-http-server")]
pub use streamable_http_server::axum::StreamableHttpServer;

/// Common use codes
pub mod common;

pub trait IntoTransport<R, E, A>: Send + 'static
where
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
#[cfg(any(
 feature = "transport-streamable-http-server",
 feature = "transport-sse-server"
))]
pub mod axum;

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
use std::{sync::Arc, time::Duration};

pub type SessionId = Arc<str>;

pub fn session_id() -> SessionId {
 uuid::Uuid::new_v4().to_string().into()
}

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

10 changes: 2 additions & 8 deletions
crates/rmcp/src/transport/sse_server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,14 +19,13 @@ use crate::{
 RoleServer, Service,
 model::ClientJsonRpcMessage,
 service::{RxJsonRpcMessage, TxJsonRpcMessage},
 transport::common::axum::{DEFAULT_AUTO_PING_INTERVAL, SessionId, session_id},
};
type SessionId = Arc<str>;

type TxStore =
 Arc<tokio::sync::RwLock<HashMap<SessionId, tokio::sync::mpsc::Sender<ClientJsonRpcMessage>>>>;
pub type TransportReceiver = ReceiverStream<RxJsonRpcMessage<RoleServer>>;

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

#[derive(Clone)]
struct App {
 txs: TxStore,
Expand DownExpand Up@@ -56,11 +55,6 @@ impl App {
 }
}

fn session_id() -> SessionId {
 let id = format!("{:016x}", rand::random::<u128>());
 Arc::from(id)
}

#[derive(Debug, serde::Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct PostEventQuery {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
#[cfg(feature = "transport-streamable-http-server")]
pub mod axum;
pub mod session;
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
feat(transport): support streamable http server#152

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

from

May 8, 2025
 Merged


feat(transport): support streamable http server
#152
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ef5feb9

feat(transport): support streamable http server


4t145 May 2, 2025
f8ac00a

refactor(transport): add common module for shared transport utilities


4t145 May 7, 2025
58f7826

perf(tracing): add more log for streamable http session


4t145 May 7, 2025
3c3bd3d

fix(test): fix port conflict in test with js


4t145 May 7, 2025
b60f2e3

fix(transport): fix id generating and session management


4t145 May 8, 2025
f7b8e8f

chore(naming): rename sse server to streamable http server


4t145 May 8, 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


1 change: 1 addition & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,6 +199,7 @@ See [examples](examples/README.md)
- `transport-sse-server`: Server SSE transport
- `transport-child-process`: Client stdio transport
- `transport-sse`: Client sse transport
- `transport-streamable-http-server` streamable http server transport

## Related Resources

Expand Down

15 changes: 13 additions & 2 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,10 +49,11 @@ tower-service = { version = "0.3", optional = true }
# for ws transport
# tokio-tungstenite ={ version = "0.26", optional = true }

# for sse-server transport
# for http-server transport
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 }

# macro
rmcp-macros = { version = "0.1", workspace = true, optional = true }
Expand All@@ -71,6 +72,16 @@ transport-sse-server = [
 "dep:axum",
 "dep:rand",
 "dep:tokio-stream",
 "uuid",
]
transport-streamable-http-server = [
 "transport-streamable-http-server-session",
 "dep:axum",
 "uuid",
]
transport-streamable-http-server-session = [
 "transport-async-rw",
 "dep:tokio-stream",
]
# transport-ws = ["transport-io", "dep:tokio-tungstenite"]
tower = ["dep:tower-service"]
Expand DownExpand Up@@ -99,7 +110,7 @@ path = "tests/test_with_python.rs"

[[test]]
name = "test_with_js"
required-features = ["server", "client", "transport-sse-server", "transport-child-process"]
required-features = ["server", "client", "transport-sse-server", "transport-child-process", "transport-streamable-http-server"]
path = "tests/test_with_js.rs"

[[test]]
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -186,7 +186,7 @@ impl<'de> Deserialize<'de> for NumberOrString {

pub type RequestId = NumberOrString;

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Hash, Eq)]
#[serde(transparent)]
pub struct ProgressToken(pub NumberOrString);
#[derive(Debug, Clone)]
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/model/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ pub struct Tool {
 pub description: Option<Cow<'static, str>>,
 /// A JSON Schema object defining the expected parameters for the tool
 pub input_schema: Arc<JsonObject>,
 #[serde(skip_serializing_if = "Option::is_none")]
 /// Optional additional tool information.
 pub annotations: Option<ToolAnnotations>,
}
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -591,7 +591,7 @@ where
 }
 };

 tracing::debug!(?evt, "new event");
 tracing::trace!(?evt, "new event");
 match evt {
 // response and error
 Event::ToSink(m) => {
Expand DownExpand Up@@ -657,7 +657,7 @@ where
 Event::PeerMessage(JsonRpcMessage::Request(JsonRpcRequest {
 id, request, ..
 })) => {
 tracing::info!(%id, ?request, "received request");
 tracing::debug!(%id, ?request, "received request");
 {
 let service = shared_service.clone();
 let sink = sink_proxy_tx.clone();
Expand All@@ -675,7 +675,7 @@ where
 let result = service.handle_request(request, context).await;
 let response = match result {
 Ok(result) => {
 tracing::info!(%id, ?result, "response message");
 tracing::debug!(%id, ?result, "response message");
 JsonRpcMessage::response(result, id)
 }
 Err(error) => {
Expand Down

7 changes: 7 additions & 0 deletions
crates/rmcp/src/transport.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,13 @@ pub use auth::{AuthError, AuthorizationManager, AuthorizationSession, Authorized

// #[cfg(feature = "transport-ws")]
// pub mod ws;
#[cfg(feature = "transport-streamable-http-server-session")]
pub mod streamable_http_server;
#[cfg(feature = "transport-streamable-http-server")]
pub use streamable_http_server::axum::StreamableHttpServer;

/// Common use codes
pub mod common;

pub trait IntoTransport<R, E, A>: Send + 'static
where
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
#[cfg(any(
 feature = "transport-streamable-http-server",
 feature = "transport-sse-server"
))]
pub mod axum;

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
use std::{sync::Arc, time::Duration};

pub type SessionId = Arc<str>;

pub fn session_id() -> SessionId {
 uuid::Uuid::new_v4().to_string().into()
}

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

10 changes: 2 additions & 8 deletions
crates/rmcp/src/transport/sse_server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,14 +19,13 @@ use crate::{
 RoleServer, Service,
 model::ClientJsonRpcMessage,
 service::{RxJsonRpcMessage, TxJsonRpcMessage},
 transport::common::axum::{DEFAULT_AUTO_PING_INTERVAL, SessionId, session_id},
};
type SessionId = Arc<str>;

type TxStore =
 Arc<tokio::sync::RwLock<HashMap<SessionId, tokio::sync::mpsc::Sender<ClientJsonRpcMessage>>>>;
pub type TransportReceiver = ReceiverStream<RxJsonRpcMessage<RoleServer>>;

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

#[derive(Clone)]
struct App {
 txs: TxStore,
Expand DownExpand Up@@ -56,11 +55,6 @@ impl App {
 }
}

fn session_id() -> SessionId {
 let id = format!("{:016x}", rand::random::<u128>());
 Arc::from(id)
}

#[derive(Debug, serde::Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct PostEventQuery {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
#[cfg(feature = "transport-streamable-http-server")]
pub mod axum;
pub mod session;
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
feat(transport): support streamable http server#152

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

from

May 8, 2025
 Merged


feat(transport): support streamable http server
#152
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ef5feb9

feat(transport): support streamable http server


4t145 May 2, 2025
f8ac00a

refactor(transport): add common module for shared transport utilities


4t145 May 7, 2025
58f7826

perf(tracing): add more log for streamable http session


4t145 May 7, 2025
3c3bd3d

fix(test): fix port conflict in test with js


4t145 May 7, 2025
b60f2e3

fix(transport): fix id generating and session management


4t145 May 8, 2025
f7b8e8f

chore(naming): rename sse server to streamable http server


4t145 May 8, 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


1 change: 1 addition & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -199,6 +199,7 @@ See [examples](examples/README.md)
- `transport-sse-server`: Server SSE transport
- `transport-child-process`: Client stdio transport
- `transport-sse`: Client sse transport
- `transport-streamable-http-server` streamable http server transport

## Related Resources

Expand Down

15 changes: 13 additions & 2 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,10 +49,11 @@ tower-service = { version = "0.3", optional = true }
# for ws transport
# tokio-tungstenite ={ version = "0.26", optional = true }

# for sse-server transport
# for http-server transport
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 }

# macro
rmcp-macros = { version = "0.1", workspace = true, optional = true }
Expand All@@ -71,6 +72,16 @@ transport-sse-server = [
 "dep:axum",
 "dep:rand",
 "dep:tokio-stream",
 "uuid",
]
transport-streamable-http-server = [
 "transport-streamable-http-server-session",
 "dep:axum",
 "uuid",
]
transport-streamable-http-server-session = [
 "transport-async-rw",
 "dep:tokio-stream",
]
# transport-ws = ["transport-io", "dep:tokio-tungstenite"]
tower = ["dep:tower-service"]
Expand DownExpand Up@@ -99,7 +110,7 @@ path = "tests/test_with_python.rs"

[[test]]
name = "test_with_js"
required-features = ["server", "client", "transport-sse-server", "transport-child-process"]
required-features = ["server", "client", "transport-sse-server", "transport-child-process", "transport-streamable-http-server"]
path = "tests/test_with_js.rs"

[[test]]
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -186,7 +186,7 @@ impl<'de> Deserialize<'de> for NumberOrString {

pub type RequestId = NumberOrString;

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Hash, Eq)]
#[serde(transparent)]
pub struct ProgressToken(pub NumberOrString);
#[derive(Debug, Clone)]
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/model/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ pub struct Tool {
 pub description: Option<Cow<'static, str>>,
 /// A JSON Schema object defining the expected parameters for the tool
 pub input_schema: Arc<JsonObject>,
 #[serde(skip_serializing_if = "Option::is_none")]
 /// Optional additional tool information.
 pub annotations: Option<ToolAnnotations>,
}
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -591,7 +591,7 @@ where
 }
 };

 tracing::debug!(?evt, "new event");
 tracing::trace!(?evt, "new event");
 match evt {
 // response and error
 Event::ToSink(m) => {
Expand DownExpand Up@@ -657,7 +657,7 @@ where
 Event::PeerMessage(JsonRpcMessage::Request(JsonRpcRequest {
 id, request, ..
 })) => {
 tracing::info!(%id, ?request, "received request");
 tracing::debug!(%id, ?request, "received request");
 {
 let service = shared_service.clone();
 let sink = sink_proxy_tx.clone();
Expand All@@ -675,7 +675,7 @@ where
 let result = service.handle_request(request, context).await;
 let response = match result {
 Ok(result) => {
 tracing::info!(%id, ?result, "response message");
 tracing::debug!(%id, ?result, "response message");
 JsonRpcMessage::response(result, id)
 }
 Err(error) => {
Expand Down

7 changes: 7 additions & 0 deletions
crates/rmcp/src/transport.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,13 @@ pub use auth::{AuthError, AuthorizationManager, AuthorizationSession, Authorized

// #[cfg(feature = "transport-ws")]
// pub mod ws;
#[cfg(feature = "transport-streamable-http-server-session")]
pub mod streamable_http_server;
#[cfg(feature = "transport-streamable-http-server")]
pub use streamable_http_server::axum::StreamableHttpServer;

/// Common use codes
pub mod common;

pub trait IntoTransport<R, E, A>: Send + 'static
where
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
#[cfg(any(
 feature = "transport-streamable-http-server",
 feature = "transport-sse-server"
))]
pub mod axum;

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
use std::{sync::Arc, time::Duration};

pub type SessionId = Arc<str>;

pub fn session_id() -> SessionId {
 uuid::Uuid::new_v4().to_string().into()
}

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

10 changes: 2 additions & 8 deletions
crates/rmcp/src/transport/sse_server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,14 +19,13 @@ use crate::{
 RoleServer, Service,
 model::ClientJsonRpcMessage,
 service::{RxJsonRpcMessage, TxJsonRpcMessage},
 transport::common::axum::{DEFAULT_AUTO_PING_INTERVAL, SessionId, session_id},
};
type SessionId = Arc<str>;

type TxStore =
 Arc<tokio::sync::RwLock<HashMap<SessionId, tokio::sync::mpsc::Sender<ClientJsonRpcMessage>>>>;
pub type TransportReceiver = ReceiverStream<RxJsonRpcMessage<RoleServer>>;

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

#[derive(Clone)]
struct App {
 txs: TxStore,
Expand DownExpand Up@@ -56,11 +55,6 @@ impl App {
 }
}

fn session_id() -> SessionId {
 let id = format!("{:016x}", rand::random::<u128>());
 Arc::from(id)
}

#[derive(Debug, serde::Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct PostEventQuery {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
#[cfg(feature = "transport-streamable-http-server")]
pub mod axum;
pub mod session;
Loading