Skip to content

Fix status codes for invalid session IDs in streamable HTTP examples #1424

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

Fix status codes for invalid session IDs in streamable HTTP examples #1424

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
32 changes: 26 additions & 6 deletions examples/server/src/elicitationFormExample.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,13 +362,25 @@ async function main() {

await transport.handleRequest(req, res, req.body);
return;
} else if (sessionId) {
// Session ID provided but not found - per spec, return 404 to signal
// client should start a new session
res.status(404).json({
jsonrpc: '2.0',
error: {
code: -32_000,
message: 'Session not found'
},
id: null
});
return;
} else {
// Invalid request - no session ID or not initialization request
// No session ID and not an initialization request - return 400
res.status(400).json({
jsonrpc: '2.0',
error: {
code: -32_000,
message: 'Bad Request: No valid session ID provided'
message: 'Bad Request: Session ID required'
},
id: null
});
Expand Down Expand Up @@ -397,8 +409,12 @@ async function main() {
// Handle GET requests for SSE streams
const mcpGetHandler = async (req: Request, res: Response) => {
const sessionId = req.headers['mcp-session-id'] as string | undefined;
if (!sessionId || !transports[sessionId]) {
res.status(400).send('Invalid or missing session ID');
if (!sessionId) {
res.status(400).send('Bad Request: Session ID required');
return;
}
if (!transports[sessionId]) {
res.status(404).send('Session not found');
return;
}

Expand All @@ -412,8 +428,12 @@ async function main() {
// Handle DELETE requests for session termination
const mcpDeleteHandler = async (req: Request, res: Response) => {
const sessionId = req.headers['mcp-session-id'] as string | undefined;
if (!sessionId || !transports[sessionId]) {
res.status(400).send('Invalid or missing session ID');
if (!sessionId) {
res.status(400).send('Bad Request: Session ID required');
return;
}
if (!transports[sessionId]) {
res.status(404).send('Session not found');
return;
}

Expand Down
32 changes: 26 additions & 6 deletions examples/server/src/elicitationUrlExample.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,13 +605,25 @@ const mcpPostHandler = async (req: Request, res: Response) => {

await transport.handleRequest(req, res, req.body);
return; // Already handled
} else if (sessionId) {
// Session ID provided but not found - per spec, return 404 to signal
// client should start a new session
res.status(404).json({
jsonrpc: '2.0',
error: {
code: -32_000,
message: 'Session not found'
},
id: null
});
return;
} else {
// Invalid request - no session ID or not initialization request
// No session ID and not an initialization request - return 400
res.status(400).json({
jsonrpc: '2.0',
error: {
code: -32_000,
message: 'Bad Request: No valid session ID provided'
message: 'Bad Request: Session ID required'
},
id: null
});
Expand Down Expand Up @@ -642,8 +654,12 @@ app.post('/mcp', authMiddleware, mcpPostHandler);
// Handle GET requests for SSE streams (using built-in support from StreamableHTTP)
const mcpGetHandler = async (req: Request, res: Response) => {
const sessionId = req.headers['mcp-session-id'] as string | undefined;
if (!sessionId || !transports[sessionId]) {
res.status(400).send('Invalid or missing session ID');
if (!sessionId) {
res.status(400).send('Bad Request: Session ID required');
return;
}
if (!transports[sessionId]) {
res.status(404).send('Session not found');
return;
}

Expand Down Expand Up @@ -681,8 +697,12 @@ app.get('/mcp', authMiddleware, mcpGetHandler);
// Handle DELETE requests for session termination (according to MCP spec)
const mcpDeleteHandler = async (req: Request, res: Response) => {
const sessionId = req.headers['mcp-session-id'] as string | undefined;
if (!sessionId || !transports[sessionId]) {
res.status(400).send('Invalid or missing session ID');
if (!sessionId) {
res.status(400).send('Bad Request: Session ID required');
return;
}
if (!transports[sessionId]) {
res.status(404).send('Session not found');
return;
}

Expand Down
16 changes: 14 additions & 2 deletions examples/server/src/jsonResponseStreamableHttp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,25 @@ app.post('/mcp', async (req: Request, res: Response) => {
await server.connect(transport);
await transport.handleRequest(req, res, req.body);
return; // Already handled
} else if (sessionId) {
// Session ID provided but not found - per spec, return 404 to signal
// client should start a new session
res.status(404).json({
jsonrpc: '2.0',
error: {
code: -32_000,
message: 'Session not found'
},
id: null
});
return;
} else {
// Invalid request - no session ID or not initialization request
// No session ID and not an initialization request - return 400
res.status(400).json({
jsonrpc: '2.0',
error: {
code: -32_000,
message: 'Bad Request: No valid session ID provided'
message: 'Bad Request: Session ID required'
},
id: null
});
Expand Down
32 changes: 26 additions & 6 deletions examples/server/src/simpleStreamableHttp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,13 +595,25 @@ const mcpPostHandler = async (req: Request, res: Response) => {

await transport.handleRequest(req, res, req.body);
return; // Already handled
} else if (sessionId) {
// Session ID provided but not found - per spec, return 404 to signal
// client should start a new session
res.status(404).json({
jsonrpc: '2.0',
error: {
code: -32_000,
message: 'Session not found'
},
id: null
});
return;
} else {
// Invalid request - no session ID or not initialization request
// No session ID and not an initialization request - return 400
res.status(400).json({
jsonrpc: '2.0',
error: {
code: -32_000,
message: 'Bad Request: No valid session ID provided'
message: 'Bad Request: Session ID required'
},
id: null
});
Expand Down Expand Up @@ -636,8 +648,12 @@ if (useOAuth && authMiddleware) {
// Handle GET requests for SSE streams (using built-in support from StreamableHTTP)
const mcpGetHandler = async (req: Request, res: Response) => {
const sessionId = req.headers['mcp-session-id'] as string | undefined;
if (!sessionId || !transports[sessionId]) {
res.status(400).send('Invalid or missing session ID');
if (!sessionId) {
res.status(400).send('Bad Request: Session ID required');
return;
}
if (!transports[sessionId]) {
res.status(404).send('Session not found');
return;
}

Expand Down Expand Up @@ -667,8 +683,12 @@ if (useOAuth && authMiddleware) {
// Handle DELETE requests for session termination (according to MCP spec)
const mcpDeleteHandler = async (req: Request, res: Response) => {
const sessionId = req.headers['mcp-session-id'] as string | undefined;
if (!sessionId || !transports[sessionId]) {
res.status(400).send('Invalid or missing session ID');
if (!sessionId) {
res.status(400).send('Bad Request: Session ID required');
return;
}
if (!transports[sessionId]) {
res.status(404).send('Session not found');
return;
}

Expand Down
27 changes: 22 additions & 5 deletions examples/server/src/simpleTaskInteractive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,10 +679,19 @@ app.post('/mcp', async (req: Request, res: Response) => {
await server.connect(transport);
await transport.handleRequest(req, res, req.body);
return;
} else if (sessionId) {
// Session ID provided but not found - per spec, return 404
res.status(404).json({
jsonrpc: '2.0',
error: { code: -32_000, message: 'Session not found' },
id: null
});
return;
} else {
// No session ID and not an initialization request - return 400
res.status(400).json({
jsonrpc: '2.0',
error: { code: -32_000, message: 'Bad Request: No valid session ID' },
error: { code: -32_000, message: 'Bad Request: Session ID required' },
id: null
});
return;
Expand All @@ -704,8 +713,12 @@ app.post('/mcp', async (req: Request, res: Response) => {
// Handle GET requests for SSE streams
app.get('/mcp', async (req: Request, res: Response) => {
const sessionId = req.headers['mcp-session-id'] as string | undefined;
if (!sessionId || !transports[sessionId]) {
res.status(400).send('Invalid or missing session ID');
if (!sessionId) {
res.status(400).send('Bad Request: Session ID required');
return;
}
if (!transports[sessionId]) {
res.status(404).send('Session not found');
return;
}

Expand All @@ -716,8 +729,12 @@ 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[sessionId]) {
res.status(400).send('Invalid or missing session ID');
if (!sessionId) {
res.status(400).send('Bad Request: Session ID required');
return;
}
if (!transports[sessionId]) {
res.status(404).send('Session not found');
return;
}

Expand Down
24 changes: 20 additions & 4 deletions examples/server/src/standaloneSseWithGetStreamableHttp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,25 @@ app.post('/mcp', async (req: Request, res: Response) => {
// Handle the request - the onsessioninitialized callback will store the transport
await transport.handleRequest(req, res, req.body);
return; // Already handled
} else if (sessionId) {
// Session ID provided but not found - per spec, return 404 to signal
// client should start a new session
res.status(404).json({
jsonrpc: '2.0',
error: {
code: -32_000,
message: 'Session not found'
},
id: null
});
return;
} else {
// Invalid request - no session ID or not initialization request
// No session ID and not an initialization request - return 400
res.status(400).json({
jsonrpc: '2.0',
error: {
code: -32_000,
message: 'Bad Request: No valid session ID provided'
message: 'Bad Request: Session ID required'
},
id: null
});
Expand All @@ -99,8 +111,12 @@ app.post('/mcp', async (req: Request, res: Response) => {
// Handle GET requests for SSE streams (now using built-in support from StreamableHTTP)
app.get('/mcp', async (req: Request, res: Response) => {
const sessionId = req.headers['mcp-session-id'] as string | undefined;
if (!sessionId || !transports[sessionId]) {
res.status(400).send('Invalid or missing session ID');
if (!sessionId) {
res.status(400).send('Bad Request: Session ID required');
return;
}
if (!transports[sessionId]) {
res.status(404).send('Session not found');
return;
}

Expand Down
Loading