refactor: refactor tool macros and router implementation (#261)

* refactor: refactor tool macros and router implementation

- Updated the `#[tool(tool_box)]` macro to `#[tool_router]` across various modules for consistency.
- Enhanced the `Calculator`, `Counter`, and `GenericService` structs to utilize `ToolRouter` for handling tool calls.
- Introduced `Parameters` struct for better parameter handling in tool functions.
- Added new methods for listing tools and calling tools in server handlers.
- Improved test cases to reflect changes in tool routing and parameter handling.
- Updated documentation and examples to align with the new router structure.

* fix: fix fmt and build error

* fix: fix test failure

* docs: documents for macros, fix ci

* fix: fix ci

* fix: fix wrongly replaced documents

* fix: remove useless file

* fix: change the parameter format for tool_router

* fix: update extract_doc_line to handle existing documentation and clean up unused code in server handler

* doc: update document for macro and examples

* doc: update readme and add contribute guide

* fix: fix type

examples/wasi/src/calculator.rs

@@ -1,41 +1,58 @@
+#![allow(dead_code)]
+
 use rmcp::{
     ServerHandler,
+    handler::server::{router::tool::ToolRouter, tool::Parameters, wrapper::Json},
     model::{ServerCapabilities, ServerInfo},
-    schemars, tool, tool_box,
+    schemars, tool, tool_handler, tool_router,
 };
 
-#[derive(Debug, rmcp::serde::Deserialize, schemars::JsonSchema)]
+#[derive(Debug, serde::Deserialize, schemars::JsonSchema)]
 pub struct SumRequest {
     #[schemars(description = "the left hand side number")]
     pub a: i32,
     pub b: i32,
 }
+
+#[derive(Debug, serde::Deserialize, schemars::JsonSchema)]
+pub struct SubRequest {
+    #[schemars(description = "the left hand side number")]
+    pub a: i32,
+    #[schemars(description = "the right hand side number")]
+    pub b: i32,
+}
+
 #[derive(Debug, Clone)]
-pub struct Calculator;
+pub struct Calculator {
+    tool_router: ToolRouter<Self>,
+}
+
+impl Default for Calculator {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+#[tool_router]
 impl Calculator {
+    pub fn new() -> Self {
+        Self {
+            tool_router: Self::tool_router(),
+        }
+    }
+
     #[tool(description = "Calculate the sum of two numbers")]
-    fn sum(&self, #[tool(aggr)] SumRequest { a, b }: SumRequest) -> String {
+    fn sum(&self, Parameters(SumRequest { a, b }): Parameters<SumRequest>) -> String {
         (a + b).to_string()
     }
 
-    #[tool(description = "Calculate the sub of two numbers")]
-    fn sub(
-        &self,
-        #[tool(param)]
-        #[schemars(description = "the left hand side number")]
-        a: i32,
-        #[tool(param)]
-        #[schemars(description = "the right hand side number")]
-        b: i32,
-    ) -> String {
-        (a - b).to_string()
+    #[tool(description = "Calculate the difference of two numbers")]
+    fn sub(&self, Parameters(SubRequest { a, b }): Parameters<SubRequest>) -> Json<i32> {
+        Json(a - b)
     }
-
-    tool_box!(Calculator { sum, sub });
 }
-
+#[tool_handler]
 impl ServerHandler for Calculator {
-    tool_box!(@derive);
     fn get_info(&self) -> ServerInfo {
         ServerInfo {
             instructions: Some("A simple calculator".into()),

examples/wasi/src/lib.rs

@@ -112,7 +112,10 @@ impl wasi::exports::cli::run::Guest for TokioCliRunner {
                 .with_writer(std::io::stderr)
                 .with_ansi(false)
                 .init();
-            let server = calculator::Calculator.serve(wasi_io()).await.unwrap();
+            let server = calculator::Calculator::new()
+                .serve(wasi_io())
+                .await
+                .unwrap();
             server.waiting().await.unwrap();
         });
         Ok(())