Skip to content

Commit 9b8604e

Browse files
committed
fix(core): remove pending response entries on request timeout and cancellation
McpClientSession and McpServerSession left the pendingResponses entry in place when the downstream timeout fired or the caller cancelled, so each timed-out request leaked its entry forever (request IDs are unique). Mirror the doOnError/doOnCancel cleanup the streamable session variant already performs after .timeout(requestTimeout). Fixes #1133
1 parent 4186ca1 commit 9b8604e

3 files changed

Lines changed: 48 additions & 22 deletions

File tree

‎mcp-core/src/main/java/io/modelcontextprotocol/spec/McpClientSession.java‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -264,21 +264,25 @@ public <T> Mono<T> sendRequest(String method, Object requestParams, TypeRef<T> t
264264
this.pendingResponses.remove(requestId);
265265
pendingResponseSink.error(error);
266266
});
267-
})).timeout(this.requestTimeout).handle((jsonRpcResponse, deliveredResponseSink) -> {
268-
if (jsonRpcResponse.error() != null) {
269-
logger.info("Server returned a JSON-RPC error when calling method {}: {}", method,
270-
jsonRpcResponse.error());
271-
deliveredResponseSink.error(new McpError(jsonRpcResponse.error()));
272-
}
273-
else {
274-
if (typeRef.getType().equals(Void.class)) {
275-
deliveredResponseSink.complete();
267+
}))
268+
.timeout(this.requestTimeout)
269+
.doOnError(e -> this.pendingResponses.remove(requestId))
270+
.doOnCancel(() -> this.pendingResponses.remove(requestId))
271+
.handle((jsonRpcResponse, deliveredResponseSink) -> {
272+
if (jsonRpcResponse.error() != null) {
273+
logger.info("Server returned a JSON-RPC error when calling method {}: {}", method,
274+
jsonRpcResponse.error());
275+
deliveredResponseSink.error(new McpError(jsonRpcResponse.error()));
276276
}
277277
else {
278-
deliveredResponseSink.next(this.transport.unmarshalFrom(jsonRpcResponse.result(), typeRef));
278+
if (typeRef.getType().equals(Void.class)) {
279+
deliveredResponseSink.complete();
280+
}
281+
else {
282+
deliveredResponseSink.next(this.transport.unmarshalFrom(jsonRpcResponse.result(), typeRef));
283+
}
279284
}
280-
}
281-
});
285+
});
282286
}
283287

284288
/**

‎mcp-core/src/main/java/io/modelcontextprotocol/spec/McpServerSession.java‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -184,19 +184,23 @@ public <T> Mono<T> sendRequest(String method, Object requestParams, TypeRef<T> t
184184
this.pendingResponses.remove(requestId);
185185
sink.error(error);
186186
});
187-
}).timeout(requestTimeout).handle((jsonRpcResponse, sink) -> {
188-
if (jsonRpcResponse.error() != null) {
189-
sink.error(new McpError(jsonRpcResponse.error()));
190-
}
191-
else {
192-
if (typeRef.getType().equals(Void.class)) {
193-
sink.complete();
187+
})
188+
.timeout(requestTimeout)
189+
.doOnError(e -> this.pendingResponses.remove(requestId))
190+
.doOnCancel(() -> this.pendingResponses.remove(requestId))
191+
.handle((jsonRpcResponse, sink) -> {
192+
if (jsonRpcResponse.error() != null) {
193+
sink.error(new McpError(jsonRpcResponse.error()));
194194
}
195195
else {
196-
sink.next(this.transport.unmarshalFrom(jsonRpcResponse.result(), typeRef));
196+
if (typeRef.getType().equals(Void.class)) {
197+
sink.complete();
198+
}
199+
else {
200+
sink.next(this.transport.unmarshalFrom(jsonRpcResponse.result(), typeRef));
201+
}
197202
}
198-
}
199-
});
203+
});
200204
}
201205

202206
@Override

‎mcp-core/src/test/java/io/modelcontextprotocol/spec/McpClientSessionTests.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,4 +303,22 @@ void testGracefulShutdown() {
303303
StepVerifier.create(session.closeGracefully()).verifyComplete();
304304
}
305305

306+
@Test
307+
void testRequestTimeoutRemovesPendingResponse() throws Exception {
308+
var transport = new MockMcpClientTransport();
309+
var session = new McpClientSession(Duration.ofMillis(50), transport, Map.of(), Map.of(), Function.identity());
310+
311+
Mono<String> responseMono = session.sendRequest(TEST_METHOD, "test", responseType);
312+
313+
StepVerifier.create(responseMono).expectError(java.util.concurrent.TimeoutException.class).verify();
314+
315+
var field = McpClientSession.class.getDeclaredField("pendingResponses");
316+
field.setAccessible(true);
317+
@SuppressWarnings("unchecked")
318+
var pendingResponses = (java.util.Map<Object, ?>) field.get(session);
319+
assertThat(pendingResponses).isEmpty();
320+
321+
session.close();
322+
}
323+
306324
}

0 commit comments

Comments
 (0)