Skip to content

Commit 5208284

Browse files
committed
refactor: move RequestIdGen trait to the sdk crate
1 parent 91be09f commit 5208284

File tree

5 files changed

+15
-111
lines changed

5 files changed

+15
-111
lines changed

crates/rust-mcp-sdk/src/mcp_runtimes/client_runtime.rs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
pub mod mcp_client_runtime;
22
pub mod mcp_client_runtime_core;
33

4-
use crate::schema::{
5-
schema_utils::{
6-
self, ClientMessage, ClientMessages, FromMessage, MessageFromClient, ServerMessage,
7-
ServerMessages,
4+
use crate::{
5+
mcp_traits::{RequestIdGen, RequestIdGenNumeric},
6+
schema::{
7+
schema_utils::{
8+
self, ClientMessage, ClientMessages, FromMessage, MessageFromClient, ServerMessage,
9+
ServerMessages,
10+
},
11+
InitializeRequest, InitializeRequestParams, InitializeResult, InitializedNotification,
12+
RequestId, RpcError, ServerResult,
813
},
9-
InitializeRequest, InitializeRequestParams, InitializeResult, InitializedNotification,
10-
RequestId, RpcError, ServerResult,
1114
};
1215
use async_trait::async_trait;
1316
use futures::future::{join_all, try_join_all};
1417
use futures::StreamExt;
1518

16-
use rust_mcp_transport::{
17-
IoStream, McpDispatch, MessageDispatcher, RequestIdGen, RequestIdGenNumeric, Transport,
18-
};
19+
use rust_mcp_transport::{IoStream, McpDispatch, MessageDispatcher, Transport};
1920
use std::{
2021
sync::{Arc, RwLock},
2122
time::Duration,

crates/rust-mcp-sdk/src/mcp_runtimes/server_runtime.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ pub mod mcp_server_runtime_core;
33
use crate::error::SdkResult;
44
use crate::mcp_traits::mcp_handler::McpServerHandler;
55
use crate::mcp_traits::mcp_server::McpServer;
6+
use crate::mcp_traits::{RequestIdGen, RequestIdGenNumeric};
67
use crate::schema::{
78
schema_utils::{
89
ClientMessage, ClientMessages, FromMessage, MessageFromServer, SdkError, ServerMessage,
@@ -16,7 +17,7 @@ use futures::future::try_join_all;
1617
use futures::{StreamExt, TryFutureExt};
1718
#[cfg(feature = "hyper-server")]
1819
use rust_mcp_transport::SessionId;
19-
use rust_mcp_transport::{IoStream, RequestIdGen, RequestIdGenNumeric, TransportDispatcher};
20+
use rust_mcp_transport::{IoStream, TransportDispatcher};
2021
use std::collections::HashMap;
2122
use std::sync::Arc;
2223
use std::time::Duration;

crates/rust-mcp-sdk/src/mcp_traits.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@ pub mod mcp_client;
33
pub mod mcp_handler;
44
#[cfg(feature = "server")]
55
pub mod mcp_server;
6+
mod request_id_gen;
7+
8+
pub use request_id_gen::*;

crates/rust-mcp-transport/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ mod client_sse;
66
pub mod error;
77
mod mcp_stream;
88
mod message_dispatcher;
9-
mod request_id_gen;
109
mod schema;
1110
#[cfg(feature = "sse")]
1211
mod sse;
@@ -17,7 +16,6 @@ mod utils;
1716
#[cfg(feature = "sse")]
1817
pub use client_sse::*;
1918
pub use message_dispatcher::*;
20-
pub use request_id_gen::*;
2119
#[cfg(feature = "sse")]
2220
pub use sse::*;
2321
pub use stdio::*;

crates/rust-mcp-transport/src/request_id_gen.rs

Lines changed: 0 additions & 99 deletions
This file was deleted.

0 commit comments

Comments
 (0)