Skip to content

fix: prevent stack overflow from re-entrant close() in StreamableHTTP transport #1705

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

fix: prevent stack overflow from re-entrant close() in StreamableHTTP transport #1705

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
30 changes: 22 additions & 8 deletions packages/server/src/server/streamableHttp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ export class WebStandardStreamableHTTPServerTransport implements Transport {
private _enableDnsRebindingProtection: boolean;
private _retryInterval?: number;
private _supportedProtocolVersions: string[];
private _isClosing = false;

sessionId?: string;
onclose?: () => void;
Expand Down Expand Up @@ -887,15 +888,28 @@ export class WebStandardStreamableHTTPServerTransport implements Transport {
}

async close(): Promise<void> {
// Close all SSE connections
for (const { cleanup } of this._streamMapping.values()) {
cleanup();
}
this._streamMapping.clear();
if (this._isClosing) return;
this._isClosing = true;

try {
// Snapshot and clear mapping before cleanup to prevent
// re-entrant deletes from cancel callbacks (fixes #1699)
const entries = [...this._streamMapping.values()];
this._streamMapping.clear();

// Clear any pending responses
this._requestResponseMap.clear();
this.onclose?.();
for (const { cleanup } of entries) {
try {
cleanup();
} catch {
// Suppress errors from already-closed controllers
}
}

// Clear any pending responses
this._requestResponseMap.clear();
} finally {
this.onclose?.();
}
}

/**
Expand Down
Loading