Skip to content

fix(core): remove pending response entries on request timeout and cancellation #1134

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
Lubaoshuai wants to merge 1 commit into
base: main
Choose a base branch
from
+48 −22
Open

fix(core): remove pending response entries on request timeout and cancellation #1134

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
28 changes: 16 additions & 12 deletions mcp-core/src/main/java/io/modelcontextprotocol/spec/McpClientSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,21 +264,25 @@ public <T> Mono<T> sendRequest(String method, Object requestParams, TypeRef<T> t
this.pendingResponses.remove(requestId);
pendingResponseSink.error(error);
});
})).timeout(this.requestTimeout).handle((jsonRpcResponse, deliveredResponseSink) -> {
if (jsonRpcResponse.error() != null) {
logger.info("Server returned a JSON-RPC error when calling method {}: {}", method,
jsonRpcResponse.error());
deliveredResponseSink.error(new McpError(jsonRpcResponse.error()));
}
else {
if (typeRef.getType().equals(Void.class)) {
deliveredResponseSink.complete();
}))
.timeout(this.requestTimeout)
.doOnError(e -> this.pendingResponses.remove(requestId))
.doOnCancel(() -> this.pendingResponses.remove(requestId))
.handle((jsonRpcResponse, deliveredResponseSink) -> {
if (jsonRpcResponse.error() != null) {
logger.info("Server returned a JSON-RPC error when calling method {}: {}", method,
jsonRpcResponse.error());
deliveredResponseSink.error(new McpError(jsonRpcResponse.error()));
}
else {
deliveredResponseSink.next(this.transport.unmarshalFrom(jsonRpcResponse.result(), typeRef));
if (typeRef.getType().equals(Void.class)) {
deliveredResponseSink.complete();
}
else {
deliveredResponseSink.next(this.transport.unmarshalFrom(jsonRpcResponse.result(), typeRef));
}
}
}
});
});
}

/**
Expand Down
24 changes: 14 additions & 10 deletions mcp-core/src/main/java/io/modelcontextprotocol/spec/McpServerSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,19 +184,23 @@ public <T> Mono<T> sendRequest(String method, Object requestParams, TypeRef<T> t
this.pendingResponses.remove(requestId);
sink.error(error);
});
}).timeout(requestTimeout).handle((jsonRpcResponse, sink) -> {
if (jsonRpcResponse.error() != null) {
sink.error(new McpError(jsonRpcResponse.error()));
}
else {
if (typeRef.getType().equals(Void.class)) {
sink.complete();
})
.timeout(requestTimeout)
.doOnError(e -> this.pendingResponses.remove(requestId))
.doOnCancel(() -> this.pendingResponses.remove(requestId))
.handle((jsonRpcResponse, sink) -> {
if (jsonRpcResponse.error() != null) {
sink.error(new McpError(jsonRpcResponse.error()));
}
else {
sink.next(this.transport.unmarshalFrom(jsonRpcResponse.result(), typeRef));
if (typeRef.getType().equals(Void.class)) {
sink.complete();
}
else {
sink.next(this.transport.unmarshalFrom(jsonRpcResponse.result(), typeRef));
}
}
}
});
});
}

@Override
Expand Down
18 changes: 18 additions & 0 deletions mcp-core/src/test/java/io/modelcontextprotocol/spec/McpClientSessionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,4 +303,22 @@ void testGracefulShutdown() {
StepVerifier.create(session.closeGracefully()).verifyComplete();
}

@Test
void testRequestTimeoutRemovesPendingResponse() throws Exception {
var transport = new MockMcpClientTransport();
var session = new McpClientSession(Duration.ofMillis(50), transport, Map.of(), Map.of(), Function.identity());

Mono<String> responseMono = session.sendRequest(TEST_METHOD, "test", responseType);

StepVerifier.create(responseMono).expectError(java.util.concurrent.TimeoutException.class).verify();

var field = McpClientSession.class.getDeclaredField("pendingResponses");
field.setAccessible(true);
@SuppressWarnings("unchecked")
var pendingResponses = (java.util.Map<Object, ?>) field.get(session);
assertThat(pendingResponses).isEmpty();

session.close();
}

}