Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/fix-v1x-sse-close-once.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@modelcontextprotocol/sdk': patch
---

fix: avoid duplicate SSE close callbacks
6 changes: 4 additions & 2 deletions src/server/sse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,10 @@ export class SSEServerTransport implements Transport {

this._sseResponse = this.res;
this.res.on('close', () => {
this._sseResponse = undefined;
this.onclose?.();
if (this._sseResponse !== undefined) {
this._sseResponse = undefined;
this.onclose?.();
}
});
}

Expand Down
33 changes: 33 additions & 0 deletions test/server/sse.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,39 @@ describe.each(zodTestMatrix)('$zodVersionLabel', (entry: ZodMatrixEntry) => {
await transport.close();
expect(transport.onclose).toHaveBeenCalled();
});

it('should only call onclose once when close ends the SSE response', async () => {
const onclose = vi.fn();
const server = createServer(async (_req, res) => {
const transport = new SSEServerTransport('/messages', res);
transport.onclose = onclose;

await transport.start();
await transport.close();
});

const baseUrl = await listenOnRandomPort(server);

try {
await new Promise<void>((resolve, reject) => {
const req = http.request(baseUrl, { headers: { Accept: 'text/event-stream' } }, response => {
response.resume();
response.on('end', resolve);
response.on('error', reject);
});

req.on('error', reject);
req.end();
});

await new Promise(resolve => setTimeout(resolve, 50));
expect(onclose).toHaveBeenCalledTimes(1);
} finally {
await new Promise<void>((resolve, reject) => {
server.close(error => (error ? reject(error) : resolve()));
});
}
});
});

describe('send method', () => {
Expand Down
Loading