Skip to content

feat: Add Pagination for server requests #140

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

feat: Add Pagination for server requests #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
094088d
feat: Add Pagination for requests
denniskawurek Apr 9, 2025
317d674
Merge branch 'main' into add-pagination
denniskawurek Jun 24, 2025
2625932
Merge branch 'main' into add-pagination
denniskawurek Jul 29, 2025
bfc5e81
chore: Apply formatter
denniskawurek Jul 29, 2025
91a30a7
Merge remote-tracking branch 'upstream/main' into add-pagination
denniskawurek Aug 18, 2025
1998f17
feat: Handle invalid cursor in streamable transport provider
denniskawurek Aug 19, 2025
d366e25
chore: Apply formatter
denniskawurek Aug 19, 2025
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
21 changes: 14 additions & 7 deletions ...va/io/modelcontextprotocol/server/transport/WebFluxStreamableServerTransportProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import io.modelcontextprotocol.server.DefaultMcpTransportContext;
import io.modelcontextprotocol.server.McpTransportContextExtractor;
import io.modelcontextprotocol.spec.HttpHeaders;
import io.modelcontextprotocol.spec.McpError;
import io.modelcontextprotocol.spec.McpSchema;
import io.modelcontextprotocol.spec.McpStreamableServerSession;
import io.modelcontextprotocol.spec.McpStreamableServerTransport;
import io.modelcontextprotocol.spec.McpStreamableServerTransportProvider;
import io.modelcontextprotocol.spec.ProtocolVersions;
import io.modelcontextprotocol.spec.*;
import io.modelcontextprotocol.server.McpTransportContext;
import io.modelcontextprotocol.util.Assert;
import io.modelcontextprotocol.util.KeepAliveScheduler;
Expand Down Expand Up @@ -278,6 +272,19 @@ else if (message instanceof McpSchema.JSONRPCRequest jsonrpcRequest) {
WebFluxStreamableMcpSessionTransport st = new WebFluxStreamableMcpSessionTransport(sink);
Mono<Void> stream = session.responseStream(jsonrpcRequest, st);
Disposable streamSubscription = stream.onErrorComplete(err -> {
if (err instanceof McpParamsValidationError) {
var errorResponse = new McpSchema.JSONRPCResponse(McpSchema.JSONRPC_VERSION,
jsonrpcRequest.id(), null, new McpSchema.JSONRPCResponse.JSONRPCError(
McpSchema.ErrorCodes.INVALID_PARAMS, err.getMessage(), null));

var event = ServerSentEvent.builder()
.event(MESSAGE_EVENT_TYPE)
.data(errorResponse)
.build();

sink.next(event);
return true;
}
sink.error(err);
return true;
}).contextWrite(sink.contextView()).subscribe();
Expand Down
14 changes: 7 additions & 7 deletions ...ava/io/modelcontextprotocol/server/transport/WebMvcStreamableServerTransportProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.ReentrantLock;

import io.modelcontextprotocol.spec.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
Expand All @@ -26,13 +27,6 @@
import io.modelcontextprotocol.server.DefaultMcpTransportContext;
import io.modelcontextprotocol.server.McpTransportContext;
import io.modelcontextprotocol.server.McpTransportContextExtractor;
import io.modelcontextprotocol.spec.HttpHeaders;
import io.modelcontextprotocol.spec.McpError;
import io.modelcontextprotocol.spec.McpSchema;
import io.modelcontextprotocol.spec.McpStreamableServerSession;
import io.modelcontextprotocol.spec.McpStreamableServerTransport;
import io.modelcontextprotocol.spec.McpStreamableServerTransportProvider;
import io.modelcontextprotocol.spec.ProtocolVersions;
import io.modelcontextprotocol.util.Assert;
import io.modelcontextprotocol.util.KeepAliveScheduler;
import reactor.core.publisher.Flux;
Expand Down Expand Up @@ -396,6 +390,12 @@ else if (message instanceof McpSchema.JSONRPCRequest jsonrpcRequest) {
.contextWrite(ctx -> ctx.put(McpTransportContext.KEY, transportContext))
.block();
}
catch (McpParamsValidationError e) {
var errorResponse = new McpSchema.JSONRPCResponse(McpSchema.JSONRPC_VERSION,
jsonrpcRequest.id(), null, new McpSchema.JSONRPCResponse.JSONRPCError(
McpSchema.ErrorCodes.INVALID_PARAMS, e.getMessage(), null));
sessionTransport.sendMessage(errorResponse).block();
}
catch (Exception e) {
logger.error("Failed to handle request stream: {}", e.getMessage());
sseBuilder.error(e);
Expand Down
Loading
Loading