From d140d9416623333c03b832fcd81fe8d983ac0523 Mon Sep 17 00:00:00 2001 From: milan Date: Sun, 24 May 2026 13:03:02 +0200 Subject: [PATCH] bump version --- Cargo.lock | 2 +- mcp_server_collection/Cargo.lock | 2 +- mcp_server_collection/Cargo.toml | 2 +- mcp_server_collection/src/caldav/client.rs | 4 ++-- mcp_server_collection/src/caldav/mod.rs | 7 ++----- mcp_server_collection/src/config.rs | 3 ++- mcp_server_collection/src/datetime.rs | 9 ++------- mcp_server_collection/src/lib.rs | 2 +- 8 files changed, 12 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0716078..4596900 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1503,7 +1503,7 @@ checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" [[package]] name = "mcp_server_collection" -version = "0.2.1" +version = "0.2.2" dependencies = [ "axum", "chrono", diff --git a/mcp_server_collection/Cargo.lock b/mcp_server_collection/Cargo.lock index 8be54ac..669e489 100644 --- a/mcp_server_collection/Cargo.lock +++ b/mcp_server_collection/Cargo.lock @@ -924,7 +924,7 @@ checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" [[package]] name = "mcp_server_collection" -version = "0.2.1" +version = "0.2.2" dependencies = [ "axum", "chrono", diff --git a/mcp_server_collection/Cargo.toml b/mcp_server_collection/Cargo.toml index 2e0e74d..3da79c9 100644 --- a/mcp_server_collection/Cargo.toml +++ b/mcp_server_collection/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mcp_server_collection" -version = "0.2.1" +version = "0.2.2" edition = "2024" [dependencies] diff --git a/mcp_server_collection/src/caldav/client.rs b/mcp_server_collection/src/caldav/client.rs index a60f0cd..6d83f54 100644 --- a/mcp_server_collection/src/caldav/client.rs +++ b/mcp_server_collection/src/caldav/client.rs @@ -85,12 +85,12 @@ pub(crate) async fn find_calendars( .ok_or(NoUserPrincipal)?; let calendar_home_sets = caldav_client - .request(FindCalendarHomeSet::new(&user_principal.path())) + .request(FindCalendarHomeSet::new(user_principal.path())) .await? .home_sets; Ok(caldav_client - .request(FindCalendars::new(&calendar_home_sets[0].path())) + .request(FindCalendars::new(calendar_home_sets[0].path())) .await? .calendars) } diff --git a/mcp_server_collection/src/caldav/mod.rs b/mcp_server_collection/src/caldav/mod.rs index 19c2800..90cec72 100644 --- a/mcp_server_collection/src/caldav/mod.rs +++ b/mcp_server_collection/src/caldav/mod.rs @@ -10,7 +10,6 @@ use crate::server_handler::{ use http::Uri; use icalendar::{Event, EventLike, Todo}; use libdav::dav::FoundCollection; -use rmcp::handler::server::tool::ToolRouter; use rmcp::handler::server::wrapper::Parameters; use rmcp::model::{CallToolResult, ErrorCode, Implementation, ServerCapabilities, ServerInfo}; use rmcp::schemars::JsonSchema; @@ -31,7 +30,6 @@ mod todo; pub(crate) struct CalDavHandler { client: AuthorizedCaldavClient, calendar_references: Vec, - tool_router: ToolRouter, default_calendar_name: String, } @@ -95,7 +93,6 @@ impl McpServerHandler for CalDavHandler { Ok(Self { client, calendar_references, - tool_router: Self::tool_router(), default_calendar_name: default_calendar, }) } @@ -209,7 +206,7 @@ impl CalDavHandler { if let Some(event_component) = component.as_event() { let event: McpEvent = event_component.clone().try_into()?; - let lower_bound = Local::now().with_timezone(&icalendar::Tz::Local(chrono::Local)); + let lower_bound = Local::now().with_timezone(&icalendar::Tz::Local(Local)); let upper_bound = lower_bound + DAYS_DELTA; let recurrence = event_component.get_recurrence(); @@ -219,7 +216,7 @@ impl CalDavHandler { for date in recurrence_result.dates { let mut event_instance = event.clone(); - event_instance.start = Some(date.with_timezone(&chrono::Local{})); + event_instance.start = Some(date.with_timezone(&Local{})); if let Some(start) = event.start && let Some(end) = event.end { let event_duration = end-start; diff --git a/mcp_server_collection/src/config.rs b/mcp_server_collection/src/config.rs index f34f37e..0e5ffde 100644 --- a/mcp_server_collection/src/config.rs +++ b/mcp_server_collection/src/config.rs @@ -14,7 +14,8 @@ pub struct Config { #[derive(Debug, Clone, Deserialize, Serialize)] pub struct ServerConfig { pub path: String, - pub r#type: McpServiceType, + #[serde(rename = "type")] + pub service_type: McpServiceType, #[serde(rename = "additional-properties", default = "Map::new")] pub additional_properties: Map, } diff --git a/mcp_server_collection/src/datetime.rs b/mcp_server_collection/src/datetime.rs index 3aeebd2..88fb807 100644 --- a/mcp_server_collection/src/datetime.rs +++ b/mcp_server_collection/src/datetime.rs @@ -1,23 +1,18 @@ use crate::server_handler::{McpServerHandler, McpServerHandlerError}; use chrono::{Datelike, Local, Utc}; -use rmcp::handler::server::tool::ToolRouter; use rmcp::model::{Implementation, ServerCapabilities, ServerInfo}; use rmcp::{ServerHandler, tool, tool_handler, tool_router}; use toml::Value; use toml::map::Map; #[derive(Debug, Clone)] -pub(crate) struct DateTimeHandler { - tool_router: ToolRouter, -} +pub(crate) struct DateTimeHandler; impl McpServerHandler for DateTimeHandler { async fn new( _additional_properties: Map, ) -> Result { - Ok(DateTimeHandler { - tool_router: Self::tool_router(), - }) + Ok(DateTimeHandler {}) } } diff --git a/mcp_server_collection/src/lib.rs b/mcp_server_collection/src/lib.rs index c03d478..9ae8904 100644 --- a/mcp_server_collection/src/lib.rs +++ b/mcp_server_collection/src/lib.rs @@ -33,7 +33,7 @@ pub(crate) async fn mcp_router( let mut router = Router::new(); for config in server_configs { - router = match config.r#type { + router = match config.service_type { #[cfg(feature = "datetime")] McpServiceType::DateTime => router.route_service( config.path.as_str(),