Skip to content

Commit 5e77762

Browse files
committed
HttpClientStreamableHttpTransport: handle HTTP 405
- Forward-port of #900 Signed-off-by: Daniel Garnier-Moiroux <git@garnier.wf>
1 parent 8c7774a commit 5e77762

File tree

2 files changed

+25
-5
lines changed

2 files changed

+25
-5
lines changed

mcp-core/src/main/java/io/modelcontextprotocol/client/transport/HttpClientStreamableHttpTransport.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,10 @@ private Mono<Disposable> reconnect(McpTransportStream<Disposable> stream) {
298298
"Authorization error connecting to SSE stream",
299299
responseEvent.responseInfo()));
300300
}
301+
else if (statusCode == METHOD_NOT_ALLOWED) {
302+
logger.debug("The server does not support SSE streams, using request-response mode.");
303+
return Flux.empty();
304+
}
301305

302306
if (!(responseEvent instanceof ResponseSubscribers.SseResponseEvent sseResponseEvent)) {
303307
return Flux.<McpSchema.JSONRPCMessage>error(new McpTransportException(
@@ -344,10 +348,6 @@ else if (statusCode >= 200 && statusCode < 300) {
344348
return Flux.empty();
345349
}
346350
}
347-
else if (statusCode == METHOD_NOT_ALLOWED) { // NotAllowed
348-
logger.debug("The server does not support SSE streams, using request-response mode.");
349-
return Flux.empty();
350-
}
351351
else if (statusCode == NOT_FOUND) {
352352

353353
if (transportSession != null && transportSession.sessionId().isPresent()) {

mcp-test/src/test/java/io/modelcontextprotocol/client/transport/HttpClientStreamableHttpTransportErrorHandlingTest.java

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.sun.net.httpserver.HttpServer;
1919
import io.modelcontextprotocol.client.transport.customizer.McpHttpClientAuthorizationErrorHandler;
2020
import io.modelcontextprotocol.common.McpTransportContext;
21-
import org.reactivestreams.Publisher;
2221
import io.modelcontextprotocol.server.transport.TomcatTestUtil;
2322
import io.modelcontextprotocol.spec.HttpHeaders;
2423
import io.modelcontextprotocol.spec.McpClientTransport;
@@ -34,6 +33,7 @@
3433
import org.junit.jupiter.api.Timeout;
3534
import org.junit.jupiter.params.ParameterizedTest;
3635
import org.junit.jupiter.params.provider.ValueSource;
36+
import org.reactivestreams.Publisher;
3737
import reactor.core.publisher.Mono;
3838
import reactor.test.StepVerifier;
3939

@@ -369,6 +369,26 @@ else if (status == 404) {
369369
StepVerifier.create(transport.closeGracefully()).verifyComplete();
370370
}
371371

372+
@Test
373+
void test405OnConnectReturnsEmptyFlux() {
374+
serverSseResponseStatus.set(405);
375+
AtomicReference<Throwable> capturedException = new AtomicReference<>();
376+
var transport = HttpClientStreamableHttpTransport.builder(HOST).openConnectionOnStartup(true).build();
377+
transport.setExceptionHandler(capturedException::set);
378+
379+
var messages = new ArrayList<McpSchema.JSONRPCMessage>();
380+
StepVerifier.create(transport.connect(msg -> msg.doOnNext(messages::add))).verifyComplete();
381+
382+
Awaitility.await()
383+
.atMost(Duration.ofSeconds(1))
384+
.untilAsserted(() -> assertThat(processedSseConnectCount.get()).isEqualTo(1));
385+
386+
assertThat(messages).isEmpty();
387+
assertThat(capturedException.get()).isNull();
388+
389+
StepVerifier.create(transport.closeGracefully()).verifyComplete();
390+
}
391+
372392
@Nested
373393
class AuthorizationError {
374394

0 commit comments

Comments
 (0)