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
38 changes: 0 additions & 38 deletions crates/rmcp/src/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -490,40 +490,6 @@ impl ErrorData {
}
}

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(untagged)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub enum JsonRpcBatchRequestItem<Req, Not> {
Request(JsonRpcRequest<Req>),
Notification(JsonRpcNotification<Not>),
}

impl<Req, Not> JsonRpcBatchRequestItem<Req, Not> {
pub fn into_non_batch_message<Resp>(self) -> JsonRpcMessage<Req, Resp, Not> {
match self {
JsonRpcBatchRequestItem::Request(r) => JsonRpcMessage::Request(r),
JsonRpcBatchRequestItem::Notification(n) => JsonRpcMessage::Notification(n),
}
}
}

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(untagged)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub enum JsonRpcBatchResponseItem<Resp> {
Response(JsonRpcResponse<Resp>),
Error(JsonRpcError),
}

impl<Resp> JsonRpcBatchResponseItem<Resp> {
pub fn into_non_batch_message<Req, Not>(self) -> JsonRpcMessage<Req, Resp, Not> {
match self {
JsonRpcBatchResponseItem::Response(r) => JsonRpcMessage::Response(r),
JsonRpcBatchResponseItem::Error(e) => JsonRpcMessage::Error(e),
}
}
}

