feat: add server/discover model types #943
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -808,6 +808,55 @@ impl CustomRequest { | |
| } | ||
| } | ||
|
|
||
| const_string!(DiscoverRequestMethod = "server/discover"); | ||
|
|
||
| /// Sent from the client to discover server identity, capabilities, and supported protocol versions. | ||
| pub type DiscoverRequest = Request<DiscoverRequestMethod, EmptyObject>; | ||
|
|
||
| #[derive(Debug, Serialize, Deserialize, Clone, PartialEq)] | ||
| #[serde(rename_all = "camelCase")] | ||
| #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] | ||
| #[non_exhaustive] | ||
| pub struct DiscoverResult { | ||
| pub supported_versions: Vec<ProtocolVersion>, | ||
| pub capabilities: ServerCapabilities, | ||
| pub server_info: Implementation, | ||
| #[serde(skip_serializing_if = "Option::is_none")] | ||
| pub instructions: Option<String>, | ||
| #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")] | ||
| pub meta: Option<Meta>, | ||
| } | ||
|
Comment on lines
+820
to
+828
Member
There was a problem hiding this comment. The draft schema shows that this struct needs more fields. 
https://modelcontextprotocol.io/specification/draft/schema#discoverresult
Member
There was a problem hiding this comment. Rebase onto rust-sdk/crates/rmcp/src/model.rs Lines 693 to 695 in 60d3e77 |
||
|
|
||
| impl DiscoverResult { | ||
| pub fn new( | ||
| supported_versions: impl Into<Vec<ProtocolVersion>>, | ||
| capabilities: ServerCapabilities, | ||
| ) -> Self { | ||
| Self { | ||
| supported_versions: supported_versions.into(), | ||
| capabilities, | ||
| server_info: Implementation::from_build_env(), | ||
| instructions: None, | ||
| meta: None, | ||
| } | ||
| } | ||
|
|
||
| pub fn with_server_info(mut self, server_info: Implementation) -> Self { | ||
| self.server_info = server_info; | ||
| self | ||
| } | ||
|
|
||
| pub fn with_instructions(mut self, instructions: impl Into<String>) -> Self { | ||
| self.instructions = Some(instructions.into()); | ||
| self | ||
| } | ||
|
|
||
| pub fn with_meta(mut self, meta: Meta) -> Self { | ||
| self.meta = Some(meta); | ||
| self | ||
| } | ||
| } | ||
|
|
||
| const_string!(InitializeResultMethod = "initialize"); | ||
| /// # Initialization | ||
| /// This request is sent from the client to the server when it first connects, asking it to begin initialization. | ||
|
|
@@ -3572,6 +3621,7 @@ macro_rules! ts_union { | |
|
|
||
| ts_union!( | ||
| export type ClientRequest = | ||
| | DiscoverRequest | ||
| | PingRequest | ||
| | InitializeRequest | ||
| | CompleteRequest | ||
|
|
@@ -3595,6 +3645,7 @@ ts_union!( | |
| impl ClientRequest { | ||
| pub fn method(&self) -> &str { | ||
| match &self { | ||
| ClientRequest::DiscoverRequest(r) => r.method.as_str(), | ||
| ClientRequest::PingRequest(r) => r.method.as_str(), | ||
| ClientRequest::InitializeRequest(r) => r.method.as_str(), | ||
| ClientRequest::CompleteRequest(r) => r.method.as_str(), | ||
|
|
@@ -3669,6 +3720,7 @@ ts_union!( | |
|
|
||
| ts_union!( | ||
| export type ServerResult = | ||
| | DiscoverResult | ||
| | InitializeResult | ||
| | CompleteResult | ||
| | GetPromptResult | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
EmptyObjectwould allow:{ "method": "server/discover", "params": {} }Is this intended?