Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 29 additions & 55 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ walkdir = "2.3.3"
warp = "0.3"

# MCP server dependencies
rmcp = { version = "0.12", features = ["schemars", "server", "transport-io"] }
schemars = "0.8"
rmcp = { version = "1.4", default-features = false, features = ["macros", "server", "schemars", "transport-io"] }
schemars = "1"

[dev-dependencies]
envtestkit = "1.1.2"
Expand Down
31 changes: 12 additions & 19 deletions src/mcp/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

use std::sync::Arc;

use rmcp::handler::server::router::tool::ToolRouter;
use rmcp::handler::server::wrapper::Parameters;
use rmcp::model::{ServerCapabilities, ServerInfo};
use rmcp::{schemars, tool, tool_handler, tool_router, ServiceExt};
Expand Down Expand Up @@ -191,7 +190,6 @@ pub struct AppUuidParam {
#[derive(Clone)]
pub struct ScreenlyMcpServer {
auth: Arc<Authentication>,
tool_router: ToolRouter<Self>,
}

impl ScreenlyMcpServer {
Expand All @@ -200,7 +198,6 @@ impl ScreenlyMcpServer {
let auth = Authentication::new()?;
Ok(Self {
auth: Arc::new(auth),
tool_router: Self::tool_router(),
})
}

Expand Down Expand Up @@ -610,21 +607,17 @@ impl ScreenlyMcpServer {
#[tool_handler]
impl rmcp::ServerHandler for ScreenlyMcpServer {
fn get_info(&self) -> ServerInfo {
ServerInfo {
instructions: Some(
"Screenly MCP Server - Manage digital signage screens, assets, and playlists. \
Use API_TOKEN environment variable or ~/.screenly file for authentication.\n\n\
PLAYLIST PREDICATES: Playlists use a predicate DSL for scheduling. Variables: \
$DATE (Unix ms), $TIME (ms since midnight, 0-86400000), $WEEKDAY (0=Sun..6=Sat). \
Operators: =, <=, >=, <, >, AND, OR, NOT, BETWEEN {min,max}, IN {values}. \
Examples: 'TRUE' (always show), '$WEEKDAY IN {1,2,3,4,5}' (weekdays only), \
'$TIME BETWEEN {32400000, 61200000}' (9AM-5PM), \
'$TIME >= 32400000 AND $TIME <= 61200000 AND NOT $WEEKDAY IN {0, 6}' (business hours). \
Time reference: 32400000=9AM, 43200000=12PM, 61200000=5PM, 72000000=8PM."
.to_string(),
),
capabilities: ServerCapabilities::builder().enable_tools().build(),
..Default::default()
}
// ServerInfo is #[non_exhaustive] in rmcp 1.x; use its builder instead of a struct literal.
ServerInfo::new(ServerCapabilities::builder().enable_tools().build()).with_instructions(
"Screenly MCP Server - Manage digital signage screens, assets, and playlists. \
Use API_TOKEN environment variable or ~/.screenly file for authentication.\n\n\
PLAYLIST PREDICATES: Playlists use a predicate DSL for scheduling. Variables: \
$DATE (Unix ms), $TIME (ms since midnight, 0-86400000), $WEEKDAY (0=Sun..6=Sat). \
Operators: =, <=, >=, <, >, AND, OR, NOT, BETWEEN {min,max}, IN {values}. \
Examples: 'TRUE' (always show), '$WEEKDAY IN {1,2,3,4,5}' (weekdays only), \
'$TIME BETWEEN {32400000, 61200000}' (9AM-5PM), \
'$TIME >= 32400000 AND $TIME <= 61200000 AND NOT $WEEKDAY IN {0, 6}' (business hours). \
Time reference: 32400000=9AM, 43200000=12PM, 61200000=5PM, 72000000=8PM.",
)
}
}
Loading