Merge branch 'main' into cleanup-zombie-processes-for-child-process-client

Author: humbertoyusta

README.md

@@ -192,13 +192,15 @@ See [examples](examples/README.md)
 - `client`: use client side sdk
 - `server`: use server side sdk
 - `macros`: macros default
+- `schemars`: implement `JsonSchema` for all model structs
 
 ### Transports
 
 - `transport-io`: Server stdio transport
 - `transport-sse-server`: Server SSE transport
 - `transport-child-process`: Client stdio transport
 - `transport-sse`: Client sse transport
+- `transport-streamable-http-server` streamable http server transport
 
 ## Related Resources
 

clippy.toml

@@ -0,0 +1,3 @@
+msrv = "1.85"
+too-many-arguments-threshold = 10
+check-private-items = false

crates/rmcp/Cargo.toml

@@ -28,7 +28,7 @@ paste = { version = "1", optional = true }
 oauth2 = { version = "5.0", optional = true }
 
 # for auto generate schema
-schemars = { version = "0.8", optional = true }
+schemars = { version = "0.8", optional = true, features = ["chrono"] }
 
 # for image encoding
 base64 = { version = "0.21", optional = true }
@@ -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 }
@@ -51,10 +50,11 @@ process-wrap = { version = "8.2", features = ["tokio1"], optional = true}
 # for ws transport
 # tokio-tungstenite ={ version = "0.26", optional = true }
 
-# for sse-server transport
+# for http-server transport
 axum = { version = "0.8", features = [], optional = true }
 rand = { version = "0.9", optional = true }
 tokio-stream = { version = "0.1", optional = true }
+uuid = { version = "1", features = ["v4"], optional = true }
 
 # macro
 rmcp-macros = { version = "0.1", workspace = true, optional = true }
@@ -64,7 +64,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 = [
@@ -77,10 +79,23 @@ transport-sse-server = [
     "dep:axum",
     "dep:rand",
     "dep:tokio-stream",
+    "uuid",
+]
+transport-streamable-http-server = [
+    "transport-streamable-http-server-session",
+    "dep:axum",
+    "uuid",
+]
+transport-streamable-http-server-session = [
+    "transport-async-rw",
+    "dep:tokio-stream",
 ]
 # transport-ws = ["transport-io", "dep:tokio-tungstenite"]
 tower = ["dep:tower-service"]
-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"]
+schemars = ["dep:schemars"]
 
 [dev-dependencies]
 tokio = { version = "1", features = ["full"] }
@@ -105,7 +120,7 @@ path = "tests/test_with_python.rs"
 
 [[test]]
 name = "test_with_js"
-required-features = ["server", "client", "transport-sse-server", "transport-child-process"]
+required-features = ["server", "client", "transport-sse-server", "transport-child-process", "transport-streamable-http-server"]
 path = "tests/test_with_js.rs"
 
 [[test]]
@@ -123,3 +138,8 @@ name = "test_message_protocol"
 required-features = ["client"]
 path = "tests/test_message_protocol.rs"
 
+[[test]]
+name = "test_message_schema"
+required-features = ["server", "client", "schemars"]
+path = "tests/test_message_schema.rs"
+

crates/rmcp/src/handler/server/tool.rs

@@ -14,7 +14,15 @@ use crate::{
 };
 /// A shortcut for generating a JSON schema for a type.
 pub fn schema_for_type<T: JsonSchema>() -> JsonObject {
-    let schema = schemars::r#gen::SchemaGenerator::default().into_root_schema_for::<T>();
+    let mut settings = schemars::r#gen::SchemaSettings::default();
+    settings.option_nullable = true;
+    settings.option_add_null_type = false;
+    settings.definitions_path = "#/components/schemas/".to_owned();
+    settings.meta_schema = None;
+    settings.visitors = Vec::default();
+    settings.inline_subschemas = false;
+    let generator = settings.into_generator();
+    let schema = generator.into_root_schema_for::<T>();
     let object = serde_json::to_value(schema).expect("failed to serialize schema");
     match object {
         serde_json::Value::Object(object) => object,