Skip to content

fix(everything): answer 404 for an unknown streamable HTTP session #4944

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

fix(everything): answer 404 for an unknown streamable HTTP session #4944

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
35 changes: 24 additions & 11 deletions src/everything/transports/streamableHttp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,18 @@ const transports: Map<string, StreamableHTTPServerTransport> = new Map<
StreamableHTTPServerTransport
>();

// The spec requires 404 for a session ID the server does not know (or has terminated).
const sendSessionNotFound = (req: Request, res: Response) => {
res.status(404).json({
jsonrpc: "2.0",
error: {
code: -32001,
message: "Session not found",
},
id: req?.body?.id,
});
};

// Handle POST requests for client messages
app.post("/mcp", async (req: Request, res: Response) => {
console.log("Received MCP POST request");
Expand Down Expand Up @@ -102,15 +114,8 @@ app.post("/mcp", async (req: Request, res: Response) => {
await transport.handleRequest(req, res);
return;
} else {
// Invalid request - no session ID or not initialization request
res.status(400).json({
jsonrpc: "2.0",
error: {
code: -32000,
message: "Bad Request: No valid session ID provided",
},
id: req?.body?.id,
});
// Unknown or terminated session: 404 tells the client to re-initialize
sendSessionNotFound(req, res);
return;
}

Expand All @@ -137,7 +142,7 @@ app.post("/mcp", async (req: Request, res: Response) => {
app.get("/mcp", async (req: Request, res: Response) => {
console.log("Received MCP GET request");
const sessionId = req.headers["mcp-session-id"] as string | undefined;
if (!sessionId || !transports.has(sessionId)) {
if (!sessionId) {
res.status(400).json({
jsonrpc: "2.0",
error: {
Expand All @@ -148,6 +153,10 @@ app.get("/mcp", async (req: Request, res: Response) => {
});
return;
}
if (!transports.has(sessionId)) {
sendSessionNotFound(req, res);
return;
}

// Check for Last-Event-ID header for resumability
const lastEventId = req.headers["last-event-id"] as string | undefined;
Expand All @@ -164,7 +173,7 @@ app.get("/mcp", async (req: Request, res: Response) => {
// Handle DELETE requests for session termination
app.delete("/mcp", async (req: Request, res: Response) => {
const sessionId = req.headers["mcp-session-id"] as string | undefined;
if (!sessionId || !transports.has(sessionId)) {
if (!sessionId) {
res.status(400).json({
jsonrpc: "2.0",
error: {
Expand All @@ -175,6 +184,10 @@ app.delete("/mcp", async (req: Request, res: Response) => {
});
return;
}
if (!transports.has(sessionId)) {
sendSessionNotFound(req, res);
return;
}

console.log(`Received session termination request for session ${sessionId}`);

Expand Down
Loading