feat: provide more context information#236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
4t145 merged 2 commits into from
May 29, 2025
Merged

feat: provide more context information #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
588c39c
feat: provide more context information
4t145 May 28, 2025
cefeb83
docs: add document for getting peer from context
4t145 May 29, 2025
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
33 changes: 33 additions & 0 deletions crates/rmcp/README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,6 +146,39 @@ let service = client.serve(transport).await?;



## Access with peer interface when handling message

You can get the [`Peer`](crate::service::Peer) struct from [`NotificationContext`](crate::service::NotificationContext) and [`RequestContext`](crate::service::RequestContext).

```rust, ignore
# use rmcp::{
# ServerHandler,
# model::{LoggingLevel, LoggingMessageNotificationParam, ProgressNotificationParam},
# service::{NotificationContext, RoleServer},
# };
# pub struct Handler;

impl ServerHandler for Handler {
async fn on_progress(
&self,
notification: ProgressNotificationParam,
context: NotificationContext<RoleServer>,
) {
let peer = context.peer;
let _ = peer
.notify_logging_message(LoggingMessageNotificationParam {
level: LoggingLevel::Info,
logger: None,
data: serde_json::json!({
"message": format!("Progress: {}", notification.progress),
}),
})
.await;
}
}
```


## Manage Multi Services

For many cases you need to manage several service in a collection, you can call `into_dyn` to convert services into the same type.
Expand Down
36 changes: 25 additions & 11 deletions crates/rmcp/src/handler/client.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
use crate::{
error::Error as McpError,
model::*,
service::{RequestContext, RoleClient, Service, ServiceRole},
service::{NotificationContext, RequestContext, RoleClient, Service, ServiceRole},
};

impl<H: ClientHandler> Service<RoleClient> for H {
Expand All@@ -26,28 +26,29 @@ impl<H: ClientHandler> Service<RoleClient> for H {
async fn handle_notification(
&self,
notification: <RoleClient as ServiceRole>::PeerNot,
context: NotificationContext<RoleClient>,
) -> Result<(), McpError> {
match notification {
ServerNotification::CancelledNotification(notification) => {
self.on_cancelled(notification.params).await
self.on_cancelled(notification.params, context).await
}
ServerNotification::ProgressNotification(notification) => {
self.on_progress(notification.params).await
self.on_progress(notification.params, context).await
}
ServerNotification::LoggingMessageNotification(notification) => {
self.on_logging_message(notification.params).await
self.on_logging_message(notification.params, context).await
}
ServerNotification::ResourceUpdatedNotification(notification) => {
self.on_resource_updated(notification.params).await
self.on_resource_updated(notification.params, context).await
}
ServerNotification::ResourceListChangedNotification(_notification_no_param) => {
self.on_resource_list_changed().await
self.on_resource_list_changed(context).await
}
ServerNotification::ToolListChangedNotification(_notification_no_param) => {
self.on_tool_list_changed().await
self.on_tool_list_changed(context).await
}
ServerNotification::PromptListChangedNotification(_notification_no_param) => {
self.on_prompt_list_changed().await
self.on_prompt_list_changed(context).await
}
};
Ok(())
Expand DownExpand Up@@ -87,34 +88,47 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
fn on_cancelled(
&self,
params: CancelledNotificationParam,
context: NotificationContext<RoleClient>,
) -> impl Future<Output = ()> + Send + '_ {
std::future::ready(())
}
fn on_progress(
&self,
params: ProgressNotificationParam,
context: NotificationContext<RoleClient>,
) -> impl Future<Output = ()> + Send + '_ {
std::future::ready(())
}
fn on_logging_message(
&self,
params: LoggingMessageNotificationParam,
context: NotificationContext<RoleClient>,
) -> impl Future<Output = ()> + Send + '_ {
std::future::ready(())
}
fn on_resource_updated(
&self,
params: ResourceUpdatedNotificationParam,
context: NotificationContext<RoleClient>,
) -> impl Future<Output = ()> + Send + '_ {
std::future::ready(())
}
fn on_resource_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
fn on_resource_list_changed(
&self,
context: NotificationContext<RoleClient>,
) -> impl Future<Output = ()> + Send + '_ {
std::future::ready(())
}
fn on_tool_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
fn on_tool_list_changed(
&self,
context: NotificationContext<RoleClient>,
) -> impl Future<Output = ()> + Send + '_ {
std::future::ready(())
}
fn on_prompt_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
fn on_prompt_list_changed(
&self,
context: NotificationContext<RoleClient>,
) -> impl Future<Output = ()> + Send + '_ {
std::future::ready(())
}

Expand Down
23 changes: 16 additions & 7 deletions crates/rmcp/src/handler/server.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
use crate::{
error::Error as McpError,
model::*,
service::{RequestContext, RoleServer, Service, ServiceRole},
service::{NotificationContext, RequestContext, RoleServer, Service, ServiceRole},
};

mod resource;
Expand DownExpand Up@@ -71,19 +71,20 @@ impl<H: ServerHandler> Service<RoleServer> for H {
async fn handle_notification(
&self,
notification: <RoleServer as ServiceRole>::PeerNot,
context: NotificationContext<RoleServer>,
) -> Result<(), McpError> {
match notification {
ClientNotification::CancelledNotification(notification) => {
self.on_cancelled(notification.params).await
self.on_cancelled(notification.params, context).await
}
ClientNotification::ProgressNotification(notification) => {
self.on_progress(notification.params).await
self.on_progress(notification.params, context).await
}
ClientNotification::InitializedNotification(_notification) => {
self.on_initialized().await
self.on_initialized(context).await
}
ClientNotification::RootsListChangedNotification(_notification) => {
self.on_roots_list_changed().await
self.on_roots_list_changed(context).await
}
};
Ok(())
Expand DownExpand Up@@ -196,20 +197,28 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
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(())
}
fn on_initialized(&self) -> impl Future<Output = ()> + Send + '_ {
fn on_initialized(
&self,
context: NotificationContext<RoleServer>,
) -> impl Future<Output = ()> + Send + '_ {
tracing::info!("client initialized");
std::future::ready(())
}
fn on_roots_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
fn on_roots_list_changed(
&self,
context: NotificationContext<RoleServer>,
) -> impl Future<Output = ()> + Send + '_ {
std::future::ready(())
}

Expand Down
36 changes: 36 additions & 0 deletions crates/rmcp/src/handler/server/tool.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -320,6 +320,42 @@ where
}
}

impl<'a, S> FromToolCallContextPart<'a, S> for crate::Peer<RoleServer> {
fn from_tool_call_context_part(
context: ToolCallContext<'a, S>,
) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
let peer = context.request_context.peer.clone();
Ok((peer, context))
}
}

impl<'a, S> FromToolCallContextPart<'a, S> for crate::model::Meta {
fn from_tool_call_context_part(
mut context: ToolCallContext<'a, S>,
) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
let mut meta = crate::model::Meta::default();
std::mem::swap(&mut meta, &mut context.request_context.meta);
Ok((meta, context))
}
}

pub struct RequestId(pub crate::model::RequestId);
impl<'a, S> FromToolCallContextPart<'a, S> for RequestId {
fn from_tool_call_context_part(
context: ToolCallContext<'a, S>,
) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
Ok((RequestId(context.request_context.id.clone()), context))
}
}

impl<'a, S> FromToolCallContextPart<'a, S> for RequestContext<RoleServer> {
fn from_tool_call_context_part(
context: ToolCallContext<'a, S>,
) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
Ok((context.request_context.clone(), context))
}
}

