modelcontextprotocol/rust-sdk
Watch
1
0
Fork
You've already forked rust-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: update peer info on duplicate initialize (#862)

Browse source
This commit is contained in:
Dale Seo 2026-06-10 15:42:09 -04:00 • committed by GitHub
commit 2536a05992
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 69 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/rmcp/src/handler/server.rs
View file

@ -184,9 +184,7 @@ macro_rules! server_handler_methods {
request: InitializeRequestParams,
context: RequestContext<RoleServer>,
) -> impl Future<Output = Result<InitializeResult, McpError>> + MaybeSendFuture + '_ {
if context.peer.peer_info().is_none() {
context.peer.set_peer_info(request);
}
context.peer.set_peer_info(request);
std::future::ready(Ok(self.get_info()))
}
fn complete(

16
crates/rmcp/src/service.rs
View file

@ -384,7 +384,7 @@ pub struct Peer<R: ServiceRole> {
tx: mpsc::Sender<PeerSinkMessage<R>>,
request_id_provider: Arc<dyn RequestIdProvider>,
progress_token_provider: Arc<dyn ProgressTokenProvider>,
info: Arc<tokio::sync::OnceCell<R::PeerInfo>>,
info: Arc<std::sync::RwLock<Option<Arc<R::PeerInfo>>>>,
}
impl<R: ServiceRole> std::fmt::Debug for Peer<R> {
@ -423,7 +423,7 @@ impl<R: ServiceRole> Peer<R> {
tx,
request_id_provider,
progress_token_provider: Arc::new(AtomicU32ProgressTokenProvider::default()),
info: Arc::new(tokio::sync::OnceCell::new_with(peer_info)),
info: Arc::new(std::sync::RwLock::new(peer_info.map(Arc::new))),
},
rx,
)
@ -484,16 +484,14 @@ impl<R: ServiceRole> Peer<R> {
peer: self.clone(),
})
}
pub fn peer_info(&self) -> Option<&R::PeerInfo> {
self.info.get()
/// Snapshot of the peer's handshake info.
pub fn peer_info(&self) -> Option<Arc<R::PeerInfo>> {
self.info.read().expect("peer info lock poisoned").clone()
}
/// Stores the peer's handshake info, overwriting any previous value.
pub fn set_peer_info(&self, info: R::PeerInfo) {
if self.info.initialized() {
tracing::warn!("trying to set peer info, which is already initialized");
} else {
let _ = self.info.set(info);
}
*self.info.write().expect("peer info lock poisoned") = Some(Arc::new(info));
}
pub fn is_transport_closed(&self) -> bool {