Skip to content

Polish HttpHeaders.MCP_SESSION_ID #446

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 1 commit into
base: main
Choose a base branch
from
+12 −10
Open

Polish HttpHeaders.MCP_SESSION_ID #446

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
6 changes: 3 additions & 3 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 @@ -90,7 +90,7 @@ public class WebMvcStreamableServerTransportProvider implements McpStreamableSer
private McpStreamableServerSession.Factory sessionFactory;

/**
* Map of active client sessions, keyed by mcp-session-id.
* Map of active client sessions, keyed by Mcp-Session-Id.
*/
private final ConcurrentHashMap<String, McpStreamableServerSession> sessions = new ConcurrentHashMap<>();

Expand Down Expand Up @@ -241,7 +241,7 @@ private ServerResponse handleGet(ServerRequest request) {
McpTransportContext transportContext = this.contextExtractor.extract(request, new DefaultMcpTransportContext());

if (!request.headers().asHttpHeaders().containsKey(HttpHeaders.MCP_SESSION_ID)) {
return ServerResponse.badRequest().body("Session ID required in mcp-session-id header");
return ServerResponse.badRequest().body("Session ID required in " + HttpHeaders.MCP_SESSION_ID + " header");
}

String sessionId = request.headers().asHttpHeaders().getFirst(HttpHeaders.MCP_SESSION_ID);
Expand Down Expand Up @@ -434,7 +434,7 @@ private ServerResponse handleDelete(ServerRequest request) {
McpTransportContext transportContext = this.contextExtractor.extract(request, new DefaultMcpTransportContext());

if (!request.headers().asHttpHeaders().containsKey(HttpHeaders.MCP_SESSION_ID)) {
return ServerResponse.badRequest().body("Session ID required in mcp-session-id header");
return ServerResponse.badRequest().body("Session ID required in " + HttpHeaders.MCP_SESSION_ID + " header");
}

String sessionId = request.headers().asHttpHeaders().getFirst(HttpHeaders.MCP_SESSION_ID);
Expand Down
6 changes: 4 additions & 2 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 @@ -416,8 +416,10 @@ public Mono<Void> sendMessage(McpSchema.JSONRPCMessage sentMessage) {
})).onErrorMap(CompletionException.class, t -> t.getCause()).onErrorComplete().subscribe();

})).flatMap(responseEvent -> {
if (transportSession.markInitialized(
responseEvent.responseInfo().headers().firstValue("mcp-session-id").orElseGet(() -> null))) {
if (transportSession.markInitialized(responseEvent.responseInfo()
.headers()
.firstValue(HttpHeaders.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.

Expand Down
8 changes: 4 additions & 4 deletions ...o/modelcontextprotocol/server/transport/HttpServletStreamableServerTransportProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public class HttpServletStreamableServerTransportProvider extends HttpServlet
private McpStreamableServerSession.Factory sessionFactory;

/**
* Map of active client sessions, keyed by mcp-session-id.
* Map of active client sessions, keyed by Mcp-Session-Id.
*/
private final ConcurrentHashMap<String, McpStreamableServerSession> sessions = new ConcurrentHashMap<>();

Expand Down Expand Up @@ -256,7 +256,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
String sessionId = request.getHeader(HttpHeaders.MCP_SESSION_ID);

if (sessionId == null || sessionId.isBlank()) {
badRequestErrors.add("Session ID required in mcp-session-id header");
badRequestErrors.add("Session ID required in " + HttpHeaders.MCP_SESSION_ID + " header");
}

if (!badRequestErrors.isEmpty()) {
Expand Down Expand Up @@ -438,7 +438,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
String sessionId = request.getHeader(HttpHeaders.MCP_SESSION_ID);

if (sessionId == null || sessionId.isBlank()) {
badRequestErrors.add("Session ID required in mcp-session-id header");
badRequestErrors.add("Session ID required in " + HttpHeaders.MCP_SESSION_ID + " header");
}

if (!badRequestErrors.isEmpty()) {
Expand Down Expand Up @@ -545,7 +545,7 @@ protected void doDelete(HttpServletRequest request, HttpServletResponse response

if (request.getHeader(HttpHeaders.MCP_SESSION_ID) == null) {
this.responseError(response, HttpServletResponse.SC_BAD_REQUEST,
new McpError("Session ID required in mcp-session-id header"));
new McpError("Session ID required in " + HttpHeaders.MCP_SESSION_ID + " header"));
return;
}

Expand Down
2 changes: 1 addition & 1 deletion mcp/src/main/java/io/modelcontextprotocol/spec/HttpHeaders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public interface HttpHeaders {
/**
* Identifies individual MCP sessions.
*/
String MCP_SESSION_ID = "mcp-session-id";
String MCP_SESSION_ID = "Mcp-Session-Id";

/**
* Identifies events within an SSE Stream.
Expand Down