/// Represents any JSON-RPC message that can be sent or received.
///
/// This enum covers all possible message types in the JSON-RPC protocol:
Expand All@@ -539,10 +505,6 @@ pub enum JsonRpcMessage<Req = Request, Resp = DefaultResponse, Noti = Notificati
Response(JsonRpcResponse<Resp>),
/// A one-way notification (no response expected)
Notification(JsonRpcNotification<Noti>),
/// Multiple requests sent together
BatchRequest(Vec<JsonRpcBatchRequestItem<Req, Noti>>),
/// Multiple responses sent together
BatchResponse(Vec<JsonRpcBatchResponseItem<Resp>>),
/// An error response
Error(JsonRpcError),
}
Expand Down
18 changes: 0 additions & 18 deletions crates/rmcp/src/model/meta.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -172,24 +172,6 @@ where
.extensions_mut()
.insert(value);
}
JsonRpcMessage::BatchRequest(json_rpc_batch_request_items) => {
for item in json_rpc_batch_request_items {
match item {
super::JsonRpcBatchRequestItem::Request(json_rpc_request) => {
json_rpc_request
.request
.extensions_mut()
.insert(value.clone());
}
super::JsonRpcBatchRequestItem::Notification(json_rpc_notification) => {
json_rpc_notification
.notification
.extensions_mut()
.insert(value.clone());
}
}
}
}
_ => {}
}
}
Expand Down
19 changes: 2 additions & 17 deletions crates/rmcp/src/service.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,8 @@ use crate::{
error::ErrorData as McpError,
model::{
CancelledNotification, CancelledNotificationParam, Extensions, GetExtensions, GetMeta,
JsonRpcBatchRequestItem, JsonRpcBatchResponseItem, JsonRpcError, JsonRpcMessage,
JsonRpcNotification, JsonRpcRequest, JsonRpcResponse, Meta, NumberOrString, ProgressToken,
RequestId, ServerJsonRpcMessage,
JsonRpcError, JsonRpcMessage, JsonRpcNotification, JsonRpcRequest, JsonRpcResponse, Meta,
NumberOrString, ProgressToken, RequestId, ServerJsonRpcMessage,
},
transport::{DynamicTransportError, IntoTransport, Transport},
};
Expand DownExpand Up@@ -835,20 +834,6 @@ where
}
}
}
Event::PeerMessage(JsonRpcMessage::BatchRequest(batch)) => {
batch_messages.extend(
batch
.into_iter()
.map(JsonRpcBatchRequestItem::into_non_batch_message),
);
}
Event::PeerMessage(JsonRpcMessage::BatchResponse(batch)) => {
batch_messages.extend(
batch
.into_iter()
.map(JsonRpcBatchResponseItem::into_non_batch_message),
);
}
}
};
let sink_close_result = transport.close().await;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -468,10 +468,6 @@ impl LocalSessionWorker {
OutboundChannel::Common
}
}
ServerJsonRpcMessage::BatchRequest(_) | ServerJsonRpcMessage::BatchResponse(_) => {
// the server side should never yield a batch request or response now
unreachable!("server side won't yield batch request or response")
}
}
}
async fn handle_server_message(
Expand DownExpand Up@@ -824,20 +820,6 @@ impl Worker for LocalSessionWorker {
crate::model::JsonRpcMessage::Notification(notification) => {
self.catch_cancellation_notification(notification)
}
crate::model::JsonRpcMessage::BatchRequest(items) => {
for r in items {
match r {
crate::model::JsonRpcBatchRequestItem::Request(request) => {
if let Some(http_request_id) = http_request_id {
self.register_request(request, http_request_id)
}
}
crate::model::JsonRpcBatchRequestItem::Notification(
notification,
) => self.catch_cancellation_notification(notification),
}
}
}
_ => {}
}
context.send_to_handler(json_rpc_message).await?;
Expand Down
10 changes: 0 additions & 10 deletions crates/rmcp/src/transport/streamable_http_server/tower.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -319,12 +319,6 @@ where
.map_err(internal_error_response("accept message"))?;
Ok(accepted_response())
}
_ => Ok(Response::builder()
.status(http::StatusCode::NOT_IMPLEMENTED)
.body(
Full::new(Bytes::from("Batch requests are not supported yet")).boxed(),
)
.expect("valid response")),
}
} else {
let (session_id, transport) = self
Expand DownExpand Up@@ -427,10 +421,6 @@ where
}
ClientJsonRpcMessage::Response(_json_rpc_response) => Ok(accepted_response()),
ClientJsonRpcMessage::Error(_json_rpc_error) => Ok(accepted_response()),
_ => Ok(Response::builder()
.status(http::StatusCode::NOT_IMPLEMENTED)
.body(Full::new(Bytes::from("Batch requests are not supported yet")).boxed())
.expect("valid response")),
}
}
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,20 +27,6 @@
}
]
},
{
"description": "Multiple requests sent together",
"type": "array",
"items": {
"$ref": "#/definitions/JsonRpcBatchRequestItem"
}
},
{
"description": "Multiple responses sent together",
"type": "array",
"items": {
"$ref": "#/definitions/JsonRpcBatchResponseItem"
}
},
{
"description": "An error response",
"allOf": [
Expand DownExpand Up@@ -559,26 +545,6 @@
"format": "const",
"const": "notifications/initialized"
},
"JsonRpcBatchRequestItem": {
"anyOf": [
{
"$ref": "#/definitions/JsonRpcRequest"
},
{
"$ref": "#/definitions/JsonRpcNotification"
}
]
},
"JsonRpcBatchResponseItem": {
"anyOf": [
{
"$ref": "#/definitions/JsonRpcResponse"
},
{
"$ref": "#/definitions/JsonRpcError"
}
]
},
"JsonRpcError": {
"type": "object",
"properties": {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix: remove batched json rpc support by 4t145 · Pull Request #408 · modelcontextprotocol/rust-sdk · GitHub
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
38 changes: 0 additions & 38 deletions crates/rmcp/src/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -490,40 +490,6 @@ impl ErrorData {
}
}

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(untagged)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub enum JsonRpcBatchRequestItem<Req, Not> {
Request(JsonRpcRequest<Req>),
Notification(JsonRpcNotification<Not>),
}

impl<Req, Not> JsonRpcBatchRequestItem<Req, Not> {
pub fn into_non_batch_message<Resp>(self) -> JsonRpcMessage<Req, Resp, Not> {
match self {
JsonRpcBatchRequestItem::Request(r) => JsonRpcMessage::Request(r),
JsonRpcBatchRequestItem::Notification(n) => JsonRpcMessage::Notification(n),
}
}
}

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(untagged)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub enum JsonRpcBatchResponseItem<Resp> {
Response(JsonRpcResponse<Resp>),
Error(JsonRpcError),
}

impl<Resp> JsonRpcBatchResponseItem<Resp> {
pub fn into_non_batch_message<Req, Not>(self) -> JsonRpcMessage<Req, Resp, Not> {
match self {
JsonRpcBatchResponseItem::Response(r) => JsonRpcMessage::Response(r),
JsonRpcBatchResponseItem::Error(e) => JsonRpcMessage::Error(e),
}
}
}

/// Represents any JSON-RPC message that can be sent or received.
///
/// This enum covers all possible message types in the JSON-RPC protocol:
Expand All@@ -539,10 +505,6 @@ pub enum JsonRpcMessage<Req = Request, Resp = DefaultResponse, Noti = Notificati
Response(JsonRpcResponse<Resp>),
/// A one-way notification (no response expected)
Notification(JsonRpcNotification<Noti>),
/// Multiple requests sent together
BatchRequest(Vec<JsonRpcBatchRequestItem<Req, Noti>>),
/// Multiple responses sent together
BatchResponse(Vec<JsonRpcBatchResponseItem<Resp>>),
/// An error response
Error(JsonRpcError),
}
Expand Down
18 changes: 0 additions & 18 deletions crates/rmcp/src/model/meta.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -172,24 +172,6 @@ where
.extensions_mut()
.insert(value);
}
JsonRpcMessage::BatchRequest(json_rpc_batch_request_items) => {
for item in json_rpc_batch_request_items {
match item {
super::JsonRpcBatchRequestItem::Request(json_rpc_request) => {
json_rpc_request
.request
.extensions_mut()
.insert(value.clone());
}
super::JsonRpcBatchRequestItem::Notification(json_rpc_notification) => {
json_rpc_notification
.notification
.extensions_mut()
.insert(value.clone());
}
}
}
}
_ => {}
}
}
Expand Down
19 changes: 2 additions & 17 deletions crates/rmcp/src/service.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,8 @@ use crate::{
error::ErrorData as McpError,
model::{
CancelledNotification, CancelledNotificationParam, Extensions, GetExtensions, GetMeta,
JsonRpcBatchRequestItem, JsonRpcBatchResponseItem, JsonRpcError, JsonRpcMessage,
JsonRpcNotification, JsonRpcRequest, JsonRpcResponse, Meta, NumberOrString, ProgressToken,
RequestId, ServerJsonRpcMessage,
JsonRpcError, JsonRpcMessage, JsonRpcNotification, JsonRpcRequest, JsonRpcResponse, Meta,
NumberOrString, ProgressToken, RequestId, ServerJsonRpcMessage,
},
transport::{DynamicTransportError, IntoTransport, Transport},
};
Expand DownExpand Up@@ -835,20 +834,6 @@ where
}
}
}
Event::PeerMessage(JsonRpcMessage::BatchRequest(batch)) => {
batch_messages.extend(
batch
.into_iter()
.map(JsonRpcBatchRequestItem::into_non_batch_message),
);
}
Event::PeerMessage(JsonRpcMessage::BatchResponse(batch)) => {
batch_messages.extend(
batch
.into_iter()
.map(JsonRpcBatchResponseItem::into_non_batch_message),
);
}
}
};
let sink_close_result = transport.close().await;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -468,10 +468,6 @@ impl LocalSessionWorker {
OutboundChannel::Common
}
}
ServerJsonRpcMessage::BatchRequest(_) | ServerJsonRpcMessage::BatchResponse(_) => {
// the server side should never yield a batch request or response now
unreachable!("server side won't yield batch request or response")
}
}
}
async fn handle_server_message(
Expand DownExpand Up@@ -824,20 +820,6 @@ impl Worker for LocalSessionWorker {
crate::model::JsonRpcMessage::Notification(notification) => {
self.catch_cancellation_notification(notification)
}
crate::model::JsonRpcMessage::BatchRequest(items) => {
for r in items {
match r {
crate::model::JsonRpcBatchRequestItem::Request(request) => {
if let Some(http_request_id) = http_request_id {
self.register_request(request, http_request_id)
}
}
crate::model::JsonRpcBatchRequestItem::Notification(
notification,
) => self.catch_cancellation_notification(notification),
}
}
}
_ => {}
}
context.send_to_handler(json_rpc_message).await?;
Expand Down
10 changes: 0 additions & 10 deletions crates/rmcp/src/transport/streamable_http_server/tower.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -319,12 +319,6 @@ where
.map_err(internal_error_response("accept message"))?;
Ok(accepted_response())
}
_ => Ok(Response::builder()
.status(http::StatusCode::NOT_IMPLEMENTED)
.body(
Full::new(Bytes::from("Batch requests are not supported yet")).boxed(),
)
.expect("valid response")),
}
} else {
let (session_id, transport) = self
Expand DownExpand Up@@ -427,10 +421,6 @@ where
}
ClientJsonRpcMessage::Response(_json_rpc_response) => Ok(accepted_response()),
ClientJsonRpcMessage::Error(_json_rpc_error) => Ok(accepted_response()),
_ => Ok(Response::builder()
.status(http::StatusCode::NOT_IMPLEMENTED)
.body(Full::new(Bytes::from("Batch requests are not supported yet")).boxed())
.expect("valid response")),
}
}
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,20 +27,6 @@
}
]
},
{
"description": "Multiple requests sent together",
"type": "array",
"items": {
"$ref": "#/definitions/JsonRpcBatchRequestItem"
}
},
{
"description": "Multiple responses sent together",
"type": "array",
"items": {
"$ref": "#/definitions/JsonRpcBatchResponseItem"
}
},
{
"description": "An error response",
"allOf": [
Expand DownExpand Up@@ -559,26 +545,6 @@
"format": "const",
"const": "notifications/initialized"
},
"JsonRpcBatchRequestItem": {
"anyOf": [
{
"$ref": "#/definitions/JsonRpcRequest"
},
{
"$ref": "#/definitions/JsonRpcNotification"
}
]
},
"JsonRpcBatchResponseItem": {
"anyOf": [
{
"$ref": "#/definitions/JsonRpcResponse"
},
{
"$ref": "#/definitions/JsonRpcError"
}
]
},
"JsonRpcError": {
"type": "object",
"properties": {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: remove batched json rpc support by 4t145 · Pull Request #408 · modelcontextprotocol/rust-sdk · GitHub
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
38 changes: 0 additions & 38 deletions crates/rmcp/src/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -490,40 +490,6 @@ impl ErrorData {
}
}

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(untagged)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub enum JsonRpcBatchRequestItem<Req, Not> {
Request(JsonRpcRequest<Req>),
Notification(JsonRpcNotification<Not>),
}

impl<Req, Not> JsonRpcBatchRequestItem<Req, Not> {
pub fn into_non_batch_message<Resp>(self) -> JsonRpcMessage<Req, Resp, Not> {
match self {
JsonRpcBatchRequestItem::Request(r) => JsonRpcMessage::Request(r),
JsonRpcBatchRequestItem::Notification(n) => JsonRpcMessage::Notification(n),
}
}
}

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(untagged)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub enum JsonRpcBatchResponseItem<Resp> {
Response(JsonRpcResponse<Resp>),
Error(JsonRpcError),
}

impl<Resp> JsonRpcBatchResponseItem<Resp> {
pub fn into_non_batch_message<Req, Not>(self) -> JsonRpcMessage<Req, Resp, Not> {
match self {
JsonRpcBatchResponseItem::Response(r) => JsonRpcMessage::Response(r),
JsonRpcBatchResponseItem::Error(e) => JsonRpcMessage::Error(e),
}
}
}

/// Represents any JSON-RPC message that can be sent or received.
///
/// This enum covers all possible message types in the JSON-RPC protocol:
Expand All@@ -539,10 +505,6 @@ pub enum JsonRpcMessage<Req = Request, Resp = DefaultResponse, Noti = Notificati
Response(JsonRpcResponse<Resp>),
/// A one-way notification (no response expected)
Notification(JsonRpcNotification<Noti>),
/// Multiple requests sent together
BatchRequest(Vec<JsonRpcBatchRequestItem<Req, Noti>>),
/// Multiple responses sent together
BatchResponse(Vec<JsonRpcBatchResponseItem<Resp>>),
/// An error response
Error(JsonRpcError),
}
Expand Down
18 changes: 0 additions & 18 deletions crates/rmcp/src/model/meta.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -172,24 +172,6 @@ where
.extensions_mut()
.insert(value);
}
JsonRpcMessage::BatchRequest(json_rpc_batch_request_items) => {
for item in json_rpc_batch_request_items {
match item {
super::JsonRpcBatchRequestItem::Request(json_rpc_request) => {
json_rpc_request
.request
.extensions_mut()
.insert(value.clone());
}
super::JsonRpcBatchRequestItem::Notification(json_rpc_notification) => {
json_rpc_notification
.notification
.extensions_mut()
.insert(value.clone());
}
}
}
}
_ => {}
}
}
Expand Down
19 changes: 2 additions & 17 deletions crates/rmcp/src/service.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,8 @@ use crate::{
error::ErrorData as McpError,
model::{
CancelledNotification, CancelledNotificationParam, Extensions, GetExtensions, GetMeta,
JsonRpcBatchRequestItem, JsonRpcBatchResponseItem, JsonRpcError, JsonRpcMessage,
JsonRpcNotification, JsonRpcRequest, JsonRpcResponse, Meta, NumberOrString, ProgressToken,
RequestId, ServerJsonRpcMessage,
JsonRpcError, JsonRpcMessage, JsonRpcNotification, JsonRpcRequest, JsonRpcResponse, Meta,
NumberOrString, ProgressToken, RequestId, ServerJsonRpcMessage,
},
transport::{DynamicTransportError, IntoTransport, Transport},
};
Expand DownExpand Up@@ -835,20 +834,6 @@ where
}
}
}
Event::PeerMessage(JsonRpcMessage::BatchRequest(batch)) => {
batch_messages.extend(
batch
.into_iter()
.map(JsonRpcBatchRequestItem::into_non_batch_message),
);
}
Event::PeerMessage(JsonRpcMessage::BatchResponse(batch)) => {
batch_messages.extend(
batch
.into_iter()
.map(JsonRpcBatchResponseItem::into_non_batch_message),
);
}
}
};
let sink_close_result = transport.close().await;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -468,10 +468,6 @@ impl LocalSessionWorker {
OutboundChannel::Common
}
}
ServerJsonRpcMessage::BatchRequest(_) | ServerJsonRpcMessage::BatchResponse(_) => {
// the server side should never yield a batch request or response now
unreachable!("server side won't yield batch request or response")
}
}
}
async fn handle_server_message(
Expand DownExpand Up@@ -824,20 +820,6 @@ impl Worker for LocalSessionWorker {
crate::model::JsonRpcMessage::Notification(notification) => {
self.catch_cancellation_notification(notification)
}
crate::model::JsonRpcMessage::BatchRequest(items) => {
for r in items {
match r {
crate::model::JsonRpcBatchRequestItem::Request(request) => {
if let Some(http_request_id) = http_request_id {
self.register_request(request, http_request_id)
}
}
crate::model::JsonRpcBatchRequestItem::Notification(
notification,
) => self.catch_cancellation_notification(notification),
}
}
}
_ => {}
}
context.send_to_handler(json_rpc_message).await?;
Expand Down
10 changes: 0 additions & 10 deletions crates/rmcp/src/transport/streamable_http_server/tower.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -319,12 +319,6 @@ where
.map_err(internal_error_response("accept message"))?;
Ok(accepted_response())
}
_ => Ok(Response::builder()
.status(http::StatusCode::NOT_IMPLEMENTED)
.body(
Full::new(Bytes::from("Batch requests are not supported yet")).boxed(),
)
.expect("valid response")),
}
} else {
let (session_id, transport) = self
Expand DownExpand Up@@ -427,10 +421,6 @@ where
}
ClientJsonRpcMessage::Response(_json_rpc_response) => Ok(accepted_response()),
ClientJsonRpcMessage::Error(_json_rpc_error) => Ok(accepted_response()),
_ => Ok(Response::builder()
.status(http::StatusCode::NOT_IMPLEMENTED)
.body(Full::new(Bytes::from("Batch requests are not supported yet")).boxed())
.expect("valid response")),
}
}
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,20 +27,6 @@
}
]
},
{
"description": "Multiple requests sent together",
"type": "array",
"items": {
"$ref": "#/definitions/JsonRpcBatchRequestItem"
}
},
{
"description": "Multiple responses sent together",
"type": "array",
"items": {
"$ref": "#/definitions/JsonRpcBatchResponseItem"
}
},
{
"description": "An error response",
"allOf": [
Expand DownExpand Up@@ -559,26 +545,6 @@
"format": "const",
"const": "notifications/initialized"
},
"JsonRpcBatchRequestItem": {
"anyOf": [
{
"$ref": "#/definitions/JsonRpcRequest"
},
{
"$ref": "#/definitions/JsonRpcNotification"
}
]
},
"JsonRpcBatchResponseItem": {
"anyOf": [
{
"$ref": "#/definitions/JsonRpcResponse"
},
{
"$ref": "#/definitions/JsonRpcError"
}
]
},
"JsonRpcError": {
"type": "object",
"properties": {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: remove batched json rpc support by 4t145 · Pull Request #408 · modelcontextprotocol/rust-sdk · GitHub
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
38 changes: 0 additions & 38 deletions crates/rmcp/src/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -490,40 +490,6 @@ impl ErrorData {
}
}

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(untagged)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub enum JsonRpcBatchRequestItem<Req, Not> {
Request(JsonRpcRequest<Req>),
Notification(JsonRpcNotification<Not>),
}

impl<Req, Not> JsonRpcBatchRequestItem<Req, Not> {
pub fn into_non_batch_message<Resp>(self) -> JsonRpcMessage<Req, Resp, Not> {
match self {
JsonRpcBatchRequestItem::Request(r) => JsonRpcMessage::Request(r),
JsonRpcBatchRequestItem::Notification(n) => JsonRpcMessage::Notification(n),
}
}
}

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(untagged)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub enum JsonRpcBatchResponseItem<Resp> {
Response(JsonRpcResponse<Resp>),
Error(JsonRpcError),
}

impl<Resp> JsonRpcBatchResponseItem<Resp> {
pub fn into_non_batch_message<Req, Not>(self) -> JsonRpcMessage<Req, Resp, Not> {
match self {
JsonRpcBatchResponseItem::Response(r) => JsonRpcMessage::Response(r),
JsonRpcBatchResponseItem::Error(e) => JsonRpcMessage::Error(e),
}
}
}

/// Represents any JSON-RPC message that can be sent or received.
///
/// This enum covers all possible message types in the JSON-RPC protocol:
Expand All@@ -539,10 +505,6 @@ pub enum JsonRpcMessage<Req = Request, Resp = DefaultResponse, Noti = Notificati
Response(JsonRpcResponse<Resp>),
/// A one-way notification (no response expected)
Notification(JsonRpcNotification<Noti>),
/// Multiple requests sent together
BatchRequest(Vec<JsonRpcBatchRequestItem<Req, Noti>>),
/// Multiple responses sent together
BatchResponse(Vec<JsonRpcBatchResponseItem<Resp>>),
/// An error response
Error(JsonRpcError),
}
Expand Down
18 changes: 0 additions & 18 deletions crates/rmcp/src/model/meta.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -172,24 +172,6 @@ where
.extensions_mut()
.insert(value);
}
JsonRpcMessage::BatchRequest(json_rpc_batch_request_items) => {
for item in json_rpc_batch_request_items {
match item {
super::JsonRpcBatchRequestItem::Request(json_rpc_request) => {
json_rpc_request
.request
.extensions_mut()
.insert(value.clone());
}
super::JsonRpcBatchRequestItem::Notification(json_rpc_notification) => {
json_rpc_notification
.notification
.extensions_mut()
.insert(value.clone());
}
}
}
}
_ => {}
}
}
Expand Down
19 changes: 2 additions & 17 deletions crates/rmcp/src/service.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,8 @@ use crate::{
error::ErrorData as McpError,
model::{
CancelledNotification, CancelledNotificationParam, Extensions, GetExtensions, GetMeta,
JsonRpcBatchRequestItem, JsonRpcBatchResponseItem, JsonRpcError, JsonRpcMessage,
JsonRpcNotification, JsonRpcRequest, JsonRpcResponse, Meta, NumberOrString, ProgressToken,
RequestId, ServerJsonRpcMessage,
JsonRpcError, JsonRpcMessage, JsonRpcNotification, JsonRpcRequest, JsonRpcResponse, Meta,
NumberOrString, ProgressToken, RequestId, ServerJsonRpcMessage,
},
transport::{DynamicTransportError, IntoTransport, Transport},
};
Expand DownExpand Up@@ -835,20 +834,6 @@ where
}
}
}
Event::PeerMessage(JsonRpcMessage::BatchRequest(batch)) => {
batch_messages.extend(
batch
.into_iter()
.map(JsonRpcBatchRequestItem::into_non_batch_message),
);
}
Event::PeerMessage(JsonRpcMessage::BatchResponse(batch)) => {
batch_messages.extend(
batch
.into_iter()
.map(JsonRpcBatchResponseItem::into_non_batch_message),
);
}
}
};
let sink_close_result = transport.close().await;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -468,10 +468,6 @@ impl LocalSessionWorker {
OutboundChannel::Common
}
}
ServerJsonRpcMessage::BatchRequest(_) | ServerJsonRpcMessage::BatchResponse(_) => {
// the server side should never yield a batch request or response now
unreachable!("server side won't yield batch request or response")
}
}
}
async fn handle_server_message(
Expand DownExpand Up@@ -824,20 +820,6 @@ impl Worker for LocalSessionWorker {
crate::model::JsonRpcMessage::Notification(notification) => {
self.catch_cancellation_notification(notification)
}
crate::model::JsonRpcMessage::BatchRequest(items) => {
for r in items {
match r {
crate::model::JsonRpcBatchRequestItem::Request(request) => {
if let Some(http_request_id) = http_request_id {
self.register_request(request, http_request_id)
}
}
crate::model::JsonRpcBatchRequestItem::Notification(
notification,
) => self.catch_cancellation_notification(notification),
}
}
}
_ => {}
}
context.send_to_handler(json_rpc_message).await?;
Expand Down
10 changes: 0 additions & 10 deletions crates/rmcp/src/transport/streamable_http_server/tower.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -319,12 +319,6 @@ where
.map_err(internal_error_response("accept message"))?;
Ok(accepted_response())
}
_ => Ok(Response::builder()
.status(http::StatusCode::NOT_IMPLEMENTED)
.body(
Full::new(Bytes::from("Batch requests are not supported yet")).boxed(),
)
.expect("valid response")),
}
} else {
let (session_id, transport) = self
Expand DownExpand Up@@ -427,10 +421,6 @@ where
}
ClientJsonRpcMessage::Response(_json_rpc_response) => Ok(accepted_response()),
ClientJsonRpcMessage::Error(_json_rpc_error) => Ok(accepted_response()),
_ => Ok(Response::builder()
.status(http::StatusCode::NOT_IMPLEMENTED)
.body(Full::new(Bytes::from("Batch requests are not supported yet")).boxed())
.expect("valid response")),
}
}
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,20 +27,6 @@
}
]
},
{
"description": "Multiple requests sent together",
"type": "array",
"items": {
"$ref": "#/definitions/JsonRpcBatchRequestItem"
}
},
{
"description": "Multiple responses sent together",
"type": "array",
"items": {
"$ref": "#/definitions/JsonRpcBatchResponseItem"
}
},
{
"description": "An error response",
"allOf": [
Expand DownExpand Up@@ -559,26 +545,6 @@
"format": "const",
"const": "notifications/initialized"
},
"JsonRpcBatchRequestItem": {
"anyOf": [
{
"$ref": "#/definitions/JsonRpcRequest"
},
{
"$ref": "#/definitions/JsonRpcNotification"
}
]
},
"JsonRpcBatchResponseItem": {
"anyOf": [
{
"$ref": "#/definitions/JsonRpcResponse"
},
{
"$ref": "#/definitions/JsonRpcError"
}
]
},
"JsonRpcError": {
"type": "object",
"properties": {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' fix: remove batched json rpc support by 4t145 · Pull Request #408 · modelcontextprotocol/rust-sdk · GitHub
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
38 changes: 0 additions & 38 deletions crates/rmcp/src/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -490,40 +490,6 @@ impl ErrorData {
}
}

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(untagged)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub enum JsonRpcBatchRequestItem<Req, Not> {
Request(JsonRpcRequest<Req>),
Notification(JsonRpcNotification<Not>),
}

impl<Req, Not> JsonRpcBatchRequestItem<Req, Not> {
pub fn into_non_batch_message<Resp>(self) -> JsonRpcMessage<Req, Resp, Not> {
match self {
JsonRpcBatchRequestItem::Request(r) => JsonRpcMessage::Request(r),
JsonRpcBatchRequestItem::Notification(n) => JsonRpcMessage::Notification(n),
}
}
}

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(untagged)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub enum JsonRpcBatchResponseItem<Resp> {
Response(JsonRpcResponse<Resp>),
Error(JsonRpcError),
}

impl<Resp> JsonRpcBatchResponseItem<Resp> {
pub fn into_non_batch_message<Req, Not>(self) -> JsonRpcMessage<Req, Resp, Not> {
match self {
JsonRpcBatchResponseItem::Response(r) => JsonRpcMessage::Response(r),
JsonRpcBatchResponseItem::Error(e) => JsonRpcMessage::Error(e),
}
}
}

/// Represents any JSON-RPC message that can be sent or received.
///
/// This enum covers all possible message types in the JSON-RPC protocol:
Expand All@@ -539,10 +505,6 @@ pub enum JsonRpcMessage<Req = Request, Resp = DefaultResponse, Noti = Notificati
Response(JsonRpcResponse<Resp>),
/// A one-way notification (no response expected)
Notification(JsonRpcNotification<Noti>),
/// Multiple requests sent together
BatchRequest(Vec<JsonRpcBatchRequestItem<Req, Noti>>),
/// Multiple responses sent together
BatchResponse(Vec<JsonRpcBatchResponseItem<Resp>>),
/// An error response
Error(JsonRpcError),
}
Expand Down
18 changes: 0 additions & 18 deletions crates/rmcp/src/model/meta.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -172,24 +172,6 @@ where
.extensions_mut()
.insert(value);
}
JsonRpcMessage::BatchRequest(json_rpc_batch_request_items) => {
for item in json_rpc_batch_request_items {
match item {
super::JsonRpcBatchRequestItem::Request(json_rpc_request) => {
json_rpc_request
.request
.extensions_mut()
.insert(value.clone());
}
super::JsonRpcBatchRequestItem::Notification(json_rpc_notification) => {
json_rpc_notification
.notification
.extensions_mut()
.insert(value.clone());
}
}
}
}
_ => {}
}
}
Expand Down
19 changes: 2 additions & 17 deletions crates/rmcp/src/service.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,8 @@ use crate::{
error::ErrorData as McpError,
model::{
CancelledNotification, CancelledNotificationParam, Extensions, GetExtensions, GetMeta,
JsonRpcBatchRequestItem, JsonRpcBatchResponseItem, JsonRpcError, JsonRpcMessage,
JsonRpcNotification, JsonRpcRequest, JsonRpcResponse, Meta, NumberOrString, ProgressToken,
RequestId, ServerJsonRpcMessage,
JsonRpcError, JsonRpcMessage, JsonRpcNotification, JsonRpcRequest, JsonRpcResponse, Meta,
NumberOrString, ProgressToken, RequestId, ServerJsonRpcMessage,
},
transport::{DynamicTransportError, IntoTransport, Transport},
};
Expand DownExpand Up@@ -835,20 +834,6 @@ where
}
}
}
Event::PeerMessage(JsonRpcMessage::BatchRequest(batch)) => {
batch_messages.extend(
batch
.into_iter()
.map(JsonRpcBatchRequestItem::into_non_batch_message),
);
}
Event::PeerMessage(JsonRpcMessage::BatchResponse(batch)) => {
batch_messages.extend(
batch
.into_iter()
.map(JsonRpcBatchResponseItem::into_non_batch_message),
);
}
}
};
let sink_close_result = transport.close().await;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -468,10 +468,6 @@ impl LocalSessionWorker {
OutboundChannel::Common
}
}
ServerJsonRpcMessage::BatchRequest(_) | ServerJsonRpcMessage::BatchResponse(_) => {
// the server side should never yield a batch request or response now
unreachable!("server side won't yield batch request or response")
}
}
}
async fn handle_server_message(
Expand DownExpand Up@@ -824,20 +820,6 @@ impl Worker for LocalSessionWorker {
crate::model::JsonRpcMessage::Notification(notification) => {
self.catch_cancellation_notification(notification)
}
crate::model::JsonRpcMessage::BatchRequest(items) => {
for r in items {
match r {
crate::model::JsonRpcBatchRequestItem::Request(request) => {
if let Some(http_request_id) = http_request_id {
self.register_request(request, http_request_id)
}
}
crate::model::JsonRpcBatchRequestItem::Notification(
notification,
) => self.catch_cancellation_notification(notification),
}
}
}
_ => {}
}
context.send_to_handler(json_rpc_message).await?;
Expand Down
10 changes: 0 additions & 10 deletions crates/rmcp/src/transport/streamable_http_server/tower.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -319,12 +319,6 @@ where
.map_err(internal_error_response("accept message"))?;
Ok(accepted_response())
}
_ => Ok(Response::builder()
.status(http::StatusCode::NOT_IMPLEMENTED)
.body(
Full::new(Bytes::from("Batch requests are not supported yet")).boxed(),
)
.expect("valid response")),
}
} else {
let (session_id, transport) = self
Expand DownExpand Up@@ -427,10 +421,6 @@ where
}
ClientJsonRpcMessage::Response(_json_rpc_response) => Ok(accepted_response()),
ClientJsonRpcMessage::Error(_json_rpc_error) => Ok(accepted_response()),
_ => Ok(Response::builder()
.status(http::StatusCode::NOT_IMPLEMENTED)
.body(Full::new(Bytes::from("Batch requests are not supported yet")).boxed())
.expect("valid response")),
}
}
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,20 +27,6 @@
}
]
},
{
"description": "Multiple requests sent together",
"type": "array",
"items": {
"$ref": "#/definitions/JsonRpcBatchRequestItem"
}
},
{
"description": "Multiple responses sent together",
"type": "array",
"items": {
"$ref": "#/definitions/JsonRpcBatchResponseItem"
}
},
{
"description": "An error response",
"allOf": [
Expand DownExpand Up@@ -559,26 +545,6 @@
"format": "const",
"const": "notifications/initialized"
},
"JsonRpcBatchRequestItem": {
"anyOf": [
{
"$ref": "#/definitions/JsonRpcRequest"
},
{
"$ref": "#/definitions/JsonRpcNotification"
}
]
},
"JsonRpcBatchResponseItem": {
"anyOf": [
{
"$ref": "#/definitions/JsonRpcResponse"
},
{
"$ref": "#/definitions/JsonRpcError"
}
]
},
"JsonRpcError": {
"type": "object",
"properties": {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: remove batched json rpc support by 4t145 · Pull Request #408 · modelcontextprotocol/rust-sdk · GitHub
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
38 changes: 0 additions & 38 deletions crates/rmcp/src/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -490,40 +490,6 @@ impl ErrorData {
}
}

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(untagged)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub enum JsonRpcBatchRequestItem<Req, Not> {
Request(JsonRpcRequest<Req>),
Notification(JsonRpcNotification<Not>),
}

impl<Req, Not> JsonRpcBatchRequestItem<Req, Not> {
pub fn into_non_batch_message<Resp>(self) -> JsonRpcMessage<Req, Resp, Not> {
match self {
JsonRpcBatchRequestItem::Request(r) => JsonRpcMessage::Request(r),
JsonRpcBatchRequestItem::Notification(n) => JsonRpcMessage::Notification(n),
}
}
}

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(untagged)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub enum JsonRpcBatchResponseItem<Resp> {
Response(JsonRpcResponse<Resp>),
Error(JsonRpcError),
}

impl<Resp> JsonRpcBatchResponseItem<Resp> {
pub fn into_non_batch_message<Req, Not>(self) -> JsonRpcMessage<Req, Resp, Not> {
match self {
JsonRpcBatchResponseItem::Response(r) => JsonRpcMessage::Response(r),
JsonRpcBatchResponseItem::Error(e) => JsonRpcMessage::Error(e),
}
}
}

/// Represents any JSON-RPC message that can be sent or received.
///
/// This enum covers all possible message types in the JSON-RPC protocol:
Expand All@@ -539,10 +505,6 @@ pub enum JsonRpcMessage<Req = Request, Resp = DefaultResponse, Noti = Notificati
Response(JsonRpcResponse<Resp>),
/// A one-way notification (no response expected)
Notification(JsonRpcNotification<Noti>),
/// Multiple requests sent together
BatchRequest(Vec<JsonRpcBatchRequestItem<Req, Noti>>),
/// Multiple responses sent together
BatchResponse(Vec<JsonRpcBatchResponseItem<Resp>>),
/// An error response
Error(JsonRpcError),
}
Expand Down
18 changes: 0 additions & 18 deletions crates/rmcp/src/model/meta.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -172,24 +172,6 @@ where
.extensions_mut()
.insert(value);
}
JsonRpcMessage::BatchRequest(json_rpc_batch_request_items) => {
for item in json_rpc_batch_request_items {
match item {
super::JsonRpcBatchRequestItem::Request(json_rpc_request) => {
json_rpc_request
.request
.extensions_mut()
.insert(value.clone());
}
super::JsonRpcBatchRequestItem::Notification(json_rpc_notification) => {
json_rpc_notification
.notification
.extensions_mut()
.insert(value.clone());
}
}
}
}
_ => {}
}
}
Expand Down
19 changes: 2 additions & 17 deletions crates/rmcp/src/service.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,8 @@ use crate::{
error::ErrorData as McpError,
model::{
CancelledNotification, CancelledNotificationParam, Extensions, GetExtensions, GetMeta,
JsonRpcBatchRequestItem, JsonRpcBatchResponseItem, JsonRpcError, JsonRpcMessage,
JsonRpcNotification, JsonRpcRequest, JsonRpcResponse, Meta, NumberOrString, ProgressToken,
RequestId, ServerJsonRpcMessage,
JsonRpcError, JsonRpcMessage, JsonRpcNotification, JsonRpcRequest, JsonRpcResponse, Meta,
NumberOrString, ProgressToken, RequestId, ServerJsonRpcMessage,
},
transport::{DynamicTransportError, IntoTransport, Transport},
};
Expand DownExpand Up@@ -835,20 +834,6 @@ where
}
}
}
Event::PeerMessage(JsonRpcMessage::BatchRequest(batch)) => {
batch_messages.extend(
batch
.into_iter()
.map(JsonRpcBatchRequestItem::into_non_batch_message),
);
}
Event::PeerMessage(JsonRpcMessage::BatchResponse(batch)) => {
batch_messages.extend(
batch
.into_iter()
.map(JsonRpcBatchResponseItem::into_non_batch_message),
);
}
}
};
let sink_close_result = transport.close().await;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -468,10 +468,6 @@ impl LocalSessionWorker {
OutboundChannel::Common
}
}
ServerJsonRpcMessage::BatchRequest(_) | ServerJsonRpcMessage::BatchResponse(_) => {
// the server side should never yield a batch request or response now
unreachable!("server side won't yield batch request or response")
}
}
}
async fn handle_server_message(
Expand DownExpand Up@@ -824,20 +820,6 @@ impl Worker for LocalSessionWorker {
crate::model::JsonRpcMessage::Notification(notification) => {
self.catch_cancellation_notification(notification)
}
crate::model::JsonRpcMessage::BatchRequest(items) => {
for r in items {
match r {
crate::model::JsonRpcBatchRequestItem::Request(request) => {
if let Some(http_request_id) = http_request_id {
self.register_request(request, http_request_id)
}
}
crate::model::JsonRpcBatchRequestItem::Notification(
notification,
) => self.catch_cancellation_notification(notification),
}
}
}
_ => {}
}
context.send_to_handler(json_rpc_message).await?;
Expand Down
10 changes: 0 additions & 10 deletions crates/rmcp/src/transport/streamable_http_server/tower.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -319,12 +319,6 @@ where
.map_err(internal_error_response("accept message"))?;
Ok(accepted_response())
}
_ => Ok(Response::builder()
.status(http::StatusCode::NOT_IMPLEMENTED)
.body(
Full::new(Bytes::from("Batch requests are not supported yet")).boxed(),
)
.expect("valid response")),
}
} else {
let (session_id, transport) = self
Expand DownExpand Up@@ -427,10 +421,6 @@ where
}
ClientJsonRpcMessage::Response(_json_rpc_response) => Ok(accepted_response()),
ClientJsonRpcMessage::Error(_json_rpc_error) => Ok(accepted_response()),
_ => Ok(Response::builder()
.status(http::StatusCode::NOT_IMPLEMENTED)
.body(Full::new(Bytes::from("Batch requests are not supported yet")).boxed())
.expect("valid response")),
}
}
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,20 +27,6 @@
}
]
},
{
"description": "Multiple requests sent together",
"type": "array",
"items": {
"$ref": "#/definitions/JsonRpcBatchRequestItem"
}
},
{
"description": "Multiple responses sent together",
"type": "array",
"items": {
"$ref": "#/definitions/JsonRpcBatchResponseItem"
}
},
{
"description": "An error response",
"allOf": [
Expand DownExpand Up@@ -559,26 +545,6 @@
"format": "const",
"const": "notifications/initialized"
},
"JsonRpcBatchRequestItem": {
"anyOf": [
{
"$ref": "#/definitions/JsonRpcRequest"
},
{
"$ref": "#/definitions/JsonRpcNotification"
}
]
},
"JsonRpcBatchResponseItem": {
"anyOf": [
{
"$ref": "#/definitions/JsonRpcResponse"
},
{
"$ref": "#/definitions/JsonRpcError"
}
]
},
"JsonRpcError": {
"type": "object",
"properties": {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); fix: remove batched json rpc support by 4t145 · Pull Request #408 · modelcontextprotocol/rust-sdk · GitHub
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
38 changes: 0 additions & 38 deletions crates/rmcp/src/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -490,40 +490,6 @@ impl ErrorData {
}
}

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(untagged)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub enum JsonRpcBatchRequestItem<Req, Not> {
Request(JsonRpcRequest<Req>),
Notification(JsonRpcNotification<Not>),
}

impl<Req, Not> JsonRpcBatchRequestItem<Req, Not> {
pub fn into_non_batch_message<Resp>(self) -> JsonRpcMessage<Req, Resp, Not> {
match self {
JsonRpcBatchRequestItem::Request(r) => JsonRpcMessage::Request(r),
JsonRpcBatchRequestItem::Notification(n) => JsonRpcMessage::Notification(n),
}
}
}

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(untagged)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub enum JsonRpcBatchResponseItem<Resp> {
Response(JsonRpcResponse<Resp>),
Error(JsonRpcError),
}

impl<Resp> JsonRpcBatchResponseItem<Resp> {
pub fn into_non_batch_message<Req, Not>(self) -> JsonRpcMessage<Req, Resp, Not> {
match self {
JsonRpcBatchResponseItem::Response(r) => JsonRpcMessage::Response(r),
JsonRpcBatchResponseItem::Error(e) => JsonRpcMessage::Error(e),
}
}
}

/// Represents any JSON-RPC message that can be sent or received.
///
/// This enum covers all possible message types in the JSON-RPC protocol:
Expand All@@ -539,10 +505,6 @@ pub enum JsonRpcMessage<Req = Request, Resp = DefaultResponse, Noti = Notificati
Response(JsonRpcResponse<Resp>),
/// A one-way notification (no response expected)
Notification(JsonRpcNotification<Noti>),
/// Multiple requests sent together
BatchRequest(Vec<JsonRpcBatchRequestItem<Req, Noti>>),
/// Multiple responses sent together
BatchResponse(Vec<JsonRpcBatchResponseItem<Resp>>),
/// An error response
Error(JsonRpcError),
}
Expand Down
18 changes: 0 additions & 18 deletions crates/rmcp/src/model/meta.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -172,24 +172,6 @@ where
.extensions_mut()
.insert(value);
}
JsonRpcMessage::BatchRequest(json_rpc_batch_request_items) => {
for item in json_rpc_batch_request_items {
match item {
super::JsonRpcBatchRequestItem::Request(json_rpc_request) => {
json_rpc_request
.request
.extensions_mut()
.insert(value.clone());
}
super::JsonRpcBatchRequestItem::Notification(json_rpc_notification) => {
json_rpc_notification
.notification
.extensions_mut()
.insert(value.clone());
}
}
}
}
_ => {}
}
}
Expand Down
19 changes: 2 additions & 17 deletions crates/rmcp/src/service.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,8 @@ use crate::{
error::ErrorData as McpError,
model::{
CancelledNotification, CancelledNotificationParam, Extensions, GetExtensions, GetMeta,
JsonRpcBatchRequestItem, JsonRpcBatchResponseItem, JsonRpcError, JsonRpcMessage,
JsonRpcNotification, JsonRpcRequest, JsonRpcResponse, Meta, NumberOrString, ProgressToken,
RequestId, ServerJsonRpcMessage,
JsonRpcError, JsonRpcMessage, JsonRpcNotification, JsonRpcRequest, JsonRpcResponse, Meta,
NumberOrString, ProgressToken, RequestId, ServerJsonRpcMessage,
},
transport::{DynamicTransportError, IntoTransport, Transport},
};
Expand DownExpand Up@@ -835,20 +834,6 @@ where
}
}
}
Event::PeerMessage(JsonRpcMessage::BatchRequest(batch)) => {
batch_messages.extend(
batch
.into_iter()
.map(JsonRpcBatchRequestItem::into_non_batch_message),
);
}
Event::PeerMessage(JsonRpcMessage::BatchResponse(batch)) => {
batch_messages.extend(
batch
.into_iter()
.map(JsonRpcBatchResponseItem::into_non_batch_message),
);
}
}
};
let sink_close_result = transport.close().await;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -468,10 +468,6 @@ impl LocalSessionWorker {
OutboundChannel::Common
}
}
ServerJsonRpcMessage::BatchRequest(_) | ServerJsonRpcMessage::BatchResponse(_) => {
// the server side should never yield a batch request or response now
unreachable!("server side won't yield batch request or response")
}
}
}
async fn handle_server_message(
Expand DownExpand Up@@ -824,20 +820,6 @@ impl Worker for LocalSessionWorker {
crate::model::JsonRpcMessage::Notification(notification) => {
self.catch_cancellation_notification(notification)
}
crate::model::JsonRpcMessage::BatchRequest(items) => {
for r in items {
match r {
crate::model::JsonRpcBatchRequestItem::Request(request) => {
if let Some(http_request_id) = http_request_id {
self.register_request(request, http_request_id)
}
}
crate::model::JsonRpcBatchRequestItem::Notification(
notification,
) => self.catch_cancellation_notification(notification),
}
}
}
_ => {}
}
context.send_to_handler(json_rpc_message).await?;
Expand Down
10 changes: 0 additions & 10 deletions crates/rmcp/src/transport/streamable_http_server/tower.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -319,12 +319,6 @@ where
.map_err(internal_error_response("accept message"))?;
Ok(accepted_response())
}
_ => Ok(Response::builder()
.status(http::StatusCode::NOT_IMPLEMENTED)
.body(
Full::new(Bytes::from("Batch requests are not supported yet")).boxed(),
)
.expect("valid response")),
}
} else {
let (session_id, transport) = self
Expand DownExpand Up@@ -427,10 +421,6 @@ where
}
ClientJsonRpcMessage::Response(_json_rpc_response) => Ok(accepted_response()),
ClientJsonRpcMessage::Error(_json_rpc_error) => Ok(accepted_response()),
_ => Ok(Response::builder()
.status(http::StatusCode::NOT_IMPLEMENTED)
.body(Full::new(Bytes::from("Batch requests are not supported yet")).boxed())
.expect("valid response")),
}
}
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,20 +27,6 @@
}
]
},
{
"description": "Multiple requests sent together",
"type": "array",
"items": {
"$ref": "#/definitions/JsonRpcBatchRequestItem"
}
},
{
"description": "Multiple responses sent together",
"type": "array",
"items": {
"$ref": "#/definitions/JsonRpcBatchResponseItem"
}
},
{
"description": "An error response",
"allOf": [
Expand DownExpand Up@@ -559,26 +545,6 @@
"format": "const",
"const": "notifications/initialized"
},
"JsonRpcBatchRequestItem": {
"anyOf": [
{
"$ref": "#/definitions/JsonRpcRequest"
},
{
"$ref": "#/definitions/JsonRpcNotification"
}
]
},
"JsonRpcBatchResponseItem": {
"anyOf": [
{
"$ref": "#/definitions/JsonRpcResponse"
},
{
"$ref": "#/definitions/JsonRpcError"
}
]
},
"JsonRpcError": {
"type": "object",
"properties": {
Expand Down
Loading