fix: sse endpoint build follow js's new URL(url, base)#197

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 3 commits into from
May 19, 2025
Merged

fix: sse endpoint build follow js's new URL(url, base)#197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ebf03c
fix: sse endpoint build follow js's `new URL(url, base)`
4t145 May 19, 2025
8e8aeb8
fix: fix feature denpencies
4t145 May 19, 2025
a38ca0d
fix: fix typo and format
4t145 May 19, 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
11 changes: 5 additions & 6 deletions crates/rmcp/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,13 +40,14 @@ reqwest = { version = "0.12", default-features = false, features = [
"stream",
], optional = true }
sse-stream = { version = "0.1.4", optional = true }
http = { version = "1", optional = true }
url = { version = "2.4", optional = true }

# For tower compatibility
tower-service = { version = "0.3", optional = true }

# for child process transport
process-wrap = { version = "8.2", features = ["tokio1"], optional = true}
process-wrap = { version = "8.2", features = ["tokio1"], optional = true}

# for ws transport
# tokio-tungstenite ={ version = "0.26", optional = true }
Expand DownExpand Up@@ -75,18 +76,15 @@ reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-tls-no-provider"]

axum = ["dep:axum"]
# SSE client
client-side-sse = ["dep:sse-stream"]
client-side-sse = ["dep:sse-stream", "dep:http"]

transport-sse-client = ["client-side-sse", "transport-worker"]

transport-worker = ["dep:tokio-stream"]


# Streamable HTTP client
transport-streamable-http-client = [
"client-side-sse",
"transport-worker",
]
transport-streamable-http-client = ["client-side-sse", "transport-worker"]


