Merge pull request #1884 from cliffhall/everything-server-multiple-connection-support

Everything server multiple connection support
This commit is contained in:
Cliff Hall 2025-05-29 10:41:51 -04:00 • committed by GitHub
commit 5f36973811
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 54 additions and 40 deletions

View file

@ -6,36 +6,48 @@ console.error('Starting SSE server...');
const app = express(); const app = express();
const { server, cleanup } = createServer(); const transports: Map<string, SSEServerTransport> = new Map<string, SSEServerTransport>();
let transport: SSEServerTransport;
app.get("/sse", async (req, res) => { app.get("/sse", async (req, res) => {
console.error("Received connection"); let transport: SSEServerTransport;
transport = new SSEServerTransport("/message", res); const { server, cleanup } = createServer();
await server.connect(transport);
server.onclose = async () => { if (req?.query?.sessionId) {
await cleanup(); const sessionId = (req?.query?.sessionId as string);
await server.close(); transport = transports.get(sessionId) as SSEServerTransport;
}; console.error("Client Reconnecting? This shouldn't happen; when client has a sessionId, GET /sse should not be called again.", transport.sessionId);
} else {
// Create and store transport for new session
transport = new SSEServerTransport("/message", res);
transports.set(transport.sessionId, transport);
// Connect server to transport
await server.connect(transport);
console.error("Client Connected: ", transport.sessionId);
// Handle close of connection
server.onclose = async () => {
console.error("Client Disconnected: ", transport.sessionId);
transports.delete(transport.sessionId);
await cleanup();
};
}
}); });
app.post("/message", async (req, res) => { app.post("/message", async (req, res) => {
console.error("Received message"); const sessionId = (req?.query?.sessionId as string);
const transport = transports.get(sessionId);
await transport.handlePostMessage(req, res); if (transport) {
}); console.error("Client Message from", sessionId);
await transport.handlePostMessage(req, res);
process.on("SIGINT", async () => { } else {
await cleanup(); console.error(`No transport found for sessionId ${sessionId}`)
await server.close(); }
process.exit(0);
}); });
const PORT = process.env.PORT || 3001; const PORT = process.env.PORT || 3001;
app.listen(PORT, () => { app.listen(PORT, () => {
console.error(`Server is running on port ${PORT}`); console.error(`Server is running on port ${PORT}`);
}); });

View file

@ -8,9 +8,7 @@ console.error('Starting Streamable HTTP server...');
const app = express(); const app = express();
const { server, cleanup } = createServer(); const transports: Map<string, StreamableHTTPServerTransport> = new Map<string, StreamableHTTPServerTransport>();
const transports: { [sessionId: string]: StreamableHTTPServerTransport } = {};
app.post('/mcp', async (req: Request, res: Response) => { app.post('/mcp', async (req: Request, res: Response) => {
console.error('Received MCP POST request'); console.error('Received MCP POST request');
@ -19,10 +17,13 @@ app.post('/mcp', async (req: Request, res: Response) => {
const sessionId = req.headers['mcp-session-id'] as string | undefined; const sessionId = req.headers['mcp-session-id'] as string | undefined;
let transport: StreamableHTTPServerTransport; let transport: StreamableHTTPServerTransport;
if (sessionId && transports[sessionId]) { if (sessionId && transports.has(sessionId)) {
// Reuse existing transport // Reuse existing transport
transport = transports[sessionId]; transport = transports.get(sessionId)!;
} else if (!sessionId) { } else if (!sessionId) {
const { server, cleanup } = createServer();
// New initialization request // New initialization request
const eventStore = new InMemoryEventStore(); const eventStore = new InMemoryEventStore();
transport = new StreamableHTTPServerTransport({ transport = new StreamableHTTPServerTransport({
@ -32,16 +33,18 @@ app.post('/mcp', async (req: Request, res: Response) => {
// Store the transport by session ID when session is initialized // Store the transport by session ID when session is initialized
// This avoids race conditions where requests might come in before the session is stored // This avoids race conditions where requests might come in before the session is stored
console.error(`Session initialized with ID: ${sessionId}`); console.error(`Session initialized with ID: ${sessionId}`);
transports[sessionId] = transport; transports.set(sessionId, transport);
} }
}); });
// Set up onclose handler to clean up transport when closed // Set up onclose handler to clean up transport when closed
transport.onclose = () => { server.onclose = async () => {
const sid = transport.sessionId; const sid = transport.sessionId;
if (sid && transports[sid]) { if (sid && transports.has(sid)) {
console.error(`Transport closed for session ${sid}, removing from transports map`); console.error(`Transport closed for session ${sid}, removing from transports map`);
delete transports[sid]; transports.delete(sid);
await cleanup();
} }
}; };
@ -87,7 +90,7 @@ app.post('/mcp', async (req: Request, res: Response) => {
app.get('/mcp', async (req: Request, res: Response) => { app.get('/mcp', async (req: Request, res: Response) => {
console.error('Received MCP GET request'); console.error('Received MCP GET request');
const sessionId = req.headers['mcp-session-id'] as string | undefined; const sessionId = req.headers['mcp-session-id'] as string | undefined;
if (!sessionId || !transports[sessionId]) { if (!sessionId || !transports.has(sessionId)) {
res.status(400).json({ res.status(400).json({
jsonrpc: '2.0', jsonrpc: '2.0',
error: { error: {
@ -107,14 +110,14 @@ app.get('/mcp', async (req: Request, res: Response) => {
console.error(`Establishing new SSE stream for session ${sessionId}`); console.error(`Establishing new SSE stream for session ${sessionId}`);
} }
const transport = transports[sessionId]; const transport = transports.get(sessionId);
await transport.handleRequest(req, res); await transport!.handleRequest(req, res);
}); });
// Handle DELETE requests for session termination (according to MCP spec) // Handle DELETE requests for session termination (according to MCP spec)
app.delete('/mcp', async (req: Request, res: Response) => { app.delete('/mcp', async (req: Request, res: Response) => {
const sessionId = req.headers['mcp-session-id'] as string | undefined; const sessionId = req.headers['mcp-session-id'] as string | undefined;
if (!sessionId || !transports[sessionId]) { if (!sessionId || !transports.has(sessionId)) {
res.status(400).json({ res.status(400).json({
jsonrpc: '2.0', jsonrpc: '2.0',
error: { error: {
@ -129,8 +132,8 @@ app.delete('/mcp', async (req: Request, res: Response) => {
console.error(`Received session termination request for session ${sessionId}`); console.error(`Received session termination request for session ${sessionId}`);
try { try {
const transport = transports[sessionId]; const transport = transports.get(sessionId);
await transport.handleRequest(req, res); await transport!.handleRequest(req, res);
} catch (error) { } catch (error) {
console.error('Error handling session termination:', error); console.error('Error handling session termination:', error);
if (!res.headersSent) { if (!res.headersSent) {
@ -161,14 +164,13 @@ process.on('SIGINT', async () => {
for (const sessionId in transports) { for (const sessionId in transports) {
try { try {
console.error(`Closing transport for session ${sessionId}`); console.error(`Closing transport for session ${sessionId}`);
await transports[sessionId].close(); await transports.get(sessionId)!.close();
delete transports[sessionId]; transports.delete(sessionId);
} catch (error) { } catch (error) {
console.error(`Error closing transport for session ${sessionId}:`, error); console.error(`Error closing transport for session ${sessionId}:`, error);
} }
} }
await cleanup();
await server.close();
console.error('Server shutdown complete'); console.error('Server shutdown complete');
process.exit(0); process.exit(0);
}); });