impl<'s, S> ToolCallContext<'s, S> {
pub fn invoke<H, A>(self, h: H) -> H::Fut
where
Expand Down
2 changes: 1 addition & 1 deletion crates/rmcp/src/model/extension.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ pub struct Extensions {
impl Extensions {
/// Create an empty `Extensions`.
#[inline]
pub fn new() -> Extensions {
pub const fn new() -> Extensions {
Extensions { map: None }
}

Expand Down
58 changes: 48 additions & 10 deletions crates/rmcp/src/service.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,9 @@ pub trait ServiceRole: std::fmt::Debug + Send + Sync + 'static + Copy + Clone {
type PeerResp: TransferObject;
type PeerNot: TryInto<CancelledNotification, Error = Self::PeerNot>
+ From<CancelledNotification>
+ TransferObject;
+ TransferObject
+ GetMeta
+ GetExtensions;
type InitializeError<E>;
const IS_CLIENT: bool;
type Info: TransferObject;
Expand All@@ -100,6 +102,7 @@ pub trait Service<R: ServiceRole>: Send + Sync + 'static {
fn handle_notification(
&self,
notification: R::PeerNot,
context: NotificationContext<R>,
) -> impl Future<Output = Result<(), McpError>> + Send + '_;
fn get_info(&self) -> R::Info;
}
Expand DownExpand Up@@ -145,8 +148,9 @@ impl<R: ServiceRole> Service<R> for Box<dyn DynService<R>> {
fn handle_notification(
&self,
notification: R::PeerNot,
context: NotificationContext<R>,
) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
DynService::handle_notification(self.as_ref(), notification)
DynService::handle_notification(self.as_ref(), notification, context)
}

fn get_info(&self) -> R::Info {
Expand All@@ -160,7 +164,11 @@ pub trait DynService<R: ServiceRole>: Send + Sync {
request: R::PeerReq,
context: RequestContext<R>,
) -> BoxFuture<Result<R::Resp, McpError>>;
fn handle_notification(&self, notification: R::PeerNot) -> BoxFuture<Result<(), McpError>>;
fn handle_notification(
&self,
notification: R::PeerNot,
context: NotificationContext<R>,
) -> BoxFuture<Result<(), McpError>>;
fn get_info(&self) -> R::Info;
}

Expand All@@ -172,8 +180,12 @@ impl<R: ServiceRole, S: Service<R>> DynService<R> for S {
) -> BoxFuture<Result<R::Resp, McpError>> {
Box::pin(self.handle_request(request, context))
}
fn handle_notification(&self, notification: R::PeerNot) -> BoxFuture<Result<(), McpError>> {
Box::pin(self.handle_notification(notification))
fn handle_notification(
&self,
notification: R::PeerNot,
context: NotificationContext<R>,
) -> BoxFuture<Result<(), McpError>> {
Box::pin(self.handle_notification(notification, context))
}
fn get_info(&self) -> R::Info {
self.get_info()
Expand DownExpand Up@@ -487,6 +499,15 @@ pub struct RequestContext<R: ServiceRole> {
pub peer: Peer<R>,
}

/// Request execution context
#[derive(Debug, Clone)]
pub struct NotificationContext<R: ServiceRole> {
pub meta: Meta,
pub extensions: Extensions,
/// An interface to fetch the remote client or server
pub peer: Peer<R>,
}

/// Use this function to skip initialization process
pub fn serve_directly<R, S, T, E, A>(
service: S,
Expand DownExpand Up@@ -710,7 +731,9 @@ where
}));
}
Event::PeerMessage(JsonRpcMessage::Request(JsonRpcRequest {
id, request, ..
id,
mut request,
..
})) => {
tracing::debug!(%id, ?request, "received request");
{
Expand All@@ -719,12 +742,17 @@ where
let request_ct = serve_loop_ct.child_token();
let context_ct = request_ct.child_token();
local_ct_pool.insert(id.clone(), request_ct);
let mut extensions = Extensions::new();
let mut meta = Meta::new();
// avoid clone
std::mem::swap(&mut extensions, request.extensions_mut());
std::mem::swap(&mut meta, request.get_meta_mut());
let context = RequestContext {
ct: context_ct,
id: id.clone(),
peer: peer.clone(),
meta: request.get_meta().clone(),
extensions: request.extensions().clone(),
meta,
extensions,
};
tokio::spawn(async move {
let result = service.handle_request(request, context).await;
Expand All@@ -748,7 +776,7 @@ where
})) => {
tracing::info!(?notification, "received notification");
// catch cancelled notification
let notification = match notification.try_into() {
let mut notification = match notification.try_into() {
Ok::<CancelledNotification, _>(cancelled) => {
if let Some(ct) = local_ct_pool.remove(&cancelled.params.request_id) {
tracing::info!(id = %cancelled.params.request_id, reason = cancelled.params.reason, "cancelled");
Expand All@@ -760,8 +788,18 @@ where
};
{
let service = shared_service.clone();
let mut extensions = Extensions::new();
let mut meta = Meta::new();
// avoid clone
std::mem::swap(&mut extensions, notification.extensions_mut());
std::mem::swap(&mut meta, notification.get_meta_mut());
let context = NotificationContext {
peer: peer.clone(),
meta,
extensions,
};
tokio::spawn(async move {
let result = service.handle_notification(notification).await;
let result = service.handle_notification(notification, context).await;
if let Err(error) = result {
tracing::warn!(%error, "Error sending notification");
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feat: provide more context information#236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

4t145
merged 2 commits into

from

May 29, 2025
 Merged


feat: provide more context information
#236
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
588c39c

feat: provide more context information


4t145 May 28, 2025
cefeb83

docs: add document for getting peer from context


4t145 May 29, 2025

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


33 changes: 33 additions & 0 deletions
crates/rmcp/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,6 +146,39 @@ let service = client.serve(transport).await?;



## Access with peer interface when handling message

You can get the [`Peer`](crate::service::Peer) struct from [`NotificationContext`](crate::service::NotificationContext) and [`RequestContext`](crate::service::RequestContext).

```rust, ignore
# use rmcp::{
# ServerHandler,
# model::{LoggingLevel, LoggingMessageNotificationParam, ProgressNotificationParam},
# service::{NotificationContext, RoleServer},
# };
# pub struct Handler;

impl ServerHandler for Handler {
 async fn on_progress(
 &self,
 notification: ProgressNotificationParam,
 context: NotificationContext<RoleServer>,
 ) {
 let peer = context.peer;
 let _ = peer
 .notify_logging_message(LoggingMessageNotificationParam {
 level: LoggingLevel::Info,
 logger: None,
 data: serde_json::json!({
 "message": format!("Progress: {}", notification.progress),
 }),
 })
 .await;
 }
}
```


## Manage Multi Services

For many cases you need to manage several service in a collection, you can call `into_dyn` to convert services into the same type.
Expand Down

36 changes: 25 additions & 11 deletions
crates/rmcp/src/handler/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
use crate::{
 error::Error as McpError,
 model::*,
 service::{RequestContext, RoleClient, Service, ServiceRole},
 service::{NotificationContext, RequestContext, RoleClient, Service, ServiceRole},
};

impl<H: ClientHandler> Service<RoleClient> for H {
Expand All@@ -26,28 +26,29 @@ impl<H: ClientHandler> Service<RoleClient> for H {
 async fn handle_notification(
 &self,
 notification: <RoleClient as ServiceRole>::PeerNot,
 context: NotificationContext<RoleClient>,
 ) -> Result<(), McpError> {
 match notification {
 ServerNotification::CancelledNotification(notification) => {
 self.on_cancelled(notification.params).await
 self.on_cancelled(notification.params, context).await
 }
 ServerNotification::ProgressNotification(notification) => {
 self.on_progress(notification.params).await
 self.on_progress(notification.params, context).await
 }
 ServerNotification::LoggingMessageNotification(notification) => {
 self.on_logging_message(notification.params).await
 self.on_logging_message(notification.params, context).await
 }
 ServerNotification::ResourceUpdatedNotification(notification) => {
 self.on_resource_updated(notification.params).await
 self.on_resource_updated(notification.params, context).await
 }
 ServerNotification::ResourceListChangedNotification(_notification_no_param) => {
 self.on_resource_list_changed().await
 self.on_resource_list_changed(context).await
 }
 ServerNotification::ToolListChangedNotification(_notification_no_param) => {
 self.on_tool_list_changed().await
 self.on_tool_list_changed(context).await
 }
 ServerNotification::PromptListChangedNotification(_notification_no_param) => {
 self.on_prompt_list_changed().await
 self.on_prompt_list_changed(context).await
 }
 };
 Ok(())
Expand DownExpand Up@@ -87,34 +88,47 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
 fn on_cancelled(
 &self,
 params: CancelledNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_progress(
 &self,
 params: ProgressNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_logging_message(
 &self,
 params: LoggingMessageNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_resource_updated(
 &self,
 params: ResourceUpdatedNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_resource_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_resource_list_changed(
 &self,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_tool_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_tool_list_changed(
 &self,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_prompt_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_prompt_list_changed(
 &self,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }

Expand Down

23 changes: 16 additions & 7 deletions
crates/rmcp/src/handler/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
use crate::{
 error::Error as McpError,
 model::*,
 service::{RequestContext, RoleServer, Service, ServiceRole},
 service::{NotificationContext, RequestContext, RoleServer, Service, ServiceRole},
};

mod resource;
Expand DownExpand Up@@ -71,19 +71,20 @@ impl<H: ServerHandler> Service<RoleServer> for H {
 async fn handle_notification(
 &self,
 notification: <RoleServer as ServiceRole>::PeerNot,
 context: NotificationContext<RoleServer>,
 ) -> Result<(), McpError> {
 match notification {
 ClientNotification::CancelledNotification(notification) => {
 self.on_cancelled(notification.params).await
 self.on_cancelled(notification.params, context).await
 }
 ClientNotification::ProgressNotification(notification) => {
 self.on_progress(notification.params).await
 self.on_progress(notification.params, context).await
 }
 ClientNotification::InitializedNotification(_notification) => {
 self.on_initialized().await
 self.on_initialized(context).await
 }
 ClientNotification::RootsListChangedNotification(_notification) => {
 self.on_roots_list_changed().await
 self.on_roots_list_changed(context).await
 }
 };
 Ok(())
Expand DownExpand Up@@ -196,20 +197,28 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
 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(())
 }
 fn on_initialized(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_initialized(
 &self,
 context: NotificationContext<RoleServer>,
 ) -> impl Future<Output = ()> + Send + '_ {
 tracing::info!("client initialized");
 std::future::ready(())
 }
 fn on_roots_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_roots_list_changed(
 &self,
 context: NotificationContext<RoleServer>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }

Expand Down

36 changes: 36 additions & 0 deletions
crates/rmcp/src/handler/server/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,6 +320,42 @@ where
 }
}

impl<'a, S> FromToolCallContextPart<'a, S> for crate::Peer<RoleServer> {
 fn from_tool_call_context_part(
 context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 let peer = context.request_context.peer.clone();
 Ok((peer, context))
 }
}

impl<'a, S> FromToolCallContextPart<'a, S> for crate::model::Meta {
 fn from_tool_call_context_part(
 mut context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 let mut meta = crate::model::Meta::default();
 std::mem::swap(&mut meta, &mut context.request_context.meta);
 Ok((meta, context))
 }
}

pub struct RequestId(pub crate::model::RequestId);
impl<'a, S> FromToolCallContextPart<'a, S> for RequestId {
 fn from_tool_call_context_part(
 context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 Ok((RequestId(context.request_context.id.clone()), context))
 }
}

impl<'a, S> FromToolCallContextPart<'a, S> for RequestContext<RoleServer> {
 fn from_tool_call_context_part(
 context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 Ok((context.request_context.clone(), context))
 }
}

impl<'s, S> ToolCallContext<'s, S> {
 pub fn invoke<H, A>(self, h: H) -> H::Fut
 where
Expand Down

2 changes: 1 addition & 1 deletion
crates/rmcp/src/model/extension.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ pub struct Extensions {
impl Extensions {
 /// Create an empty `Extensions`.
 #[inline]
 pub fn new() -> Extensions {
 pub const fn new() -> Extensions {
 Extensions { map: None }
 }

Expand Down

58 changes: 48 additions & 10 deletions
crates/rmcp/src/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,9 @@ pub trait ServiceRole: std::fmt::Debug + Send + Sync + 'static + Copy + Clone {
 type PeerResp: TransferObject;
 type PeerNot: TryInto<CancelledNotification, Error = Self::PeerNot>
 + From<CancelledNotification>
 + TransferObject;
 + TransferObject
 + GetMeta
 + GetExtensions;
 type InitializeError<E>;
 const IS_CLIENT: bool;
 type Info: TransferObject;
Expand All@@ -100,6 +102,7 @@ pub trait Service<R: ServiceRole>: Send + Sync + 'static {
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_;
 fn get_info(&self) -> R::Info;
}
Expand DownExpand Up@@ -145,8 +148,9 @@ impl<R: ServiceRole> Service<R> for Box<dyn DynService<R>> {
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
 DynService::handle_notification(self.as_ref(), notification)
 DynService::handle_notification(self.as_ref(), notification, context)
 }

 fn get_info(&self) -> R::Info {
Expand All@@ -160,7 +164,11 @@ pub trait DynService<R: ServiceRole>: Send + Sync {
 request: R::PeerReq,
 context: RequestContext<R>,
 ) -> BoxFuture<Result<R::Resp, McpError>>;
 fn handle_notification(&self, notification: R::PeerNot) -> BoxFuture<Result<(), McpError>>;
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> BoxFuture<Result<(), McpError>>;
 fn get_info(&self) -> R::Info;
}

Expand All@@ -172,8 +180,12 @@ impl<R: ServiceRole, S: Service<R>> DynService<R> for S {
 ) -> BoxFuture<Result<R::Resp, McpError>> {
 Box::pin(self.handle_request(request, context))
 }
 fn handle_notification(&self, notification: R::PeerNot) -> BoxFuture<Result<(), McpError>> {
 Box::pin(self.handle_notification(notification))
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> BoxFuture<Result<(), McpError>> {
 Box::pin(self.handle_notification(notification, context))
 }
 fn get_info(&self) -> R::Info {
 self.get_info()
Expand DownExpand Up@@ -487,6 +499,15 @@ pub struct RequestContext<R: ServiceRole> {
 pub peer: Peer<R>,
}

/// Request execution context
#[derive(Debug, Clone)]
pub struct NotificationContext<R: ServiceRole> {
 pub meta: Meta,
 pub extensions: Extensions,
 /// An interface to fetch the remote client or server
 pub peer: Peer<R>,
}

/// Use this function to skip initialization process
pub fn serve_directly<R, S, T, E, A>(
 service: S,
Expand DownExpand Up@@ -710,7 +731,9 @@ where
 }));
 }
 Event::PeerMessage(JsonRpcMessage::Request(JsonRpcRequest {
 id, request, ..
 id,
 mut request,
 ..
 })) => {
 tracing::debug!(%id, ?request, "received request");
 {
Expand All@@ -719,12 +742,17 @@ where
 let request_ct = serve_loop_ct.child_token();
 let context_ct = request_ct.child_token();
 local_ct_pool.insert(id.clone(), request_ct);
 let mut extensions = Extensions::new();
 let mut meta = Meta::new();
 // avoid clone
 std::mem::swap(&mut extensions, request.extensions_mut());
 std::mem::swap(&mut meta, request.get_meta_mut());
 let context = RequestContext {
 ct: context_ct,
 id: id.clone(),
 peer: peer.clone(),
 meta: request.get_meta().clone(),
 extensions: request.extensions().clone(),
 meta,
 extensions,
 };
 tokio::spawn(async move {
 let result = service.handle_request(request, context).await;
Expand All@@ -748,7 +776,7 @@ where
 })) => {
 tracing::info!(?notification, "received notification");
 // catch cancelled notification
 let notification = match notification.try_into() {
 let mut notification = match notification.try_into() {
 Ok::<CancelledNotification, _>(cancelled) => {
 if let Some(ct) = local_ct_pool.remove(&cancelled.params.request_id) {
 tracing::info!(id = %cancelled.params.request_id, reason = cancelled.params.reason, "cancelled");
Expand All@@ -760,8 +788,18 @@ where
 };
 {
 let service = shared_service.clone();
 let mut extensions = Extensions::new();
 let mut meta = Meta::new();
 // avoid clone
 std::mem::swap(&mut extensions, notification.extensions_mut());
 std::mem::swap(&mut meta, notification.get_meta_mut());
 let context = NotificationContext {
 peer: peer.clone(),
 meta,
 extensions,
 };
 tokio::spawn(async move {
 let result = service.handle_notification(notification).await;
 let result = service.handle_notification(notification, context).await;
 if let Err(error) = result {
 tracing::warn!(%error, "Error sending notification");
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: provide more context information#236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

4t145
merged 2 commits into

from

May 29, 2025
 Merged


feat: provide more context information
#236
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
588c39c

feat: provide more context information


4t145 May 28, 2025
cefeb83

docs: add document for getting peer from context


4t145 May 29, 2025

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


33 changes: 33 additions & 0 deletions
crates/rmcp/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,6 +146,39 @@ let service = client.serve(transport).await?;



## Access with peer interface when handling message

You can get the [`Peer`](crate::service::Peer) struct from [`NotificationContext`](crate::service::NotificationContext) and [`RequestContext`](crate::service::RequestContext).

```rust, ignore
# use rmcp::{
# ServerHandler,
# model::{LoggingLevel, LoggingMessageNotificationParam, ProgressNotificationParam},
# service::{NotificationContext, RoleServer},
# };
# pub struct Handler;

impl ServerHandler for Handler {
 async fn on_progress(
 &self,
 notification: ProgressNotificationParam,
 context: NotificationContext<RoleServer>,
 ) {
 let peer = context.peer;
 let _ = peer
 .notify_logging_message(LoggingMessageNotificationParam {
 level: LoggingLevel::Info,
 logger: None,
 data: serde_json::json!({
 "message": format!("Progress: {}", notification.progress),
 }),
 })
 .await;
 }
}
```


## Manage Multi Services

For many cases you need to manage several service in a collection, you can call `into_dyn` to convert services into the same type.
Expand Down

36 changes: 25 additions & 11 deletions
crates/rmcp/src/handler/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
use crate::{
 error::Error as McpError,
 model::*,
 service::{RequestContext, RoleClient, Service, ServiceRole},
 service::{NotificationContext, RequestContext, RoleClient, Service, ServiceRole},
};

impl<H: ClientHandler> Service<RoleClient> for H {
Expand All@@ -26,28 +26,29 @@ impl<H: ClientHandler> Service<RoleClient> for H {
 async fn handle_notification(
 &self,
 notification: <RoleClient as ServiceRole>::PeerNot,
 context: NotificationContext<RoleClient>,
 ) -> Result<(), McpError> {
 match notification {
 ServerNotification::CancelledNotification(notification) => {
 self.on_cancelled(notification.params).await
 self.on_cancelled(notification.params, context).await
 }
 ServerNotification::ProgressNotification(notification) => {
 self.on_progress(notification.params).await
 self.on_progress(notification.params, context).await
 }
 ServerNotification::LoggingMessageNotification(notification) => {
 self.on_logging_message(notification.params).await
 self.on_logging_message(notification.params, context).await
 }
 ServerNotification::ResourceUpdatedNotification(notification) => {
 self.on_resource_updated(notification.params).await
 self.on_resource_updated(notification.params, context).await
 }
 ServerNotification::ResourceListChangedNotification(_notification_no_param) => {
 self.on_resource_list_changed().await
 self.on_resource_list_changed(context).await
 }
 ServerNotification::ToolListChangedNotification(_notification_no_param) => {
 self.on_tool_list_changed().await
 self.on_tool_list_changed(context).await
 }
 ServerNotification::PromptListChangedNotification(_notification_no_param) => {
 self.on_prompt_list_changed().await
 self.on_prompt_list_changed(context).await
 }
 };
 Ok(())
Expand DownExpand Up@@ -87,34 +88,47 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
 fn on_cancelled(
 &self,
 params: CancelledNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_progress(
 &self,
 params: ProgressNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_logging_message(
 &self,
 params: LoggingMessageNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_resource_updated(
 &self,
 params: ResourceUpdatedNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_resource_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_resource_list_changed(
 &self,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_tool_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_tool_list_changed(
 &self,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_prompt_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_prompt_list_changed(
 &self,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }

Expand Down

23 changes: 16 additions & 7 deletions
crates/rmcp/src/handler/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
use crate::{
 error::Error as McpError,
 model::*,
 service::{RequestContext, RoleServer, Service, ServiceRole},
 service::{NotificationContext, RequestContext, RoleServer, Service, ServiceRole},
};

mod resource;
Expand DownExpand Up@@ -71,19 +71,20 @@ impl<H: ServerHandler> Service<RoleServer> for H {
 async fn handle_notification(
 &self,
 notification: <RoleServer as ServiceRole>::PeerNot,
 context: NotificationContext<RoleServer>,
 ) -> Result<(), McpError> {
 match notification {
 ClientNotification::CancelledNotification(notification) => {
 self.on_cancelled(notification.params).await
 self.on_cancelled(notification.params, context).await
 }
 ClientNotification::ProgressNotification(notification) => {
 self.on_progress(notification.params).await
 self.on_progress(notification.params, context).await
 }
 ClientNotification::InitializedNotification(_notification) => {
 self.on_initialized().await
 self.on_initialized(context).await
 }
 ClientNotification::RootsListChangedNotification(_notification) => {
 self.on_roots_list_changed().await
 self.on_roots_list_changed(context).await
 }
 };
 Ok(())
Expand DownExpand Up@@ -196,20 +197,28 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
 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(())
 }
 fn on_initialized(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_initialized(
 &self,
 context: NotificationContext<RoleServer>,
 ) -> impl Future<Output = ()> + Send + '_ {
 tracing::info!("client initialized");
 std::future::ready(())
 }
 fn on_roots_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_roots_list_changed(
 &self,
 context: NotificationContext<RoleServer>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }

Expand Down

36 changes: 36 additions & 0 deletions
crates/rmcp/src/handler/server/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,6 +320,42 @@ where
 }
}

impl<'a, S> FromToolCallContextPart<'a, S> for crate::Peer<RoleServer> {
 fn from_tool_call_context_part(
 context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 let peer = context.request_context.peer.clone();
 Ok((peer, context))
 }
}

impl<'a, S> FromToolCallContextPart<'a, S> for crate::model::Meta {
 fn from_tool_call_context_part(
 mut context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 let mut meta = crate::model::Meta::default();
 std::mem::swap(&mut meta, &mut context.request_context.meta);
 Ok((meta, context))
 }
}

pub struct RequestId(pub crate::model::RequestId);
impl<'a, S> FromToolCallContextPart<'a, S> for RequestId {
 fn from_tool_call_context_part(
 context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 Ok((RequestId(context.request_context.id.clone()), context))
 }
}

impl<'a, S> FromToolCallContextPart<'a, S> for RequestContext<RoleServer> {
 fn from_tool_call_context_part(
 context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 Ok((context.request_context.clone(), context))
 }
}

impl<'s, S> ToolCallContext<'s, S> {
 pub fn invoke<H, A>(self, h: H) -> H::Fut
 where
Expand Down

2 changes: 1 addition & 1 deletion
crates/rmcp/src/model/extension.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ pub struct Extensions {
impl Extensions {
 /// Create an empty `Extensions`.
 #[inline]
 pub fn new() -> Extensions {
 pub const fn new() -> Extensions {
 Extensions { map: None }
 }

Expand Down

58 changes: 48 additions & 10 deletions
crates/rmcp/src/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,9 @@ pub trait ServiceRole: std::fmt::Debug + Send + Sync + 'static + Copy + Clone {
 type PeerResp: TransferObject;
 type PeerNot: TryInto<CancelledNotification, Error = Self::PeerNot>
 + From<CancelledNotification>
 + TransferObject;
 + TransferObject
 + GetMeta
 + GetExtensions;
 type InitializeError<E>;
 const IS_CLIENT: bool;
 type Info: TransferObject;
Expand All@@ -100,6 +102,7 @@ pub trait Service<R: ServiceRole>: Send + Sync + 'static {
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_;
 fn get_info(&self) -> R::Info;
}
Expand DownExpand Up@@ -145,8 +148,9 @@ impl<R: ServiceRole> Service<R> for Box<dyn DynService<R>> {
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
 DynService::handle_notification(self.as_ref(), notification)
 DynService::handle_notification(self.as_ref(), notification, context)
 }

 fn get_info(&self) -> R::Info {
Expand All@@ -160,7 +164,11 @@ pub trait DynService<R: ServiceRole>: Send + Sync {
 request: R::PeerReq,
 context: RequestContext<R>,
 ) -> BoxFuture<Result<R::Resp, McpError>>;
 fn handle_notification(&self, notification: R::PeerNot) -> BoxFuture<Result<(), McpError>>;
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> BoxFuture<Result<(), McpError>>;
 fn get_info(&self) -> R::Info;
}

Expand All@@ -172,8 +180,12 @@ impl<R: ServiceRole, S: Service<R>> DynService<R> for S {
 ) -> BoxFuture<Result<R::Resp, McpError>> {
 Box::pin(self.handle_request(request, context))
 }
 fn handle_notification(&self, notification: R::PeerNot) -> BoxFuture<Result<(), McpError>> {
 Box::pin(self.handle_notification(notification))
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> BoxFuture<Result<(), McpError>> {
 Box::pin(self.handle_notification(notification, context))
 }
 fn get_info(&self) -> R::Info {
 self.get_info()
Expand DownExpand Up@@ -487,6 +499,15 @@ pub struct RequestContext<R: ServiceRole> {
 pub peer: Peer<R>,
}

/// Request execution context
#[derive(Debug, Clone)]
pub struct NotificationContext<R: ServiceRole> {
 pub meta: Meta,
 pub extensions: Extensions,
 /// An interface to fetch the remote client or server
 pub peer: Peer<R>,
}

/// Use this function to skip initialization process
pub fn serve_directly<R, S, T, E, A>(
 service: S,
Expand DownExpand Up@@ -710,7 +731,9 @@ where
 }));
 }
 Event::PeerMessage(JsonRpcMessage::Request(JsonRpcRequest {
 id, request, ..
 id,
 mut request,
 ..
 })) => {
 tracing::debug!(%id, ?request, "received request");
 {
Expand All@@ -719,12 +742,17 @@ where
 let request_ct = serve_loop_ct.child_token();
 let context_ct = request_ct.child_token();
 local_ct_pool.insert(id.clone(), request_ct);
 let mut extensions = Extensions::new();
 let mut meta = Meta::new();
 // avoid clone
 std::mem::swap(&mut extensions, request.extensions_mut());
 std::mem::swap(&mut meta, request.get_meta_mut());
 let context = RequestContext {
 ct: context_ct,
 id: id.clone(),
 peer: peer.clone(),
 meta: request.get_meta().clone(),
 extensions: request.extensions().clone(),
 meta,
 extensions,
 };
 tokio::spawn(async move {
 let result = service.handle_request(request, context).await;
Expand All@@ -748,7 +776,7 @@ where
 })) => {
 tracing::info!(?notification, "received notification");
 // catch cancelled notification
 let notification = match notification.try_into() {
 let mut notification = match notification.try_into() {
 Ok::<CancelledNotification, _>(cancelled) => {
 if let Some(ct) = local_ct_pool.remove(&cancelled.params.request_id) {
 tracing::info!(id = %cancelled.params.request_id, reason = cancelled.params.reason, "cancelled");
Expand All@@ -760,8 +788,18 @@ where
 };
 {
 let service = shared_service.clone();
 let mut extensions = Extensions::new();
 let mut meta = Meta::new();
 // avoid clone
 std::mem::swap(&mut extensions, notification.extensions_mut());
 std::mem::swap(&mut meta, notification.get_meta_mut());
 let context = NotificationContext {
 peer: peer.clone(),
 meta,
 extensions,
 };
 tokio::spawn(async move {
 let result = service.handle_notification(notification).await;
 let result = service.handle_notification(notification, context).await;
 if let Err(error) = result {
 tracing::warn!(%error, "Error sending notification");
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: provide more context information#236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

4t145
merged 2 commits into

from

May 29, 2025
 Merged


feat: provide more context information
#236
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
588c39c

feat: provide more context information


4t145 May 28, 2025
cefeb83

docs: add document for getting peer from context


4t145 May 29, 2025

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


33 changes: 33 additions & 0 deletions
crates/rmcp/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,6 +146,39 @@ let service = client.serve(transport).await?;



## Access with peer interface when handling message

You can get the [`Peer`](crate::service::Peer) struct from [`NotificationContext`](crate::service::NotificationContext) and [`RequestContext`](crate::service::RequestContext).

```rust, ignore
# use rmcp::{
# ServerHandler,
# model::{LoggingLevel, LoggingMessageNotificationParam, ProgressNotificationParam},
# service::{NotificationContext, RoleServer},
# };
# pub struct Handler;

impl ServerHandler for Handler {
 async fn on_progress(
 &self,
 notification: ProgressNotificationParam,
 context: NotificationContext<RoleServer>,
 ) {
 let peer = context.peer;
 let _ = peer
 .notify_logging_message(LoggingMessageNotificationParam {
 level: LoggingLevel::Info,
 logger: None,
 data: serde_json::json!({
 "message": format!("Progress: {}", notification.progress),
 }),
 })
 .await;
 }
}
```


## Manage Multi Services

For many cases you need to manage several service in a collection, you can call `into_dyn` to convert services into the same type.
Expand Down

36 changes: 25 additions & 11 deletions
crates/rmcp/src/handler/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
use crate::{
 error::Error as McpError,
 model::*,
 service::{RequestContext, RoleClient, Service, ServiceRole},
 service::{NotificationContext, RequestContext, RoleClient, Service, ServiceRole},
};

impl<H: ClientHandler> Service<RoleClient> for H {
Expand All@@ -26,28 +26,29 @@ impl<H: ClientHandler> Service<RoleClient> for H {
 async fn handle_notification(
 &self,
 notification: <RoleClient as ServiceRole>::PeerNot,
 context: NotificationContext<RoleClient>,
 ) -> Result<(), McpError> {
 match notification {
 ServerNotification::CancelledNotification(notification) => {
 self.on_cancelled(notification.params).await
 self.on_cancelled(notification.params, context).await
 }
 ServerNotification::ProgressNotification(notification) => {
 self.on_progress(notification.params).await
 self.on_progress(notification.params, context).await
 }
 ServerNotification::LoggingMessageNotification(notification) => {
 self.on_logging_message(notification.params).await
 self.on_logging_message(notification.params, context).await
 }
 ServerNotification::ResourceUpdatedNotification(notification) => {
 self.on_resource_updated(notification.params).await
 self.on_resource_updated(notification.params, context).await
 }
 ServerNotification::ResourceListChangedNotification(_notification_no_param) => {
 self.on_resource_list_changed().await
 self.on_resource_list_changed(context).await
 }
 ServerNotification::ToolListChangedNotification(_notification_no_param) => {
 self.on_tool_list_changed().await
 self.on_tool_list_changed(context).await
 }
 ServerNotification::PromptListChangedNotification(_notification_no_param) => {
 self.on_prompt_list_changed().await
 self.on_prompt_list_changed(context).await
 }
 };
 Ok(())
Expand DownExpand Up@@ -87,34 +88,47 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
 fn on_cancelled(
 &self,
 params: CancelledNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_progress(
 &self,
 params: ProgressNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_logging_message(
 &self,
 params: LoggingMessageNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_resource_updated(
 &self,
 params: ResourceUpdatedNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_resource_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_resource_list_changed(
 &self,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_tool_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_tool_list_changed(
 &self,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_prompt_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_prompt_list_changed(
 &self,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }

Expand Down

23 changes: 16 additions & 7 deletions
crates/rmcp/src/handler/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
use crate::{
 error::Error as McpError,
 model::*,
 service::{RequestContext, RoleServer, Service, ServiceRole},
 service::{NotificationContext, RequestContext, RoleServer, Service, ServiceRole},
};

mod resource;
Expand DownExpand Up@@ -71,19 +71,20 @@ impl<H: ServerHandler> Service<RoleServer> for H {
 async fn handle_notification(
 &self,
 notification: <RoleServer as ServiceRole>::PeerNot,
 context: NotificationContext<RoleServer>,
 ) -> Result<(), McpError> {
 match notification {
 ClientNotification::CancelledNotification(notification) => {
 self.on_cancelled(notification.params).await
 self.on_cancelled(notification.params, context).await
 }
 ClientNotification::ProgressNotification(notification) => {
 self.on_progress(notification.params).await
 self.on_progress(notification.params, context).await
 }
 ClientNotification::InitializedNotification(_notification) => {
 self.on_initialized().await
 self.on_initialized(context).await
 }
 ClientNotification::RootsListChangedNotification(_notification) => {
 self.on_roots_list_changed().await
 self.on_roots_list_changed(context).await
 }
 };
 Ok(())
Expand DownExpand Up@@ -196,20 +197,28 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
 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(())
 }
 fn on_initialized(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_initialized(
 &self,
 context: NotificationContext<RoleServer>,
 ) -> impl Future<Output = ()> + Send + '_ {
 tracing::info!("client initialized");
 std::future::ready(())
 }
 fn on_roots_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_roots_list_changed(
 &self,
 context: NotificationContext<RoleServer>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }

Expand Down

36 changes: 36 additions & 0 deletions
crates/rmcp/src/handler/server/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,6 +320,42 @@ where
 }
}

impl<'a, S> FromToolCallContextPart<'a, S> for crate::Peer<RoleServer> {
 fn from_tool_call_context_part(
 context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 let peer = context.request_context.peer.clone();
 Ok((peer, context))
 }
}

impl<'a, S> FromToolCallContextPart<'a, S> for crate::model::Meta {
 fn from_tool_call_context_part(
 mut context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 let mut meta = crate::model::Meta::default();
 std::mem::swap(&mut meta, &mut context.request_context.meta);
 Ok((meta, context))
 }
}

pub struct RequestId(pub crate::model::RequestId);
impl<'a, S> FromToolCallContextPart<'a, S> for RequestId {
 fn from_tool_call_context_part(
 context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 Ok((RequestId(context.request_context.id.clone()), context))
 }
}

impl<'a, S> FromToolCallContextPart<'a, S> for RequestContext<RoleServer> {
 fn from_tool_call_context_part(
 context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 Ok((context.request_context.clone(), context))
 }
}

impl<'s, S> ToolCallContext<'s, S> {
 pub fn invoke<H, A>(self, h: H) -> H::Fut
 where
Expand Down

2 changes: 1 addition & 1 deletion
crates/rmcp/src/model/extension.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ pub struct Extensions {
impl Extensions {
 /// Create an empty `Extensions`.
 #[inline]
 pub fn new() -> Extensions {
 pub const fn new() -> Extensions {
 Extensions { map: None }
 }

Expand Down

58 changes: 48 additions & 10 deletions
crates/rmcp/src/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,9 @@ pub trait ServiceRole: std::fmt::Debug + Send + Sync + 'static + Copy + Clone {
 type PeerResp: TransferObject;
 type PeerNot: TryInto<CancelledNotification, Error = Self::PeerNot>
 + From<CancelledNotification>
 + TransferObject;
 + TransferObject
 + GetMeta
 + GetExtensions;
 type InitializeError<E>;
 const IS_CLIENT: bool;
 type Info: TransferObject;
Expand All@@ -100,6 +102,7 @@ pub trait Service<R: ServiceRole>: Send + Sync + 'static {
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_;
 fn get_info(&self) -> R::Info;
}
Expand DownExpand Up@@ -145,8 +148,9 @@ impl<R: ServiceRole> Service<R> for Box<dyn DynService<R>> {
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
 DynService::handle_notification(self.as_ref(), notification)
 DynService::handle_notification(self.as_ref(), notification, context)
 }

 fn get_info(&self) -> R::Info {
Expand All@@ -160,7 +164,11 @@ pub trait DynService<R: ServiceRole>: Send + Sync {
 request: R::PeerReq,
 context: RequestContext<R>,
 ) -> BoxFuture<Result<R::Resp, McpError>>;
 fn handle_notification(&self, notification: R::PeerNot) -> BoxFuture<Result<(), McpError>>;
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> BoxFuture<Result<(), McpError>>;
 fn get_info(&self) -> R::Info;
}

Expand All@@ -172,8 +180,12 @@ impl<R: ServiceRole, S: Service<R>> DynService<R> for S {
 ) -> BoxFuture<Result<R::Resp, McpError>> {
 Box::pin(self.handle_request(request, context))
 }
 fn handle_notification(&self, notification: R::PeerNot) -> BoxFuture<Result<(), McpError>> {
 Box::pin(self.handle_notification(notification))
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> BoxFuture<Result<(), McpError>> {
 Box::pin(self.handle_notification(notification, context))
 }
 fn get_info(&self) -> R::Info {
 self.get_info()
Expand DownExpand Up@@ -487,6 +499,15 @@ pub struct RequestContext<R: ServiceRole> {
 pub peer: Peer<R>,
}

/// Request execution context
#[derive(Debug, Clone)]
pub struct NotificationContext<R: ServiceRole> {
 pub meta: Meta,
 pub extensions: Extensions,
 /// An interface to fetch the remote client or server
 pub peer: Peer<R>,
}

/// Use this function to skip initialization process
pub fn serve_directly<R, S, T, E, A>(
 service: S,
Expand DownExpand Up@@ -710,7 +731,9 @@ where
 }));
 }
 Event::PeerMessage(JsonRpcMessage::Request(JsonRpcRequest {
 id, request, ..
 id,
 mut request,
 ..
 })) => {
 tracing::debug!(%id, ?request, "received request");
 {
Expand All@@ -719,12 +742,17 @@ where
 let request_ct = serve_loop_ct.child_token();
 let context_ct = request_ct.child_token();
 local_ct_pool.insert(id.clone(), request_ct);
 let mut extensions = Extensions::new();
 let mut meta = Meta::new();
 // avoid clone
 std::mem::swap(&mut extensions, request.extensions_mut());
 std::mem::swap(&mut meta, request.get_meta_mut());
 let context = RequestContext {
 ct: context_ct,
 id: id.clone(),
 peer: peer.clone(),
 meta: request.get_meta().clone(),
 extensions: request.extensions().clone(),
 meta,
 extensions,
 };
 tokio::spawn(async move {
 let result = service.handle_request(request, context).await;
Expand All@@ -748,7 +776,7 @@ where
 })) => {
 tracing::info!(?notification, "received notification");
 // catch cancelled notification
 let notification = match notification.try_into() {
 let mut notification = match notification.try_into() {
 Ok::<CancelledNotification, _>(cancelled) => {
 if let Some(ct) = local_ct_pool.remove(&cancelled.params.request_id) {
 tracing::info!(id = %cancelled.params.request_id, reason = cancelled.params.reason, "cancelled");
Expand All@@ -760,8 +788,18 @@ where
 };
 {
 let service = shared_service.clone();
 let mut extensions = Extensions::new();
 let mut meta = Meta::new();
 // avoid clone
 std::mem::swap(&mut extensions, notification.extensions_mut());
 std::mem::swap(&mut meta, notification.get_meta_mut());
 let context = NotificationContext {
 peer: peer.clone(),
 meta,
 extensions,
 };
 tokio::spawn(async move {
 let result = service.handle_notification(notification).await;
 let result = service.handle_notification(notification, context).await;
 if let Err(error) = result {
 tracing::warn!(%error, "Error sending notification");
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
feat: provide more context information#236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

4t145
merged 2 commits into

from

May 29, 2025
 Merged


feat: provide more context information
#236
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
588c39c

feat: provide more context information


4t145 May 28, 2025
cefeb83

docs: add document for getting peer from context


4t145 May 29, 2025

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


33 changes: 33 additions & 0 deletions
crates/rmcp/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,6 +146,39 @@ let service = client.serve(transport).await?;



## Access with peer interface when handling message

You can get the [`Peer`](crate::service::Peer) struct from [`NotificationContext`](crate::service::NotificationContext) and [`RequestContext`](crate::service::RequestContext).

```rust, ignore
# use rmcp::{
# ServerHandler,
# model::{LoggingLevel, LoggingMessageNotificationParam, ProgressNotificationParam},
# service::{NotificationContext, RoleServer},
# };
# pub struct Handler;

impl ServerHandler for Handler {
 async fn on_progress(
 &self,
 notification: ProgressNotificationParam,
 context: NotificationContext<RoleServer>,
 ) {
 let peer = context.peer;
 let _ = peer
 .notify_logging_message(LoggingMessageNotificationParam {
 level: LoggingLevel::Info,
 logger: None,
 data: serde_json::json!({
 "message": format!("Progress: {}", notification.progress),
 }),
 })
 .await;
 }
}
```


## Manage Multi Services

For many cases you need to manage several service in a collection, you can call `into_dyn` to convert services into the same type.
Expand Down

36 changes: 25 additions & 11 deletions
crates/rmcp/src/handler/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
use crate::{
 error::Error as McpError,
 model::*,
 service::{RequestContext, RoleClient, Service, ServiceRole},
 service::{NotificationContext, RequestContext, RoleClient, Service, ServiceRole},
};

impl<H: ClientHandler> Service<RoleClient> for H {
Expand All@@ -26,28 +26,29 @@ impl<H: ClientHandler> Service<RoleClient> for H {
 async fn handle_notification(
 &self,
 notification: <RoleClient as ServiceRole>::PeerNot,
 context: NotificationContext<RoleClient>,
 ) -> Result<(), McpError> {
 match notification {
 ServerNotification::CancelledNotification(notification) => {
 self.on_cancelled(notification.params).await
 self.on_cancelled(notification.params, context).await
 }
 ServerNotification::ProgressNotification(notification) => {
 self.on_progress(notification.params).await
 self.on_progress(notification.params, context).await
 }
 ServerNotification::LoggingMessageNotification(notification) => {
 self.on_logging_message(notification.params).await
 self.on_logging_message(notification.params, context).await
 }
 ServerNotification::ResourceUpdatedNotification(notification) => {
 self.on_resource_updated(notification.params).await
 self.on_resource_updated(notification.params, context).await
 }
 ServerNotification::ResourceListChangedNotification(_notification_no_param) => {
 self.on_resource_list_changed().await
 self.on_resource_list_changed(context).await
 }
 ServerNotification::ToolListChangedNotification(_notification_no_param) => {
 self.on_tool_list_changed().await
 self.on_tool_list_changed(context).await
 }
 ServerNotification::PromptListChangedNotification(_notification_no_param) => {
 self.on_prompt_list_changed().await
 self.on_prompt_list_changed(context).await
 }
 };
 Ok(())
Expand DownExpand Up@@ -87,34 +88,47 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
 fn on_cancelled(
 &self,
 params: CancelledNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_progress(
 &self,
 params: ProgressNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_logging_message(
 &self,
 params: LoggingMessageNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_resource_updated(
 &self,
 params: ResourceUpdatedNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_resource_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_resource_list_changed(
 &self,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_tool_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_tool_list_changed(
 &self,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_prompt_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_prompt_list_changed(
 &self,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }

Expand Down

23 changes: 16 additions & 7 deletions
crates/rmcp/src/handler/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
use crate::{
 error::Error as McpError,
 model::*,
 service::{RequestContext, RoleServer, Service, ServiceRole},
 service::{NotificationContext, RequestContext, RoleServer, Service, ServiceRole},
};

mod resource;
Expand DownExpand Up@@ -71,19 +71,20 @@ impl<H: ServerHandler> Service<RoleServer> for H {
 async fn handle_notification(
 &self,
 notification: <RoleServer as ServiceRole>::PeerNot,
 context: NotificationContext<RoleServer>,
 ) -> Result<(), McpError> {
 match notification {
 ClientNotification::CancelledNotification(notification) => {
 self.on_cancelled(notification.params).await
 self.on_cancelled(notification.params, context).await
 }
 ClientNotification::ProgressNotification(notification) => {
 self.on_progress(notification.params).await
 self.on_progress(notification.params, context).await
 }
 ClientNotification::InitializedNotification(_notification) => {
 self.on_initialized().await
 self.on_initialized(context).await
 }
 ClientNotification::RootsListChangedNotification(_notification) => {
 self.on_roots_list_changed().await
 self.on_roots_list_changed(context).await
 }
 };
 Ok(())
Expand DownExpand Up@@ -196,20 +197,28 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
 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(())
 }
 fn on_initialized(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_initialized(
 &self,
 context: NotificationContext<RoleServer>,
 ) -> impl Future<Output = ()> + Send + '_ {
 tracing::info!("client initialized");
 std::future::ready(())
 }
 fn on_roots_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_roots_list_changed(
 &self,
 context: NotificationContext<RoleServer>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }

Expand Down

36 changes: 36 additions & 0 deletions
crates/rmcp/src/handler/server/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,6 +320,42 @@ where
 }
}

impl<'a, S> FromToolCallContextPart<'a, S> for crate::Peer<RoleServer> {
 fn from_tool_call_context_part(
 context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 let peer = context.request_context.peer.clone();
 Ok((peer, context))
 }
}

impl<'a, S> FromToolCallContextPart<'a, S> for crate::model::Meta {
 fn from_tool_call_context_part(
 mut context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 let mut meta = crate::model::Meta::default();
 std::mem::swap(&mut meta, &mut context.request_context.meta);
 Ok((meta, context))
 }
}

pub struct RequestId(pub crate::model::RequestId);
impl<'a, S> FromToolCallContextPart<'a, S> for RequestId {
 fn from_tool_call_context_part(
 context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 Ok((RequestId(context.request_context.id.clone()), context))
 }
}

impl<'a, S> FromToolCallContextPart<'a, S> for RequestContext<RoleServer> {
 fn from_tool_call_context_part(
 context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 Ok((context.request_context.clone(), context))
 }
}

impl<'s, S> ToolCallContext<'s, S> {
 pub fn invoke<H, A>(self, h: H) -> H::Fut
 where
Expand Down

2 changes: 1 addition & 1 deletion
crates/rmcp/src/model/extension.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ pub struct Extensions {
impl Extensions {
 /// Create an empty `Extensions`.
 #[inline]
 pub fn new() -> Extensions {
 pub const fn new() -> Extensions {
 Extensions { map: None }
 }

Expand Down

58 changes: 48 additions & 10 deletions
crates/rmcp/src/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,9 @@ pub trait ServiceRole: std::fmt::Debug + Send + Sync + 'static + Copy + Clone {
 type PeerResp: TransferObject;
 type PeerNot: TryInto<CancelledNotification, Error = Self::PeerNot>
 + From<CancelledNotification>
 + TransferObject;
 + TransferObject
 + GetMeta
 + GetExtensions;
 type InitializeError<E>;
 const IS_CLIENT: bool;
 type Info: TransferObject;
Expand All@@ -100,6 +102,7 @@ pub trait Service<R: ServiceRole>: Send + Sync + 'static {
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_;
 fn get_info(&self) -> R::Info;
}
Expand DownExpand Up@@ -145,8 +148,9 @@ impl<R: ServiceRole> Service<R> for Box<dyn DynService<R>> {
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
 DynService::handle_notification(self.as_ref(), notification)
 DynService::handle_notification(self.as_ref(), notification, context)
 }

 fn get_info(&self) -> R::Info {
Expand All@@ -160,7 +164,11 @@ pub trait DynService<R: ServiceRole>: Send + Sync {
 request: R::PeerReq,
 context: RequestContext<R>,
 ) -> BoxFuture<Result<R::Resp, McpError>>;
 fn handle_notification(&self, notification: R::PeerNot) -> BoxFuture<Result<(), McpError>>;
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> BoxFuture<Result<(), McpError>>;
 fn get_info(&self) -> R::Info;
}

Expand All@@ -172,8 +180,12 @@ impl<R: ServiceRole, S: Service<R>> DynService<R> for S {
 ) -> BoxFuture<Result<R::Resp, McpError>> {
 Box::pin(self.handle_request(request, context))
 }
 fn handle_notification(&self, notification: R::PeerNot) -> BoxFuture<Result<(), McpError>> {
 Box::pin(self.handle_notification(notification))
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> BoxFuture<Result<(), McpError>> {
 Box::pin(self.handle_notification(notification, context))
 }
 fn get_info(&self) -> R::Info {
 self.get_info()
Expand DownExpand Up@@ -487,6 +499,15 @@ pub struct RequestContext<R: ServiceRole> {
 pub peer: Peer<R>,
}

/// Request execution context
#[derive(Debug, Clone)]
pub struct NotificationContext<R: ServiceRole> {
 pub meta: Meta,
 pub extensions: Extensions,
 /// An interface to fetch the remote client or server
 pub peer: Peer<R>,
}

/// Use this function to skip initialization process
pub fn serve_directly<R, S, T, E, A>(
 service: S,
Expand DownExpand Up@@ -710,7 +731,9 @@ where
 }));
 }
 Event::PeerMessage(JsonRpcMessage::Request(JsonRpcRequest {
 id, request, ..
 id,
 mut request,
 ..
 })) => {
 tracing::debug!(%id, ?request, "received request");
 {
Expand All@@ -719,12 +742,17 @@ where
 let request_ct = serve_loop_ct.child_token();
 let context_ct = request_ct.child_token();
 local_ct_pool.insert(id.clone(), request_ct);
 let mut extensions = Extensions::new();
 let mut meta = Meta::new();
 // avoid clone
 std::mem::swap(&mut extensions, request.extensions_mut());
 std::mem::swap(&mut meta, request.get_meta_mut());
 let context = RequestContext {
 ct: context_ct,
 id: id.clone(),
 peer: peer.clone(),
 meta: request.get_meta().clone(),
 extensions: request.extensions().clone(),
 meta,
 extensions,
 };
 tokio::spawn(async move {
 let result = service.handle_request(request, context).await;
Expand All@@ -748,7 +776,7 @@ where
 })) => {
 tracing::info!(?notification, "received notification");
 // catch cancelled notification
 let notification = match notification.try_into() {
 let mut notification = match notification.try_into() {
 Ok::<CancelledNotification, _>(cancelled) => {
 if let Some(ct) = local_ct_pool.remove(&cancelled.params.request_id) {
 tracing::info!(id = %cancelled.params.request_id, reason = cancelled.params.reason, "cancelled");
Expand All@@ -760,8 +788,18 @@ where
 };
 {
 let service = shared_service.clone();
 let mut extensions = Extensions::new();
 let mut meta = Meta::new();
 // avoid clone
 std::mem::swap(&mut extensions, notification.extensions_mut());
 std::mem::swap(&mut meta, notification.get_meta_mut());
 let context = NotificationContext {
 peer: peer.clone(),
 meta,
 extensions,
 };
 tokio::spawn(async move {
 let result = service.handle_notification(notification).await;
 let result = service.handle_notification(notification, context).await;
 if let Err(error) = result {
 tracing::warn!(%error, "Error sending notification");
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: provide more context information#236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

4t145
merged 2 commits into

from

May 29, 2025
 Merged


feat: provide more context information
#236
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
588c39c

feat: provide more context information


4t145 May 28, 2025
cefeb83

docs: add document for getting peer from context


4t145 May 29, 2025

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


33 changes: 33 additions & 0 deletions
crates/rmcp/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,6 +146,39 @@ let service = client.serve(transport).await?;



## Access with peer interface when handling message

You can get the [`Peer`](crate::service::Peer) struct from [`NotificationContext`](crate::service::NotificationContext) and [`RequestContext`](crate::service::RequestContext).

```rust, ignore
# use rmcp::{
# ServerHandler,
# model::{LoggingLevel, LoggingMessageNotificationParam, ProgressNotificationParam},
# service::{NotificationContext, RoleServer},
# };
# pub struct Handler;

impl ServerHandler for Handler {
 async fn on_progress(
 &self,
 notification: ProgressNotificationParam,
 context: NotificationContext<RoleServer>,
 ) {
 let peer = context.peer;
 let _ = peer
 .notify_logging_message(LoggingMessageNotificationParam {
 level: LoggingLevel::Info,
 logger: None,
 data: serde_json::json!({
 "message": format!("Progress: {}", notification.progress),
 }),
 })
 .await;
 }
}
```


## Manage Multi Services

For many cases you need to manage several service in a collection, you can call `into_dyn` to convert services into the same type.
Expand Down

36 changes: 25 additions & 11 deletions
crates/rmcp/src/handler/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
use crate::{
 error::Error as McpError,
 model::*,
 service::{RequestContext, RoleClient, Service, ServiceRole},
 service::{NotificationContext, RequestContext, RoleClient, Service, ServiceRole},
};

impl<H: ClientHandler> Service<RoleClient> for H {
Expand All@@ -26,28 +26,29 @@ impl<H: ClientHandler> Service<RoleClient> for H {
 async fn handle_notification(
 &self,
 notification: <RoleClient as ServiceRole>::PeerNot,
 context: NotificationContext<RoleClient>,
 ) -> Result<(), McpError> {
 match notification {
 ServerNotification::CancelledNotification(notification) => {
 self.on_cancelled(notification.params).await
 self.on_cancelled(notification.params, context).await
 }
 ServerNotification::ProgressNotification(notification) => {
 self.on_progress(notification.params).await
 self.on_progress(notification.params, context).await
 }
 ServerNotification::LoggingMessageNotification(notification) => {
 self.on_logging_message(notification.params).await
 self.on_logging_message(notification.params, context).await
 }
 ServerNotification::ResourceUpdatedNotification(notification) => {
 self.on_resource_updated(notification.params).await
 self.on_resource_updated(notification.params, context).await
 }
 ServerNotification::ResourceListChangedNotification(_notification_no_param) => {
 self.on_resource_list_changed().await
 self.on_resource_list_changed(context).await
 }
 ServerNotification::ToolListChangedNotification(_notification_no_param) => {
 self.on_tool_list_changed().await
 self.on_tool_list_changed(context).await
 }
 ServerNotification::PromptListChangedNotification(_notification_no_param) => {
 self.on_prompt_list_changed().await
 self.on_prompt_list_changed(context).await
 }
 };
 Ok(())
Expand DownExpand Up@@ -87,34 +88,47 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
 fn on_cancelled(
 &self,
 params: CancelledNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_progress(
 &self,
 params: ProgressNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_logging_message(
 &self,
 params: LoggingMessageNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_resource_updated(
 &self,
 params: ResourceUpdatedNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_resource_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_resource_list_changed(
 &self,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_tool_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_tool_list_changed(
 &self,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_prompt_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_prompt_list_changed(
 &self,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }

Expand Down

23 changes: 16 additions & 7 deletions
crates/rmcp/src/handler/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
use crate::{
 error::Error as McpError,
 model::*,
 service::{RequestContext, RoleServer, Service, ServiceRole},
 service::{NotificationContext, RequestContext, RoleServer, Service, ServiceRole},
};

mod resource;
Expand DownExpand Up@@ -71,19 +71,20 @@ impl<H: ServerHandler> Service<RoleServer> for H {
 async fn handle_notification(
 &self,
 notification: <RoleServer as ServiceRole>::PeerNot,
 context: NotificationContext<RoleServer>,
 ) -> Result<(), McpError> {
 match notification {
 ClientNotification::CancelledNotification(notification) => {
 self.on_cancelled(notification.params).await
 self.on_cancelled(notification.params, context).await
 }
 ClientNotification::ProgressNotification(notification) => {
 self.on_progress(notification.params).await
 self.on_progress(notification.params, context).await
 }
 ClientNotification::InitializedNotification(_notification) => {
 self.on_initialized().await
 self.on_initialized(context).await
 }
 ClientNotification::RootsListChangedNotification(_notification) => {
 self.on_roots_list_changed().await
 self.on_roots_list_changed(context).await
 }
 };
 Ok(())
Expand DownExpand Up@@ -196,20 +197,28 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
 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(())
 }
 fn on_initialized(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_initialized(
 &self,
 context: NotificationContext<RoleServer>,
 ) -> impl Future<Output = ()> + Send + '_ {
 tracing::info!("client initialized");
 std::future::ready(())
 }
 fn on_roots_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_roots_list_changed(
 &self,
 context: NotificationContext<RoleServer>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }

Expand Down

36 changes: 36 additions & 0 deletions
crates/rmcp/src/handler/server/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,6 +320,42 @@ where
 }
}

impl<'a, S> FromToolCallContextPart<'a, S> for crate::Peer<RoleServer> {
 fn from_tool_call_context_part(
 context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 let peer = context.request_context.peer.clone();
 Ok((peer, context))
 }
}

impl<'a, S> FromToolCallContextPart<'a, S> for crate::model::Meta {
 fn from_tool_call_context_part(
 mut context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 let mut meta = crate::model::Meta::default();
 std::mem::swap(&mut meta, &mut context.request_context.meta);
 Ok((meta, context))
 }
}

pub struct RequestId(pub crate::model::RequestId);
impl<'a, S> FromToolCallContextPart<'a, S> for RequestId {
 fn from_tool_call_context_part(
 context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 Ok((RequestId(context.request_context.id.clone()), context))
 }
}

impl<'a, S> FromToolCallContextPart<'a, S> for RequestContext<RoleServer> {
 fn from_tool_call_context_part(
 context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 Ok((context.request_context.clone(), context))
 }
}

impl<'s, S> ToolCallContext<'s, S> {
 pub fn invoke<H, A>(self, h: H) -> H::Fut
 where
Expand Down

2 changes: 1 addition & 1 deletion
crates/rmcp/src/model/extension.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ pub struct Extensions {
impl Extensions {
 /// Create an empty `Extensions`.
 #[inline]
 pub fn new() -> Extensions {
 pub const fn new() -> Extensions {
 Extensions { map: None }
 }

Expand Down

58 changes: 48 additions & 10 deletions
crates/rmcp/src/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,9 @@ pub trait ServiceRole: std::fmt::Debug + Send + Sync + 'static + Copy + Clone {
 type PeerResp: TransferObject;
 type PeerNot: TryInto<CancelledNotification, Error = Self::PeerNot>
 + From<CancelledNotification>
 + TransferObject;
 + TransferObject
 + GetMeta
 + GetExtensions;
 type InitializeError<E>;
 const IS_CLIENT: bool;
 type Info: TransferObject;
Expand All@@ -100,6 +102,7 @@ pub trait Service<R: ServiceRole>: Send + Sync + 'static {
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_;
 fn get_info(&self) -> R::Info;
}
Expand DownExpand Up@@ -145,8 +148,9 @@ impl<R: ServiceRole> Service<R> for Box<dyn DynService<R>> {
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
 DynService::handle_notification(self.as_ref(), notification)
 DynService::handle_notification(self.as_ref(), notification, context)
 }

 fn get_info(&self) -> R::Info {
Expand All@@ -160,7 +164,11 @@ pub trait DynService<R: ServiceRole>: Send + Sync {
 request: R::PeerReq,
 context: RequestContext<R>,
 ) -> BoxFuture<Result<R::Resp, McpError>>;
 fn handle_notification(&self, notification: R::PeerNot) -> BoxFuture<Result<(), McpError>>;
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> BoxFuture<Result<(), McpError>>;
 fn get_info(&self) -> R::Info;
}

Expand All@@ -172,8 +180,12 @@ impl<R: ServiceRole, S: Service<R>> DynService<R> for S {
 ) -> BoxFuture<Result<R::Resp, McpError>> {
 Box::pin(self.handle_request(request, context))
 }
 fn handle_notification(&self, notification: R::PeerNot) -> BoxFuture<Result<(), McpError>> {
 Box::pin(self.handle_notification(notification))
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> BoxFuture<Result<(), McpError>> {
 Box::pin(self.handle_notification(notification, context))
 }
 fn get_info(&self) -> R::Info {
 self.get_info()
Expand DownExpand Up@@ -487,6 +499,15 @@ pub struct RequestContext<R: ServiceRole> {
 pub peer: Peer<R>,
}

/// Request execution context
#[derive(Debug, Clone)]
pub struct NotificationContext<R: ServiceRole> {
 pub meta: Meta,
 pub extensions: Extensions,
 /// An interface to fetch the remote client or server
 pub peer: Peer<R>,
}

/// Use this function to skip initialization process
pub fn serve_directly<R, S, T, E, A>(
 service: S,
Expand DownExpand Up@@ -710,7 +731,9 @@ where
 }));
 }
 Event::PeerMessage(JsonRpcMessage::Request(JsonRpcRequest {
 id, request, ..
 id,
 mut request,
 ..
 })) => {
 tracing::debug!(%id, ?request, "received request");
 {
Expand All@@ -719,12 +742,17 @@ where
 let request_ct = serve_loop_ct.child_token();
 let context_ct = request_ct.child_token();
 local_ct_pool.insert(id.clone(), request_ct);
 let mut extensions = Extensions::new();
 let mut meta = Meta::new();
 // avoid clone
 std::mem::swap(&mut extensions, request.extensions_mut());
 std::mem::swap(&mut meta, request.get_meta_mut());
 let context = RequestContext {
 ct: context_ct,
 id: id.clone(),
 peer: peer.clone(),
 meta: request.get_meta().clone(),
 extensions: request.extensions().clone(),
 meta,
 extensions,
 };
 tokio::spawn(async move {
 let result = service.handle_request(request, context).await;
Expand All@@ -748,7 +776,7 @@ where
 })) => {
 tracing::info!(?notification, "received notification");
 // catch cancelled notification
 let notification = match notification.try_into() {
 let mut notification = match notification.try_into() {
 Ok::<CancelledNotification, _>(cancelled) => {
 if let Some(ct) = local_ct_pool.remove(&cancelled.params.request_id) {
 tracing::info!(id = %cancelled.params.request_id, reason = cancelled.params.reason, "cancelled");
Expand All@@ -760,8 +788,18 @@ where
 };
 {
 let service = shared_service.clone();
 let mut extensions = Extensions::new();
 let mut meta = Meta::new();
 // avoid clone
 std::mem::swap(&mut extensions, notification.extensions_mut());
 std::mem::swap(&mut meta, notification.get_meta_mut());
 let context = NotificationContext {
 peer: peer.clone(),
 meta,
 extensions,
 };
 tokio::spawn(async move {
 let result = service.handle_notification(notification).await;
 let result = service.handle_notification(notification, context).await;
 if let Err(error) = result {
 tracing::warn!(%error, "Error sending notification");
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat: provide more context information#236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

4t145
merged 2 commits into

from

May 29, 2025
 Merged


feat: provide more context information
#236
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
588c39c

feat: provide more context information


4t145 May 28, 2025
cefeb83

docs: add document for getting peer from context


4t145 May 29, 2025

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


33 changes: 33 additions & 0 deletions
crates/rmcp/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,6 +146,39 @@ let service = client.serve(transport).await?;



## Access with peer interface when handling message

You can get the [`Peer`](crate::service::Peer) struct from [`NotificationContext`](crate::service::NotificationContext) and [`RequestContext`](crate::service::RequestContext).

```rust, ignore
# use rmcp::{
# ServerHandler,
# model::{LoggingLevel, LoggingMessageNotificationParam, ProgressNotificationParam},
# service::{NotificationContext, RoleServer},
# };
# pub struct Handler;

impl ServerHandler for Handler {
 async fn on_progress(
 &self,
 notification: ProgressNotificationParam,
 context: NotificationContext<RoleServer>,
 ) {
 let peer = context.peer;
 let _ = peer
 .notify_logging_message(LoggingMessageNotificationParam {
 level: LoggingLevel::Info,
 logger: None,
 data: serde_json::json!({
 "message": format!("Progress: {}", notification.progress),
 }),
 })
 .await;
 }
}
```


## Manage Multi Services

For many cases you need to manage several service in a collection, you can call `into_dyn` to convert services into the same type.
Expand Down

36 changes: 25 additions & 11 deletions
crates/rmcp/src/handler/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
use crate::{
 error::Error as McpError,
 model::*,
 service::{RequestContext, RoleClient, Service, ServiceRole},
 service::{NotificationContext, RequestContext, RoleClient, Service, ServiceRole},
};

impl<H: ClientHandler> Service<RoleClient> for H {
Expand All@@ -26,28 +26,29 @@ impl<H: ClientHandler> Service<RoleClient> for H {
 async fn handle_notification(
 &self,
 notification: <RoleClient as ServiceRole>::PeerNot,
 context: NotificationContext<RoleClient>,
 ) -> Result<(), McpError> {
 match notification {
 ServerNotification::CancelledNotification(notification) => {
 self.on_cancelled(notification.params).await
 self.on_cancelled(notification.params, context).await
 }
 ServerNotification::ProgressNotification(notification) => {
 self.on_progress(notification.params).await
 self.on_progress(notification.params, context).await
 }
 ServerNotification::LoggingMessageNotification(notification) => {
 self.on_logging_message(notification.params).await
 self.on_logging_message(notification.params, context).await
 }
 ServerNotification::ResourceUpdatedNotification(notification) => {
 self.on_resource_updated(notification.params).await
 self.on_resource_updated(notification.params, context).await
 }
 ServerNotification::ResourceListChangedNotification(_notification_no_param) => {
 self.on_resource_list_changed().await
 self.on_resource_list_changed(context).await
 }
 ServerNotification::ToolListChangedNotification(_notification_no_param) => {
 self.on_tool_list_changed().await
 self.on_tool_list_changed(context).await
 }
 ServerNotification::PromptListChangedNotification(_notification_no_param) => {
 self.on_prompt_list_changed().await
 self.on_prompt_list_changed(context).await
 }
 };
 Ok(())
Expand DownExpand Up@@ -87,34 +88,47 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
 fn on_cancelled(
 &self,
 params: CancelledNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_progress(
 &self,
 params: ProgressNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_logging_message(
 &self,
 params: LoggingMessageNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_resource_updated(
 &self,
 params: ResourceUpdatedNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_resource_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_resource_list_changed(
 &self,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_tool_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_tool_list_changed(
 &self,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_prompt_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_prompt_list_changed(
 &self,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }

Expand Down

23 changes: 16 additions & 7 deletions
crates/rmcp/src/handler/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
use crate::{
 error::Error as McpError,
 model::*,
 service::{RequestContext, RoleServer, Service, ServiceRole},
 service::{NotificationContext, RequestContext, RoleServer, Service, ServiceRole},
};

mod resource;
Expand DownExpand Up@@ -71,19 +71,20 @@ impl<H: ServerHandler> Service<RoleServer> for H {
 async fn handle_notification(
 &self,
 notification: <RoleServer as ServiceRole>::PeerNot,
 context: NotificationContext<RoleServer>,
 ) -> Result<(), McpError> {
 match notification {
 ClientNotification::CancelledNotification(notification) => {
 self.on_cancelled(notification.params).await
 self.on_cancelled(notification.params, context).await
 }
 ClientNotification::ProgressNotification(notification) => {
 self.on_progress(notification.params).await
 self.on_progress(notification.params, context).await
 }
 ClientNotification::InitializedNotification(_notification) => {
 self.on_initialized().await
 self.on_initialized(context).await
 }
 ClientNotification::RootsListChangedNotification(_notification) => {
 self.on_roots_list_changed().await
 self.on_roots_list_changed(context).await
 }
 };
 Ok(())
Expand DownExpand Up@@ -196,20 +197,28 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
 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(())
 }
 fn on_initialized(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_initialized(
 &self,
 context: NotificationContext<RoleServer>,
 ) -> impl Future<Output = ()> + Send + '_ {
 tracing::info!("client initialized");
 std::future::ready(())
 }
 fn on_roots_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_roots_list_changed(
 &self,
 context: NotificationContext<RoleServer>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }

Expand Down

36 changes: 36 additions & 0 deletions
crates/rmcp/src/handler/server/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,6 +320,42 @@ where
 }
}

impl<'a, S> FromToolCallContextPart<'a, S> for crate::Peer<RoleServer> {
 fn from_tool_call_context_part(
 context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 let peer = context.request_context.peer.clone();
 Ok((peer, context))
 }
}

impl<'a, S> FromToolCallContextPart<'a, S> for crate::model::Meta {
 fn from_tool_call_context_part(
 mut context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 let mut meta = crate::model::Meta::default();
 std::mem::swap(&mut meta, &mut context.request_context.meta);
 Ok((meta, context))
 }
}

pub struct RequestId(pub crate::model::RequestId);
impl<'a, S> FromToolCallContextPart<'a, S> for RequestId {
 fn from_tool_call_context_part(
 context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 Ok((RequestId(context.request_context.id.clone()), context))
 }
}

impl<'a, S> FromToolCallContextPart<'a, S> for RequestContext<RoleServer> {
 fn from_tool_call_context_part(
 context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 Ok((context.request_context.clone(), context))
 }
}

impl<'s, S> ToolCallContext<'s, S> {
 pub fn invoke<H, A>(self, h: H) -> H::Fut
 where
Expand Down

2 changes: 1 addition & 1 deletion
crates/rmcp/src/model/extension.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ pub struct Extensions {
impl Extensions {
 /// Create an empty `Extensions`.
 #[inline]
 pub fn new() -> Extensions {
 pub const fn new() -> Extensions {
 Extensions { map: None }
 }

Expand Down

58 changes: 48 additions & 10 deletions
crates/rmcp/src/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,9 @@ pub trait ServiceRole: std::fmt::Debug + Send + Sync + 'static + Copy + Clone {
 type PeerResp: TransferObject;
 type PeerNot: TryInto<CancelledNotification, Error = Self::PeerNot>
 + From<CancelledNotification>
 + TransferObject;
 + TransferObject
 + GetMeta
 + GetExtensions;
 type InitializeError<E>;
 const IS_CLIENT: bool;
 type Info: TransferObject;
Expand All@@ -100,6 +102,7 @@ pub trait Service<R: ServiceRole>: Send + Sync + 'static {
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_;
 fn get_info(&self) -> R::Info;
}
Expand DownExpand Up@@ -145,8 +148,9 @@ impl<R: ServiceRole> Service<R> for Box<dyn DynService<R>> {
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
 DynService::handle_notification(self.as_ref(), notification)
 DynService::handle_notification(self.as_ref(), notification, context)
 }

 fn get_info(&self) -> R::Info {
Expand All@@ -160,7 +164,11 @@ pub trait DynService<R: ServiceRole>: Send + Sync {
 request: R::PeerReq,
 context: RequestContext<R>,
 ) -> BoxFuture<Result<R::Resp, McpError>>;
 fn handle_notification(&self, notification: R::PeerNot) -> BoxFuture<Result<(), McpError>>;
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> BoxFuture<Result<(), McpError>>;
 fn get_info(&self) -> R::Info;
}

Expand All@@ -172,8 +180,12 @@ impl<R: ServiceRole, S: Service<R>> DynService<R> for S {
 ) -> BoxFuture<Result<R::Resp, McpError>> {
 Box::pin(self.handle_request(request, context))
 }
 fn handle_notification(&self, notification: R::PeerNot) -> BoxFuture<Result<(), McpError>> {
 Box::pin(self.handle_notification(notification))
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> BoxFuture<Result<(), McpError>> {
 Box::pin(self.handle_notification(notification, context))
 }
 fn get_info(&self) -> R::Info {
 self.get_info()
Expand DownExpand Up@@ -487,6 +499,15 @@ pub struct RequestContext<R: ServiceRole> {
 pub peer: Peer<R>,
}

/// Request execution context
#[derive(Debug, Clone)]
pub struct NotificationContext<R: ServiceRole> {
 pub meta: Meta,
 pub extensions: Extensions,
 /// An interface to fetch the remote client or server
 pub peer: Peer<R>,
}

/// Use this function to skip initialization process
pub fn serve_directly<R, S, T, E, A>(
 service: S,
Expand DownExpand Up@@ -710,7 +731,9 @@ where
 }));
 }
 Event::PeerMessage(JsonRpcMessage::Request(JsonRpcRequest {
 id, request, ..
 id,
 mut request,
 ..
 })) => {
 tracing::debug!(%id, ?request, "received request");
 {
Expand All@@ -719,12 +742,17 @@ where
 let request_ct = serve_loop_ct.child_token();
 let context_ct = request_ct.child_token();
 local_ct_pool.insert(id.clone(), request_ct);
 let mut extensions = Extensions::new();
 let mut meta = Meta::new();
 // avoid clone
 std::mem::swap(&mut extensions, request.extensions_mut());
 std::mem::swap(&mut meta, request.get_meta_mut());
 let context = RequestContext {
 ct: context_ct,
 id: id.clone(),
 peer: peer.clone(),
 meta: request.get_meta().clone(),
 extensions: request.extensions().clone(),
 meta,
 extensions,
 };
 tokio::spawn(async move {
 let result = service.handle_request(request, context).await;
Expand All@@ -748,7 +776,7 @@ where
 })) => {
 tracing::info!(?notification, "received notification");
 // catch cancelled notification
 let notification = match notification.try_into() {
 let mut notification = match notification.try_into() {
 Ok::<CancelledNotification, _>(cancelled) => {
 if let Some(ct) = local_ct_pool.remove(&cancelled.params.request_id) {
 tracing::info!(id = %cancelled.params.request_id, reason = cancelled.params.reason, "cancelled");
Expand All@@ -760,8 +788,18 @@ where
 };
 {
 let service = shared_service.clone();
 let mut extensions = Extensions::new();
 let mut meta = Meta::new();
 // avoid clone
 std::mem::swap(&mut extensions, notification.extensions_mut());
 std::mem::swap(&mut meta, notification.get_meta_mut());
 let context = NotificationContext {
 peer: peer.clone(),
 meta,
 extensions,
 };
 tokio::spawn(async move {
 let result = service.handle_notification(notification).await;
 let result = service.handle_notification(notification, context).await;
 if let Err(error) = result {
 tracing::warn!(%error, "Error sending notification");
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
feat: provide more context information#236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

4t145
merged 2 commits into

from

May 29, 2025
 Merged


feat: provide more context information
#236
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
588c39c

feat: provide more context information


4t145 May 28, 2025
cefeb83

docs: add document for getting peer from context


4t145 May 29, 2025

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


33 changes: 33 additions & 0 deletions
crates/rmcp/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -146,6 +146,39 @@ let service = client.serve(transport).await?;



## Access with peer interface when handling message

You can get the [`Peer`](crate::service::Peer) struct from [`NotificationContext`](crate::service::NotificationContext) and [`RequestContext`](crate::service::RequestContext).

```rust, ignore
# use rmcp::{
# ServerHandler,
# model::{LoggingLevel, LoggingMessageNotificationParam, ProgressNotificationParam},
# service::{NotificationContext, RoleServer},
# };
# pub struct Handler;

impl ServerHandler for Handler {
 async fn on_progress(
 &self,
 notification: ProgressNotificationParam,
 context: NotificationContext<RoleServer>,
 ) {
 let peer = context.peer;
 let _ = peer
 .notify_logging_message(LoggingMessageNotificationParam {
 level: LoggingLevel::Info,
 logger: None,
 data: serde_json::json!({
 "message": format!("Progress: {}", notification.progress),
 }),
 })
 .await;
 }
}
```


## Manage Multi Services

For many cases you need to manage several service in a collection, you can call `into_dyn` to convert services into the same type.
Expand Down

36 changes: 25 additions & 11 deletions
crates/rmcp/src/handler/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
use crate::{
 error::Error as McpError,
 model::*,
 service::{RequestContext, RoleClient, Service, ServiceRole},
 service::{NotificationContext, RequestContext, RoleClient, Service, ServiceRole},
};

impl<H: ClientHandler> Service<RoleClient> for H {
Expand All@@ -26,28 +26,29 @@ impl<H: ClientHandler> Service<RoleClient> for H {
 async fn handle_notification(
 &self,
 notification: <RoleClient as ServiceRole>::PeerNot,
 context: NotificationContext<RoleClient>,
 ) -> Result<(), McpError> {
 match notification {
 ServerNotification::CancelledNotification(notification) => {
 self.on_cancelled(notification.params).await
 self.on_cancelled(notification.params, context).await
 }
 ServerNotification::ProgressNotification(notification) => {
 self.on_progress(notification.params).await
 self.on_progress(notification.params, context).await
 }
 ServerNotification::LoggingMessageNotification(notification) => {
 self.on_logging_message(notification.params).await
 self.on_logging_message(notification.params, context).await
 }
 ServerNotification::ResourceUpdatedNotification(notification) => {
 self.on_resource_updated(notification.params).await
 self.on_resource_updated(notification.params, context).await
 }
 ServerNotification::ResourceListChangedNotification(_notification_no_param) => {
 self.on_resource_list_changed().await
 self.on_resource_list_changed(context).await
 }
 ServerNotification::ToolListChangedNotification(_notification_no_param) => {
 self.on_tool_list_changed().await
 self.on_tool_list_changed(context).await
 }
 ServerNotification::PromptListChangedNotification(_notification_no_param) => {
 self.on_prompt_list_changed().await
 self.on_prompt_list_changed(context).await
 }
 };
 Ok(())
Expand DownExpand Up@@ -87,34 +88,47 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
 fn on_cancelled(
 &self,
 params: CancelledNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_progress(
 &self,
 params: ProgressNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_logging_message(
 &self,
 params: LoggingMessageNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_resource_updated(
 &self,
 params: ResourceUpdatedNotificationParam,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_resource_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_resource_list_changed(
 &self,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_tool_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_tool_list_changed(
 &self,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }
 fn on_prompt_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_prompt_list_changed(
 &self,
 context: NotificationContext<RoleClient>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }

Expand Down

23 changes: 16 additions & 7 deletions
crates/rmcp/src/handler/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
use crate::{
 error::Error as McpError,
 model::*,
 service::{RequestContext, RoleServer, Service, ServiceRole},
 service::{NotificationContext, RequestContext, RoleServer, Service, ServiceRole},
};

mod resource;
Expand DownExpand Up@@ -71,19 +71,20 @@ impl<H: ServerHandler> Service<RoleServer> for H {
 async fn handle_notification(
 &self,
 notification: <RoleServer as ServiceRole>::PeerNot,
 context: NotificationContext<RoleServer>,
 ) -> Result<(), McpError> {
 match notification {
 ClientNotification::CancelledNotification(notification) => {
 self.on_cancelled(notification.params).await
 self.on_cancelled(notification.params, context).await
 }
 ClientNotification::ProgressNotification(notification) => {
 self.on_progress(notification.params).await
 self.on_progress(notification.params, context).await
 }
 ClientNotification::InitializedNotification(_notification) => {
 self.on_initialized().await
 self.on_initialized(context).await
 }
 ClientNotification::RootsListChangedNotification(_notification) => {
 self.on_roots_list_changed().await
 self.on_roots_list_changed(context).await
 }
 };
 Ok(())
Expand DownExpand Up@@ -196,20 +197,28 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
 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(())
 }
 fn on_initialized(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_initialized(
 &self,
 context: NotificationContext<RoleServer>,
 ) -> impl Future<Output = ()> + Send + '_ {
 tracing::info!("client initialized");
 std::future::ready(())
 }
 fn on_roots_list_changed(&self) -> impl Future<Output = ()> + Send + '_ {
 fn on_roots_list_changed(
 &self,
 context: NotificationContext<RoleServer>,
 ) -> impl Future<Output = ()> + Send + '_ {
 std::future::ready(())
 }

Expand Down

36 changes: 36 additions & 0 deletions
crates/rmcp/src/handler/server/tool.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,6 +320,42 @@ where
 }
}

impl<'a, S> FromToolCallContextPart<'a, S> for crate::Peer<RoleServer> {
 fn from_tool_call_context_part(
 context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 let peer = context.request_context.peer.clone();
 Ok((peer, context))
 }
}

impl<'a, S> FromToolCallContextPart<'a, S> for crate::model::Meta {
 fn from_tool_call_context_part(
 mut context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 let mut meta = crate::model::Meta::default();
 std::mem::swap(&mut meta, &mut context.request_context.meta);
 Ok((meta, context))
 }
}

pub struct RequestId(pub crate::model::RequestId);
impl<'a, S> FromToolCallContextPart<'a, S> for RequestId {
 fn from_tool_call_context_part(
 context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 Ok((RequestId(context.request_context.id.clone()), context))
 }
}

impl<'a, S> FromToolCallContextPart<'a, S> for RequestContext<RoleServer> {
 fn from_tool_call_context_part(
 context: ToolCallContext<'a, S>,
 ) -> Result<(Self, ToolCallContext<'a, S>), crate::Error> {
 Ok((context.request_context.clone(), context))
 }
}

impl<'s, S> ToolCallContext<'s, S> {
 pub fn invoke<H, A>(self, h: H) -> H::Fut
 where
Expand Down

2 changes: 1 addition & 1 deletion
crates/rmcp/src/model/extension.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ pub struct Extensions {
impl Extensions {
 /// Create an empty `Extensions`.
 #[inline]
 pub fn new() -> Extensions {
 pub const fn new() -> Extensions {
 Extensions { map: None }
 }

Expand Down

58 changes: 48 additions & 10 deletions
crates/rmcp/src/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,9 @@ pub trait ServiceRole: std::fmt::Debug + Send + Sync + 'static + Copy + Clone {
 type PeerResp: TransferObject;
 type PeerNot: TryInto<CancelledNotification, Error = Self::PeerNot>
 + From<CancelledNotification>
 + TransferObject;
 + TransferObject
 + GetMeta
 + GetExtensions;
 type InitializeError<E>;
 const IS_CLIENT: bool;
 type Info: TransferObject;
Expand All@@ -100,6 +102,7 @@ pub trait Service<R: ServiceRole>: Send + Sync + 'static {
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_;
 fn get_info(&self) -> R::Info;
}
Expand DownExpand Up@@ -145,8 +148,9 @@ impl<R: ServiceRole> Service<R> for Box<dyn DynService<R>> {
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
 DynService::handle_notification(self.as_ref(), notification)
 DynService::handle_notification(self.as_ref(), notification, context)
 }

 fn get_info(&self) -> R::Info {
Expand All@@ -160,7 +164,11 @@ pub trait DynService<R: ServiceRole>: Send + Sync {
 request: R::PeerReq,
 context: RequestContext<R>,
 ) -> BoxFuture<Result<R::Resp, McpError>>;
 fn handle_notification(&self, notification: R::PeerNot) -> BoxFuture<Result<(), McpError>>;
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> BoxFuture<Result<(), McpError>>;
 fn get_info(&self) -> R::Info;
}

Expand All@@ -172,8 +180,12 @@ impl<R: ServiceRole, S: Service<R>> DynService<R> for S {
 ) -> BoxFuture<Result<R::Resp, McpError>> {
 Box::pin(self.handle_request(request, context))
 }
 fn handle_notification(&self, notification: R::PeerNot) -> BoxFuture<Result<(), McpError>> {
 Box::pin(self.handle_notification(notification))
 fn handle_notification(
 &self,
 notification: R::PeerNot,
 context: NotificationContext<R>,
 ) -> BoxFuture<Result<(), McpError>> {
 Box::pin(self.handle_notification(notification, context))
 }
 fn get_info(&self) -> R::Info {
 self.get_info()
Expand DownExpand Up@@ -487,6 +499,15 @@ pub struct RequestContext<R: ServiceRole> {
 pub peer: Peer<R>,
}

/// Request execution context
#[derive(Debug, Clone)]
pub struct NotificationContext<R: ServiceRole> {
 pub meta: Meta,
 pub extensions: Extensions,
 /// An interface to fetch the remote client or server
 pub peer: Peer<R>,
}

/// Use this function to skip initialization process
pub fn serve_directly<R, S, T, E, A>(
 service: S,
Expand DownExpand Up@@ -710,7 +731,9 @@ where
 }));
 }
 Event::PeerMessage(JsonRpcMessage::Request(JsonRpcRequest {
 id, request, ..
 id,
 mut request,
 ..
 })) => {
 tracing::debug!(%id, ?request, "received request");
 {
Expand All@@ -719,12 +742,17 @@ where
 let request_ct = serve_loop_ct.child_token();
 let context_ct = request_ct.child_token();
 local_ct_pool.insert(id.clone(), request_ct);
 let mut extensions = Extensions::new();
 let mut meta = Meta::new();
 // avoid clone
 std::mem::swap(&mut extensions, request.extensions_mut());
 std::mem::swap(&mut meta, request.get_meta_mut());
 let context = RequestContext {
 ct: context_ct,
 id: id.clone(),
 peer: peer.clone(),
 meta: request.get_meta().clone(),
 extensions: request.extensions().clone(),
 meta,
 extensions,
 };
 tokio::spawn(async move {
 let result = service.handle_request(request, context).await;
Expand All@@ -748,7 +776,7 @@ where
 })) => {
 tracing::info!(?notification, "received notification");
 // catch cancelled notification
 let notification = match notification.try_into() {
 let mut notification = match notification.try_into() {
 Ok::<CancelledNotification, _>(cancelled) => {
 if let Some(ct) = local_ct_pool.remove(&cancelled.params.request_id) {
 tracing::info!(id = %cancelled.params.request_id, reason = cancelled.params.reason, "cancelled");
Expand All@@ -760,8 +788,18 @@ where
 };
 {
 let service = shared_service.clone();
 let mut extensions = Extensions::new();
 let mut meta = Meta::new();
 // avoid clone
 std::mem::swap(&mut extensions, notification.extensions_mut());
 std::mem::swap(&mut meta, notification.get_meta_mut());
 let context = NotificationContext {
 peer: peer.clone(),
 meta,
 extensions,
 };
 tokio::spawn(async move {
 let result = service.handle_notification(notification).await;
 let result = service.handle_notification(notification, context).await;
 if let Err(error) = result {
 tracing::warn!(%error, "Error sending notification");
 }
Expand Down
Loading