feat(macros): auto-generate get_info and default router (#785)

* feat(macros): auto-generate get_info and default router

* docs: simplify examples and docs with new defaults

* feat(macros): add tool_router(server_handler) to elide separate #[tool_handler] impl

* docs: add Tools section to README and simplify calculator examples with server_handler
This commit is contained in:
Dale Seo 2026-04-08 15:06:26 -04:00 • committed by GitHub
commit be321a4abe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 742 additions and 233 deletions

View file

@ -2,11 +2,7 @@
use rmcp::{
ServerHandler,
handler::server::{
router::tool::ToolRouter,
wrapper::{Json, Parameters},
},
model::{ServerCapabilities, ServerInfo},
handler::server::wrapper::{Json, Parameters},
schemars, tool, tool_handler, tool_router,
};
@ -26,17 +22,7 @@ pub struct SubRequest {
}
#[derive(Debug, Clone)]
pub struct Calculator {
tool_router: ToolRouter<Self>,
}
impl Calculator {
pub fn new() -> Self {
Self {
tool_router: Self::tool_router(),
}
}
}
pub struct Calculator;
#[tool_router]
impl Calculator {
@ -50,10 +36,5 @@ impl Calculator {
Json(a - b)
}
}
#[tool_handler]
impl ServerHandler for Calculator {
fn get_info(&self) -> ServerInfo {
ServerInfo::new(ServerCapabilities::builder().enable_tools().build())
.with_instructions("A simple calculator")
}
}
#[tool_handler(instructions = "A simple calculator")]
impl ServerHandler for Calculator {}

View file

@ -24,7 +24,7 @@ async fn main() -> anyhow::Result<()> {
async fn http_server(req: Request<Incoming>) -> Result<hyper::Response<String>, hyper::Error> {
tokio::spawn(async move {
let upgraded = hyper::upgrade::on(req).await?;
let service = Calculator::new().serve(TokioIo::new(upgraded)).await?;
let service = Calculator.serve(TokioIo::new(upgraded)).await?;
service.waiting().await?;
anyhow::Result::<()>::Ok(())
});

View file

@ -16,7 +16,7 @@ async fn main() -> anyhow::Result<()> {
let stream = server;
server = ServerOptions::new().create(name)?;
tokio::spawn(async move {
match serve_server(Calculator::new(), stream).await {
match serve_server(Calculator, stream).await {
Ok(server) => {
println!("Server initialized successfully");
if let Err(e) = server.waiting().await {

View file

@ -13,7 +13,7 @@ async fn server() -> anyhow::Result<()> {
let tcp_listener = tokio::net::TcpListener::bind("127.0.0.1:8001").await?;
while let Ok((stream, _)) = tcp_listener.accept().await {
tokio::spawn(async move {
let server = serve_server(Calculator::new(), stream).await?;
let server = serve_server(Calculator, stream).await?;
server.waiting().await?;
anyhow::Ok(())
});

View file

@ -14,7 +14,7 @@ async fn main() -> anyhow::Result<()> {
while let Ok((stream, addr)) = unix_listener.accept().await {
println!("Client connected: {:?}", addr);
tokio::spawn(async move {
match serve_server(Calculator::new(), stream).await {
match serve_server(Calculator, stream).await {
Ok(server) => {
println!("Server initialized successfully");
if let Err(e) = server.waiting().await {

View file

@ -40,7 +40,7 @@ async fn start_server() -> anyhow::Result<()> {
tokio::spawn(async move {
let ws_stream = tokio_tungstenite::accept_async(stream).await?;
let transport = WebsocketTransport::new_server(ws_stream);
let server = Calculator::new().serve(transport).await?;
let server = Calculator.serve(transport).await?;
server.waiting().await?;
Ok::<(), anyhow::Error>(())
});