fix: add init_timeout for streamable-http sessions#811
Merged
Conversation
github-actions
Bot
added
T-test
DaleSeo
force-pushed
the
fix/issue-808-init-timeout
branch
from
3ec3a2a to
ddd3da7
Compare
alexhancock
reviewed
May 1, 2026
| "get initialize request", | ||
| ) | ||
| })?; | ||
| let init_timeout = self.session_config.init_timeout.unwrap_or(Duration::MAX); |
Contributor
There was a problem hiding this comment.
I don't understand why the _or(Duration::MAX) here. Aren't we setting a default init timeout of 60s?
Member
Author
There was a problem hiding this comment.
@alexhancock You're right. The default is 60s but users can set it to None to disable the timeout. unwrap_or(Duration::MAX) handles that opt-out case. This mirrors how keep_alive is handled a few lines below.
Contributor
There was a problem hiding this comment.
Right, but I was thinking we should not have
pub init_timeout: Option<Duration>
pub init_timeout: Duration
seems more clear to me in this situation where it has a builtin default that is always set. It would make it so if the user wants to make it really long they could do the Duration::MAX
alexhancock
approved these changes
May 1, 2026
Merged
jrmelsha
added a commit
to UserGeneratedLLC/rmcp-rust-sdk
that referenced
this pull request
May 1, 2026
Brings in upstream rmcp v1.6.0: - fix(http): fall back to :authority for HTTP/2 (modelcontextprotocol#827) - fix: add init_timeout for streamable-http sessions (modelcontextprotocol#811) - feat(http): log Host/Origin rejections (modelcontextprotocol#826) Conflict resolution: - crates/rmcp/CHANGELOG.md: kept fork's bare-boolean Unreleased entry, inserted upstream's 1.6.0 release section beneath it - crates/rmcp/src/transport/streamable_http_server/tower.rs: auto-merged upstream's Host/Origin/HTTP-2 logging additions; kept fork's tracing::debug! for "Resume failed" (ab4ccdb) over upstream's tracing::warn! revert - Cargo.toml workspace bumped to 1.6.0; fork's newer dep versions (pastey 0.2.2, schemars 1.2, reqwest 0.13.3, url 2.5, process-wrap 9.1, chrono 0.4.44) preserved; rand stays removed (ed5868d) since fork doesn't use it - docs.rs anthropic-ext feature retained
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes #808.
Motivation and Context
The
LocalSessionWorker::run()function waited for the firstinitializerequest using justself.event_rx.recv().awaitwithout a timeout. Any HTTP POST that created a session but didn’t follow up could keep a worker task running indefinitely. The only way to free it was through a server shutdown, which eventually led to memory exhaustion.The post-init loop already had a
keep_alivetimeout in place, but there was an issue with the pre-init path that created an asymmetric gap.How Has This Been Tested?
Added two integration tests
Breaking Changes
No API breaks. Both
SessionConfigandLocalSessionWorkerErrorare#[non_exhaustive].Types of changes
Checklist
Additional context