transport-async-rw = ["tokio/io-util", "tokio-util/codec"]
Expand All@@ -98,6 +96,7 @@ transport-child-process = [
]
transport-sse-server = [
"transport-async-rw",
"transport-worker",
"axum",
"dep:rand",
"dep:tokio-stream",
Expand Down
6 changes: 4 additions & 2 deletions crates/rmcp/src/transport/common/auth/sse_client.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
use http::Uri;

use crate::transport::{
auth::AuthClient,
sse_client::{SseClient, SseTransportError},
Expand All@@ -10,7 +12,7 @@ where

async fn post_message(
&self,
uri: std::sync::Arc<str>,
uri: Uri,
message: crate::model::ClientJsonRpcMessage,
mut auth_token: Option<String>,
) -> Result<(), SseTransportError<Self::Error>> {
Expand All@@ -25,7 +27,7 @@ where

async fn get_stream(
&self,
uri: std::sync::Arc<str>,
uri: Uri,
last_event_id: Option<String>,
mut auth_token: Option<String>,
) -> Result<
Expand Down
11 changes: 6 additions & 5 deletions crates/rmcp/src/transport/common/reqwest/sse_client.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
use std::sync::Arc;

use futures::StreamExt;
use http::Uri;
use reqwest::header::ACCEPT;
use sse_stream::SseStream;

Expand All@@ -15,11 +16,11 @@ impl SseClient for reqwest::Client {

async fn post_message(
&self,
uri: std::sync::Arc<str>,
uri: Uri,
message: crate::model::ClientJsonRpcMessage,
auth_token: Option<String>,
) -> Result<(), SseTransportError<Self::Error>> {
let mut request_builder = self.post(uri.as_ref()).json(&message);
let mut request_builder = self.post(uri.to_string()).json(&message);
if let Some(auth_header) = auth_token {
request_builder = request_builder.bearer_auth(auth_header);
}
Expand All@@ -33,15 +34,15 @@ impl SseClient for reqwest::Client {

async fn get_stream(
&self,
uri: std::sync::Arc<str>,
uri: Uri,
last_event_id: Option<String>,
auth_token: Option<String>,
) -> Result<
crate::transport::common::client_side_sse::BoxedSseResponse,
SseTransportError<Self::Error>,
> {
let mut request_builder = self
.get(uri.as_ref())
.get(uri.to_string())
.header(ACCEPT, EVENT_STREAM_MIME_TYPE);
if let Some(auth_header) = auth_token {
request_builder = request_builder.bearer_auth(auth_header);
Expand DownExpand Up@@ -73,7 +74,7 @@ impl SseClientTransport<reqwest::Client> {
SseClientTransport::start_with_client(
reqwest::Client::default(),
SseClientConfig {
uri: uri.into(),
sse_endpoint: uri.into(),
..Default::default()
},
)
Expand Down
62 changes: 41 additions & 21 deletions crates/rmcp/src/transport/sse_client.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
use std::{pin::Pin, sync::Arc};

use futures::{StreamExt, future::BoxFuture};
use http::Uri;
use reqwest::header::HeaderValue;
use sse_stream::Error as SseError;
use thiserror::Error;
Expand DownExpand Up@@ -32,6 +33,10 @@ pub enum SseTransportError<E: std::error::Error + Send + Sync + 'static> {
#[cfg_attr(docsrs, doc(cfg(feature = "auth")))]
#[error("Auth error: {0}")]
Auth(#[from] crate::transport::auth::AuthError),
#[error("Invalid uri: {0}")]
InvalidUri(#[from] http::uri::InvalidUri),
#[error("Invalid uri parts: {0}")]
InvalidUriParts(#[from] http::uri::InvalidUriParts),
}

impl From<reqwest::Error> for SseTransportError<reqwest::Error> {
Expand All@@ -44,21 +49,21 @@ pub trait SseClient: Clone + Send + Sync + 'static {
type Error: std::error::Error + Send + Sync + 'static;
fn post_message(
&self,
uri: Arc<str>,
uri: Uri,
message: ClientJsonRpcMessage,
auth_token: Option<String>,
) -> impl Future<Output = Result<(), SseTransportError<Self::Error>>> + Send + '_;
fn get_stream(
&self,
uri: Arc<str>,
uri: Uri,
last_event_id: Option<String>,
auth_token: Option<String>,
) -> impl Future<Output = Result<BoxedSseResponse, SseTransportError<Self::Error>>> + Send + '_;
}

struct SseClientReconnect<C> {
pub client: C,
pub uri: Arc<str>,
pub uri: Uri,
}

impl<C: SseClient> SseStreamReconnect for SseClientReconnect<C> {
Expand All@@ -75,7 +80,7 @@ type ServerMessageStream<C> = Pin<Box<SseAutoReconnectStream<SseClientReconnect<
pub struct SseClientTransport<C: SseClient> {
client: C,
config: SseClientConfig,
post_uri: Arc<str>,
message_endpoint: Uri,
stream: Option<ServerMessageStream<C>>,
}

Expand All@@ -89,7 +94,7 @@ impl<C: SseClient> Transport<RoleClient> for SseClientTransport<C> {
item: crate::service::TxJsonRpcMessage<RoleClient>,
) -> impl Future<Output = Result<(), Self::Error>> + Send + 'static {
let client = self.client.clone();
let uri = self.post_uri.clone();
let uri = self.message_endpoint.clone();
async move { client.post_message(uri, item, None).await }
}
async fn close(&mut self) -> Result<(), Self::Error> {
Expand All@@ -112,9 +117,11 @@ impl<C: SseClient> SseClientTransport<C> {
client: C,
config: SseClientConfig,
) -> Result<Self, SseTransportError<C::Error>> {
let mut sse_stream = client.get_stream(config.uri.clone(), None, None).await?;
let endpoint = if let Some(endpoint) = config.use_endpoint.clone() {
endpoint
let sse_endpoint = config.sse_endpoint.as_ref().parse::<http::Uri>()?;

let mut sse_stream = client.get_stream(sse_endpoint.clone(), None, None).await?;
let message_endpoint = if let Some(endpoint) = config.use_message_endpoint.clone() {
endpoint.parse::<http::Uri>()?
} else {
// wait the endpoint event
loop {
Expand All@@ -125,46 +132,59 @@ impl<C: SseClient> SseClientTransport<C> {
let Some("endpoint") = sse.event.as_deref() else {
continue;
};
break sse.data.unwrap_or_default();
let sse_endpoint = sse.data.unwrap_or_default();
break sse_endpoint.parse::<http::Uri>()?;
}
};
let post_uri: Arc<str> = format!(
"{}/{}",
config.uri.trim_end_matches("/"),
endpoint.trim_start_matches("/")
)
.into();

// sse: <authority><sse_pq> -> <authority><message_pq>
let message_endpoint = {
let mut sse_endpoint_parts = sse_endpoint.clone().into_parts();
sse_endpoint_parts.path_and_query = message_endpoint.into_parts().path_and_query;
Uri::from_parts(sse_endpoint_parts)?
};
let stream = Box::pin(SseAutoReconnectStream::new(
sse_stream,
SseClientReconnect {
client: client.clone(),
uri: config.uri.clone(),
uri: sse_endpoint.clone(),
},
config.retry_policy.clone(),
));
Ok(Self {
client,
config,
post_uri,
message_endpoint,
stream: Some(stream),
})
}
}

#[derive(Debug, Clone)]
pub struct SseClientConfig {
pub uri: Arc<str>,
/// client sse endpoint
///
/// # How this client resolve the message endpoint
/// if sse_endpoint has this format: `<schema><authority?><sse_pq>`,
/// then the message endpoint will be `<schema><authority?><message_pq>`.
///
/// For example, if you config the sse_endpoint as `http://example.com/some_path/sse`,
/// and the server send the message endpoint event as `message?session_id=123`,
/// then the message endpoint will be `http://example.com/message`.
///
/// This follow the rules of JavaScript's [`new URL(url, base)`](https://developer.mozilla.org/zh-CN/docs/Web/API/URL/URL)
pub sse_endpoint: Arc<str>,
pub retry_policy: Arc<dyn SseRetryPolicy>,
/// if this is settled, the client will use this endpoint to send message and skip get the endpoint event
pub use_endpoint: Option<String>,
pub use_message_endpoint: Option<String>,
}

impl Default for SseClientConfig {
fn default() -> Self {
Self {
uri: "".into(),
sse_endpoint: "".into(),
retry_policy: Arc::new(super::common::client_side_sse::FixedInterval::default()),
use_endpoint: None,
use_message_endpoint: None,
}
}
}
2 changes: 1 addition & 1 deletion examples/clients/src/oauth_client.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,7 +147,7 @@ async fn main() -> Result<()> {
let transport = SseClientTransport::start_with_client(
client,
SseClientConfig {
uri: MCP_SSE_URL.into(),
sse_endpoint: MCP_SSE_URL.into(),
..Default::default()
},
)
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix: sse endpoint build follow js's new URL(url, base)#197

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

from

May 19, 2025
 Merged


fix: sse endpoint build follow js's new URL(url, base)#197
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0ebf03c

fix: sse endpoint build follow js's `new URL(url, base)`


4t145 May 19, 2025
8e8aeb8

fix: fix feature denpencies


4t145 May 19, 2025
a38ca0d

fix: fix typo and format


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


11 changes: 5 additions & 6 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,13 +40,14 @@ reqwest = { version = "0.12", default-features = false, features = [
 "stream",
], optional = true }
sse-stream = { version = "0.1.4", optional = true }
http = { version = "1", optional = true }
url = { version = "2.4", optional = true }

# For tower compatibility
tower-service = { version = "0.3", optional = true }

# for child process transport
process-wrap = { version = "8.2", features = ["tokio1"], optional = true}
process-wrap = { version = "8.2", features = ["tokio1"], optional = true}

# for ws transport
# tokio-tungstenite ={ version = "0.26", optional = true }
Expand DownExpand Up@@ -75,18 +76,15 @@ reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-tls-no-provider"]

axum = ["dep:axum"]
# SSE client
client-side-sse = ["dep:sse-stream"]
client-side-sse = ["dep:sse-stream", "dep:http"]

transport-sse-client = ["client-side-sse", "transport-worker"]

transport-worker = ["dep:tokio-stream"]


# Streamable HTTP client
transport-streamable-http-client = [
 "client-side-sse",
 "transport-worker",
]
transport-streamable-http-client = ["client-side-sse", "transport-worker"]


transport-async-rw = ["tokio/io-util", "tokio-util/codec"]
Expand All@@ -98,6 +96,7 @@ transport-child-process = [
]
transport-sse-server = [
 "transport-async-rw",
 "transport-worker",
 "axum",
 "dep:rand",
 "dep:tokio-stream",
Expand Down

6 changes: 4 additions & 2 deletions
crates/rmcp/src/transport/common/auth/sse_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
use http::Uri;

use crate::transport::{
 auth::AuthClient,
 sse_client::{SseClient, SseTransportError},
Expand All@@ -10,7 +12,7 @@ where

 async fn post_message(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 message: crate::model::ClientJsonRpcMessage,
 mut auth_token: Option<String>,
 ) -> Result<(), SseTransportError<Self::Error>> {
Expand All@@ -25,7 +27,7 @@ where

 async fn get_stream(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 last_event_id: Option<String>,
 mut auth_token: Option<String>,
 ) -> Result<
Expand Down

11 changes: 6 additions & 5 deletions
crates/rmcp/src/transport/common/reqwest/sse_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
use std::sync::Arc;

use futures::StreamExt;
use http::Uri;
use reqwest::header::ACCEPT;
use sse_stream::SseStream;

Expand All@@ -15,11 +16,11 @@ impl SseClient for reqwest::Client {

 async fn post_message(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 message: crate::model::ClientJsonRpcMessage,
 auth_token: Option<String>,
 ) -> Result<(), SseTransportError<Self::Error>> {
 let mut request_builder = self.post(uri.as_ref()).json(&message);
 let mut request_builder = self.post(uri.to_string()).json(&message);
 if let Some(auth_header) = auth_token {
 request_builder = request_builder.bearer_auth(auth_header);
 }
Expand All@@ -33,15 +34,15 @@ impl SseClient for reqwest::Client {

 async fn get_stream(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 last_event_id: Option<String>,
 auth_token: Option<String>,
 ) -> Result<
 crate::transport::common::client_side_sse::BoxedSseResponse,
 SseTransportError<Self::Error>,
 > {
 let mut request_builder = self
 .get(uri.as_ref())
 .get(uri.to_string())
 .header(ACCEPT, EVENT_STREAM_MIME_TYPE);
 if let Some(auth_header) = auth_token {
 request_builder = request_builder.bearer_auth(auth_header);
Expand DownExpand Up@@ -73,7 +74,7 @@ impl SseClientTransport<reqwest::Client> {
 SseClientTransport::start_with_client(
 reqwest::Client::default(),
 SseClientConfig {
uri: uri.into(),
sse_endpoint: uri.into(),
 ..Default::default()
 },
 )
Expand Down

62 changes: 41 additions & 21 deletions
crates/rmcp/src/transport/sse_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
use std::{pin::Pin, sync::Arc};

use futures::{StreamExt, future::BoxFuture};
use http::Uri;
use reqwest::header::HeaderValue;
use sse_stream::Error as SseError;
use thiserror::Error;
Expand DownExpand Up@@ -32,6 +33,10 @@ pub enum SseTransportError<E: std::error::Error + Send + Sync + 'static> {
 #[cfg_attr(docsrs, doc(cfg(feature = "auth")))]
 #[error("Auth error: {0}")]
 Auth(#[from] crate::transport::auth::AuthError),
 #[error("Invalid uri: {0}")]
 InvalidUri(#[from] http::uri::InvalidUri),
 #[error("Invalid uri parts: {0}")]
 InvalidUriParts(#[from] http::uri::InvalidUriParts),
}

impl From<reqwest::Error> for SseTransportError<reqwest::Error> {
Expand All@@ -44,21 +49,21 @@ pub trait SseClient: Clone + Send + Sync + 'static {
 type Error: std::error::Error + Send + Sync + 'static;
 fn post_message(
 &self,
 uri: Arc<str>,
 uri: Uri,
 message: ClientJsonRpcMessage,
 auth_token: Option<String>,
 ) -> impl Future<Output = Result<(), SseTransportError<Self::Error>>> + Send + '_;
 fn get_stream(
 &self,
 uri: Arc<str>,
 uri: Uri,
 last_event_id: Option<String>,
 auth_token: Option<String>,
 ) -> impl Future<Output = Result<BoxedSseResponse, SseTransportError<Self::Error>>> + Send + '_;
}

struct SseClientReconnect<C> {
 pub client: C,
 pub uri: Arc<str>,
 pub uri: Uri,
}

impl<C: SseClient> SseStreamReconnect for SseClientReconnect<C> {
Expand All@@ -75,7 +80,7 @@ type ServerMessageStream<C> = Pin<Box<SseAutoReconnectStream<SseClientReconnect<
pub struct SseClientTransport<C: SseClient> {
 client: C,
 config: SseClientConfig,
post_uri: Arc<str>,
message_endpoint: Uri,
 stream: Option<ServerMessageStream<C>>,
}

Expand All@@ -89,7 +94,7 @@ impl<C: SseClient> Transport<RoleClient> for SseClientTransport<C> {
 item: crate::service::TxJsonRpcMessage<RoleClient>,
 ) -> impl Future<Output = Result<(), Self::Error>> + Send + 'static {
 let client = self.client.clone();
 let uri = self.post_uri.clone();
 let uri = self.message_endpoint.clone();
 async move { client.post_message(uri, item, None).await }
 }
 async fn close(&mut self) -> Result<(), Self::Error> {
Expand All@@ -112,9 +117,11 @@ impl<C: SseClient> SseClientTransport<C> {
 client: C,
 config: SseClientConfig,
 ) -> Result<Self, SseTransportError<C::Error>> {
 let mut sse_stream = client.get_stream(config.uri.clone(), None, None).await?;
 let endpoint = if let Some(endpoint) = config.use_endpoint.clone() {
 endpoint
 let sse_endpoint = config.sse_endpoint.as_ref().parse::<http::Uri>()?;

 let mut sse_stream = client.get_stream(sse_endpoint.clone(), None, None).await?;
 let message_endpoint = if let Some(endpoint) = config.use_message_endpoint.clone() {
 endpoint.parse::<http::Uri>()?
 } else {
 // wait the endpoint event
 loop {
Expand All@@ -125,46 +132,59 @@ impl<C: SseClient> SseClientTransport<C> {
 let Some("endpoint") = sse.event.as_deref() else {
 continue;
 };
 break sse.data.unwrap_or_default();
 let sse_endpoint = sse.data.unwrap_or_default();
 break sse_endpoint.parse::<http::Uri>()?;
 }
 };
 let post_uri: Arc<str> = format!(
 "{}/{}",
 config.uri.trim_end_matches("/"),
 endpoint.trim_start_matches("/")
 )
 .into();

 // sse: <authority><sse_pq> -> <authority><message_pq>
 let message_endpoint = {
 let mut sse_endpoint_parts = sse_endpoint.clone().into_parts();
 sse_endpoint_parts.path_and_query = message_endpoint.into_parts().path_and_query;
 Uri::from_parts(sse_endpoint_parts)?
 };
 let stream = Box::pin(SseAutoReconnectStream::new(
 sse_stream,
 SseClientReconnect {
 client: client.clone(),
 uri: config.uri.clone(),
 uri: sse_endpoint.clone(),
 },
 config.retry_policy.clone(),
 ));
 Ok(Self {
 client,
 config,
post_uri,
message_endpoint,
 stream: Some(stream),
 })
 }
}

#[derive(Debug, Clone)]
pub struct SseClientConfig {
 pub uri: Arc<str>,
 /// client sse endpoint
 ///
 /// # How this client resolve the message endpoint
 /// if sse_endpoint has this format: `<schema><authority?><sse_pq>`,
 /// then the message endpoint will be `<schema><authority?><message_pq>`.
 ///
 /// For example, if you config the sse_endpoint as `http://example.com/some_path/sse`,
 /// and the server send the message endpoint event as `message?session_id=123`,
 /// then the message endpoint will be `http://example.com/message`.
 ///
 /// This follow the rules of JavaScript's [`new URL(url, base)`](https://developer.mozilla.org/zh-CN/docs/Web/API/URL/URL)
 pub sse_endpoint: Arc<str>,
 pub retry_policy: Arc<dyn SseRetryPolicy>,
 /// if this is settled, the client will use this endpoint to send message and skip get the endpoint event
 pub use_endpoint: Option<String>,
 pub use_message_endpoint: Option<String>,
}

impl Default for SseClientConfig {
 fn default() -> Self {
 Self {
uri: "".into(),
sse_endpoint: "".into(),
 retry_policy: Arc::new(super::common::client_side_sse::FixedInterval::default()),
use_endpoint: None,
use_message_endpoint: None,
 }
 }
}

2 changes: 1 addition & 1 deletion
examples/clients/src/oauth_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,7 +147,7 @@ async fn main() -> Result<()> {
 let transport = SseClientTransport::start_with_client(
 client,
 SseClientConfig {
uri: MCP_SSE_URL.into(),
sse_endpoint: MCP_SSE_URL.into(),
 ..Default::default()
 },
 )
Expand Down

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

Skip to content
fix: sse endpoint build follow js's new URL(url, base)#197

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

from

May 19, 2025
 Merged


fix: sse endpoint build follow js's new URL(url, base)#197
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0ebf03c

fix: sse endpoint build follow js's `new URL(url, base)`


4t145 May 19, 2025
8e8aeb8

fix: fix feature denpencies


4t145 May 19, 2025
a38ca0d

fix: fix typo and format


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


11 changes: 5 additions & 6 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,13 +40,14 @@ reqwest = { version = "0.12", default-features = false, features = [
 "stream",
], optional = true }
sse-stream = { version = "0.1.4", optional = true }
http = { version = "1", optional = true }
url = { version = "2.4", optional = true }

# For tower compatibility
tower-service = { version = "0.3", optional = true }

# for child process transport
process-wrap = { version = "8.2", features = ["tokio1"], optional = true}
process-wrap = { version = "8.2", features = ["tokio1"], optional = true}

# for ws transport
# tokio-tungstenite ={ version = "0.26", optional = true }
Expand DownExpand Up@@ -75,18 +76,15 @@ reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-tls-no-provider"]

axum = ["dep:axum"]
# SSE client
client-side-sse = ["dep:sse-stream"]
client-side-sse = ["dep:sse-stream", "dep:http"]

transport-sse-client = ["client-side-sse", "transport-worker"]

transport-worker = ["dep:tokio-stream"]


# Streamable HTTP client
transport-streamable-http-client = [
 "client-side-sse",
 "transport-worker",
]
transport-streamable-http-client = ["client-side-sse", "transport-worker"]


transport-async-rw = ["tokio/io-util", "tokio-util/codec"]
Expand All@@ -98,6 +96,7 @@ transport-child-process = [
]
transport-sse-server = [
 "transport-async-rw",
 "transport-worker",
 "axum",
 "dep:rand",
 "dep:tokio-stream",
Expand Down

6 changes: 4 additions & 2 deletions
crates/rmcp/src/transport/common/auth/sse_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
use http::Uri;

use crate::transport::{
 auth::AuthClient,
 sse_client::{SseClient, SseTransportError},
Expand All@@ -10,7 +12,7 @@ where

 async fn post_message(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 message: crate::model::ClientJsonRpcMessage,
 mut auth_token: Option<String>,
 ) -> Result<(), SseTransportError<Self::Error>> {
Expand All@@ -25,7 +27,7 @@ where

 async fn get_stream(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 last_event_id: Option<String>,
 mut auth_token: Option<String>,
 ) -> Result<
Expand Down

11 changes: 6 additions & 5 deletions
crates/rmcp/src/transport/common/reqwest/sse_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
use std::sync::Arc;

use futures::StreamExt;
use http::Uri;
use reqwest::header::ACCEPT;
use sse_stream::SseStream;

Expand All@@ -15,11 +16,11 @@ impl SseClient for reqwest::Client {

 async fn post_message(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 message: crate::model::ClientJsonRpcMessage,
 auth_token: Option<String>,
 ) -> Result<(), SseTransportError<Self::Error>> {
 let mut request_builder = self.post(uri.as_ref()).json(&message);
 let mut request_builder = self.post(uri.to_string()).json(&message);
 if let Some(auth_header) = auth_token {
 request_builder = request_builder.bearer_auth(auth_header);
 }
Expand All@@ -33,15 +34,15 @@ impl SseClient for reqwest::Client {

 async fn get_stream(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 last_event_id: Option<String>,
 auth_token: Option<String>,
 ) -> Result<
 crate::transport::common::client_side_sse::BoxedSseResponse,
 SseTransportError<Self::Error>,
 > {
 let mut request_builder = self
 .get(uri.as_ref())
 .get(uri.to_string())
 .header(ACCEPT, EVENT_STREAM_MIME_TYPE);
 if let Some(auth_header) = auth_token {
 request_builder = request_builder.bearer_auth(auth_header);
Expand DownExpand Up@@ -73,7 +74,7 @@ impl SseClientTransport<reqwest::Client> {
 SseClientTransport::start_with_client(
 reqwest::Client::default(),
 SseClientConfig {
uri: uri.into(),
sse_endpoint: uri.into(),
 ..Default::default()
 },
 )
Expand Down

62 changes: 41 additions & 21 deletions
crates/rmcp/src/transport/sse_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
use std::{pin::Pin, sync::Arc};

use futures::{StreamExt, future::BoxFuture};
use http::Uri;
use reqwest::header::HeaderValue;
use sse_stream::Error as SseError;
use thiserror::Error;
Expand DownExpand Up@@ -32,6 +33,10 @@ pub enum SseTransportError<E: std::error::Error + Send + Sync + 'static> {
 #[cfg_attr(docsrs, doc(cfg(feature = "auth")))]
 #[error("Auth error: {0}")]
 Auth(#[from] crate::transport::auth::AuthError),
 #[error("Invalid uri: {0}")]
 InvalidUri(#[from] http::uri::InvalidUri),
 #[error("Invalid uri parts: {0}")]
 InvalidUriParts(#[from] http::uri::InvalidUriParts),
}

impl From<reqwest::Error> for SseTransportError<reqwest::Error> {
Expand All@@ -44,21 +49,21 @@ pub trait SseClient: Clone + Send + Sync + 'static {
 type Error: std::error::Error + Send + Sync + 'static;
 fn post_message(
 &self,
 uri: Arc<str>,
 uri: Uri,
 message: ClientJsonRpcMessage,
 auth_token: Option<String>,
 ) -> impl Future<Output = Result<(), SseTransportError<Self::Error>>> + Send + '_;
 fn get_stream(
 &self,
 uri: Arc<str>,
 uri: Uri,
 last_event_id: Option<String>,
 auth_token: Option<String>,
 ) -> impl Future<Output = Result<BoxedSseResponse, SseTransportError<Self::Error>>> + Send + '_;
}

struct SseClientReconnect<C> {
 pub client: C,
 pub uri: Arc<str>,
 pub uri: Uri,
}

impl<C: SseClient> SseStreamReconnect for SseClientReconnect<C> {
Expand All@@ -75,7 +80,7 @@ type ServerMessageStream<C> = Pin<Box<SseAutoReconnectStream<SseClientReconnect<
pub struct SseClientTransport<C: SseClient> {
 client: C,
 config: SseClientConfig,
post_uri: Arc<str>,
message_endpoint: Uri,
 stream: Option<ServerMessageStream<C>>,
}

Expand All@@ -89,7 +94,7 @@ impl<C: SseClient> Transport<RoleClient> for SseClientTransport<C> {
 item: crate::service::TxJsonRpcMessage<RoleClient>,
 ) -> impl Future<Output = Result<(), Self::Error>> + Send + 'static {
 let client = self.client.clone();
 let uri = self.post_uri.clone();
 let uri = self.message_endpoint.clone();
 async move { client.post_message(uri, item, None).await }
 }
 async fn close(&mut self) -> Result<(), Self::Error> {
Expand All@@ -112,9 +117,11 @@ impl<C: SseClient> SseClientTransport<C> {
 client: C,
 config: SseClientConfig,
 ) -> Result<Self, SseTransportError<C::Error>> {
 let mut sse_stream = client.get_stream(config.uri.clone(), None, None).await?;
 let endpoint = if let Some(endpoint) = config.use_endpoint.clone() {
 endpoint
 let sse_endpoint = config.sse_endpoint.as_ref().parse::<http::Uri>()?;

 let mut sse_stream = client.get_stream(sse_endpoint.clone(), None, None).await?;
 let message_endpoint = if let Some(endpoint) = config.use_message_endpoint.clone() {
 endpoint.parse::<http::Uri>()?
 } else {
 // wait the endpoint event
 loop {
Expand All@@ -125,46 +132,59 @@ impl<C: SseClient> SseClientTransport<C> {
 let Some("endpoint") = sse.event.as_deref() else {
 continue;
 };
 break sse.data.unwrap_or_default();
 let sse_endpoint = sse.data.unwrap_or_default();
 break sse_endpoint.parse::<http::Uri>()?;
 }
 };
 let post_uri: Arc<str> = format!(
 "{}/{}",
 config.uri.trim_end_matches("/"),
 endpoint.trim_start_matches("/")
 )
 .into();

 // sse: <authority><sse_pq> -> <authority><message_pq>
 let message_endpoint = {
 let mut sse_endpoint_parts = sse_endpoint.clone().into_parts();
 sse_endpoint_parts.path_and_query = message_endpoint.into_parts().path_and_query;
 Uri::from_parts(sse_endpoint_parts)?
 };
 let stream = Box::pin(SseAutoReconnectStream::new(
 sse_stream,
 SseClientReconnect {
 client: client.clone(),
 uri: config.uri.clone(),
 uri: sse_endpoint.clone(),
 },
 config.retry_policy.clone(),
 ));
 Ok(Self {
 client,
 config,
post_uri,
message_endpoint,
 stream: Some(stream),
 })
 }
}

#[derive(Debug, Clone)]
pub struct SseClientConfig {
 pub uri: Arc<str>,
 /// client sse endpoint
 ///
 /// # How this client resolve the message endpoint
 /// if sse_endpoint has this format: `<schema><authority?><sse_pq>`,
 /// then the message endpoint will be `<schema><authority?><message_pq>`.
 ///
 /// For example, if you config the sse_endpoint as `http://example.com/some_path/sse`,
 /// and the server send the message endpoint event as `message?session_id=123`,
 /// then the message endpoint will be `http://example.com/message`.
 ///
 /// This follow the rules of JavaScript's [`new URL(url, base)`](https://developer.mozilla.org/zh-CN/docs/Web/API/URL/URL)
 pub sse_endpoint: Arc<str>,
 pub retry_policy: Arc<dyn SseRetryPolicy>,
 /// if this is settled, the client will use this endpoint to send message and skip get the endpoint event
 pub use_endpoint: Option<String>,
 pub use_message_endpoint: Option<String>,
}

impl Default for SseClientConfig {
 fn default() -> Self {
 Self {
uri: "".into(),
sse_endpoint: "".into(),
 retry_policy: Arc::new(super::common::client_side_sse::FixedInterval::default()),
use_endpoint: None,
use_message_endpoint: None,
 }
 }
}

2 changes: 1 addition & 1 deletion
examples/clients/src/oauth_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,7 +147,7 @@ async fn main() -> Result<()> {
 let transport = SseClientTransport::start_with_client(
 client,
 SseClientConfig {
uri: MCP_SSE_URL.into(),
sse_endpoint: MCP_SSE_URL.into(),
 ..Default::default()
 },
 )
Expand Down

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

Skip to content
fix: sse endpoint build follow js's new URL(url, base)#197

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

from

May 19, 2025
 Merged


fix: sse endpoint build follow js's new URL(url, base)#197
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0ebf03c

fix: sse endpoint build follow js's `new URL(url, base)`


4t145 May 19, 2025
8e8aeb8

fix: fix feature denpencies


4t145 May 19, 2025
a38ca0d

fix: fix typo and format


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


11 changes: 5 additions & 6 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,13 +40,14 @@ reqwest = { version = "0.12", default-features = false, features = [
 "stream",
], optional = true }
sse-stream = { version = "0.1.4", optional = true }
http = { version = "1", optional = true }
url = { version = "2.4", optional = true }

# For tower compatibility
tower-service = { version = "0.3", optional = true }

# for child process transport
process-wrap = { version = "8.2", features = ["tokio1"], optional = true}
process-wrap = { version = "8.2", features = ["tokio1"], optional = true}

# for ws transport
# tokio-tungstenite ={ version = "0.26", optional = true }
Expand DownExpand Up@@ -75,18 +76,15 @@ reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-tls-no-provider"]

axum = ["dep:axum"]
# SSE client
client-side-sse = ["dep:sse-stream"]
client-side-sse = ["dep:sse-stream", "dep:http"]

transport-sse-client = ["client-side-sse", "transport-worker"]

transport-worker = ["dep:tokio-stream"]


# Streamable HTTP client
transport-streamable-http-client = [
 "client-side-sse",
 "transport-worker",
]
transport-streamable-http-client = ["client-side-sse", "transport-worker"]


transport-async-rw = ["tokio/io-util", "tokio-util/codec"]
Expand All@@ -98,6 +96,7 @@ transport-child-process = [
]
transport-sse-server = [
 "transport-async-rw",
 "transport-worker",
 "axum",
 "dep:rand",
 "dep:tokio-stream",
Expand Down

6 changes: 4 additions & 2 deletions
crates/rmcp/src/transport/common/auth/sse_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
use http::Uri;

use crate::transport::{
 auth::AuthClient,
 sse_client::{SseClient, SseTransportError},
Expand All@@ -10,7 +12,7 @@ where

 async fn post_message(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 message: crate::model::ClientJsonRpcMessage,
 mut auth_token: Option<String>,
 ) -> Result<(), SseTransportError<Self::Error>> {
Expand All@@ -25,7 +27,7 @@ where

 async fn get_stream(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 last_event_id: Option<String>,
 mut auth_token: Option<String>,
 ) -> Result<
Expand Down

11 changes: 6 additions & 5 deletions
crates/rmcp/src/transport/common/reqwest/sse_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
use std::sync::Arc;

use futures::StreamExt;
use http::Uri;
use reqwest::header::ACCEPT;
use sse_stream::SseStream;

Expand All@@ -15,11 +16,11 @@ impl SseClient for reqwest::Client {

 async fn post_message(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 message: crate::model::ClientJsonRpcMessage,
 auth_token: Option<String>,
 ) -> Result<(), SseTransportError<Self::Error>> {
 let mut request_builder = self.post(uri.as_ref()).json(&message);
 let mut request_builder = self.post(uri.to_string()).json(&message);
 if let Some(auth_header) = auth_token {
 request_builder = request_builder.bearer_auth(auth_header);
 }
Expand All@@ -33,15 +34,15 @@ impl SseClient for reqwest::Client {

 async fn get_stream(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 last_event_id: Option<String>,
 auth_token: Option<String>,
 ) -> Result<
 crate::transport::common::client_side_sse::BoxedSseResponse,
 SseTransportError<Self::Error>,
 > {
 let mut request_builder = self
 .get(uri.as_ref())
 .get(uri.to_string())
 .header(ACCEPT, EVENT_STREAM_MIME_TYPE);
 if let Some(auth_header) = auth_token {
 request_builder = request_builder.bearer_auth(auth_header);
Expand DownExpand Up@@ -73,7 +74,7 @@ impl SseClientTransport<reqwest::Client> {
 SseClientTransport::start_with_client(
 reqwest::Client::default(),
 SseClientConfig {
uri: uri.into(),
sse_endpoint: uri.into(),
 ..Default::default()
 },
 )
Expand Down

62 changes: 41 additions & 21 deletions
crates/rmcp/src/transport/sse_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
use std::{pin::Pin, sync::Arc};

use futures::{StreamExt, future::BoxFuture};
use http::Uri;
use reqwest::header::HeaderValue;
use sse_stream::Error as SseError;
use thiserror::Error;
Expand DownExpand Up@@ -32,6 +33,10 @@ pub enum SseTransportError<E: std::error::Error + Send + Sync + 'static> {
 #[cfg_attr(docsrs, doc(cfg(feature = "auth")))]
 #[error("Auth error: {0}")]
 Auth(#[from] crate::transport::auth::AuthError),
 #[error("Invalid uri: {0}")]
 InvalidUri(#[from] http::uri::InvalidUri),
 #[error("Invalid uri parts: {0}")]
 InvalidUriParts(#[from] http::uri::InvalidUriParts),
}

impl From<reqwest::Error> for SseTransportError<reqwest::Error> {
Expand All@@ -44,21 +49,21 @@ pub trait SseClient: Clone + Send + Sync + 'static {
 type Error: std::error::Error + Send + Sync + 'static;
 fn post_message(
 &self,
 uri: Arc<str>,
 uri: Uri,
 message: ClientJsonRpcMessage,
 auth_token: Option<String>,
 ) -> impl Future<Output = Result<(), SseTransportError<Self::Error>>> + Send + '_;
 fn get_stream(
 &self,
 uri: Arc<str>,
 uri: Uri,
 last_event_id: Option<String>,
 auth_token: Option<String>,
 ) -> impl Future<Output = Result<BoxedSseResponse, SseTransportError<Self::Error>>> + Send + '_;
}

struct SseClientReconnect<C> {
 pub client: C,
 pub uri: Arc<str>,
 pub uri: Uri,
}

impl<C: SseClient> SseStreamReconnect for SseClientReconnect<C> {
Expand All@@ -75,7 +80,7 @@ type ServerMessageStream<C> = Pin<Box<SseAutoReconnectStream<SseClientReconnect<
pub struct SseClientTransport<C: SseClient> {
 client: C,
 config: SseClientConfig,
post_uri: Arc<str>,
message_endpoint: Uri,
 stream: Option<ServerMessageStream<C>>,
}

Expand All@@ -89,7 +94,7 @@ impl<C: SseClient> Transport<RoleClient> for SseClientTransport<C> {
 item: crate::service::TxJsonRpcMessage<RoleClient>,
 ) -> impl Future<Output = Result<(), Self::Error>> + Send + 'static {
 let client = self.client.clone();
 let uri = self.post_uri.clone();
 let uri = self.message_endpoint.clone();
 async move { client.post_message(uri, item, None).await }
 }
 async fn close(&mut self) -> Result<(), Self::Error> {
Expand All@@ -112,9 +117,11 @@ impl<C: SseClient> SseClientTransport<C> {
 client: C,
 config: SseClientConfig,
 ) -> Result<Self, SseTransportError<C::Error>> {
 let mut sse_stream = client.get_stream(config.uri.clone(), None, None).await?;
 let endpoint = if let Some(endpoint) = config.use_endpoint.clone() {
 endpoint
 let sse_endpoint = config.sse_endpoint.as_ref().parse::<http::Uri>()?;

 let mut sse_stream = client.get_stream(sse_endpoint.clone(), None, None).await?;
 let message_endpoint = if let Some(endpoint) = config.use_message_endpoint.clone() {
 endpoint.parse::<http::Uri>()?
 } else {
 // wait the endpoint event
 loop {
Expand All@@ -125,46 +132,59 @@ impl<C: SseClient> SseClientTransport<C> {
 let Some("endpoint") = sse.event.as_deref() else {
 continue;
 };
 break sse.data.unwrap_or_default();
 let sse_endpoint = sse.data.unwrap_or_default();
 break sse_endpoint.parse::<http::Uri>()?;
 }
 };
 let post_uri: Arc<str> = format!(
 "{}/{}",
 config.uri.trim_end_matches("/"),
 endpoint.trim_start_matches("/")
 )
 .into();

 // sse: <authority><sse_pq> -> <authority><message_pq>
 let message_endpoint = {
 let mut sse_endpoint_parts = sse_endpoint.clone().into_parts();
 sse_endpoint_parts.path_and_query = message_endpoint.into_parts().path_and_query;
 Uri::from_parts(sse_endpoint_parts)?
 };
 let stream = Box::pin(SseAutoReconnectStream::new(
 sse_stream,
 SseClientReconnect {
 client: client.clone(),
 uri: config.uri.clone(),
 uri: sse_endpoint.clone(),
 },
 config.retry_policy.clone(),
 ));
 Ok(Self {
 client,
 config,
post_uri,
message_endpoint,
 stream: Some(stream),
 })
 }
}

#[derive(Debug, Clone)]
pub struct SseClientConfig {
 pub uri: Arc<str>,
 /// client sse endpoint
 ///
 /// # How this client resolve the message endpoint
 /// if sse_endpoint has this format: `<schema><authority?><sse_pq>`,
 /// then the message endpoint will be `<schema><authority?><message_pq>`.
 ///
 /// For example, if you config the sse_endpoint as `http://example.com/some_path/sse`,
 /// and the server send the message endpoint event as `message?session_id=123`,
 /// then the message endpoint will be `http://example.com/message`.
 ///
 /// This follow the rules of JavaScript's [`new URL(url, base)`](https://developer.mozilla.org/zh-CN/docs/Web/API/URL/URL)
 pub sse_endpoint: Arc<str>,
 pub retry_policy: Arc<dyn SseRetryPolicy>,
 /// if this is settled, the client will use this endpoint to send message and skip get the endpoint event
 pub use_endpoint: Option<String>,
 pub use_message_endpoint: Option<String>,
}

impl Default for SseClientConfig {
 fn default() -> Self {
 Self {
uri: "".into(),
sse_endpoint: "".into(),
 retry_policy: Arc::new(super::common::client_side_sse::FixedInterval::default()),
use_endpoint: None,
use_message_endpoint: None,
 }
 }
}

2 changes: 1 addition & 1 deletion
examples/clients/src/oauth_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,7 +147,7 @@ async fn main() -> Result<()> {
 let transport = SseClientTransport::start_with_client(
 client,
 SseClientConfig {
uri: MCP_SSE_URL.into(),
sse_endpoint: MCP_SSE_URL.into(),
 ..Default::default()
 },
 )
Expand Down

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

Skip to content
fix: sse endpoint build follow js's new URL(url, base)#197

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

from

May 19, 2025
 Merged


fix: sse endpoint build follow js's new URL(url, base)#197
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0ebf03c

fix: sse endpoint build follow js's `new URL(url, base)`


4t145 May 19, 2025
8e8aeb8

fix: fix feature denpencies


4t145 May 19, 2025
a38ca0d

fix: fix typo and format


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


11 changes: 5 additions & 6 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,13 +40,14 @@ reqwest = { version = "0.12", default-features = false, features = [
 "stream",
], optional = true }
sse-stream = { version = "0.1.4", optional = true }
http = { version = "1", optional = true }
url = { version = "2.4", optional = true }

# For tower compatibility
tower-service = { version = "0.3", optional = true }

# for child process transport
process-wrap = { version = "8.2", features = ["tokio1"], optional = true}
process-wrap = { version = "8.2", features = ["tokio1"], optional = true}

# for ws transport
# tokio-tungstenite ={ version = "0.26", optional = true }
Expand DownExpand Up@@ -75,18 +76,15 @@ reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-tls-no-provider"]

axum = ["dep:axum"]
# SSE client
client-side-sse = ["dep:sse-stream"]
client-side-sse = ["dep:sse-stream", "dep:http"]

transport-sse-client = ["client-side-sse", "transport-worker"]

transport-worker = ["dep:tokio-stream"]


# Streamable HTTP client
transport-streamable-http-client = [
 "client-side-sse",
 "transport-worker",
]
transport-streamable-http-client = ["client-side-sse", "transport-worker"]


transport-async-rw = ["tokio/io-util", "tokio-util/codec"]
Expand All@@ -98,6 +96,7 @@ transport-child-process = [
]
transport-sse-server = [
 "transport-async-rw",
 "transport-worker",
 "axum",
 "dep:rand",
 "dep:tokio-stream",
Expand Down

6 changes: 4 additions & 2 deletions
crates/rmcp/src/transport/common/auth/sse_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
use http::Uri;

use crate::transport::{
 auth::AuthClient,
 sse_client::{SseClient, SseTransportError},
Expand All@@ -10,7 +12,7 @@ where

 async fn post_message(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 message: crate::model::ClientJsonRpcMessage,
 mut auth_token: Option<String>,
 ) -> Result<(), SseTransportError<Self::Error>> {
Expand All@@ -25,7 +27,7 @@ where

 async fn get_stream(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 last_event_id: Option<String>,
 mut auth_token: Option<String>,
 ) -> Result<
Expand Down

11 changes: 6 additions & 5 deletions
crates/rmcp/src/transport/common/reqwest/sse_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
use std::sync::Arc;

use futures::StreamExt;
use http::Uri;
use reqwest::header::ACCEPT;
use sse_stream::SseStream;

Expand All@@ -15,11 +16,11 @@ impl SseClient for reqwest::Client {

 async fn post_message(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 message: crate::model::ClientJsonRpcMessage,
 auth_token: Option<String>,
 ) -> Result<(), SseTransportError<Self::Error>> {
 let mut request_builder = self.post(uri.as_ref()).json(&message);
 let mut request_builder = self.post(uri.to_string()).json(&message);
 if let Some(auth_header) = auth_token {
 request_builder = request_builder.bearer_auth(auth_header);
 }
Expand All@@ -33,15 +34,15 @@ impl SseClient for reqwest::Client {

 async fn get_stream(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 last_event_id: Option<String>,
 auth_token: Option<String>,
 ) -> Result<
 crate::transport::common::client_side_sse::BoxedSseResponse,
 SseTransportError<Self::Error>,
 > {
 let mut request_builder = self
 .get(uri.as_ref())
 .get(uri.to_string())
 .header(ACCEPT, EVENT_STREAM_MIME_TYPE);
 if let Some(auth_header) = auth_token {
 request_builder = request_builder.bearer_auth(auth_header);
Expand DownExpand Up@@ -73,7 +74,7 @@ impl SseClientTransport<reqwest::Client> {
 SseClientTransport::start_with_client(
 reqwest::Client::default(),
 SseClientConfig {
uri: uri.into(),
sse_endpoint: uri.into(),
 ..Default::default()
 },
 )
Expand Down

62 changes: 41 additions & 21 deletions
crates/rmcp/src/transport/sse_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
use std::{pin::Pin, sync::Arc};

use futures::{StreamExt, future::BoxFuture};
use http::Uri;
use reqwest::header::HeaderValue;
use sse_stream::Error as SseError;
use thiserror::Error;
Expand DownExpand Up@@ -32,6 +33,10 @@ pub enum SseTransportError<E: std::error::Error + Send + Sync + 'static> {
 #[cfg_attr(docsrs, doc(cfg(feature = "auth")))]
 #[error("Auth error: {0}")]
 Auth(#[from] crate::transport::auth::AuthError),
 #[error("Invalid uri: {0}")]
 InvalidUri(#[from] http::uri::InvalidUri),
 #[error("Invalid uri parts: {0}")]
 InvalidUriParts(#[from] http::uri::InvalidUriParts),
}

impl From<reqwest::Error> for SseTransportError<reqwest::Error> {
Expand All@@ -44,21 +49,21 @@ pub trait SseClient: Clone + Send + Sync + 'static {
 type Error: std::error::Error + Send + Sync + 'static;
 fn post_message(
 &self,
 uri: Arc<str>,
 uri: Uri,
 message: ClientJsonRpcMessage,
 auth_token: Option<String>,
 ) -> impl Future<Output = Result<(), SseTransportError<Self::Error>>> + Send + '_;
 fn get_stream(
 &self,
 uri: Arc<str>,
 uri: Uri,
 last_event_id: Option<String>,
 auth_token: Option<String>,
 ) -> impl Future<Output = Result<BoxedSseResponse, SseTransportError<Self::Error>>> + Send + '_;
}

struct SseClientReconnect<C> {
 pub client: C,
 pub uri: Arc<str>,
 pub uri: Uri,
}

impl<C: SseClient> SseStreamReconnect for SseClientReconnect<C> {
Expand All@@ -75,7 +80,7 @@ type ServerMessageStream<C> = Pin<Box<SseAutoReconnectStream<SseClientReconnect<
pub struct SseClientTransport<C: SseClient> {
 client: C,
 config: SseClientConfig,
post_uri: Arc<str>,
message_endpoint: Uri,
 stream: Option<ServerMessageStream<C>>,
}

Expand All@@ -89,7 +94,7 @@ impl<C: SseClient> Transport<RoleClient> for SseClientTransport<C> {
 item: crate::service::TxJsonRpcMessage<RoleClient>,
 ) -> impl Future<Output = Result<(), Self::Error>> + Send + 'static {
 let client = self.client.clone();
 let uri = self.post_uri.clone();
 let uri = self.message_endpoint.clone();
 async move { client.post_message(uri, item, None).await }
 }
 async fn close(&mut self) -> Result<(), Self::Error> {
Expand All@@ -112,9 +117,11 @@ impl<C: SseClient> SseClientTransport<C> {
 client: C,
 config: SseClientConfig,
 ) -> Result<Self, SseTransportError<C::Error>> {
 let mut sse_stream = client.get_stream(config.uri.clone(), None, None).await?;
 let endpoint = if let Some(endpoint) = config.use_endpoint.clone() {
 endpoint
 let sse_endpoint = config.sse_endpoint.as_ref().parse::<http::Uri>()?;

 let mut sse_stream = client.get_stream(sse_endpoint.clone(), None, None).await?;
 let message_endpoint = if let Some(endpoint) = config.use_message_endpoint.clone() {
 endpoint.parse::<http::Uri>()?
 } else {
 // wait the endpoint event
 loop {
Expand All@@ -125,46 +132,59 @@ impl<C: SseClient> SseClientTransport<C> {
 let Some("endpoint") = sse.event.as_deref() else {
 continue;
 };
 break sse.data.unwrap_or_default();
 let sse_endpoint = sse.data.unwrap_or_default();
 break sse_endpoint.parse::<http::Uri>()?;
 }
 };
 let post_uri: Arc<str> = format!(
 "{}/{}",
 config.uri.trim_end_matches("/"),
 endpoint.trim_start_matches("/")
 )
 .into();

 // sse: <authority><sse_pq> -> <authority><message_pq>
 let message_endpoint = {
 let mut sse_endpoint_parts = sse_endpoint.clone().into_parts();
 sse_endpoint_parts.path_and_query = message_endpoint.into_parts().path_and_query;
 Uri::from_parts(sse_endpoint_parts)?
 };
 let stream = Box::pin(SseAutoReconnectStream::new(
 sse_stream,
 SseClientReconnect {
 client: client.clone(),
 uri: config.uri.clone(),
 uri: sse_endpoint.clone(),
 },
 config.retry_policy.clone(),
 ));
 Ok(Self {
 client,
 config,
post_uri,
message_endpoint,
 stream: Some(stream),
 })
 }
}

#[derive(Debug, Clone)]
pub struct SseClientConfig {
 pub uri: Arc<str>,
 /// client sse endpoint
 ///
 /// # How this client resolve the message endpoint
 /// if sse_endpoint has this format: `<schema><authority?><sse_pq>`,
 /// then the message endpoint will be `<schema><authority?><message_pq>`.
 ///
 /// For example, if you config the sse_endpoint as `http://example.com/some_path/sse`,
 /// and the server send the message endpoint event as `message?session_id=123`,
 /// then the message endpoint will be `http://example.com/message`.
 ///
 /// This follow the rules of JavaScript's [`new URL(url, base)`](https://developer.mozilla.org/zh-CN/docs/Web/API/URL/URL)
 pub sse_endpoint: Arc<str>,
 pub retry_policy: Arc<dyn SseRetryPolicy>,
 /// if this is settled, the client will use this endpoint to send message and skip get the endpoint event
 pub use_endpoint: Option<String>,
 pub use_message_endpoint: Option<String>,
}

impl Default for SseClientConfig {
 fn default() -> Self {
 Self {
uri: "".into(),
sse_endpoint: "".into(),
 retry_policy: Arc::new(super::common::client_side_sse::FixedInterval::default()),
use_endpoint: None,
use_message_endpoint: None,
 }
 }
}

2 changes: 1 addition & 1 deletion
examples/clients/src/oauth_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,7 +147,7 @@ async fn main() -> Result<()> {
 let transport = SseClientTransport::start_with_client(
 client,
 SseClientConfig {
uri: MCP_SSE_URL.into(),
sse_endpoint: MCP_SSE_URL.into(),
 ..Default::default()
 },
 )
Expand Down

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

Skip to content
fix: sse endpoint build follow js's new URL(url, base)#197

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

from

May 19, 2025
 Merged


fix: sse endpoint build follow js's new URL(url, base)#197
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0ebf03c

fix: sse endpoint build follow js's `new URL(url, base)`


4t145 May 19, 2025
8e8aeb8

fix: fix feature denpencies


4t145 May 19, 2025
a38ca0d

fix: fix typo and format


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


11 changes: 5 additions & 6 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,13 +40,14 @@ reqwest = { version = "0.12", default-features = false, features = [
 "stream",
], optional = true }
sse-stream = { version = "0.1.4", optional = true }
http = { version = "1", optional = true }
url = { version = "2.4", optional = true }

# For tower compatibility
tower-service = { version = "0.3", optional = true }

# for child process transport
process-wrap = { version = "8.2", features = ["tokio1"], optional = true}
process-wrap = { version = "8.2", features = ["tokio1"], optional = true}

# for ws transport
# tokio-tungstenite ={ version = "0.26", optional = true }
Expand DownExpand Up@@ -75,18 +76,15 @@ reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-tls-no-provider"]

axum = ["dep:axum"]
# SSE client
client-side-sse = ["dep:sse-stream"]
client-side-sse = ["dep:sse-stream", "dep:http"]

transport-sse-client = ["client-side-sse", "transport-worker"]

transport-worker = ["dep:tokio-stream"]


# Streamable HTTP client
transport-streamable-http-client = [
 "client-side-sse",
 "transport-worker",
]
transport-streamable-http-client = ["client-side-sse", "transport-worker"]


transport-async-rw = ["tokio/io-util", "tokio-util/codec"]
Expand All@@ -98,6 +96,7 @@ transport-child-process = [
]
transport-sse-server = [
 "transport-async-rw",
 "transport-worker",
 "axum",
 "dep:rand",
 "dep:tokio-stream",
Expand Down

6 changes: 4 additions & 2 deletions
crates/rmcp/src/transport/common/auth/sse_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
use http::Uri;

use crate::transport::{
 auth::AuthClient,
 sse_client::{SseClient, SseTransportError},
Expand All@@ -10,7 +12,7 @@ where

 async fn post_message(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 message: crate::model::ClientJsonRpcMessage,
 mut auth_token: Option<String>,
 ) -> Result<(), SseTransportError<Self::Error>> {
Expand All@@ -25,7 +27,7 @@ where

 async fn get_stream(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 last_event_id: Option<String>,
 mut auth_token: Option<String>,
 ) -> Result<
Expand Down

11 changes: 6 additions & 5 deletions
crates/rmcp/src/transport/common/reqwest/sse_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
use std::sync::Arc;

use futures::StreamExt;
use http::Uri;
use reqwest::header::ACCEPT;
use sse_stream::SseStream;

Expand All@@ -15,11 +16,11 @@ impl SseClient for reqwest::Client {

 async fn post_message(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 message: crate::model::ClientJsonRpcMessage,
 auth_token: Option<String>,
 ) -> Result<(), SseTransportError<Self::Error>> {
 let mut request_builder = self.post(uri.as_ref()).json(&message);
 let mut request_builder = self.post(uri.to_string()).json(&message);
 if let Some(auth_header) = auth_token {
 request_builder = request_builder.bearer_auth(auth_header);
 }
Expand All@@ -33,15 +34,15 @@ impl SseClient for reqwest::Client {

 async fn get_stream(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 last_event_id: Option<String>,
 auth_token: Option<String>,
 ) -> Result<
 crate::transport::common::client_side_sse::BoxedSseResponse,
 SseTransportError<Self::Error>,
 > {
 let mut request_builder = self
 .get(uri.as_ref())
 .get(uri.to_string())
 .header(ACCEPT, EVENT_STREAM_MIME_TYPE);
 if let Some(auth_header) = auth_token {
 request_builder = request_builder.bearer_auth(auth_header);
Expand DownExpand Up@@ -73,7 +74,7 @@ impl SseClientTransport<reqwest::Client> {
 SseClientTransport::start_with_client(
 reqwest::Client::default(),
 SseClientConfig {
uri: uri.into(),
sse_endpoint: uri.into(),
 ..Default::default()
 },
 )
Expand Down

62 changes: 41 additions & 21 deletions
crates/rmcp/src/transport/sse_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
use std::{pin::Pin, sync::Arc};

use futures::{StreamExt, future::BoxFuture};
use http::Uri;
use reqwest::header::HeaderValue;
use sse_stream::Error as SseError;
use thiserror::Error;
Expand DownExpand Up@@ -32,6 +33,10 @@ pub enum SseTransportError<E: std::error::Error + Send + Sync + 'static> {
 #[cfg_attr(docsrs, doc(cfg(feature = "auth")))]
 #[error("Auth error: {0}")]
 Auth(#[from] crate::transport::auth::AuthError),
 #[error("Invalid uri: {0}")]
 InvalidUri(#[from] http::uri::InvalidUri),
 #[error("Invalid uri parts: {0}")]
 InvalidUriParts(#[from] http::uri::InvalidUriParts),
}

impl From<reqwest::Error> for SseTransportError<reqwest::Error> {
Expand All@@ -44,21 +49,21 @@ pub trait SseClient: Clone + Send + Sync + 'static {
 type Error: std::error::Error + Send + Sync + 'static;
 fn post_message(
 &self,
 uri: Arc<str>,
 uri: Uri,
 message: ClientJsonRpcMessage,
 auth_token: Option<String>,
 ) -> impl Future<Output = Result<(), SseTransportError<Self::Error>>> + Send + '_;
 fn get_stream(
 &self,
 uri: Arc<str>,
 uri: Uri,
 last_event_id: Option<String>,
 auth_token: Option<String>,
 ) -> impl Future<Output = Result<BoxedSseResponse, SseTransportError<Self::Error>>> + Send + '_;
}

struct SseClientReconnect<C> {
 pub client: C,
 pub uri: Arc<str>,
 pub uri: Uri,
}

impl<C: SseClient> SseStreamReconnect for SseClientReconnect<C> {
Expand All@@ -75,7 +80,7 @@ type ServerMessageStream<C> = Pin<Box<SseAutoReconnectStream<SseClientReconnect<
pub struct SseClientTransport<C: SseClient> {
 client: C,
 config: SseClientConfig,
post_uri: Arc<str>,
message_endpoint: Uri,
 stream: Option<ServerMessageStream<C>>,
}

Expand All@@ -89,7 +94,7 @@ impl<C: SseClient> Transport<RoleClient> for SseClientTransport<C> {
 item: crate::service::TxJsonRpcMessage<RoleClient>,
 ) -> impl Future<Output = Result<(), Self::Error>> + Send + 'static {
 let client = self.client.clone();
 let uri = self.post_uri.clone();
 let uri = self.message_endpoint.clone();
 async move { client.post_message(uri, item, None).await }
 }
 async fn close(&mut self) -> Result<(), Self::Error> {
Expand All@@ -112,9 +117,11 @@ impl<C: SseClient> SseClientTransport<C> {
 client: C,
 config: SseClientConfig,
 ) -> Result<Self, SseTransportError<C::Error>> {
 let mut sse_stream = client.get_stream(config.uri.clone(), None, None).await?;
 let endpoint = if let Some(endpoint) = config.use_endpoint.clone() {
 endpoint
 let sse_endpoint = config.sse_endpoint.as_ref().parse::<http::Uri>()?;

 let mut sse_stream = client.get_stream(sse_endpoint.clone(), None, None).await?;
 let message_endpoint = if let Some(endpoint) = config.use_message_endpoint.clone() {
 endpoint.parse::<http::Uri>()?
 } else {
 // wait the endpoint event
 loop {
Expand All@@ -125,46 +132,59 @@ impl<C: SseClient> SseClientTransport<C> {
 let Some("endpoint") = sse.event.as_deref() else {
 continue;
 };
 break sse.data.unwrap_or_default();
 let sse_endpoint = sse.data.unwrap_or_default();
 break sse_endpoint.parse::<http::Uri>()?;
 }
 };
 let post_uri: Arc<str> = format!(
 "{}/{}",
 config.uri.trim_end_matches("/"),
 endpoint.trim_start_matches("/")
 )
 .into();

 // sse: <authority><sse_pq> -> <authority><message_pq>
 let message_endpoint = {
 let mut sse_endpoint_parts = sse_endpoint.clone().into_parts();
 sse_endpoint_parts.path_and_query = message_endpoint.into_parts().path_and_query;
 Uri::from_parts(sse_endpoint_parts)?
 };
 let stream = Box::pin(SseAutoReconnectStream::new(
 sse_stream,
 SseClientReconnect {
 client: client.clone(),
 uri: config.uri.clone(),
 uri: sse_endpoint.clone(),
 },
 config.retry_policy.clone(),
 ));
 Ok(Self {
 client,
 config,
post_uri,
message_endpoint,
 stream: Some(stream),
 })
 }
}

#[derive(Debug, Clone)]
pub struct SseClientConfig {
 pub uri: Arc<str>,
 /// client sse endpoint
 ///
 /// # How this client resolve the message endpoint
 /// if sse_endpoint has this format: `<schema><authority?><sse_pq>`,
 /// then the message endpoint will be `<schema><authority?><message_pq>`.
 ///
 /// For example, if you config the sse_endpoint as `http://example.com/some_path/sse`,
 /// and the server send the message endpoint event as `message?session_id=123`,
 /// then the message endpoint will be `http://example.com/message`.
 ///
 /// This follow the rules of JavaScript's [`new URL(url, base)`](https://developer.mozilla.org/zh-CN/docs/Web/API/URL/URL)
 pub sse_endpoint: Arc<str>,
 pub retry_policy: Arc<dyn SseRetryPolicy>,
 /// if this is settled, the client will use this endpoint to send message and skip get the endpoint event
 pub use_endpoint: Option<String>,
 pub use_message_endpoint: Option<String>,
}

impl Default for SseClientConfig {
 fn default() -> Self {
 Self {
uri: "".into(),
sse_endpoint: "".into(),
 retry_policy: Arc::new(super::common::client_side_sse::FixedInterval::default()),
use_endpoint: None,
use_message_endpoint: None,
 }
 }
}

2 changes: 1 addition & 1 deletion
examples/clients/src/oauth_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,7 +147,7 @@ async fn main() -> Result<()> {
 let transport = SseClientTransport::start_with_client(
 client,
 SseClientConfig {
uri: MCP_SSE_URL.into(),
sse_endpoint: MCP_SSE_URL.into(),
 ..Default::default()
 },
 )
Expand Down

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

Skip to content
fix: sse endpoint build follow js's new URL(url, base)#197

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

from

May 19, 2025
 Merged


fix: sse endpoint build follow js's new URL(url, base)#197
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0ebf03c

fix: sse endpoint build follow js's `new URL(url, base)`


4t145 May 19, 2025
8e8aeb8

fix: fix feature denpencies


4t145 May 19, 2025
a38ca0d

fix: fix typo and format


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


11 changes: 5 additions & 6 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,13 +40,14 @@ reqwest = { version = "0.12", default-features = false, features = [
 "stream",
], optional = true }
sse-stream = { version = "0.1.4", optional = true }
http = { version = "1", optional = true }
url = { version = "2.4", optional = true }

# For tower compatibility
tower-service = { version = "0.3", optional = true }

# for child process transport
process-wrap = { version = "8.2", features = ["tokio1"], optional = true}
process-wrap = { version = "8.2", features = ["tokio1"], optional = true}

# for ws transport
# tokio-tungstenite ={ version = "0.26", optional = true }
Expand DownExpand Up@@ -75,18 +76,15 @@ reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-tls-no-provider"]

axum = ["dep:axum"]
# SSE client
client-side-sse = ["dep:sse-stream"]
client-side-sse = ["dep:sse-stream", "dep:http"]

transport-sse-client = ["client-side-sse", "transport-worker"]

transport-worker = ["dep:tokio-stream"]


# Streamable HTTP client
transport-streamable-http-client = [
 "client-side-sse",
 "transport-worker",
]
transport-streamable-http-client = ["client-side-sse", "transport-worker"]


transport-async-rw = ["tokio/io-util", "tokio-util/codec"]
Expand All@@ -98,6 +96,7 @@ transport-child-process = [
]
transport-sse-server = [
 "transport-async-rw",
 "transport-worker",
 "axum",
 "dep:rand",
 "dep:tokio-stream",
Expand Down

6 changes: 4 additions & 2 deletions
crates/rmcp/src/transport/common/auth/sse_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
use http::Uri;

use crate::transport::{
 auth::AuthClient,
 sse_client::{SseClient, SseTransportError},
Expand All@@ -10,7 +12,7 @@ where

 async fn post_message(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 message: crate::model::ClientJsonRpcMessage,
 mut auth_token: Option<String>,
 ) -> Result<(), SseTransportError<Self::Error>> {
Expand All@@ -25,7 +27,7 @@ where

 async fn get_stream(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 last_event_id: Option<String>,
 mut auth_token: Option<String>,
 ) -> Result<
Expand Down

11 changes: 6 additions & 5 deletions
crates/rmcp/src/transport/common/reqwest/sse_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
use std::sync::Arc;

use futures::StreamExt;
use http::Uri;
use reqwest::header::ACCEPT;
use sse_stream::SseStream;

Expand All@@ -15,11 +16,11 @@ impl SseClient for reqwest::Client {

 async fn post_message(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 message: crate::model::ClientJsonRpcMessage,
 auth_token: Option<String>,
 ) -> Result<(), SseTransportError<Self::Error>> {
 let mut request_builder = self.post(uri.as_ref()).json(&message);
 let mut request_builder = self.post(uri.to_string()).json(&message);
 if let Some(auth_header) = auth_token {
 request_builder = request_builder.bearer_auth(auth_header);
 }
Expand All@@ -33,15 +34,15 @@ impl SseClient for reqwest::Client {

 async fn get_stream(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 last_event_id: Option<String>,
 auth_token: Option<String>,
 ) -> Result<
 crate::transport::common::client_side_sse::BoxedSseResponse,
 SseTransportError<Self::Error>,
 > {
 let mut request_builder = self
 .get(uri.as_ref())
 .get(uri.to_string())
 .header(ACCEPT, EVENT_STREAM_MIME_TYPE);
 if let Some(auth_header) = auth_token {
 request_builder = request_builder.bearer_auth(auth_header);
Expand DownExpand Up@@ -73,7 +74,7 @@ impl SseClientTransport<reqwest::Client> {
 SseClientTransport::start_with_client(
 reqwest::Client::default(),
 SseClientConfig {
uri: uri.into(),
sse_endpoint: uri.into(),
 ..Default::default()
 },
 )
Expand Down

62 changes: 41 additions & 21 deletions
crates/rmcp/src/transport/sse_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
use std::{pin::Pin, sync::Arc};

use futures::{StreamExt, future::BoxFuture};
use http::Uri;
use reqwest::header::HeaderValue;
use sse_stream::Error as SseError;
use thiserror::Error;
Expand DownExpand Up@@ -32,6 +33,10 @@ pub enum SseTransportError<E: std::error::Error + Send + Sync + 'static> {
 #[cfg_attr(docsrs, doc(cfg(feature = "auth")))]
 #[error("Auth error: {0}")]
 Auth(#[from] crate::transport::auth::AuthError),
 #[error("Invalid uri: {0}")]
 InvalidUri(#[from] http::uri::InvalidUri),
 #[error("Invalid uri parts: {0}")]
 InvalidUriParts(#[from] http::uri::InvalidUriParts),
}

impl From<reqwest::Error> for SseTransportError<reqwest::Error> {
Expand All@@ -44,21 +49,21 @@ pub trait SseClient: Clone + Send + Sync + 'static {
 type Error: std::error::Error + Send + Sync + 'static;
 fn post_message(
 &self,
 uri: Arc<str>,
 uri: Uri,
 message: ClientJsonRpcMessage,
 auth_token: Option<String>,
 ) -> impl Future<Output = Result<(), SseTransportError<Self::Error>>> + Send + '_;
 fn get_stream(
 &self,
 uri: Arc<str>,
 uri: Uri,
 last_event_id: Option<String>,
 auth_token: Option<String>,
 ) -> impl Future<Output = Result<BoxedSseResponse, SseTransportError<Self::Error>>> + Send + '_;
}

struct SseClientReconnect<C> {
 pub client: C,
 pub uri: Arc<str>,
 pub uri: Uri,
}

impl<C: SseClient> SseStreamReconnect for SseClientReconnect<C> {
Expand All@@ -75,7 +80,7 @@ type ServerMessageStream<C> = Pin<Box<SseAutoReconnectStream<SseClientReconnect<
pub struct SseClientTransport<C: SseClient> {
 client: C,
 config: SseClientConfig,
post_uri: Arc<str>,
message_endpoint: Uri,
 stream: Option<ServerMessageStream<C>>,
}

Expand All@@ -89,7 +94,7 @@ impl<C: SseClient> Transport<RoleClient> for SseClientTransport<C> {
 item: crate::service::TxJsonRpcMessage<RoleClient>,
 ) -> impl Future<Output = Result<(), Self::Error>> + Send + 'static {
 let client = self.client.clone();
 let uri = self.post_uri.clone();
 let uri = self.message_endpoint.clone();
 async move { client.post_message(uri, item, None).await }
 }
 async fn close(&mut self) -> Result<(), Self::Error> {
Expand All@@ -112,9 +117,11 @@ impl<C: SseClient> SseClientTransport<C> {
 client: C,
 config: SseClientConfig,
 ) -> Result<Self, SseTransportError<C::Error>> {
 let mut sse_stream = client.get_stream(config.uri.clone(), None, None).await?;
 let endpoint = if let Some(endpoint) = config.use_endpoint.clone() {
 endpoint
 let sse_endpoint = config.sse_endpoint.as_ref().parse::<http::Uri>()?;

 let mut sse_stream = client.get_stream(sse_endpoint.clone(), None, None).await?;
 let message_endpoint = if let Some(endpoint) = config.use_message_endpoint.clone() {
 endpoint.parse::<http::Uri>()?
 } else {
 // wait the endpoint event
 loop {
Expand All@@ -125,46 +132,59 @@ impl<C: SseClient> SseClientTransport<C> {
 let Some("endpoint") = sse.event.as_deref() else {
 continue;
 };
 break sse.data.unwrap_or_default();
 let sse_endpoint = sse.data.unwrap_or_default();
 break sse_endpoint.parse::<http::Uri>()?;
 }
 };
 let post_uri: Arc<str> = format!(
 "{}/{}",
 config.uri.trim_end_matches("/"),
 endpoint.trim_start_matches("/")
 )
 .into();

 // sse: <authority><sse_pq> -> <authority><message_pq>
 let message_endpoint = {
 let mut sse_endpoint_parts = sse_endpoint.clone().into_parts();
 sse_endpoint_parts.path_and_query = message_endpoint.into_parts().path_and_query;
 Uri::from_parts(sse_endpoint_parts)?
 };
 let stream = Box::pin(SseAutoReconnectStream::new(
 sse_stream,
 SseClientReconnect {
 client: client.clone(),
 uri: config.uri.clone(),
 uri: sse_endpoint.clone(),
 },
 config.retry_policy.clone(),
 ));
 Ok(Self {
 client,
 config,
post_uri,
message_endpoint,
 stream: Some(stream),
 })
 }
}

#[derive(Debug, Clone)]
pub struct SseClientConfig {
 pub uri: Arc<str>,
 /// client sse endpoint
 ///
 /// # How this client resolve the message endpoint
 /// if sse_endpoint has this format: `<schema><authority?><sse_pq>`,
 /// then the message endpoint will be `<schema><authority?><message_pq>`.
 ///
 /// For example, if you config the sse_endpoint as `http://example.com/some_path/sse`,
 /// and the server send the message endpoint event as `message?session_id=123`,
 /// then the message endpoint will be `http://example.com/message`.
 ///
 /// This follow the rules of JavaScript's [`new URL(url, base)`](https://developer.mozilla.org/zh-CN/docs/Web/API/URL/URL)
 pub sse_endpoint: Arc<str>,
 pub retry_policy: Arc<dyn SseRetryPolicy>,
 /// if this is settled, the client will use this endpoint to send message and skip get the endpoint event
 pub use_endpoint: Option<String>,
 pub use_message_endpoint: Option<String>,
}

impl Default for SseClientConfig {
 fn default() -> Self {
 Self {
uri: "".into(),
sse_endpoint: "".into(),
 retry_policy: Arc::new(super::common::client_side_sse::FixedInterval::default()),
use_endpoint: None,
use_message_endpoint: None,
 }
 }
}

2 changes: 1 addition & 1 deletion
examples/clients/src/oauth_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,7 +147,7 @@ async fn main() -> Result<()> {
 let transport = SseClientTransport::start_with_client(
 client,
 SseClientConfig {
uri: MCP_SSE_URL.into(),
sse_endpoint: MCP_SSE_URL.into(),
 ..Default::default()
 },
 )
Expand Down

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

Skip to content
fix: sse endpoint build follow js's new URL(url, base)#197

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

from

May 19, 2025
 Merged


fix: sse endpoint build follow js's new URL(url, base)#197
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0ebf03c

fix: sse endpoint build follow js's `new URL(url, base)`


4t145 May 19, 2025
8e8aeb8

fix: fix feature denpencies


4t145 May 19, 2025
a38ca0d

fix: fix typo and format


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


11 changes: 5 additions & 6 deletions
crates/rmcp/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,13 +40,14 @@ reqwest = { version = "0.12", default-features = false, features = [
 "stream",
], optional = true }
sse-stream = { version = "0.1.4", optional = true }
http = { version = "1", optional = true }
url = { version = "2.4", optional = true }

# For tower compatibility
tower-service = { version = "0.3", optional = true }

# for child process transport
process-wrap = { version = "8.2", features = ["tokio1"], optional = true}
process-wrap = { version = "8.2", features = ["tokio1"], optional = true}

# for ws transport
# tokio-tungstenite ={ version = "0.26", optional = true }
Expand DownExpand Up@@ -75,18 +76,15 @@ reqwest-tls-no-provider = ["__reqwest", "reqwest?/rustls-tls-no-provider"]

axum = ["dep:axum"]
# SSE client
client-side-sse = ["dep:sse-stream"]
client-side-sse = ["dep:sse-stream", "dep:http"]

transport-sse-client = ["client-side-sse", "transport-worker"]

transport-worker = ["dep:tokio-stream"]


# Streamable HTTP client
transport-streamable-http-client = [
 "client-side-sse",
 "transport-worker",
]
transport-streamable-http-client = ["client-side-sse", "transport-worker"]


transport-async-rw = ["tokio/io-util", "tokio-util/codec"]
Expand All@@ -98,6 +96,7 @@ transport-child-process = [
]
transport-sse-server = [
 "transport-async-rw",
 "transport-worker",
 "axum",
 "dep:rand",
 "dep:tokio-stream",
Expand Down

6 changes: 4 additions & 2 deletions
crates/rmcp/src/transport/common/auth/sse_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
use http::Uri;

use crate::transport::{
 auth::AuthClient,
 sse_client::{SseClient, SseTransportError},
Expand All@@ -10,7 +12,7 @@ where

 async fn post_message(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 message: crate::model::ClientJsonRpcMessage,
 mut auth_token: Option<String>,
 ) -> Result<(), SseTransportError<Self::Error>> {
Expand All@@ -25,7 +27,7 @@ where

 async fn get_stream(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 last_event_id: Option<String>,
 mut auth_token: Option<String>,
 ) -> Result<
Expand Down

11 changes: 6 additions & 5 deletions
crates/rmcp/src/transport/common/reqwest/sse_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
use std::sync::Arc;

use futures::StreamExt;
use http::Uri;
use reqwest::header::ACCEPT;
use sse_stream::SseStream;

Expand All@@ -15,11 +16,11 @@ impl SseClient for reqwest::Client {

 async fn post_message(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 message: crate::model::ClientJsonRpcMessage,
 auth_token: Option<String>,
 ) -> Result<(), SseTransportError<Self::Error>> {
 let mut request_builder = self.post(uri.as_ref()).json(&message);
 let mut request_builder = self.post(uri.to_string()).json(&message);
 if let Some(auth_header) = auth_token {
 request_builder = request_builder.bearer_auth(auth_header);
 }
Expand All@@ -33,15 +34,15 @@ impl SseClient for reqwest::Client {

 async fn get_stream(
 &self,
 uri: std::sync::Arc<str>,
 uri: Uri,
 last_event_id: Option<String>,
 auth_token: Option<String>,
 ) -> Result<
 crate::transport::common::client_side_sse::BoxedSseResponse,
 SseTransportError<Self::Error>,
 > {
 let mut request_builder = self
 .get(uri.as_ref())
 .get(uri.to_string())
 .header(ACCEPT, EVENT_STREAM_MIME_TYPE);
 if let Some(auth_header) = auth_token {
 request_builder = request_builder.bearer_auth(auth_header);
Expand DownExpand Up@@ -73,7 +74,7 @@ impl SseClientTransport<reqwest::Client> {
 SseClientTransport::start_with_client(
 reqwest::Client::default(),
 SseClientConfig {
uri: uri.into(),
sse_endpoint: uri.into(),
 ..Default::default()
 },
 )
Expand Down

62 changes: 41 additions & 21 deletions
crates/rmcp/src/transport/sse_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
use std::{pin::Pin, sync::Arc};

use futures::{StreamExt, future::BoxFuture};
use http::Uri;
use reqwest::header::HeaderValue;
use sse_stream::Error as SseError;
use thiserror::Error;
Expand DownExpand Up@@ -32,6 +33,10 @@ pub enum SseTransportError<E: std::error::Error + Send + Sync + 'static> {
 #[cfg_attr(docsrs, doc(cfg(feature = "auth")))]
 #[error("Auth error: {0}")]
 Auth(#[from] crate::transport::auth::AuthError),
 #[error("Invalid uri: {0}")]
 InvalidUri(#[from] http::uri::InvalidUri),
 #[error("Invalid uri parts: {0}")]
 InvalidUriParts(#[from] http::uri::InvalidUriParts),
}

impl From<reqwest::Error> for SseTransportError<reqwest::Error> {
Expand All@@ -44,21 +49,21 @@ pub trait SseClient: Clone + Send + Sync + 'static {
 type Error: std::error::Error + Send + Sync + 'static;
 fn post_message(
 &self,
 uri: Arc<str>,
 uri: Uri,
 message: ClientJsonRpcMessage,
 auth_token: Option<String>,
 ) -> impl Future<Output = Result<(), SseTransportError<Self::Error>>> + Send + '_;
 fn get_stream(
 &self,
 uri: Arc<str>,
 uri: Uri,
 last_event_id: Option<String>,
 auth_token: Option<String>,
 ) -> impl Future<Output = Result<BoxedSseResponse, SseTransportError<Self::Error>>> + Send + '_;
}

struct SseClientReconnect<C> {
 pub client: C,
 pub uri: Arc<str>,
 pub uri: Uri,
}

impl<C: SseClient> SseStreamReconnect for SseClientReconnect<C> {
Expand All@@ -75,7 +80,7 @@ type ServerMessageStream<C> = Pin<Box<SseAutoReconnectStream<SseClientReconnect<
pub struct SseClientTransport<C: SseClient> {
 client: C,
 config: SseClientConfig,
post_uri: Arc<str>,
message_endpoint: Uri,
 stream: Option<ServerMessageStream<C>>,
}

Expand All@@ -89,7 +94,7 @@ impl<C: SseClient> Transport<RoleClient> for SseClientTransport<C> {
 item: crate::service::TxJsonRpcMessage<RoleClient>,
 ) -> impl Future<Output = Result<(), Self::Error>> + Send + 'static {
 let client = self.client.clone();
 let uri = self.post_uri.clone();
 let uri = self.message_endpoint.clone();
 async move { client.post_message(uri, item, None).await }
 }
 async fn close(&mut self) -> Result<(), Self::Error> {
Expand All@@ -112,9 +117,11 @@ impl<C: SseClient> SseClientTransport<C> {
 client: C,
 config: SseClientConfig,
 ) -> Result<Self, SseTransportError<C::Error>> {
 let mut sse_stream = client.get_stream(config.uri.clone(), None, None).await?;
 let endpoint = if let Some(endpoint) = config.use_endpoint.clone() {
 endpoint
 let sse_endpoint = config.sse_endpoint.as_ref().parse::<http::Uri>()?;

 let mut sse_stream = client.get_stream(sse_endpoint.clone(), None, None).await?;
 let message_endpoint = if let Some(endpoint) = config.use_message_endpoint.clone() {
 endpoint.parse::<http::Uri>()?
 } else {
 // wait the endpoint event
 loop {
Expand All@@ -125,46 +132,59 @@ impl<C: SseClient> SseClientTransport<C> {
 let Some("endpoint") = sse.event.as_deref() else {
 continue;
 };
 break sse.data.unwrap_or_default();
 let sse_endpoint = sse.data.unwrap_or_default();
 break sse_endpoint.parse::<http::Uri>()?;
 }
 };
 let post_uri: Arc<str> = format!(
 "{}/{}",
 config.uri.trim_end_matches("/"),
 endpoint.trim_start_matches("/")
 )
 .into();

 // sse: <authority><sse_pq> -> <authority><message_pq>
 let message_endpoint = {
 let mut sse_endpoint_parts = sse_endpoint.clone().into_parts();
 sse_endpoint_parts.path_and_query = message_endpoint.into_parts().path_and_query;
 Uri::from_parts(sse_endpoint_parts)?
 };
 let stream = Box::pin(SseAutoReconnectStream::new(
 sse_stream,
 SseClientReconnect {
 client: client.clone(),
 uri: config.uri.clone(),
 uri: sse_endpoint.clone(),
 },
 config.retry_policy.clone(),
 ));
 Ok(Self {
 client,
 config,
post_uri,
message_endpoint,
 stream: Some(stream),
 })
 }
}

#[derive(Debug, Clone)]
pub struct SseClientConfig {
 pub uri: Arc<str>,
 /// client sse endpoint
 ///
 /// # How this client resolve the message endpoint
 /// if sse_endpoint has this format: `<schema><authority?><sse_pq>`,
 /// then the message endpoint will be `<schema><authority?><message_pq>`.
 ///
 /// For example, if you config the sse_endpoint as `http://example.com/some_path/sse`,
 /// and the server send the message endpoint event as `message?session_id=123`,
 /// then the message endpoint will be `http://example.com/message`.
 ///
 /// This follow the rules of JavaScript's [`new URL(url, base)`](https://developer.mozilla.org/zh-CN/docs/Web/API/URL/URL)
 pub sse_endpoint: Arc<str>,
 pub retry_policy: Arc<dyn SseRetryPolicy>,
 /// if this is settled, the client will use this endpoint to send message and skip get the endpoint event
 pub use_endpoint: Option<String>,
 pub use_message_endpoint: Option<String>,
}

impl Default for SseClientConfig {
 fn default() -> Self {
 Self {
uri: "".into(),
sse_endpoint: "".into(),
 retry_policy: Arc::new(super::common::client_side_sse::FixedInterval::default()),
use_endpoint: None,
use_message_endpoint: None,
 }
 }
}

2 changes: 1 addition & 1 deletion
examples/clients/src/oauth_client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,7 +147,7 @@ async fn main() -> Result<()> {
 let transport = SseClientTransport::start_with_client(
 client,
 SseClientConfig {
uri: MCP_SSE_URL.into(),
sse_endpoint: MCP_SSE_URL.into(),
 ..Default::default()
 },
 )
Expand Down