update deps, breaking: streamable-http now started at /mcp route

Signed-off-by: Tuan Anh Tran <[email protected]>

Author: tuananh

Cargo.lock

@@ -31,10 +31,11 @@ log = "=0.4.27"
 sigstore = { version = "=0.12.1", features = ["cosign", "verify", "bundle"] }
 tracing = "=0.1.41"
 tracing-subscriber = { version = "=0.3.19", features = ["env-filter"] }
-rmcp = { git = "https://github.com/modelcontextprotocol/rust-sdk", rev = "22134eb33e249a3b3ae6c0153b0176e4dd532220", features = ["server", "transport-io", "transport-sse-server", "transport-streamable-http-server"] }
+rmcp = { git = "https://github.com/modelcontextprotocol/rust-sdk", rev = "a66f66ae345a0fafde1e2ee496ec137d77aef82a", features = ["server", "transport-io", "transport-sse-server", "transport-streamable-http-server"] }
 serde_yaml = "=0.9.34"
 toml = "=0.8.22"
 bytesize = "=2.0.1"
+axum = "=0.8.4"
 
 [[bin]]
 name = "hyper-mcp"

Cargo.toml

@@ -1,7 +1,9 @@
 use anyhow::Result;
 use clap::Parser;
 use rmcp::transport::sse_server::SseServer;
-use rmcp::transport::streamable_http_server::axum::StreamableHttpServer;
+use rmcp::transport::streamable_http_server::{
+    StreamableHttpService, session::local::LocalSessionManager,
+};
 use rmcp::{ServiceExt, transport::stdio};
 use std::path::PathBuf;
 use tracing_subscriber::{self, EnvFilter};
@@ -10,9 +12,6 @@ mod config;
 mod oci;
 mod plugins;
 
-pub const JSONRPC_VERSION: &str = "2.0";
-pub const SERVER_NAME: &str = "hyper-mcp";
-pub const SERVER_VERSION: &str = "0.1.0";
 pub const DEFAULT_BIND_ADDRESS: &str = "127.0.0.1:3001";
 
 #[derive(Parser, Clone)]
@@ -138,7 +137,10 @@ async fn main() -> Result<()> {
             service.waiting().await?;
         }
         "sse" => {
-            tracing::info!("Starting SSE server at {}", cli.bind_address);
+            tracing::info!(
+                "Starting hyper-mcp with SSE transport at {}",
+                cli.bind_address
+            );
             let ct = SseServer::serve(cli.bind_address.parse()?)
                 .await?
                 .with_service(move || plugin_service.clone());
@@ -147,13 +149,29 @@ async fn main() -> Result<()> {
             ct.cancel();
         }
         "streamable-http" => {
-            tracing::info!("Starting Streamable HTTP server at {}", cli.bind_address);
-            let ct = StreamableHttpServer::serve(cli.bind_address.parse()?)
-                .await?
-                .with_service(move || plugin_service.clone());
-
-            tokio::signal::ctrl_c().await?;
-            ct.cancel();
+            tracing::info!(
+                "Starting hyper-mcp with streamable-http transport at {}",
+                cli.bind_address
+            );
+
+            let service = StreamableHttpService::new(
+                move || plugin_service.clone(),
+                LocalSessionManager::default().into(),
+                Default::default(),
+            );
+
+            let router = axum::Router::new().nest_service("/mcp", service);
+
+            let tcp_listener = tokio::net::TcpListener::bind(cli.bind_address).await?;
+            let _ = axum::serve(tcp_listener, router)
+                .with_graceful_shutdown(async {
+                    tokio::signal::ctrl_c().await.unwrap();
+                    tracing::info!("Received Ctrl+C, shutting down hyper-mcp server...");
+                    // Give the log a moment to flush
+                    tokio::time::sleep(std::time::Duration::from_millis(100)).await;
+                    std::process::exit(0);
+                })
+                .await;
         }
         _ => unreachable!(),
     }

src/main.rs

@@ -4,7 +4,7 @@ use crate::oci::OciDownloader;
 use anyhow::Result;
 use bytesize::ByteSize;
 use extism::{Manifest, Plugin, Wasm};
-use rmcp::service::{RequestContext, RoleServer};
+use rmcp::service::{NotificationContext, RequestContext, RoleServer};
 use rmcp::{Error as McpError, ServerHandler, model::*};
 use std::str::FromStr;
 
@@ -278,21 +278,26 @@ impl ServerHandler for PluginService {
         std::future::ready(Ok(()))
     }
 
-    fn on_initialized(&self) -> impl Future<Output = ()> + Send + '_ {
+    fn on_initialized(
+        &self,
+        _context: NotificationContext<RoleServer>,
+    ) -> impl Future<Output = ()> + Send + '_ {
         tracing::info!("got initialized notification");
         std::future::ready(())
     }
 
     fn on_cancelled(
         &self,
         _notification: CancelledNotificationParam,
+        _context: NotificationContext<RoleServer>,
     ) -> impl Future<Output = ()> + Send + '_ {
         std::future::ready(())
     }
 
     fn on_progress(
         &self,
         _notification: ProgressNotificationParam,
+        _context: NotificationContext<RoleServer>,
     ) -> impl Future<Output = ()> + Send + '_ {
         std::future::ready(())
     }