Skip to content

Move markInitialized/reconnect after status code check in Streamable HTTP transport #851

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.

Sign up for GitHub

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
rameshreddy-adutla wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Move markInitialized/reconnect after status code check in Streamable HTTP transport #851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions ...main/java/io/modelcontextprotocol/client/transport/HttpClientStreamableHttpTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,17 +574,18 @@ public Mono<Void> sendMessage(McpSchema.JSONRPCMessage sentMessage) {
"Authorization error when sending message", requestSnapshot, responseEvent.responseInfo()));
}

if (transportSession.markInitialized(
responseEvent.responseInfo().headers().firstValue("mcp-session-id").orElseGet(() -> null))) {
// Once we have a session, we try to open an async stream for
// the server to send notifications and requests out-of-band.

reconnect(null).contextWrite(deliveredSink.contextView()).subscribe();
}

String sessionRepresentation = sessionIdOrPlaceholder(transportSession);

if (statusCode >= 200 && statusCode < 300) {
if (transportSession.markInitialized(responseEvent.responseInfo()
.headers()
.firstValue("mcp-session-id")
.orElseGet(() -> null))) {
// Once we have a session, we try to open an async stream
// for the server to send notifications and requests
// out-of-band.
reconnect(null).contextWrite(deliveredSink.contextView()).subscribe();
}

String contentType = responseEvent.responseInfo()
.headers()
Expand Down
16 changes: 16 additions & 0 deletions ...lcontextprotocol/client/transport/HttpClientStreamableHttpTransportErrorHandlingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,22 @@ void test405OnConnectReturnsEmptyFlux() {
StepVerifier.create(transport.closeGracefully()).verifyComplete();
}

@Test
void test405OnSendMessageDoesNotOpenSseConnection() {
serverResponseStatus.set(405);
currentServerSessionId.set("ignored-session-id");

StepVerifier.create(transport.sendMessage(createTestRequestMessage()))
.expectErrorMatches(
error -> error instanceof McpTransportException && error.getMessage().contains("Status code: 405"))
.verify();

Awaitility.await()
.during(Duration.ofMillis(300))
.atMost(Duration.ofSeconds(1))
.untilAsserted(() -> assertThat(processedSseConnectCount.get()).isZero());
}

@Nested
class AuthorizationError {

Expand Down
Loading