Merge branch 'main' into set-oauth-creds

Author: the-rooster

crates/rmcp/Cargo.toml

@@ -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 }
@@ -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"]
@@ -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"] }

crates/rmcp/src/model/tool.rs

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

crates/rmcp/src/transport.rs

@@ -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")]
@@ -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")]

crates/rmcp/tests/test_with_js/client.js

@@ -1,7 +1,7 @@
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
 
-const transport = new SSEClientTransport( new URL(`http://127.0.0.1:8000/sse`));
+const transport = new SSEClientTransport(new URL(`http://127.0.0.1:8000/sse`));
 
 const client = new Client(
   {
@@ -26,3 +26,4 @@ console.log(templates);
 const prompts = await client.listPrompts();
 console.log(prompts);
 await client.close();
+await transport.close();

crates/rmcp/tests/test_with_js/server.js

@@ -32,4 +32,4 @@ server.tool(
 );
 
 const transport = new StdioServerTransport();
-await server.connect(transport);
+await server.connect(transport);