Skip to content

feat: allow use of reqwest without ring provider #155

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

feat: allow use of reqwest without ring provider #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7bf95f
feat: allow use of reqwest without ring provider
msardara May 5, 2025
c3afd40
Merge branch 'main' of https://github.com/modelcontextprotocol/rust-sdk
msardara May 7, 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
9 changes: 6 additions & 3 deletions crates/rmcp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ base64 = { version = "0.21", optional = true }
reqwest = { version = "0.12", default-features = false, features = [
"json",
"stream",
"rustls-tls",
], optional = true }
sse-stream = { version = "0.1.3", optional = true }
url = { version = "2.4", optional = true }
Expand All @@ -62,7 +61,9 @@ default = ["base64", "macros", "server"]
client = []
server = ["transport-async-rw", "dep:schemars"]
macros = ["dep:rmcp-macros", "dep:paste"]
transport-sse = ["dep:reqwest", "dep:sse-stream", "dep:url"]
__transport-sse = ["dep:reqwest", "dep:sse-stream", "dep:url"]
transport-sse = ["__transport-sse", "reqwest?/rustls-tls"]
transport-sse-tls-no-provider = ["__transport-sse", "reqwest?/rustls-tls-no-provider"]
transport-async-rw = ["tokio/io-util", "tokio-util/codec"]
transport-io = ["transport-async-rw", "tokio/io-std"]
transport-child-process = ["transport-async-rw", "tokio/process"]
Expand All @@ -74,7 +75,9 @@ transport-sse-server = [
]
# transport-ws = ["transport-io", "dep:tokio-tungstenite"]
tower = ["dep:tower-service"]
auth = ["dep:oauth2", "dep:reqwest", "dep:url"]
__auth = ["dep:oauth2", "dep:reqwest", "dep:url"]
auth = ["__auth", "reqwest?/rustls-tls"]
auth-tls-no-provider = ["auth", "reqwest?/rustls-tls-no-provider"]

[dev-dependencies]
tokio = { version = "1", features = ["full"] }
Expand Down
12 changes: 6 additions & 6 deletions crates/rmcp/src/transport.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ pub mod io;
#[cfg(feature = "transport-io")]
pub use io::stdio;

#[cfg(feature = "transport-sse")]
#[cfg(feature = "__transport-sse")]
pub mod sse;
#[cfg(feature = "transport-sse")]
#[cfg(feature = "__transport-sse")]
pub use sse::SseTransport;

#[cfg(all(feature = "transport-sse", feature = "auth"))]
#[cfg(all(feature = "__transport-sse", feature = "__auth"))]
pub mod sse_auth;
#[cfg(all(feature = "transport-sse", feature = "auth"))]
#[cfg(all(feature = "__transport-sse", feature = "__auth"))]
pub use sse_auth::{AuthorizedSseClient, create_authorized_transport};

// #[cfg(feature = "tower")]
Expand All @@ -69,9 +69,9 @@ pub mod sse_server;
#[cfg(feature = "transport-sse-server")]
pub use sse_server::SseServer;

#[cfg(feature = "auth")]
#[cfg(feature = "__auth")]
pub mod auth;
#[cfg(feature = "auth")]
#[cfg(feature = "__auth")]
pub use auth::{AuthError, AuthorizationManager, AuthorizationSession, AuthorizedHttpClient};

// #[cfg(feature = "transport-ws")]
Expand Down
Loading