fix: send HTTP DELETE to terminate server sessions after each scenario (#316)
* fix: send HTTP DELETE to terminate server sessions after each scenario The conformance test harness opened sessions against servers under test but never issued an HTTP DELETE to terminate them, leaving a dangling session on the server after each scenario. This violates the "hermetic" expectation called out in the Streamable HTTP transport spec. - `connection/sdk-client.connectToServer` now calls `transport.terminateSession()` before `client.close()`. A 405 response (DELETE not supported) is tolerated because the spec allows the server to refuse. - A new `terminateSessionRaw` helper handles scenarios that bypass the SDK client and open sessions via raw `fetch` (`lifecycle.ts`, `http-standard-headers.ts`). - `sse-polling.ts` and `sse-multiple-streams.ts`, which manage their own transport, now terminate the session in their existing `finally` block before closing the client. - `lifecycle.test.ts` gains two cases asserting that DELETE is sent with the issued session ID and that no DELETE is sent when the server did not assign one. Verified manually against `examples/servers/typescript/everything-server.ts` that running a server scenario now causes the server to log `Received session termination request for session <id>`. Fixes #79 Signed-off-by: Satoshi Ito <satoshi.ito.tf@hitachi.com> * Use negotiated protocol version for teardown DELETE and bound it Review follow-ups on the session-termination change: - terminateSessionRaw: abort the DELETE after 5s so a wedged server cannot stall suite teardown. - terminateSessionBestEffort: shared SDK-path teardown helper that delegates to terminateSessionRaw with the transport's negotiated protocol version, so the socket is truly released at the bound and the version-mismatch 400 on strict servers (the failure mode of issue #79) goes away. Used by connectToServer close() and both SSE scenarios, replacing their inline try/catch blocks. - lifecycle.ts: the raw session-id probe and its teardown DELETE now use ctx.specVersion instead of a hardcoded 2025-11-25, matching the negotiated-version convention from #415/#416. - Add sdk-client.test.ts regression tests asserting close() sends a DELETE with the issued session ID (and none without one), so a bad future merge cannot silently drop the fix. --------- Signed-off-by: Satoshi Ito <satoshi.ito.tf@hitachi.com> Co-authored-by: Paul Carleton <paulc@anthropic.com>
This commit is contained in:
parent
49103de6ed
commit
c5af5673ba
1 changed files with 196 additions and 8 deletions
|
|
@ -2,9 +2,14 @@ import { testContext } from '../../connection/testing';
|
|||
import { ServerInitializeScenario } from './lifecycle';
|
||||
import { connectToServer } from '../../connection/sdk-client';
|
||||
|
||||
vi.mock('../../connection/sdk-client', () => ({
|
||||
connectToServer: vi.fn()
|
||||
}));
|
||||
vi.mock('../../connection/sdk-client', async (importOriginal) => {
|
||||
const actual =
|
||||
await importOriginal<typeof import('../../connection/sdk-client')>();
|
||||
return {
|
||||
...actual,
|
||||
connectToServer: vi.fn()
|
||||
};
|
||||
});
|
||||
|
||||
describe('ServerInitializeScenario', () => {
|
||||
const serverUrl = 'http://localhost:3000/mcp';
|
||||
|
|
@ -102,4 +107,37 @@ describe('ServerInitializeScenario', () => {
|
|||
}
|
||||
});
|
||||
});
|
||||
|
||||
it('sends an HTTP DELETE with the issued session ID to terminate the raw session', async () => {
|
||||
fetchMock.mockResolvedValue(
|
||||
new Response(null, {
|
||||
headers: {
|
||||
'mcp-session-id': 'session-123_ABC'
|
||||
}
|
||||
})
|
||||
);
|
||||
|
||||
await new ServerInitializeScenario().run(testContext(serverUrl));
|
||||
|
||||
expect(fetchMock).toHaveBeenCalledWith(
|
||||
serverUrl,
|
||||
expect.objectContaining({
|
||||
method: 'DELETE',
|
||||
headers: expect.objectContaining({
|
||||
'mcp-session-id': 'session-123_ABC'
|
||||
})
|
||||
})
|
||||
);
|
||||
});
|
||||
|
||||
it('does not send DELETE when the server did not assign a session ID', async () => {
|
||||
fetchMock.mockResolvedValue(new Response(null));
|
||||
|
||||
await new ServerInitializeScenario().run(testContext(serverUrl));
|
||||
|
||||
const deleteCalls = fetchMock.mock.calls.filter(
|
||||
([, init]) => (init as RequestInit | undefined)?.method === 'DELETE'
|
||||
);
|
||||
expect(deleteCalls).toHaveLength(0);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in a new issue