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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions crates/rmcp/src/handler/client.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,9 @@ impl<H: ClientHandler> Service<RoleClient> for H {
ServerNotification::PromptListChangedNotification(_notification_no_param) => {
self.on_prompt_list_changed(context).await
}
ServerNotification::CustomNotification(notification) => {
self.on_custom_notification(notification, context).await
}
};
Ok(())
}
Expand DownExpand Up@@ -166,6 +169,14 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
) -> impl Future<Output = ()> + Send + '_ {
std::future::ready(())
}
fn on_custom_notification(
&self,
notification: CustomNotification,
context: NotificationContext<RoleClient>,
) -> impl Future<Output = ()> + Send + '_ {
let _ = (notification, context);
std::future::ready(())
}

fn get_info(&self) -> ClientInfo {
ClientInfo::default()
Expand Down
4 changes: 2 additions & 2 deletions crates/rmcp/src/handler/server.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ impl<H: ServerHandler> Service<RoleServer> for H {
ClientNotification::RootsListChangedNotification(_notification) => {
self.on_roots_list_changed(context).await
}
ClientNotification::CustomClientNotification(notification) => {
ClientNotification::CustomNotification(notification) => {
self.on_custom_notification(notification, context).await
}
};
Expand DownExpand Up@@ -230,7 +230,7 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
}
fn on_custom_notification(
&self,
notification: CustomClientNotification,
notification: CustomNotification,
context: NotificationContext<RoleServer>,
) -> impl Future<Output = ()> + Send + '_ {
let _ = (notification, context);
Expand Down
45 changes: 39 additions & 6 deletions crates/rmcp/src/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -627,13 +627,13 @@ const_string!(CancelledNotificationMethod = "notifications/cancelled");
pub type CancelledNotification =
Notification<CancelledNotificationMethod, CancelledNotificationParam>;

/// A catch-all notification the client can use to send custom messages to a server.
/// A catch-all notification either side can use to send custom messages to its peer.
///
/// This preserves the raw `method` name and `params` payload so handlers can
/// deserialize them into domain-specific types.
#[derive(Debug, Clone)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct CustomClientNotification {
pub struct CustomNotification {
pub method: String,
pub params: Option<Value>,
/// extensions will carry anything possible in the context, including [`Meta`]
Expand All@@ -643,7 +643,7 @@ pub struct CustomClientNotification {
pub extensions: Extensions,
}

impl CustomClientNotification {
impl CustomNotification {
pub fn new(method: impl Into<String>, params: Option<Value>) -> Self {
Self {
method: method.into(),
Expand DownExpand Up@@ -1786,7 +1786,7 @@ ts_union!(
| ProgressNotification
| InitializedNotification
| RootsListChangedNotification
| CustomClientNotification;
| CustomNotification;
);

ts_union!(
Expand DownExpand Up@@ -1817,7 +1817,8 @@ ts_union!(
| ResourceUpdatedNotification
| ResourceListChangedNotification
| ToolListChangedNotification
| PromptListChangedNotification;
| PromptListChangedNotification
| CustomNotification;
);

ts_union!(
Expand DownExpand Up@@ -1907,7 +1908,7 @@ mod tests {
serde_json::from_value(raw.clone()).expect("invalid notification");
match &message {
ClientJsonRpcMessage::Notification(JsonRpcNotification {
notification: ClientNotification::CustomClientNotification(notification),
notification: ClientNotification::CustomNotification(notification),
..
}) => {
assert_eq!(notification.method, "notifications/custom");
Expand All@@ -1927,6 +1928,38 @@ mod tests {
assert_eq!(json, raw);
}

#[test]
fn test_custom_server_notification_roundtrip() {
let raw = json!( {
"jsonrpc": JsonRpcVersion2_0,
"method": "notifications/custom-server",
"params": {"hello": "world"},
});

let message: ServerJsonRpcMessage =
serde_json::from_value(raw.clone()).expect("invalid notification");
match &message {
ServerJsonRpcMessage::Notification(JsonRpcNotification {
notification: ServerNotification::CustomNotification(notification),
..
}) => {
assert_eq!(notification.method, "notifications/custom-server");
assert_eq!(
notification
.params
.as_ref()
.and_then(|p| p.get("hello"))
.expect("hello present"),
"world"
);
}
_ => panic!("Expected custom server notification"),
}

let json = serde_json::to_value(message).expect("valid json");
assert_eq!(json, raw);
}

#[test]
fn test_request_conversion() {
let raw = json!( {
Expand Down
11 changes: 6 additions & 5 deletions crates/rmcp/src/model/meta.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@ use serde::{Deserialize, Serialize};
use serde_json::Value;

use super::{
ClientNotification, ClientRequest, CustomClientNotification, Extensions, JsonObject,
JsonRpcMessage, NumberOrString, ProgressToken, ServerNotification, ServerRequest,
ClientNotification, ClientRequest, CustomNotification, Extensions, JsonObject, JsonRpcMessage,
NumberOrString, ProgressToken, ServerNotification, ServerRequest,
};

pub trait GetMeta {
Expand All@@ -18,7 +18,7 @@ pub trait GetExtensions {
fn extensions_mut(&mut self) -> &mut Extensions;
}

impl GetExtensions for CustomClientNotification {
impl GetExtensions for CustomNotification {
fn extensions(&self) -> &Extensions {
&self.extensions
}
Expand All@@ -27,7 +27,7 @@ impl GetExtensions for CustomClientNotification {
}
}

impl GetMeta for CustomClientNotification {
impl GetMeta for CustomNotification {
fn get_meta_mut(&mut self) -> &mut Meta {
self.extensions_mut().get_or_insert_default()
}
Expand DownExpand Up@@ -104,7 +104,7 @@ variant_extension! {
ProgressNotification
InitializedNotification
RootsListChangedNotification
CustomClientNotification
CustomNotification
}
}

Expand All@@ -117,6 +117,7 @@ variant_extension! {
ResourceListChangedNotification
ToolListChangedNotification
PromptListChangedNotification
CustomNotification
}
}
#[derive(Debug, Serialize, Deserialize, Clone, Default, PartialEq)]
Expand Down
8 changes: 4 additions & 4 deletions crates/rmcp/src/model/serde_impl.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ use std::borrow::Cow;
use serde::{Deserialize, Serialize};

use super::{
CustomClientNotification, Extensions, Meta, Notification, NotificationNoParam, Request,
CustomNotification, Extensions, Meta, Notification, NotificationNoParam, Request,
RequestNoParam, RequestOptionalParam,
};
#[derive(Serialize, Deserialize)]
Expand DownExpand Up@@ -249,7 +249,7 @@ where
}
}

impl Serialize for CustomClientNotification {
impl Serialize for CustomNotification {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
Expand DownExpand Up@@ -277,7 +277,7 @@ impl Serialize for CustomClientNotification {
}
}

impl<'de> Deserialize<'de> for CustomClientNotification {
impl<'de> Deserialize<'de> for CustomNotification {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: serde::Deserializer<'de>,
Expand All@@ -294,7 +294,7 @@ impl<'de> Deserialize<'de> for CustomClientNotification {
if let Some(meta) = _meta {
extensions.insert(meta);
}
Ok(CustomClientNotification {
Ok(CustomNotification {
extensions,
method: body.method,
params,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -396,8 +396,8 @@
"content"
]
},
"CustomClientNotification": {
"description": "A catch-all notification the client can use to send custom messages to a server.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
Expand DownExpand Up@@ -651,7 +651,7 @@
"$ref": "#/definitions/NotificationNoParam2"
},
{
"$ref": "#/definitions/CustomClientNotification"
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -396,8 +396,8 @@
"content"
]
},
"CustomClientNotification": {
"description": "A catch-all notification the client can use to send custom messages to a server.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
Expand DownExpand Up@@ -651,7 +651,7 @@
"$ref": "#/definitions/NotificationNoParam2"
},
{
"$ref": "#/definitions/CustomClientNotification"
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,19 @@
"content"
]
},
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
"type": "string"
},
"params": true
},
"required": [
"method"
]
},
"CancelledNotificationMethod": {
"type": "string",
"format": "const",
Expand DownExpand Up@@ -977,6 +990,9 @@
},
{
"$ref": "#/definitions/NotificationNoParam3"
},
{
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,19 @@
"content"
]
},
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
"type": "string"
},
"params": true
},
"required": [
"method"
]
},
"CancelledNotificationMethod": {
"type": "string",
"format": "const",
Expand DownExpand Up@@ -977,6 +990,9 @@
},
{
"$ref": "#/definitions/NotificationNoParam3"
},
{
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions crates/rmcp/src/handler/client.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,9 @@ impl<H: ClientHandler> Service<RoleClient> for H {
ServerNotification::PromptListChangedNotification(_notification_no_param) => {
self.on_prompt_list_changed(context).await
}
ServerNotification::CustomNotification(notification) => {
self.on_custom_notification(notification, context).await
}
};
Ok(())
}
Expand DownExpand Up@@ -166,6 +169,14 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
) -> impl Future<Output = ()> + Send + '_ {
std::future::ready(())
}
fn on_custom_notification(
&self,
notification: CustomNotification,
context: NotificationContext<RoleClient>,
) -> impl Future<Output = ()> + Send + '_ {
let _ = (notification, context);
std::future::ready(())
}

fn get_info(&self) -> ClientInfo {
ClientInfo::default()
Expand Down
4 changes: 2 additions & 2 deletions crates/rmcp/src/handler/server.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ impl<H: ServerHandler> Service<RoleServer> for H {
ClientNotification::RootsListChangedNotification(_notification) => {
self.on_roots_list_changed(context).await
}
ClientNotification::CustomClientNotification(notification) => {
ClientNotification::CustomNotification(notification) => {
self.on_custom_notification(notification, context).await
}
};
Expand DownExpand Up@@ -230,7 +230,7 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
}
fn on_custom_notification(
&self,
notification: CustomClientNotification,
notification: CustomNotification,
context: NotificationContext<RoleServer>,
) -> impl Future<Output = ()> + Send + '_ {
let _ = (notification, context);
Expand Down
45 changes: 39 additions & 6 deletions crates/rmcp/src/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -627,13 +627,13 @@ const_string!(CancelledNotificationMethod = "notifications/cancelled");
pub type CancelledNotification =
Notification<CancelledNotificationMethod, CancelledNotificationParam>;

/// A catch-all notification the client can use to send custom messages to a server.
/// A catch-all notification either side can use to send custom messages to its peer.
///
/// This preserves the raw `method` name and `params` payload so handlers can
/// deserialize them into domain-specific types.
#[derive(Debug, Clone)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct CustomClientNotification {
pub struct CustomNotification {
pub method: String,
pub params: Option<Value>,
/// extensions will carry anything possible in the context, including [`Meta`]
Expand All@@ -643,7 +643,7 @@ pub struct CustomClientNotification {
pub extensions: Extensions,
}

impl CustomClientNotification {
impl CustomNotification {
pub fn new(method: impl Into<String>, params: Option<Value>) -> Self {
Self {
method: method.into(),
Expand DownExpand Up@@ -1786,7 +1786,7 @@ ts_union!(
| ProgressNotification
| InitializedNotification
| RootsListChangedNotification
| CustomClientNotification;
| CustomNotification;
);

ts_union!(
Expand DownExpand Up@@ -1817,7 +1817,8 @@ ts_union!(
| ResourceUpdatedNotification
| ResourceListChangedNotification
| ToolListChangedNotification
| PromptListChangedNotification;
| PromptListChangedNotification
| CustomNotification;
);

ts_union!(
Expand DownExpand Up@@ -1907,7 +1908,7 @@ mod tests {
serde_json::from_value(raw.clone()).expect("invalid notification");
match &message {
ClientJsonRpcMessage::Notification(JsonRpcNotification {
notification: ClientNotification::CustomClientNotification(notification),
notification: ClientNotification::CustomNotification(notification),
..
}) => {
assert_eq!(notification.method, "notifications/custom");
Expand All@@ -1927,6 +1928,38 @@ mod tests {
assert_eq!(json, raw);
}

#[test]
fn test_custom_server_notification_roundtrip() {
let raw = json!( {
"jsonrpc": JsonRpcVersion2_0,
"method": "notifications/custom-server",
"params": {"hello": "world"},
});

let message: ServerJsonRpcMessage =
serde_json::from_value(raw.clone()).expect("invalid notification");
match &message {
ServerJsonRpcMessage::Notification(JsonRpcNotification {
notification: ServerNotification::CustomNotification(notification),
..
}) => {
assert_eq!(notification.method, "notifications/custom-server");
assert_eq!(
notification
.params
.as_ref()
.and_then(|p| p.get("hello"))
.expect("hello present"),
"world"
);
}
_ => panic!("Expected custom server notification"),
}

let json = serde_json::to_value(message).expect("valid json");
assert_eq!(json, raw);
}

#[test]
fn test_request_conversion() {
let raw = json!( {
Expand Down
11 changes: 6 additions & 5 deletions crates/rmcp/src/model/meta.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@ use serde::{Deserialize, Serialize};
use serde_json::Value;

use super::{
ClientNotification, ClientRequest, CustomClientNotification, Extensions, JsonObject,
JsonRpcMessage, NumberOrString, ProgressToken, ServerNotification, ServerRequest,
ClientNotification, ClientRequest, CustomNotification, Extensions, JsonObject, JsonRpcMessage,
NumberOrString, ProgressToken, ServerNotification, ServerRequest,
};

pub trait GetMeta {
Expand All@@ -18,7 +18,7 @@ pub trait GetExtensions {
fn extensions_mut(&mut self) -> &mut Extensions;
}

impl GetExtensions for CustomClientNotification {
impl GetExtensions for CustomNotification {
fn extensions(&self) -> &Extensions {
&self.extensions
}
Expand All@@ -27,7 +27,7 @@ impl GetExtensions for CustomClientNotification {
}
}

impl GetMeta for CustomClientNotification {
impl GetMeta for CustomNotification {
fn get_meta_mut(&mut self) -> &mut Meta {
self.extensions_mut().get_or_insert_default()
}
Expand DownExpand Up@@ -104,7 +104,7 @@ variant_extension! {
ProgressNotification
InitializedNotification
RootsListChangedNotification
CustomClientNotification
CustomNotification
}
}

Expand All@@ -117,6 +117,7 @@ variant_extension! {
ResourceListChangedNotification
ToolListChangedNotification
PromptListChangedNotification
CustomNotification
}
}
#[derive(Debug, Serialize, Deserialize, Clone, Default, PartialEq)]
Expand Down
8 changes: 4 additions & 4 deletions crates/rmcp/src/model/serde_impl.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ use std::borrow::Cow;
use serde::{Deserialize, Serialize};

use super::{
CustomClientNotification, Extensions, Meta, Notification, NotificationNoParam, Request,
CustomNotification, Extensions, Meta, Notification, NotificationNoParam, Request,
RequestNoParam, RequestOptionalParam,
};
#[derive(Serialize, Deserialize)]
Expand DownExpand Up@@ -249,7 +249,7 @@ where
}
}

impl Serialize for CustomClientNotification {
impl Serialize for CustomNotification {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
Expand DownExpand Up@@ -277,7 +277,7 @@ impl Serialize for CustomClientNotification {
}
}

impl<'de> Deserialize<'de> for CustomClientNotification {
impl<'de> Deserialize<'de> for CustomNotification {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: serde::Deserializer<'de>,
Expand All@@ -294,7 +294,7 @@ impl<'de> Deserialize<'de> for CustomClientNotification {
if let Some(meta) = _meta {
extensions.insert(meta);
}
Ok(CustomClientNotification {
Ok(CustomNotification {
extensions,
method: body.method,
params,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -396,8 +396,8 @@
"content"
]
},
"CustomClientNotification": {
"description": "A catch-all notification the client can use to send custom messages to a server.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
Expand DownExpand Up@@ -651,7 +651,7 @@
"$ref": "#/definitions/NotificationNoParam2"
},
{
"$ref": "#/definitions/CustomClientNotification"
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -396,8 +396,8 @@
"content"
]
},
"CustomClientNotification": {
"description": "A catch-all notification the client can use to send custom messages to a server.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
Expand DownExpand Up@@ -651,7 +651,7 @@
"$ref": "#/definitions/NotificationNoParam2"
},
{
"$ref": "#/definitions/CustomClientNotification"
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,19 @@
"content"
]
},
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
"type": "string"
},
"params": true
},
"required": [
"method"
]
},
"CancelledNotificationMethod": {
"type": "string",
"format": "const",
Expand DownExpand Up@@ -977,6 +990,9 @@
},
{
"$ref": "#/definitions/NotificationNoParam3"
},
{
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,19 @@
"content"
]
},
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
"type": "string"
},
"params": true
},
"required": [
"method"
]
},
"CancelledNotificationMethod": {
"type": "string",
"format": "const",
Expand DownExpand Up@@ -977,6 +990,9 @@
},
{
"$ref": "#/definitions/NotificationNoParam3"
},
{
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions crates/rmcp/src/handler/client.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,9 @@ impl<H: ClientHandler> Service<RoleClient> for H {
ServerNotification::PromptListChangedNotification(_notification_no_param) => {
self.on_prompt_list_changed(context).await
}
ServerNotification::CustomNotification(notification) => {
self.on_custom_notification(notification, context).await
}
};
Ok(())
}
Expand DownExpand Up@@ -166,6 +169,14 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
) -> impl Future<Output = ()> + Send + '_ {
std::future::ready(())
}
fn on_custom_notification(
&self,
notification: CustomNotification,
context: NotificationContext<RoleClient>,
) -> impl Future<Output = ()> + Send + '_ {
let _ = (notification, context);
std::future::ready(())
}

fn get_info(&self) -> ClientInfo {
ClientInfo::default()
Expand Down
4 changes: 2 additions & 2 deletions crates/rmcp/src/handler/server.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ impl<H: ServerHandler> Service<RoleServer> for H {
ClientNotification::RootsListChangedNotification(_notification) => {
self.on_roots_list_changed(context).await
}
ClientNotification::CustomClientNotification(notification) => {
ClientNotification::CustomNotification(notification) => {
self.on_custom_notification(notification, context).await
}
};
Expand DownExpand Up@@ -230,7 +230,7 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
}
fn on_custom_notification(
&self,
notification: CustomClientNotification,
notification: CustomNotification,
context: NotificationContext<RoleServer>,
) -> impl Future<Output = ()> + Send + '_ {
let _ = (notification, context);
Expand Down
45 changes: 39 additions & 6 deletions crates/rmcp/src/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -627,13 +627,13 @@ const_string!(CancelledNotificationMethod = "notifications/cancelled");
pub type CancelledNotification =
Notification<CancelledNotificationMethod, CancelledNotificationParam>;

/// A catch-all notification the client can use to send custom messages to a server.
/// A catch-all notification either side can use to send custom messages to its peer.
///
/// This preserves the raw `method` name and `params` payload so handlers can
/// deserialize them into domain-specific types.
#[derive(Debug, Clone)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct CustomClientNotification {
pub struct CustomNotification {
pub method: String,
pub params: Option<Value>,
/// extensions will carry anything possible in the context, including [`Meta`]
Expand All@@ -643,7 +643,7 @@ pub struct CustomClientNotification {
pub extensions: Extensions,
}

impl CustomClientNotification {
impl CustomNotification {
pub fn new(method: impl Into<String>, params: Option<Value>) -> Self {
Self {
method: method.into(),
Expand DownExpand Up@@ -1786,7 +1786,7 @@ ts_union!(
| ProgressNotification
| InitializedNotification
| RootsListChangedNotification
| CustomClientNotification;
| CustomNotification;
);

ts_union!(
Expand DownExpand Up@@ -1817,7 +1817,8 @@ ts_union!(
| ResourceUpdatedNotification
| ResourceListChangedNotification
| ToolListChangedNotification
| PromptListChangedNotification;
| PromptListChangedNotification
| CustomNotification;
);

ts_union!(
Expand DownExpand Up@@ -1907,7 +1908,7 @@ mod tests {
serde_json::from_value(raw.clone()).expect("invalid notification");
match &message {
ClientJsonRpcMessage::Notification(JsonRpcNotification {
notification: ClientNotification::CustomClientNotification(notification),
notification: ClientNotification::CustomNotification(notification),
..
}) => {
assert_eq!(notification.method, "notifications/custom");
Expand All@@ -1927,6 +1928,38 @@ mod tests {
assert_eq!(json, raw);
}

#[test]
fn test_custom_server_notification_roundtrip() {
let raw = json!( {
"jsonrpc": JsonRpcVersion2_0,
"method": "notifications/custom-server",
"params": {"hello": "world"},
});

let message: ServerJsonRpcMessage =
serde_json::from_value(raw.clone()).expect("invalid notification");
match &message {
ServerJsonRpcMessage::Notification(JsonRpcNotification {
notification: ServerNotification::CustomNotification(notification),
..
}) => {
assert_eq!(notification.method, "notifications/custom-server");
assert_eq!(
notification
.params
.as_ref()
.and_then(|p| p.get("hello"))
.expect("hello present"),
"world"
);
}
_ => panic!("Expected custom server notification"),
}

let json = serde_json::to_value(message).expect("valid json");
assert_eq!(json, raw);
}

#[test]
fn test_request_conversion() {
let raw = json!( {
Expand Down
11 changes: 6 additions & 5 deletions crates/rmcp/src/model/meta.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@ use serde::{Deserialize, Serialize};
use serde_json::Value;

use super::{
ClientNotification, ClientRequest, CustomClientNotification, Extensions, JsonObject,
JsonRpcMessage, NumberOrString, ProgressToken, ServerNotification, ServerRequest,
ClientNotification, ClientRequest, CustomNotification, Extensions, JsonObject, JsonRpcMessage,
NumberOrString, ProgressToken, ServerNotification, ServerRequest,
};

pub trait GetMeta {
Expand All@@ -18,7 +18,7 @@ pub trait GetExtensions {
fn extensions_mut(&mut self) -> &mut Extensions;
}

impl GetExtensions for CustomClientNotification {
impl GetExtensions for CustomNotification {
fn extensions(&self) -> &Extensions {
&self.extensions
}
Expand All@@ -27,7 +27,7 @@ impl GetExtensions for CustomClientNotification {
}
}

impl GetMeta for CustomClientNotification {
impl GetMeta for CustomNotification {
fn get_meta_mut(&mut self) -> &mut Meta {
self.extensions_mut().get_or_insert_default()
}
Expand DownExpand Up@@ -104,7 +104,7 @@ variant_extension! {
ProgressNotification
InitializedNotification
RootsListChangedNotification
CustomClientNotification
CustomNotification
}
}

Expand All@@ -117,6 +117,7 @@ variant_extension! {
ResourceListChangedNotification
ToolListChangedNotification
PromptListChangedNotification
CustomNotification
}
}
#[derive(Debug, Serialize, Deserialize, Clone, Default, PartialEq)]
Expand Down
8 changes: 4 additions & 4 deletions crates/rmcp/src/model/serde_impl.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ use std::borrow::Cow;
use serde::{Deserialize, Serialize};

use super::{
CustomClientNotification, Extensions, Meta, Notification, NotificationNoParam, Request,
CustomNotification, Extensions, Meta, Notification, NotificationNoParam, Request,
RequestNoParam, RequestOptionalParam,
};
#[derive(Serialize, Deserialize)]
Expand DownExpand Up@@ -249,7 +249,7 @@ where
}
}

impl Serialize for CustomClientNotification {
impl Serialize for CustomNotification {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
Expand DownExpand Up@@ -277,7 +277,7 @@ impl Serialize for CustomClientNotification {
}
}

impl<'de> Deserialize<'de> for CustomClientNotification {
impl<'de> Deserialize<'de> for CustomNotification {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: serde::Deserializer<'de>,
Expand All@@ -294,7 +294,7 @@ impl<'de> Deserialize<'de> for CustomClientNotification {
if let Some(meta) = _meta {
extensions.insert(meta);
}
Ok(CustomClientNotification {
Ok(CustomNotification {
extensions,
method: body.method,
params,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -396,8 +396,8 @@
"content"
]
},
"CustomClientNotification": {
"description": "A catch-all notification the client can use to send custom messages to a server.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
Expand DownExpand Up@@ -651,7 +651,7 @@
"$ref": "#/definitions/NotificationNoParam2"
},
{
"$ref": "#/definitions/CustomClientNotification"
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -396,8 +396,8 @@
"content"
]
},
"CustomClientNotification": {
"description": "A catch-all notification the client can use to send custom messages to a server.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
Expand DownExpand Up@@ -651,7 +651,7 @@
"$ref": "#/definitions/NotificationNoParam2"
},
{
"$ref": "#/definitions/CustomClientNotification"
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,19 @@
"content"
]
},
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
"type": "string"
},
"params": true
},
"required": [
"method"
]
},
"CancelledNotificationMethod": {
"type": "string",
"format": "const",
Expand DownExpand Up@@ -977,6 +990,9 @@
},
{
"$ref": "#/definitions/NotificationNoParam3"
},
{
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,19 @@
"content"
]
},
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
"type": "string"
},
"params": true
},
"required": [
"method"
]
},
"CancelledNotificationMethod": {
"type": "string",
"format": "const",
Expand DownExpand Up@@ -977,6 +990,9 @@
},
{
"$ref": "#/definitions/NotificationNoParam3"
},
{
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions crates/rmcp/src/handler/client.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,9 @@ impl<H: ClientHandler> Service<RoleClient> for H {
ServerNotification::PromptListChangedNotification(_notification_no_param) => {
self.on_prompt_list_changed(context).await
}
ServerNotification::CustomNotification(notification) => {
self.on_custom_notification(notification, context).await
}
};
Ok(())
}
Expand DownExpand Up@@ -166,6 +169,14 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
) -> impl Future<Output = ()> + Send + '_ {
std::future::ready(())
}
fn on_custom_notification(
&self,
notification: CustomNotification,
context: NotificationContext<RoleClient>,
) -> impl Future<Output = ()> + Send + '_ {
let _ = (notification, context);
std::future::ready(())
}

fn get_info(&self) -> ClientInfo {
ClientInfo::default()
Expand Down
4 changes: 2 additions & 2 deletions crates/rmcp/src/handler/server.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ impl<H: ServerHandler> Service<RoleServer> for H {
ClientNotification::RootsListChangedNotification(_notification) => {
self.on_roots_list_changed(context).await
}
ClientNotification::CustomClientNotification(notification) => {
ClientNotification::CustomNotification(notification) => {
self.on_custom_notification(notification, context).await
}
};
Expand DownExpand Up@@ -230,7 +230,7 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
}
fn on_custom_notification(
&self,
notification: CustomClientNotification,
notification: CustomNotification,
context: NotificationContext<RoleServer>,
) -> impl Future<Output = ()> + Send + '_ {
let _ = (notification, context);
Expand Down
45 changes: 39 additions & 6 deletions crates/rmcp/src/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -627,13 +627,13 @@ const_string!(CancelledNotificationMethod = "notifications/cancelled");
pub type CancelledNotification =
Notification<CancelledNotificationMethod, CancelledNotificationParam>;

/// A catch-all notification the client can use to send custom messages to a server.
/// A catch-all notification either side can use to send custom messages to its peer.
///
/// This preserves the raw `method` name and `params` payload so handlers can
/// deserialize them into domain-specific types.
#[derive(Debug, Clone)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct CustomClientNotification {
pub struct CustomNotification {
pub method: String,
pub params: Option<Value>,
/// extensions will carry anything possible in the context, including [`Meta`]
Expand All@@ -643,7 +643,7 @@ pub struct CustomClientNotification {
pub extensions: Extensions,
}

impl CustomClientNotification {
impl CustomNotification {
pub fn new(method: impl Into<String>, params: Option<Value>) -> Self {
Self {
method: method.into(),
Expand DownExpand Up@@ -1786,7 +1786,7 @@ ts_union!(
| ProgressNotification
| InitializedNotification
| RootsListChangedNotification
| CustomClientNotification;
| CustomNotification;
);

ts_union!(
Expand DownExpand Up@@ -1817,7 +1817,8 @@ ts_union!(
| ResourceUpdatedNotification
| ResourceListChangedNotification
| ToolListChangedNotification
| PromptListChangedNotification;
| PromptListChangedNotification
| CustomNotification;
);

ts_union!(
Expand DownExpand Up@@ -1907,7 +1908,7 @@ mod tests {
serde_json::from_value(raw.clone()).expect("invalid notification");
match &message {
ClientJsonRpcMessage::Notification(JsonRpcNotification {
notification: ClientNotification::CustomClientNotification(notification),
notification: ClientNotification::CustomNotification(notification),
..
}) => {
assert_eq!(notification.method, "notifications/custom");
Expand All@@ -1927,6 +1928,38 @@ mod tests {
assert_eq!(json, raw);
}

#[test]
fn test_custom_server_notification_roundtrip() {
let raw = json!( {
"jsonrpc": JsonRpcVersion2_0,
"method": "notifications/custom-server",
"params": {"hello": "world"},
});

let message: ServerJsonRpcMessage =
serde_json::from_value(raw.clone()).expect("invalid notification");
match &message {
ServerJsonRpcMessage::Notification(JsonRpcNotification {
notification: ServerNotification::CustomNotification(notification),
..
}) => {
assert_eq!(notification.method, "notifications/custom-server");
assert_eq!(
notification
.params
.as_ref()
.and_then(|p| p.get("hello"))
.expect("hello present"),
"world"
);
}
_ => panic!("Expected custom server notification"),
}

let json = serde_json::to_value(message).expect("valid json");
assert_eq!(json, raw);
}

#[test]
fn test_request_conversion() {
let raw = json!( {
Expand Down
11 changes: 6 additions & 5 deletions crates/rmcp/src/model/meta.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@ use serde::{Deserialize, Serialize};
use serde_json::Value;

use super::{
ClientNotification, ClientRequest, CustomClientNotification, Extensions, JsonObject,
JsonRpcMessage, NumberOrString, ProgressToken, ServerNotification, ServerRequest,
ClientNotification, ClientRequest, CustomNotification, Extensions, JsonObject, JsonRpcMessage,
NumberOrString, ProgressToken, ServerNotification, ServerRequest,
};

pub trait GetMeta {
Expand All@@ -18,7 +18,7 @@ pub trait GetExtensions {
fn extensions_mut(&mut self) -> &mut Extensions;
}

impl GetExtensions for CustomClientNotification {
impl GetExtensions for CustomNotification {
fn extensions(&self) -> &Extensions {
&self.extensions
}
Expand All@@ -27,7 +27,7 @@ impl GetExtensions for CustomClientNotification {
}
}

impl GetMeta for CustomClientNotification {
impl GetMeta for CustomNotification {
fn get_meta_mut(&mut self) -> &mut Meta {
self.extensions_mut().get_or_insert_default()
}
Expand DownExpand Up@@ -104,7 +104,7 @@ variant_extension! {
ProgressNotification
InitializedNotification
RootsListChangedNotification
CustomClientNotification
CustomNotification
}
}

Expand All@@ -117,6 +117,7 @@ variant_extension! {
ResourceListChangedNotification
ToolListChangedNotification
PromptListChangedNotification
CustomNotification
}
}
#[derive(Debug, Serialize, Deserialize, Clone, Default, PartialEq)]
Expand Down
8 changes: 4 additions & 4 deletions crates/rmcp/src/model/serde_impl.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ use std::borrow::Cow;
use serde::{Deserialize, Serialize};

use super::{
CustomClientNotification, Extensions, Meta, Notification, NotificationNoParam, Request,
CustomNotification, Extensions, Meta, Notification, NotificationNoParam, Request,
RequestNoParam, RequestOptionalParam,
};
#[derive(Serialize, Deserialize)]
Expand DownExpand Up@@ -249,7 +249,7 @@ where
}
}

impl Serialize for CustomClientNotification {
impl Serialize for CustomNotification {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
Expand DownExpand Up@@ -277,7 +277,7 @@ impl Serialize for CustomClientNotification {
}
}

impl<'de> Deserialize<'de> for CustomClientNotification {
impl<'de> Deserialize<'de> for CustomNotification {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: serde::Deserializer<'de>,
Expand All@@ -294,7 +294,7 @@ impl<'de> Deserialize<'de> for CustomClientNotification {
if let Some(meta) = _meta {
extensions.insert(meta);
}
Ok(CustomClientNotification {
Ok(CustomNotification {
extensions,
method: body.method,
params,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -396,8 +396,8 @@
"content"
]
},
"CustomClientNotification": {
"description": "A catch-all notification the client can use to send custom messages to a server.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
Expand DownExpand Up@@ -651,7 +651,7 @@
"$ref": "#/definitions/NotificationNoParam2"
},
{
"$ref": "#/definitions/CustomClientNotification"
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -396,8 +396,8 @@
"content"
]
},
"CustomClientNotification": {
"description": "A catch-all notification the client can use to send custom messages to a server.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
Expand DownExpand Up@@ -651,7 +651,7 @@
"$ref": "#/definitions/NotificationNoParam2"
},
{
"$ref": "#/definitions/CustomClientNotification"
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,19 @@
"content"
]
},
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
"type": "string"
},
"params": true
},
"required": [
"method"
]
},
"CancelledNotificationMethod": {
"type": "string",
"format": "const",
Expand DownExpand Up@@ -977,6 +990,9 @@
},
{
"$ref": "#/definitions/NotificationNoParam3"
},
{
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,19 @@
"content"
]
},
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
"type": "string"
},
"params": true
},
"required": [
"method"
]
},
"CancelledNotificationMethod": {
"type": "string",
"format": "const",
Expand DownExpand Up@@ -977,6 +990,9 @@
},
{
"$ref": "#/definitions/NotificationNoParam3"
},
{
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions crates/rmcp/src/handler/client.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,9 @@ impl<H: ClientHandler> Service<RoleClient> for H {
ServerNotification::PromptListChangedNotification(_notification_no_param) => {
self.on_prompt_list_changed(context).await
}
ServerNotification::CustomNotification(notification) => {
self.on_custom_notification(notification, context).await
}
};
Ok(())
}
Expand DownExpand Up@@ -166,6 +169,14 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
) -> impl Future<Output = ()> + Send + '_ {
std::future::ready(())
}
fn on_custom_notification(
&self,
notification: CustomNotification,
context: NotificationContext<RoleClient>,
) -> impl Future<Output = ()> + Send + '_ {
let _ = (notification, context);
std::future::ready(())
}

fn get_info(&self) -> ClientInfo {
ClientInfo::default()
Expand Down
4 changes: 2 additions & 2 deletions crates/rmcp/src/handler/server.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ impl<H: ServerHandler> Service<RoleServer> for H {
ClientNotification::RootsListChangedNotification(_notification) => {
self.on_roots_list_changed(context).await
}
ClientNotification::CustomClientNotification(notification) => {
ClientNotification::CustomNotification(notification) => {
self.on_custom_notification(notification, context).await
}
};
Expand DownExpand Up@@ -230,7 +230,7 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
}
fn on_custom_notification(
&self,
notification: CustomClientNotification,
notification: CustomNotification,
context: NotificationContext<RoleServer>,
) -> impl Future<Output = ()> + Send + '_ {
let _ = (notification, context);
Expand Down
45 changes: 39 additions & 6 deletions crates/rmcp/src/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -627,13 +627,13 @@ const_string!(CancelledNotificationMethod = "notifications/cancelled");
pub type CancelledNotification =
Notification<CancelledNotificationMethod, CancelledNotificationParam>;

/// A catch-all notification the client can use to send custom messages to a server.
/// A catch-all notification either side can use to send custom messages to its peer.
///
/// This preserves the raw `method` name and `params` payload so handlers can
/// deserialize them into domain-specific types.
#[derive(Debug, Clone)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct CustomClientNotification {
pub struct CustomNotification {
pub method: String,
pub params: Option<Value>,
/// extensions will carry anything possible in the context, including [`Meta`]
Expand All@@ -643,7 +643,7 @@ pub struct CustomClientNotification {
pub extensions: Extensions,
}

impl CustomClientNotification {
impl CustomNotification {
pub fn new(method: impl Into<String>, params: Option<Value>) -> Self {
Self {
method: method.into(),
Expand DownExpand Up@@ -1786,7 +1786,7 @@ ts_union!(
| ProgressNotification
| InitializedNotification
| RootsListChangedNotification
| CustomClientNotification;
| CustomNotification;
);

ts_union!(
Expand DownExpand Up@@ -1817,7 +1817,8 @@ ts_union!(
| ResourceUpdatedNotification
| ResourceListChangedNotification
| ToolListChangedNotification
| PromptListChangedNotification;
| PromptListChangedNotification
| CustomNotification;
);

ts_union!(
Expand DownExpand Up@@ -1907,7 +1908,7 @@ mod tests {
serde_json::from_value(raw.clone()).expect("invalid notification");
match &message {
ClientJsonRpcMessage::Notification(JsonRpcNotification {
notification: ClientNotification::CustomClientNotification(notification),
notification: ClientNotification::CustomNotification(notification),
..
}) => {
assert_eq!(notification.method, "notifications/custom");
Expand All@@ -1927,6 +1928,38 @@ mod tests {
assert_eq!(json, raw);
}

#[test]
fn test_custom_server_notification_roundtrip() {
let raw = json!( {
"jsonrpc": JsonRpcVersion2_0,
"method": "notifications/custom-server",
"params": {"hello": "world"},
});

let message: ServerJsonRpcMessage =
serde_json::from_value(raw.clone()).expect("invalid notification");
match &message {
ServerJsonRpcMessage::Notification(JsonRpcNotification {
notification: ServerNotification::CustomNotification(notification),
..
}) => {
assert_eq!(notification.method, "notifications/custom-server");
assert_eq!(
notification
.params
.as_ref()
.and_then(|p| p.get("hello"))
.expect("hello present"),
"world"
);
}
_ => panic!("Expected custom server notification"),
}

let json = serde_json::to_value(message).expect("valid json");
assert_eq!(json, raw);
}

#[test]
fn test_request_conversion() {
let raw = json!( {
Expand Down
11 changes: 6 additions & 5 deletions crates/rmcp/src/model/meta.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@ use serde::{Deserialize, Serialize};
use serde_json::Value;

use super::{
ClientNotification, ClientRequest, CustomClientNotification, Extensions, JsonObject,
JsonRpcMessage, NumberOrString, ProgressToken, ServerNotification, ServerRequest,
ClientNotification, ClientRequest, CustomNotification, Extensions, JsonObject, JsonRpcMessage,
NumberOrString, ProgressToken, ServerNotification, ServerRequest,
};

pub trait GetMeta {
Expand All@@ -18,7 +18,7 @@ pub trait GetExtensions {
fn extensions_mut(&mut self) -> &mut Extensions;
}

impl GetExtensions for CustomClientNotification {
impl GetExtensions for CustomNotification {
fn extensions(&self) -> &Extensions {
&self.extensions
}
Expand All@@ -27,7 +27,7 @@ impl GetExtensions for CustomClientNotification {
}
}

impl GetMeta for CustomClientNotification {
impl GetMeta for CustomNotification {
fn get_meta_mut(&mut self) -> &mut Meta {
self.extensions_mut().get_or_insert_default()
}
Expand DownExpand Up@@ -104,7 +104,7 @@ variant_extension! {
ProgressNotification
InitializedNotification
RootsListChangedNotification
CustomClientNotification
CustomNotification
}
}

Expand All@@ -117,6 +117,7 @@ variant_extension! {
ResourceListChangedNotification
ToolListChangedNotification
PromptListChangedNotification
CustomNotification
}
}
#[derive(Debug, Serialize, Deserialize, Clone, Default, PartialEq)]
Expand Down
8 changes: 4 additions & 4 deletions crates/rmcp/src/model/serde_impl.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ use std::borrow::Cow;
use serde::{Deserialize, Serialize};

use super::{
CustomClientNotification, Extensions, Meta, Notification, NotificationNoParam, Request,
CustomNotification, Extensions, Meta, Notification, NotificationNoParam, Request,
RequestNoParam, RequestOptionalParam,
};
#[derive(Serialize, Deserialize)]
Expand DownExpand Up@@ -249,7 +249,7 @@ where
}
}

impl Serialize for CustomClientNotification {
impl Serialize for CustomNotification {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
Expand DownExpand Up@@ -277,7 +277,7 @@ impl Serialize for CustomClientNotification {
}
}

impl<'de> Deserialize<'de> for CustomClientNotification {
impl<'de> Deserialize<'de> for CustomNotification {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: serde::Deserializer<'de>,
Expand All@@ -294,7 +294,7 @@ impl<'de> Deserialize<'de> for CustomClientNotification {
if let Some(meta) = _meta {
extensions.insert(meta);
}
Ok(CustomClientNotification {
Ok(CustomNotification {
extensions,
method: body.method,
params,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -396,8 +396,8 @@
"content"
]
},
"CustomClientNotification": {
"description": "A catch-all notification the client can use to send custom messages to a server.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
Expand DownExpand Up@@ -651,7 +651,7 @@
"$ref": "#/definitions/NotificationNoParam2"
},
{
"$ref": "#/definitions/CustomClientNotification"
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -396,8 +396,8 @@
"content"
]
},
"CustomClientNotification": {
"description": "A catch-all notification the client can use to send custom messages to a server.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
Expand DownExpand Up@@ -651,7 +651,7 @@
"$ref": "#/definitions/NotificationNoParam2"
},
{
"$ref": "#/definitions/CustomClientNotification"
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,19 @@
"content"
]
},
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
"type": "string"
},
"params": true
},
"required": [
"method"
]
},
"CancelledNotificationMethod": {
"type": "string",
"format": "const",
Expand DownExpand Up@@ -977,6 +990,9 @@
},
{
"$ref": "#/definitions/NotificationNoParam3"
},
{
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,19 @@
"content"
]
},
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
"type": "string"
},
"params": true
},
"required": [
"method"
]
},
"CancelledNotificationMethod": {
"type": "string",
"format": "const",
Expand DownExpand Up@@ -977,6 +990,9 @@
},
{
"$ref": "#/definitions/NotificationNoParam3"
},
{
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions crates/rmcp/src/handler/client.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,9 @@ impl<H: ClientHandler> Service<RoleClient> for H {
ServerNotification::PromptListChangedNotification(_notification_no_param) => {
self.on_prompt_list_changed(context).await
}
ServerNotification::CustomNotification(notification) => {
self.on_custom_notification(notification, context).await
}
};
Ok(())
}
Expand DownExpand Up@@ -166,6 +169,14 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
) -> impl Future<Output = ()> + Send + '_ {
std::future::ready(())
}
fn on_custom_notification(
&self,
notification: CustomNotification,
context: NotificationContext<RoleClient>,
) -> impl Future<Output = ()> + Send + '_ {
let _ = (notification, context);
std::future::ready(())
}

fn get_info(&self) -> ClientInfo {
ClientInfo::default()
Expand Down
4 changes: 2 additions & 2 deletions crates/rmcp/src/handler/server.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ impl<H: ServerHandler> Service<RoleServer> for H {
ClientNotification::RootsListChangedNotification(_notification) => {
self.on_roots_list_changed(context).await
}
ClientNotification::CustomClientNotification(notification) => {
ClientNotification::CustomNotification(notification) => {
self.on_custom_notification(notification, context).await
}
};
Expand DownExpand Up@@ -230,7 +230,7 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
}
fn on_custom_notification(
&self,
notification: CustomClientNotification,
notification: CustomNotification,
context: NotificationContext<RoleServer>,
) -> impl Future<Output = ()> + Send + '_ {
let _ = (notification, context);
Expand Down
45 changes: 39 additions & 6 deletions crates/rmcp/src/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -627,13 +627,13 @@ const_string!(CancelledNotificationMethod = "notifications/cancelled");
pub type CancelledNotification =
Notification<CancelledNotificationMethod, CancelledNotificationParam>;

/// A catch-all notification the client can use to send custom messages to a server.
/// A catch-all notification either side can use to send custom messages to its peer.
///
/// This preserves the raw `method` name and `params` payload so handlers can
/// deserialize them into domain-specific types.
#[derive(Debug, Clone)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct CustomClientNotification {
pub struct CustomNotification {
pub method: String,
pub params: Option<Value>,
/// extensions will carry anything possible in the context, including [`Meta`]
Expand All@@ -643,7 +643,7 @@ pub struct CustomClientNotification {
pub extensions: Extensions,
}

impl CustomClientNotification {
impl CustomNotification {
pub fn new(method: impl Into<String>, params: Option<Value>) -> Self {
Self {
method: method.into(),
Expand DownExpand Up@@ -1786,7 +1786,7 @@ ts_union!(
| ProgressNotification
| InitializedNotification
| RootsListChangedNotification
| CustomClientNotification;
| CustomNotification;
);

ts_union!(
Expand DownExpand Up@@ -1817,7 +1817,8 @@ ts_union!(
| ResourceUpdatedNotification
| ResourceListChangedNotification
| ToolListChangedNotification
| PromptListChangedNotification;
| PromptListChangedNotification
| CustomNotification;
);

ts_union!(
Expand DownExpand Up@@ -1907,7 +1908,7 @@ mod tests {
serde_json::from_value(raw.clone()).expect("invalid notification");
match &message {
ClientJsonRpcMessage::Notification(JsonRpcNotification {
notification: ClientNotification::CustomClientNotification(notification),
notification: ClientNotification::CustomNotification(notification),
..
}) => {
assert_eq!(notification.method, "notifications/custom");
Expand All@@ -1927,6 +1928,38 @@ mod tests {
assert_eq!(json, raw);
}

#[test]
fn test_custom_server_notification_roundtrip() {
let raw = json!( {
"jsonrpc": JsonRpcVersion2_0,
"method": "notifications/custom-server",
"params": {"hello": "world"},
});

let message: ServerJsonRpcMessage =
serde_json::from_value(raw.clone()).expect("invalid notification");
match &message {
ServerJsonRpcMessage::Notification(JsonRpcNotification {
notification: ServerNotification::CustomNotification(notification),
..
}) => {
assert_eq!(notification.method, "notifications/custom-server");
assert_eq!(
notification
.params
.as_ref()
.and_then(|p| p.get("hello"))
.expect("hello present"),
"world"
);
}
_ => panic!("Expected custom server notification"),
}

let json = serde_json::to_value(message).expect("valid json");
assert_eq!(json, raw);
}

#[test]
fn test_request_conversion() {
let raw = json!( {
Expand Down
11 changes: 6 additions & 5 deletions crates/rmcp/src/model/meta.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@ use serde::{Deserialize, Serialize};
use serde_json::Value;

use super::{
ClientNotification, ClientRequest, CustomClientNotification, Extensions, JsonObject,
JsonRpcMessage, NumberOrString, ProgressToken, ServerNotification, ServerRequest,
ClientNotification, ClientRequest, CustomNotification, Extensions, JsonObject, JsonRpcMessage,
NumberOrString, ProgressToken, ServerNotification, ServerRequest,
};

pub trait GetMeta {
Expand All@@ -18,7 +18,7 @@ pub trait GetExtensions {
fn extensions_mut(&mut self) -> &mut Extensions;
}

impl GetExtensions for CustomClientNotification {
impl GetExtensions for CustomNotification {
fn extensions(&self) -> &Extensions {
&self.extensions
}
Expand All@@ -27,7 +27,7 @@ impl GetExtensions for CustomClientNotification {
}
}

impl GetMeta for CustomClientNotification {
impl GetMeta for CustomNotification {
fn get_meta_mut(&mut self) -> &mut Meta {
self.extensions_mut().get_or_insert_default()
}
Expand DownExpand Up@@ -104,7 +104,7 @@ variant_extension! {
ProgressNotification
InitializedNotification
RootsListChangedNotification
CustomClientNotification
CustomNotification
}
}

Expand All@@ -117,6 +117,7 @@ variant_extension! {
ResourceListChangedNotification
ToolListChangedNotification
PromptListChangedNotification
CustomNotification
}
}
#[derive(Debug, Serialize, Deserialize, Clone, Default, PartialEq)]
Expand Down
8 changes: 4 additions & 4 deletions crates/rmcp/src/model/serde_impl.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ use std::borrow::Cow;
use serde::{Deserialize, Serialize};

use super::{
CustomClientNotification, Extensions, Meta, Notification, NotificationNoParam, Request,
CustomNotification, Extensions, Meta, Notification, NotificationNoParam, Request,
RequestNoParam, RequestOptionalParam,
};
#[derive(Serialize, Deserialize)]
Expand DownExpand Up@@ -249,7 +249,7 @@ where
}
}

impl Serialize for CustomClientNotification {
impl Serialize for CustomNotification {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
Expand DownExpand Up@@ -277,7 +277,7 @@ impl Serialize for CustomClientNotification {
}
}

impl<'de> Deserialize<'de> for CustomClientNotification {
impl<'de> Deserialize<'de> for CustomNotification {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: serde::Deserializer<'de>,
Expand All@@ -294,7 +294,7 @@ impl<'de> Deserialize<'de> for CustomClientNotification {
if let Some(meta) = _meta {
extensions.insert(meta);
}
Ok(CustomClientNotification {
Ok(CustomNotification {
extensions,
method: body.method,
params,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -396,8 +396,8 @@
"content"
]
},
"CustomClientNotification": {
"description": "A catch-all notification the client can use to send custom messages to a server.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
Expand DownExpand Up@@ -651,7 +651,7 @@
"$ref": "#/definitions/NotificationNoParam2"
},
{
"$ref": "#/definitions/CustomClientNotification"
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -396,8 +396,8 @@
"content"
]
},
"CustomClientNotification": {
"description": "A catch-all notification the client can use to send custom messages to a server.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
Expand DownExpand Up@@ -651,7 +651,7 @@
"$ref": "#/definitions/NotificationNoParam2"
},
{
"$ref": "#/definitions/CustomClientNotification"
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,19 @@
"content"
]
},
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
"type": "string"
},
"params": true
},
"required": [
"method"
]
},
"CancelledNotificationMethod": {
"type": "string",
"format": "const",
Expand DownExpand Up@@ -977,6 +990,9 @@
},
{
"$ref": "#/definitions/NotificationNoParam3"
},
{
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,19 @@
"content"
]
},
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
"type": "string"
},
"params": true
},
"required": [
"method"
]
},
"CancelledNotificationMethod": {
"type": "string",
"format": "const",
Expand DownExpand Up@@ -977,6 +990,9 @@
},
{
"$ref": "#/definitions/NotificationNoParam3"
},
{
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions crates/rmcp/src/handler/client.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,9 @@ impl<H: ClientHandler> Service<RoleClient> for H {
ServerNotification::PromptListChangedNotification(_notification_no_param) => {
self.on_prompt_list_changed(context).await
}
ServerNotification::CustomNotification(notification) => {
self.on_custom_notification(notification, context).await
}
};
Ok(())
}
Expand DownExpand Up@@ -166,6 +169,14 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
) -> impl Future<Output = ()> + Send + '_ {
std::future::ready(())
}
fn on_custom_notification(
&self,
notification: CustomNotification,
context: NotificationContext<RoleClient>,
) -> impl Future<Output = ()> + Send + '_ {
let _ = (notification, context);
std::future::ready(())
}

fn get_info(&self) -> ClientInfo {
ClientInfo::default()
Expand Down
4 changes: 2 additions & 2 deletions crates/rmcp/src/handler/server.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ impl<H: ServerHandler> Service<RoleServer> for H {
ClientNotification::RootsListChangedNotification(_notification) => {
self.on_roots_list_changed(context).await
}
ClientNotification::CustomClientNotification(notification) => {
ClientNotification::CustomNotification(notification) => {
self.on_custom_notification(notification, context).await
}
};
Expand DownExpand Up@@ -230,7 +230,7 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
}
fn on_custom_notification(
&self,
notification: CustomClientNotification,
notification: CustomNotification,
context: NotificationContext<RoleServer>,
) -> impl Future<Output = ()> + Send + '_ {
let _ = (notification, context);
Expand Down
45 changes: 39 additions & 6 deletions crates/rmcp/src/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -627,13 +627,13 @@ const_string!(CancelledNotificationMethod = "notifications/cancelled");
pub type CancelledNotification =
Notification<CancelledNotificationMethod, CancelledNotificationParam>;

/// A catch-all notification the client can use to send custom messages to a server.
/// A catch-all notification either side can use to send custom messages to its peer.
///
/// This preserves the raw `method` name and `params` payload so handlers can
/// deserialize them into domain-specific types.
#[derive(Debug, Clone)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct CustomClientNotification {
pub struct CustomNotification {
pub method: String,
pub params: Option<Value>,
/// extensions will carry anything possible in the context, including [`Meta`]
Expand All@@ -643,7 +643,7 @@ pub struct CustomClientNotification {
pub extensions: Extensions,
}

impl CustomClientNotification {
impl CustomNotification {
pub fn new(method: impl Into<String>, params: Option<Value>) -> Self {
Self {
method: method.into(),
Expand DownExpand Up@@ -1786,7 +1786,7 @@ ts_union!(
| ProgressNotification
| InitializedNotification
| RootsListChangedNotification
| CustomClientNotification;
| CustomNotification;
);

ts_union!(
Expand DownExpand Up@@ -1817,7 +1817,8 @@ ts_union!(
| ResourceUpdatedNotification
| ResourceListChangedNotification
| ToolListChangedNotification
| PromptListChangedNotification;
| PromptListChangedNotification
| CustomNotification;
);

ts_union!(
Expand DownExpand Up@@ -1907,7 +1908,7 @@ mod tests {
serde_json::from_value(raw.clone()).expect("invalid notification");
match &message {
ClientJsonRpcMessage::Notification(JsonRpcNotification {
notification: ClientNotification::CustomClientNotification(notification),
notification: ClientNotification::CustomNotification(notification),
..
}) => {
assert_eq!(notification.method, "notifications/custom");
Expand All@@ -1927,6 +1928,38 @@ mod tests {
assert_eq!(json, raw);
}

#[test]
fn test_custom_server_notification_roundtrip() {
let raw = json!( {
"jsonrpc": JsonRpcVersion2_0,
"method": "notifications/custom-server",
"params": {"hello": "world"},
});

let message: ServerJsonRpcMessage =
serde_json::from_value(raw.clone()).expect("invalid notification");
match &message {
ServerJsonRpcMessage::Notification(JsonRpcNotification {
notification: ServerNotification::CustomNotification(notification),
..
}) => {
assert_eq!(notification.method, "notifications/custom-server");
assert_eq!(
notification
.params
.as_ref()
.and_then(|p| p.get("hello"))
.expect("hello present"),
"world"
);
}
_ => panic!("Expected custom server notification"),
}

let json = serde_json::to_value(message).expect("valid json");
assert_eq!(json, raw);
}

#[test]
fn test_request_conversion() {
let raw = json!( {
Expand Down
11 changes: 6 additions & 5 deletions crates/rmcp/src/model/meta.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@ use serde::{Deserialize, Serialize};
use serde_json::Value;

use super::{
ClientNotification, ClientRequest, CustomClientNotification, Extensions, JsonObject,
JsonRpcMessage, NumberOrString, ProgressToken, ServerNotification, ServerRequest,
ClientNotification, ClientRequest, CustomNotification, Extensions, JsonObject, JsonRpcMessage,
NumberOrString, ProgressToken, ServerNotification, ServerRequest,
};

pub trait GetMeta {
Expand All@@ -18,7 +18,7 @@ pub trait GetExtensions {
fn extensions_mut(&mut self) -> &mut Extensions;
}

impl GetExtensions for CustomClientNotification {
impl GetExtensions for CustomNotification {
fn extensions(&self) -> &Extensions {
&self.extensions
}
Expand All@@ -27,7 +27,7 @@ impl GetExtensions for CustomClientNotification {
}
}

impl GetMeta for CustomClientNotification {
impl GetMeta for CustomNotification {
fn get_meta_mut(&mut self) -> &mut Meta {
self.extensions_mut().get_or_insert_default()
}
Expand DownExpand Up@@ -104,7 +104,7 @@ variant_extension! {
ProgressNotification
InitializedNotification
RootsListChangedNotification
CustomClientNotification
CustomNotification
}
}

Expand All@@ -117,6 +117,7 @@ variant_extension! {
ResourceListChangedNotification
ToolListChangedNotification
PromptListChangedNotification
CustomNotification
}
}
#[derive(Debug, Serialize, Deserialize, Clone, Default, PartialEq)]
Expand Down
8 changes: 4 additions & 4 deletions crates/rmcp/src/model/serde_impl.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ use std::borrow::Cow;
use serde::{Deserialize, Serialize};

use super::{
CustomClientNotification, Extensions, Meta, Notification, NotificationNoParam, Request,
CustomNotification, Extensions, Meta, Notification, NotificationNoParam, Request,
RequestNoParam, RequestOptionalParam,
};
#[derive(Serialize, Deserialize)]
Expand DownExpand Up@@ -249,7 +249,7 @@ where
}
}

impl Serialize for CustomClientNotification {
impl Serialize for CustomNotification {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
Expand DownExpand Up@@ -277,7 +277,7 @@ impl Serialize for CustomClientNotification {
}
}

impl<'de> Deserialize<'de> for CustomClientNotification {
impl<'de> Deserialize<'de> for CustomNotification {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: serde::Deserializer<'de>,
Expand All@@ -294,7 +294,7 @@ impl<'de> Deserialize<'de> for CustomClientNotification {
if let Some(meta) = _meta {
extensions.insert(meta);
}
Ok(CustomClientNotification {
Ok(CustomNotification {
extensions,
method: body.method,
params,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -396,8 +396,8 @@
"content"
]
},
"CustomClientNotification": {
"description": "A catch-all notification the client can use to send custom messages to a server.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
Expand DownExpand Up@@ -651,7 +651,7 @@
"$ref": "#/definitions/NotificationNoParam2"
},
{
"$ref": "#/definitions/CustomClientNotification"
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -396,8 +396,8 @@
"content"
]
},
"CustomClientNotification": {
"description": "A catch-all notification the client can use to send custom messages to a server.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
Expand DownExpand Up@@ -651,7 +651,7 @@
"$ref": "#/definitions/NotificationNoParam2"
},
{
"$ref": "#/definitions/CustomClientNotification"
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,19 @@
"content"
]
},
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
"type": "string"
},
"params": true
},
"required": [
"method"
]
},
"CancelledNotificationMethod": {
"type": "string",
"format": "const",
Expand DownExpand Up@@ -977,6 +990,9 @@
},
{
"$ref": "#/definitions/NotificationNoParam3"
},
{
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,19 @@
"content"
]
},
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
"type": "string"
},
"params": true
},
"required": [
"method"
]
},
"CancelledNotificationMethod": {
"type": "string",
"format": "const",
Expand DownExpand Up@@ -977,6 +990,9 @@
},
{
"$ref": "#/definitions/NotificationNoParam3"
},
{
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions crates/rmcp/src/handler/client.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,9 @@ impl<H: ClientHandler> Service<RoleClient> for H {
ServerNotification::PromptListChangedNotification(_notification_no_param) => {
self.on_prompt_list_changed(context).await
}
ServerNotification::CustomNotification(notification) => {
self.on_custom_notification(notification, context).await
}
};
Ok(())
}
Expand DownExpand Up@@ -166,6 +169,14 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
) -> impl Future<Output = ()> + Send + '_ {
std::future::ready(())
}
fn on_custom_notification(
&self,
notification: CustomNotification,
context: NotificationContext<RoleClient>,
) -> impl Future<Output = ()> + Send + '_ {
let _ = (notification, context);
std::future::ready(())
}

fn get_info(&self) -> ClientInfo {
ClientInfo::default()
Expand Down
4 changes: 2 additions & 2 deletions crates/rmcp/src/handler/server.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,7 @@ impl<H: ServerHandler> Service<RoleServer> for H {
ClientNotification::RootsListChangedNotification(_notification) => {
self.on_roots_list_changed(context).await
}
ClientNotification::CustomClientNotification(notification) => {
ClientNotification::CustomNotification(notification) => {
self.on_custom_notification(notification, context).await
}
};
Expand DownExpand Up@@ -230,7 +230,7 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
}
fn on_custom_notification(
&self,
notification: CustomClientNotification,
notification: CustomNotification,
context: NotificationContext<RoleServer>,
) -> impl Future<Output = ()> + Send + '_ {
let _ = (notification, context);
Expand Down
45 changes: 39 additions & 6 deletions crates/rmcp/src/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -627,13 +627,13 @@ const_string!(CancelledNotificationMethod = "notifications/cancelled");
pub type CancelledNotification =
Notification<CancelledNotificationMethod, CancelledNotificationParam>;

/// A catch-all notification the client can use to send custom messages to a server.
/// A catch-all notification either side can use to send custom messages to its peer.
///
/// This preserves the raw `method` name and `params` payload so handlers can
/// deserialize them into domain-specific types.
#[derive(Debug, Clone)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct CustomClientNotification {
pub struct CustomNotification {
pub method: String,
pub params: Option<Value>,
/// extensions will carry anything possible in the context, including [`Meta`]
Expand All@@ -643,7 +643,7 @@ pub struct CustomClientNotification {
pub extensions: Extensions,
}

impl CustomClientNotification {
impl CustomNotification {
pub fn new(method: impl Into<String>, params: Option<Value>) -> Self {
Self {
method: method.into(),
Expand DownExpand Up@@ -1786,7 +1786,7 @@ ts_union!(
| ProgressNotification
| InitializedNotification
| RootsListChangedNotification
| CustomClientNotification;
| CustomNotification;
);

ts_union!(
Expand DownExpand Up@@ -1817,7 +1817,8 @@ ts_union!(
| ResourceUpdatedNotification
| ResourceListChangedNotification
| ToolListChangedNotification
| PromptListChangedNotification;
| PromptListChangedNotification
| CustomNotification;
);

ts_union!(
Expand DownExpand Up@@ -1907,7 +1908,7 @@ mod tests {
serde_json::from_value(raw.clone()).expect("invalid notification");
match &message {
ClientJsonRpcMessage::Notification(JsonRpcNotification {
notification: ClientNotification::CustomClientNotification(notification),
notification: ClientNotification::CustomNotification(notification),
..
}) => {
assert_eq!(notification.method, "notifications/custom");
Expand All@@ -1927,6 +1928,38 @@ mod tests {
assert_eq!(json, raw);
}

#[test]
fn test_custom_server_notification_roundtrip() {
let raw = json!( {
"jsonrpc": JsonRpcVersion2_0,
"method": "notifications/custom-server",
"params": {"hello": "world"},
});

let message: ServerJsonRpcMessage =
serde_json::from_value(raw.clone()).expect("invalid notification");
match &message {
ServerJsonRpcMessage::Notification(JsonRpcNotification {
notification: ServerNotification::CustomNotification(notification),
..
}) => {
assert_eq!(notification.method, "notifications/custom-server");
assert_eq!(
notification
.params
.as_ref()
.and_then(|p| p.get("hello"))
.expect("hello present"),
"world"
);
}
_ => panic!("Expected custom server notification"),
}

let json = serde_json::to_value(message).expect("valid json");
assert_eq!(json, raw);
}

#[test]
fn test_request_conversion() {
let raw = json!( {
Expand Down
11 changes: 6 additions & 5 deletions crates/rmcp/src/model/meta.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@ use serde::{Deserialize, Serialize};
use serde_json::Value;

use super::{
ClientNotification, ClientRequest, CustomClientNotification, Extensions, JsonObject,
JsonRpcMessage, NumberOrString, ProgressToken, ServerNotification, ServerRequest,
ClientNotification, ClientRequest, CustomNotification, Extensions, JsonObject, JsonRpcMessage,
NumberOrString, ProgressToken, ServerNotification, ServerRequest,
};

pub trait GetMeta {
Expand All@@ -18,7 +18,7 @@ pub trait GetExtensions {
fn extensions_mut(&mut self) -> &mut Extensions;
}

impl GetExtensions for CustomClientNotification {
impl GetExtensions for CustomNotification {
fn extensions(&self) -> &Extensions {
&self.extensions
}
Expand All@@ -27,7 +27,7 @@ impl GetExtensions for CustomClientNotification {
}
}

impl GetMeta for CustomClientNotification {
impl GetMeta for CustomNotification {
fn get_meta_mut(&mut self) -> &mut Meta {
self.extensions_mut().get_or_insert_default()
}
Expand DownExpand Up@@ -104,7 +104,7 @@ variant_extension! {
ProgressNotification
InitializedNotification
RootsListChangedNotification
CustomClientNotification
CustomNotification
}
}

Expand All@@ -117,6 +117,7 @@ variant_extension! {
ResourceListChangedNotification
ToolListChangedNotification
PromptListChangedNotification
CustomNotification
}
}
#[derive(Debug, Serialize, Deserialize, Clone, Default, PartialEq)]
Expand Down
8 changes: 4 additions & 4 deletions crates/rmcp/src/model/serde_impl.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ use std::borrow::Cow;
use serde::{Deserialize, Serialize};

use super::{
CustomClientNotification, Extensions, Meta, Notification, NotificationNoParam, Request,
CustomNotification, Extensions, Meta, Notification, NotificationNoParam, Request,
RequestNoParam, RequestOptionalParam,
};
#[derive(Serialize, Deserialize)]
Expand DownExpand Up@@ -249,7 +249,7 @@ where
}
}

impl Serialize for CustomClientNotification {
impl Serialize for CustomNotification {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
Expand DownExpand Up@@ -277,7 +277,7 @@ impl Serialize for CustomClientNotification {
}
}

impl<'de> Deserialize<'de> for CustomClientNotification {
impl<'de> Deserialize<'de> for CustomNotification {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: serde::Deserializer<'de>,
Expand All@@ -294,7 +294,7 @@ impl<'de> Deserialize<'de> for CustomClientNotification {
if let Some(meta) = _meta {
extensions.insert(meta);
}
Ok(CustomClientNotification {
Ok(CustomNotification {
extensions,
method: body.method,
params,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -396,8 +396,8 @@
"content"
]
},
"CustomClientNotification": {
"description": "A catch-all notification the client can use to send custom messages to a server.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
Expand DownExpand Up@@ -651,7 +651,7 @@
"$ref": "#/definitions/NotificationNoParam2"
},
{
"$ref": "#/definitions/CustomClientNotification"
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -396,8 +396,8 @@
"content"
]
},
"CustomClientNotification": {
"description": "A catch-all notification the client can use to send custom messages to a server.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
Expand DownExpand Up@@ -651,7 +651,7 @@
"$ref": "#/definitions/NotificationNoParam2"
},
{
"$ref": "#/definitions/CustomClientNotification"
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,19 @@
"content"
]
},
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
"type": "string"
},
"params": true
},
"required": [
"method"
]
},
"CancelledNotificationMethod": {
"type": "string",
"format": "const",
Expand DownExpand Up@@ -977,6 +990,9 @@
},
{
"$ref": "#/definitions/NotificationNoParam3"
},
{
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -392,6 +392,19 @@
"content"
]
},
"CustomNotification": {
"description": "A catch-all notification either side can use to send custom messages to its peer.\n\nThis preserves the raw `method` name and `params` payload so handlers can\ndeserialize them into domain-specific types.",
"type": "object",
"properties": {
"method": {
"type": "string"
},
"params": true
},
"required": [
"method"
]
},
"CancelledNotificationMethod": {
"type": "string",
"format": "const",
Expand DownExpand Up@@ -977,6 +990,9 @@
},
{
"$ref": "#/definitions/NotificationNoParam3"
},
{
"$ref": "#/definitions/CustomNotification"
}
],
"required": [
Expand Down
Loading