Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Support validation for method fields in *Request #81

New issue

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

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

Already on GitHub? Sign in to your account

Open
zhongyi51 wants to merge 1 commit into rust-mcp-stack:main
base: main
Choose a base branch
Loading
from zhongyi51:main
Open
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
114 changes: 114 additions & 0 deletions src/generated_schema/2025_06_18/mcp_schema.rs
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1312,6 +1312,8 @@ impl ::std::convert::From<EmbeddedResource> for ContentBlock {
/// </details>
#[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
pub struct CreateMessageRequest {
// This field requires custom deserialization for validation.
#[serde(deserialize_with = "server_request_method_validation::deserialize_CreateMessageRequest_method")]
method: ::std::string::String,
pub params: CreateMessageRequestParams,
}
Expand Down Expand Up @@ -1625,6 +1627,8 @@ pub struct Cursor(pub ::std::string::String);
/// </details>
#[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
pub struct ElicitRequest {
// This field requires custom deserialization for validation.
#[serde(deserialize_with = "server_request_method_validation::deserialize_ElicitRequest_method")]
method: ::std::string::String,
pub params: ElicitRequestParams,
}
Expand Down Expand Up @@ -3302,6 +3306,8 @@ structure or access specific locations that the client has permission to read fr
/// </details>
#[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
pub struct ListRootsRequest {
// This field requires custom deserialization for validation.
#[serde(deserialize_with = "server_request_method_validation::deserialize_ListRootsRequest_method")]
method: ::std::string::String,
#[serde(default, skip_serializing_if = "::std::option::Option::is_none")]
pub params: ::std::option::Option<ListRootsRequestParams>,
Expand Down Expand Up @@ -4040,6 +4046,8 @@ pub struct PaginatedResult {
/// </details>
#[derive(::serde::Deserialize, ::serde::Serialize, Clone, Debug)]
pub struct PingRequest {
// This field requires custom deserialization for validation.
#[serde(deserialize_with = "server_request_method_validation::deserialize_PingRequest_method")]
method: ::std::string::String,
#[serde(default, skip_serializing_if = "::std::option::Option::is_none")]
pub params: ::std::option::Option<PingRequestParams>,
Expand Down Expand Up @@ -7167,5 +7175,111 @@ impl ServerNotification {
}
}
}

// Custom module for deserialization function to prevent name conflicts.
mod server_request_method_validation{

// Custom deserialization function, following the `deserialize_#StructName_#FieldName` format.
#[allow(non_snake_case)]
pub(super) fn deserialize_PingRequest_method<'de, D>(
deserializer: D,
) -> std::result::Result<String, D::Error>
where
D: serde::de::Deserializer<'de>,
{
let value = serde::Deserialize::deserialize(deserializer)?;
// The expected constant value.
let expected = "ping";

// Validate the deserialized value.
if value == expected {
Ok(value)
} else {
// The error message with format
// "Expected field `#FieldName` in struct `#StructName` as const value '{}', but got '{}'"
Err(serde::de::Error::custom(format!(
"Expected field `method` in struct `PingRequest` as const value '{}', but got '{}'",
expected, value
)))
}
}

// Custom deserialization function, following the `deserialize_#StructName_#FieldName` format.
#[allow(non_snake_case)]
pub(super) fn deserialize_CreateMessageRequest_method<'de, D>(
deserializer: D,
) -> std::result::Result<String, D::Error>
where
D: serde::de::Deserializer<'de>,
{
let value = serde::Deserialize::deserialize(deserializer)?;
// The expected constant value.
let expected = "sampling/createMessage";

// Validate the deserialized value.
if value == expected {
Ok(value)
} else {
// The error message with format
// "Expected field `#FieldName` in struct `#StructName` as const value '{}', but got '{}'"
Err(serde::de::Error::custom(format!(
"Expected field `method` in struct `CreateMessageRequest` as const value '{}', but got '{}'",
expected, value
)))
}
}

// Custom deserialization function, following the `deserialize_#StructName_#FieldName` format.
#[allow(non_snake_case)]
pub(super) fn deserialize_ListRootsRequest_method<'de, D>(
deserializer: D,
) -> std::result::Result<String, D::Error>
where
D: serde::de::Deserializer<'de>,
{
let value = serde::Deserialize::deserialize(deserializer)?;
// The expected constant value.
let expected = "roots/list";

// Validate the deserialized value.
if value == expected {
Ok(value)
} else {
// The error message with format
// "Expected field `#FieldName` in struct `#StructName` as const value '{}', but got '{}'"
Err(serde::de::Error::custom(format!(
"Expected field `method` in struct `ListRootsRequest` as const value '{}', but got '{}'",
expected, value
)))
}
}

// Custom deserialization function, following the `deserialize_#StructName_#FieldName` format.
#[allow(non_snake_case)]
pub(super) fn deserialize_ElicitRequest_method<'de, D>(
deserializer: D,
) -> std::result::Result<String, D::Error>
where
D: serde::de::Deserializer<'de>,
{
let value = serde::Deserialize::deserialize(deserializer)?;
// The expected constant value.
let expected = "elicitation/create";

// Validate the deserialized value.
if value == expected {
Ok(value)
} else {
// The error message with format
// "Expected field `#FieldName` in struct `#StructName` as const value '{}', but got '{}'"
Err(serde::de::Error::custom(format!(
"Expected field `method` in struct `ElicitRequest` as const value '{}', but got '{}'",
expected, value
)))
}
}

}

#[deprecated(since = "0.3.0", note = "Use `RpcError` instead.")]
pub type JsonrpcErrorError = RpcError;
7 changes: 7 additions & 0 deletions src/generated_schema/2025_06_18/schema_utils.rs
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3922,5 +3922,12 @@ mod tests {
// default
let result = detect_message_type(&json!({}));
assert!(matches!(result, MessageTypes::Request));

// assert method type validation
let should_err:std::result::Result<PingRequest,_> = serde_json::from_value(json!({
"method":"wrong_method",
"params":null
}));
assert!(should_err.is_err());
}
}

AltStyle によって変換されたページ (->オリジナル) /