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
9 changes: 9 additions & 0 deletions .changeset/stdio-client-send-drain-hang.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@modelcontextprotocol/client': patch
---

Fix `StdioClientTransport.send()` never settling when a backpressured write is still in flight and the pipe to the server dies. `send()` waited for a `'drain'` event, but a destroyed stream never drains, so the returned promise stayed pending and the `'drain'` listener was never removed. It now settles from the `write()` callback, which Node invokes on flush or on failure, so the send rejects with the underlying write error instead. This is what `StdioServerTransport.send()` already does for its own stdout.

The visible symptom was `await client.notification(...)`, which never returned: the notification path awaits the transport send with no timeout, and the connection-closed teardown settles pending responses but not pending sends. Requests were already rescued by that teardown, so `callTool()` and friends now report the actual write error (`EPIPE`, `EOF`) rather than a generic connection-closed error.

Reaching this needs a write the pipe will not accept in one go, which starts anywhere from tens to hundreds of KB depending on the platform pipe buffer and the Node version, sizes that base64 image payloads and file contents in tool arguments reach routinely.
10 changes: 6 additions & 4 deletions packages/client/src/client/stdio.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -313,16 +313,18 @@ export class StdioClientTransport implements Transport {
}

send(message: JSONRPCMessage): Promise<void> {
return new Promise(resolve => {
return new Promise((resolve, reject) => {
if (!this._process?.stdin) {
throw new SdkError(SdkErrorCode.NotConnected, 'Not connected');
}

const json = serializeMessage(message);
if (this._process.stdin.write(json)) {
// The write callback runs once the chunk is flushed or the write fails,
// so a backpressured send still settles when the server exits and
// destroys the pipe. Waiting on 'drain' alone parks forever there,
// because a destroyed stream never drains.
if (this._process.stdin.write(json, error => (error ? reject(error) : resolve()))) {
resolve();
} else {
this._process.stdin.once('drain', resolve);
}
});
}
Expand Down
38 changes: 38 additions & 0 deletions packages/client/test/client/stdio.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -150,3 +150,41 @@ test('_dispose releases the parent-side pipe handles even when a helper process
expect(proc.stdout?.destroyed).toBe(true);
expect(proc.stdin?.destroyed).toBe(true);
}, 10_000);

test('send() rejects instead of hanging when the server exits before a large write flushes', async () => {
// A server that never reads stdin and then exits: the write stays buffered,
// and the exit destroys the pipe, so the stream can never flush or drain.
const transport = new StdioClientTransport({
command: process.execPath,
args: ['-e', 'setTimeout(() => process.exit(0), 200)']
});
transport.onerror = () => {};
await transport.start();
const stdin = (transport as unknown as { _process: import('node:child_process').ChildProcess })._process.stdin!;

// 8 MB of params, far past stdin's 16 KB high water mark, so write() returns
// false and the send has to wait for the stream instead of resolving at once.
const pending = transport.send({
jsonrpc: '2.0',
id: 1,
method: 'tools/call',
params: { name: 'echo', arguments: { blob: 'x'.repeat(8 * 1024 * 1024) } }
});

// Bounded so the unfixed behaviour reports as 'hung' rather than as a suite
// timeout. The rejection reason is platform specific (EPIPE, EOF), so only
// the fact that it settles is asserted.
const outcome = await Promise.race([
pending.then(
() => 'resolved' as const,
() => 'rejected' as const
),
new Promise<'hung'>(resolve => {
setTimeout(() => resolve('hung'), 3000).unref();
})
]);

expect(outcome).toBe('rejected');
expect(stdin.listenerCount('drain')).toBe(0);
await transport.close();
}, 15_000);
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(client): reject stdio send() when the write fails instead of waiting for 'drain' by ondraulehla · Pull Request #2552 · modelcontextprotocol/typescript-sdk · GitHub
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
9 changes: 9 additions & 0 deletions .changeset/stdio-client-send-drain-hang.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@modelcontextprotocol/client': patch
---

Fix `StdioClientTransport.send()` never settling when a backpressured write is still in flight and the pipe to the server dies. `send()` waited for a `'drain'` event, but a destroyed stream never drains, so the returned promise stayed pending and the `'drain'` listener was never removed. It now settles from the `write()` callback, which Node invokes on flush or on failure, so the send rejects with the underlying write error instead. This is what `StdioServerTransport.send()` already does for its own stdout.

The visible symptom was `await client.notification(...)`, which never returned: the notification path awaits the transport send with no timeout, and the connection-closed teardown settles pending responses but not pending sends. Requests were already rescued by that teardown, so `callTool()` and friends now report the actual write error (`EPIPE`, `EOF`) rather than a generic connection-closed error.

Reaching this needs a write the pipe will not accept in one go, which starts anywhere from tens to hundreds of KB depending on the platform pipe buffer and the Node version, sizes that base64 image payloads and file contents in tool arguments reach routinely.
10 changes: 6 additions & 4 deletions packages/client/src/client/stdio.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -313,16 +313,18 @@ export class StdioClientTransport implements Transport {
}

send(message: JSONRPCMessage): Promise<void> {
return new Promise(resolve => {
return new Promise((resolve, reject) => {
if (!this._process?.stdin) {
throw new SdkError(SdkErrorCode.NotConnected, 'Not connected');
}

const json = serializeMessage(message);
if (this._process.stdin.write(json)) {
// The write callback runs once the chunk is flushed or the write fails,
// so a backpressured send still settles when the server exits and
// destroys the pipe. Waiting on 'drain' alone parks forever there,
// because a destroyed stream never drains.
if (this._process.stdin.write(json, error => (error ? reject(error) : resolve()))) {
resolve();
} else {
this._process.stdin.once('drain', resolve);
}
});
}
Expand Down
38 changes: 38 additions & 0 deletions packages/client/test/client/stdio.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -150,3 +150,41 @@ test('_dispose releases the parent-side pipe handles even when a helper process
expect(proc.stdout?.destroyed).toBe(true);
expect(proc.stdin?.destroyed).toBe(true);
}, 10_000);

test('send() rejects instead of hanging when the server exits before a large write flushes', async () => {
// A server that never reads stdin and then exits: the write stays buffered,
// and the exit destroys the pipe, so the stream can never flush or drain.
const transport = new StdioClientTransport({
command: process.execPath,
args: ['-e', 'setTimeout(() => process.exit(0), 200)']
});
transport.onerror = () => {};
await transport.start();
const stdin = (transport as unknown as { _process: import('node:child_process').ChildProcess })._process.stdin!;

// 8 MB of params, far past stdin's 16 KB high water mark, so write() returns
// false and the send has to wait for the stream instead of resolving at once.
const pending = transport.send({
jsonrpc: '2.0',
id: 1,
method: 'tools/call',
params: { name: 'echo', arguments: { blob: 'x'.repeat(8 * 1024 * 1024) } }
});

// Bounded so the unfixed behaviour reports as 'hung' rather than as a suite
// timeout. The rejection reason is platform specific (EPIPE, EOF), so only
// the fact that it settles is asserted.
const outcome = await Promise.race([
pending.then(
() => 'resolved' as const,
() => 'rejected' as const
),
new Promise<'hung'>(resolve => {
setTimeout(() => resolve('hung'), 3000).unref();
})
]);

expect(outcome).toBe('rejected');
expect(stdin.listenerCount('drain')).toBe(0);
await transport.close();
}, 15_000);
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(client): reject stdio send() when the write fails instead of waiting for 'drain' by ondraulehla · Pull Request #2552 · modelcontextprotocol/typescript-sdk · GitHub
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
9 changes: 9 additions & 0 deletions .changeset/stdio-client-send-drain-hang.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@modelcontextprotocol/client': patch
---

Fix `StdioClientTransport.send()` never settling when a backpressured write is still in flight and the pipe to the server dies. `send()` waited for a `'drain'` event, but a destroyed stream never drains, so the returned promise stayed pending and the `'drain'` listener was never removed. It now settles from the `write()` callback, which Node invokes on flush or on failure, so the send rejects with the underlying write error instead. This is what `StdioServerTransport.send()` already does for its own stdout.

The visible symptom was `await client.notification(...)`, which never returned: the notification path awaits the transport send with no timeout, and the connection-closed teardown settles pending responses but not pending sends. Requests were already rescued by that teardown, so `callTool()` and friends now report the actual write error (`EPIPE`, `EOF`) rather than a generic connection-closed error.

Reaching this needs a write the pipe will not accept in one go, which starts anywhere from tens to hundreds of KB depending on the platform pipe buffer and the Node version, sizes that base64 image payloads and file contents in tool arguments reach routinely.
10 changes: 6 additions & 4 deletions packages/client/src/client/stdio.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -313,16 +313,18 @@ export class StdioClientTransport implements Transport {
}

send(message: JSONRPCMessage): Promise<void> {
return new Promise(resolve => {
return new Promise((resolve, reject) => {
if (!this._process?.stdin) {
throw new SdkError(SdkErrorCode.NotConnected, 'Not connected');
}

const json = serializeMessage(message);
if (this._process.stdin.write(json)) {
// The write callback runs once the chunk is flushed or the write fails,
// so a backpressured send still settles when the server exits and
// destroys the pipe. Waiting on 'drain' alone parks forever there,
// because a destroyed stream never drains.
if (this._process.stdin.write(json, error => (error ? reject(error) : resolve()))) {
resolve();
} else {
this._process.stdin.once('drain', resolve);
}
});
}
Expand Down
38 changes: 38 additions & 0 deletions packages/client/test/client/stdio.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -150,3 +150,41 @@ test('_dispose releases the parent-side pipe handles even when a helper process
expect(proc.stdout?.destroyed).toBe(true);
expect(proc.stdin?.destroyed).toBe(true);
}, 10_000);

test('send() rejects instead of hanging when the server exits before a large write flushes', async () => {
// A server that never reads stdin and then exits: the write stays buffered,
// and the exit destroys the pipe, so the stream can never flush or drain.
const transport = new StdioClientTransport({
command: process.execPath,
args: ['-e', 'setTimeout(() => process.exit(0), 200)']
});
transport.onerror = () => {};
await transport.start();
const stdin = (transport as unknown as { _process: import('node:child_process').ChildProcess })._process.stdin!;

// 8 MB of params, far past stdin's 16 KB high water mark, so write() returns
// false and the send has to wait for the stream instead of resolving at once.
const pending = transport.send({
jsonrpc: '2.0',
id: 1,
method: 'tools/call',
params: { name: 'echo', arguments: { blob: 'x'.repeat(8 * 1024 * 1024) } }
});

// Bounded so the unfixed behaviour reports as 'hung' rather than as a suite
// timeout. The rejection reason is platform specific (EPIPE, EOF), so only
// the fact that it settles is asserted.
const outcome = await Promise.race([
pending.then(
() => 'resolved' as const,
() => 'rejected' as const
),
new Promise<'hung'>(resolve => {
setTimeout(() => resolve('hung'), 3000).unref();
})
]);

expect(outcome).toBe('rejected');
expect(stdin.listenerCount('drain')).toBe(0);
await transport.close();
}, 15_000);
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(client): reject stdio send() when the write fails instead of waiting for 'drain' by ondraulehla · Pull Request #2552 · modelcontextprotocol/typescript-sdk · GitHub
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
9 changes: 9 additions & 0 deletions .changeset/stdio-client-send-drain-hang.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@modelcontextprotocol/client': patch
---

Fix `StdioClientTransport.send()` never settling when a backpressured write is still in flight and the pipe to the server dies. `send()` waited for a `'drain'` event, but a destroyed stream never drains, so the returned promise stayed pending and the `'drain'` listener was never removed. It now settles from the `write()` callback, which Node invokes on flush or on failure, so the send rejects with the underlying write error instead. This is what `StdioServerTransport.send()` already does for its own stdout.

The visible symptom was `await client.notification(...)`, which never returned: the notification path awaits the transport send with no timeout, and the connection-closed teardown settles pending responses but not pending sends. Requests were already rescued by that teardown, so `callTool()` and friends now report the actual write error (`EPIPE`, `EOF`) rather than a generic connection-closed error.

Reaching this needs a write the pipe will not accept in one go, which starts anywhere from tens to hundreds of KB depending on the platform pipe buffer and the Node version, sizes that base64 image payloads and file contents in tool arguments reach routinely.
10 changes: 6 additions & 4 deletions packages/client/src/client/stdio.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -313,16 +313,18 @@ export class StdioClientTransport implements Transport {
}

send(message: JSONRPCMessage): Promise<void> {
return new Promise(resolve => {
return new Promise((resolve, reject) => {
if (!this._process?.stdin) {
throw new SdkError(SdkErrorCode.NotConnected, 'Not connected');
}

const json = serializeMessage(message);
if (this._process.stdin.write(json)) {
// The write callback runs once the chunk is flushed or the write fails,
// so a backpressured send still settles when the server exits and
// destroys the pipe. Waiting on 'drain' alone parks forever there,
// because a destroyed stream never drains.
if (this._process.stdin.write(json, error => (error ? reject(error) : resolve()))) {
resolve();
} else {
this._process.stdin.once('drain', resolve);
}
});
}
Expand Down
38 changes: 38 additions & 0 deletions packages/client/test/client/stdio.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -150,3 +150,41 @@ test('_dispose releases the parent-side pipe handles even when a helper process
expect(proc.stdout?.destroyed).toBe(true);
expect(proc.stdin?.destroyed).toBe(true);
}, 10_000);

test('send() rejects instead of hanging when the server exits before a large write flushes', async () => {
// A server that never reads stdin and then exits: the write stays buffered,
// and the exit destroys the pipe, so the stream can never flush or drain.
const transport = new StdioClientTransport({
command: process.execPath,
args: ['-e', 'setTimeout(() => process.exit(0), 200)']
});
transport.onerror = () => {};
await transport.start();
const stdin = (transport as unknown as { _process: import('node:child_process').ChildProcess })._process.stdin!;

// 8 MB of params, far past stdin's 16 KB high water mark, so write() returns
// false and the send has to wait for the stream instead of resolving at once.
const pending = transport.send({
jsonrpc: '2.0',
id: 1,
method: 'tools/call',
params: { name: 'echo', arguments: { blob: 'x'.repeat(8 * 1024 * 1024) } }
});

// Bounded so the unfixed behaviour reports as 'hung' rather than as a suite
// timeout. The rejection reason is platform specific (EPIPE, EOF), so only
// the fact that it settles is asserted.
const outcome = await Promise.race([
pending.then(
() => 'resolved' as const,
() => 'rejected' as const
),
new Promise<'hung'>(resolve => {
setTimeout(() => resolve('hung'), 3000).unref();
})
]);

expect(outcome).toBe('rejected');
expect(stdin.listenerCount('drain')).toBe(0);
await transport.close();
}, 15_000);
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' fix(client): reject stdio send() when the write fails instead of waiting for 'drain' by ondraulehla · Pull Request #2552 · modelcontextprotocol/typescript-sdk · GitHub
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
9 changes: 9 additions & 0 deletions .changeset/stdio-client-send-drain-hang.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@modelcontextprotocol/client': patch
---

Fix `StdioClientTransport.send()` never settling when a backpressured write is still in flight and the pipe to the server dies. `send()` waited for a `'drain'` event, but a destroyed stream never drains, so the returned promise stayed pending and the `'drain'` listener was never removed. It now settles from the `write()` callback, which Node invokes on flush or on failure, so the send rejects with the underlying write error instead. This is what `StdioServerTransport.send()` already does for its own stdout.

The visible symptom was `await client.notification(...)`, which never returned: the notification path awaits the transport send with no timeout, and the connection-closed teardown settles pending responses but not pending sends. Requests were already rescued by that teardown, so `callTool()` and friends now report the actual write error (`EPIPE`, `EOF`) rather than a generic connection-closed error.

Reaching this needs a write the pipe will not accept in one go, which starts anywhere from tens to hundreds of KB depending on the platform pipe buffer and the Node version, sizes that base64 image payloads and file contents in tool arguments reach routinely.
10 changes: 6 additions & 4 deletions packages/client/src/client/stdio.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -313,16 +313,18 @@ export class StdioClientTransport implements Transport {
}

send(message: JSONRPCMessage): Promise<void> {
return new Promise(resolve => {
return new Promise((resolve, reject) => {
if (!this._process?.stdin) {
throw new SdkError(SdkErrorCode.NotConnected, 'Not connected');
}

const json = serializeMessage(message);
if (this._process.stdin.write(json)) {
// The write callback runs once the chunk is flushed or the write fails,
// so a backpressured send still settles when the server exits and
// destroys the pipe. Waiting on 'drain' alone parks forever there,
// because a destroyed stream never drains.
if (this._process.stdin.write(json, error => (error ? reject(error) : resolve()))) {
resolve();
} else {
this._process.stdin.once('drain', resolve);
}
});
}
Expand Down
38 changes: 38 additions & 0 deletions packages/client/test/client/stdio.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -150,3 +150,41 @@ test('_dispose releases the parent-side pipe handles even when a helper process
expect(proc.stdout?.destroyed).toBe(true);
expect(proc.stdin?.destroyed).toBe(true);
}, 10_000);

test('send() rejects instead of hanging when the server exits before a large write flushes', async () => {
// A server that never reads stdin and then exits: the write stays buffered,
// and the exit destroys the pipe, so the stream can never flush or drain.
const transport = new StdioClientTransport({
command: process.execPath,
args: ['-e', 'setTimeout(() => process.exit(0), 200)']
});
transport.onerror = () => {};
await transport.start();
const stdin = (transport as unknown as { _process: import('node:child_process').ChildProcess })._process.stdin!;

// 8 MB of params, far past stdin's 16 KB high water mark, so write() returns
// false and the send has to wait for the stream instead of resolving at once.
const pending = transport.send({
jsonrpc: '2.0',
id: 1,
method: 'tools/call',
params: { name: 'echo', arguments: { blob: 'x'.repeat(8 * 1024 * 1024) } }
});

// Bounded so the unfixed behaviour reports as 'hung' rather than as a suite
// timeout. The rejection reason is platform specific (EPIPE, EOF), so only
// the fact that it settles is asserted.
const outcome = await Promise.race([
pending.then(
() => 'resolved' as const,
() => 'rejected' as const
),
new Promise<'hung'>(resolve => {
setTimeout(() => resolve('hung'), 3000).unref();
})
]);

expect(outcome).toBe('rejected');
expect(stdin.listenerCount('drain')).toBe(0);
await transport.close();
}, 15_000);
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(client): reject stdio send() when the write fails instead of waiting for 'drain' by ondraulehla · Pull Request #2552 · modelcontextprotocol/typescript-sdk · GitHub
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
9 changes: 9 additions & 0 deletions .changeset/stdio-client-send-drain-hang.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@modelcontextprotocol/client': patch
---

Fix `StdioClientTransport.send()` never settling when a backpressured write is still in flight and the pipe to the server dies. `send()` waited for a `'drain'` event, but a destroyed stream never drains, so the returned promise stayed pending and the `'drain'` listener was never removed. It now settles from the `write()` callback, which Node invokes on flush or on failure, so the send rejects with the underlying write error instead. This is what `StdioServerTransport.send()` already does for its own stdout.

The visible symptom was `await client.notification(...)`, which never returned: the notification path awaits the transport send with no timeout, and the connection-closed teardown settles pending responses but not pending sends. Requests were already rescued by that teardown, so `callTool()` and friends now report the actual write error (`EPIPE`, `EOF`) rather than a generic connection-closed error.

Reaching this needs a write the pipe will not accept in one go, which starts anywhere from tens to hundreds of KB depending on the platform pipe buffer and the Node version, sizes that base64 image payloads and file contents in tool arguments reach routinely.
10 changes: 6 additions & 4 deletions packages/client/src/client/stdio.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -313,16 +313,18 @@ export class StdioClientTransport implements Transport {
}

send(message: JSONRPCMessage): Promise<void> {
return new Promise(resolve => {
return new Promise((resolve, reject) => {
if (!this._process?.stdin) {
throw new SdkError(SdkErrorCode.NotConnected, 'Not connected');
}

const json = serializeMessage(message);
if (this._process.stdin.write(json)) {
// The write callback runs once the chunk is flushed or the write fails,
// so a backpressured send still settles when the server exits and
// destroys the pipe. Waiting on 'drain' alone parks forever there,
// because a destroyed stream never drains.
if (this._process.stdin.write(json, error => (error ? reject(error) : resolve()))) {
resolve();
} else {
this._process.stdin.once('drain', resolve);
}
});
}
Expand Down
38 changes: 38 additions & 0 deletions packages/client/test/client/stdio.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -150,3 +150,41 @@ test('_dispose releases the parent-side pipe handles even when a helper process
expect(proc.stdout?.destroyed).toBe(true);
expect(proc.stdin?.destroyed).toBe(true);
}, 10_000);

test('send() rejects instead of hanging when the server exits before a large write flushes', async () => {
// A server that never reads stdin and then exits: the write stays buffered,
// and the exit destroys the pipe, so the stream can never flush or drain.
const transport = new StdioClientTransport({
command: process.execPath,
args: ['-e', 'setTimeout(() => process.exit(0), 200)']
});
transport.onerror = () => {};
await transport.start();
const stdin = (transport as unknown as { _process: import('node:child_process').ChildProcess })._process.stdin!;

// 8 MB of params, far past stdin's 16 KB high water mark, so write() returns
// false and the send has to wait for the stream instead of resolving at once.
const pending = transport.send({
jsonrpc: '2.0',
id: 1,
method: 'tools/call',
params: { name: 'echo', arguments: { blob: 'x'.repeat(8 * 1024 * 1024) } }
});

// Bounded so the unfixed behaviour reports as 'hung' rather than as a suite
// timeout. The rejection reason is platform specific (EPIPE, EOF), so only
// the fact that it settles is asserted.
const outcome = await Promise.race([
pending.then(
() => 'resolved' as const,
() => 'rejected' as const
),
new Promise<'hung'>(resolve => {
setTimeout(() => resolve('hung'), 3000).unref();
})
]);

expect(outcome).toBe('rejected');
expect(stdin.listenerCount('drain')).toBe(0);
await transport.close();
}, 15_000);
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(client): reject stdio send() when the write fails instead of waiting for 'drain' by ondraulehla · Pull Request #2552 · modelcontextprotocol/typescript-sdk · GitHub
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
9 changes: 9 additions & 0 deletions .changeset/stdio-client-send-drain-hang.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@modelcontextprotocol/client': patch
---

Fix `StdioClientTransport.send()` never settling when a backpressured write is still in flight and the pipe to the server dies. `send()` waited for a `'drain'` event, but a destroyed stream never drains, so the returned promise stayed pending and the `'drain'` listener was never removed. It now settles from the `write()` callback, which Node invokes on flush or on failure, so the send rejects with the underlying write error instead. This is what `StdioServerTransport.send()` already does for its own stdout.

The visible symptom was `await client.notification(...)`, which never returned: the notification path awaits the transport send with no timeout, and the connection-closed teardown settles pending responses but not pending sends. Requests were already rescued by that teardown, so `callTool()` and friends now report the actual write error (`EPIPE`, `EOF`) rather than a generic connection-closed error.

Reaching this needs a write the pipe will not accept in one go, which starts anywhere from tens to hundreds of KB depending on the platform pipe buffer and the Node version, sizes that base64 image payloads and file contents in tool arguments reach routinely.
10 changes: 6 additions & 4 deletions packages/client/src/client/stdio.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -313,16 +313,18 @@ export class StdioClientTransport implements Transport {
}

send(message: JSONRPCMessage): Promise<void> {
return new Promise(resolve => {
return new Promise((resolve, reject) => {
if (!this._process?.stdin) {
throw new SdkError(SdkErrorCode.NotConnected, 'Not connected');
}

const json = serializeMessage(message);
if (this._process.stdin.write(json)) {
// The write callback runs once the chunk is flushed or the write fails,
// so a backpressured send still settles when the server exits and
// destroys the pipe. Waiting on 'drain' alone parks forever there,
// because a destroyed stream never drains.
if (this._process.stdin.write(json, error => (error ? reject(error) : resolve()))) {
resolve();
} else {
this._process.stdin.once('drain', resolve);
}
});
}
Expand Down
38 changes: 38 additions & 0 deletions packages/client/test/client/stdio.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -150,3 +150,41 @@ test('_dispose releases the parent-side pipe handles even when a helper process
expect(proc.stdout?.destroyed).toBe(true);
expect(proc.stdin?.destroyed).toBe(true);
}, 10_000);

test('send() rejects instead of hanging when the server exits before a large write flushes', async () => {
// A server that never reads stdin and then exits: the write stays buffered,
// and the exit destroys the pipe, so the stream can never flush or drain.
const transport = new StdioClientTransport({
command: process.execPath,
args: ['-e', 'setTimeout(() => process.exit(0), 200)']
});
transport.onerror = () => {};
await transport.start();
const stdin = (transport as unknown as { _process: import('node:child_process').ChildProcess })._process.stdin!;

// 8 MB of params, far past stdin's 16 KB high water mark, so write() returns
// false and the send has to wait for the stream instead of resolving at once.
const pending = transport.send({
jsonrpc: '2.0',
id: 1,
method: 'tools/call',
params: { name: 'echo', arguments: { blob: 'x'.repeat(8 * 1024 * 1024) } }
});

// Bounded so the unfixed behaviour reports as 'hung' rather than as a suite
// timeout. The rejection reason is platform specific (EPIPE, EOF), so only
// the fact that it settles is asserted.
const outcome = await Promise.race([
pending.then(
() => 'resolved' as const,
() => 'rejected' as const
),
new Promise<'hung'>(resolve => {
setTimeout(() => resolve('hung'), 3000).unref();
})
]);

expect(outcome).toBe('rejected');
expect(stdin.listenerCount('drain')).toBe(0);
await transport.close();
}, 15_000);
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); fix(client): reject stdio send() when the write fails instead of waiting for 'drain' by ondraulehla · Pull Request #2552 · modelcontextprotocol/typescript-sdk · GitHub
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
9 changes: 9 additions & 0 deletions .changeset/stdio-client-send-drain-hang.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@modelcontextprotocol/client': patch
---

Fix `StdioClientTransport.send()` never settling when a backpressured write is still in flight and the pipe to the server dies. `send()` waited for a `'drain'` event, but a destroyed stream never drains, so the returned promise stayed pending and the `'drain'` listener was never removed. It now settles from the `write()` callback, which Node invokes on flush or on failure, so the send rejects with the underlying write error instead. This is what `StdioServerTransport.send()` already does for its own stdout.

The visible symptom was `await client.notification(...)`, which never returned: the notification path awaits the transport send with no timeout, and the connection-closed teardown settles pending responses but not pending sends. Requests were already rescued by that teardown, so `callTool()` and friends now report the actual write error (`EPIPE`, `EOF`) rather than a generic connection-closed error.

Reaching this needs a write the pipe will not accept in one go, which starts anywhere from tens to hundreds of KB depending on the platform pipe buffer and the Node version, sizes that base64 image payloads and file contents in tool arguments reach routinely.
10 changes: 6 additions & 4 deletions packages/client/src/client/stdio.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -313,16 +313,18 @@ export class StdioClientTransport implements Transport {
}

send(message: JSONRPCMessage): Promise<void> {
return new Promise(resolve => {
return new Promise((resolve, reject) => {
if (!this._process?.stdin) {
throw new SdkError(SdkErrorCode.NotConnected, 'Not connected');
}

const json = serializeMessage(message);
if (this._process.stdin.write(json)) {
// The write callback runs once the chunk is flushed or the write fails,
// so a backpressured send still settles when the server exits and
// destroys the pipe. Waiting on 'drain' alone parks forever there,
// because a destroyed stream never drains.
if (this._process.stdin.write(json, error => (error ? reject(error) : resolve()))) {
resolve();
} else {
this._process.stdin.once('drain', resolve);
}
});
}
Expand Down
38 changes: 38 additions & 0 deletions packages/client/test/client/stdio.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -150,3 +150,41 @@ test('_dispose releases the parent-side pipe handles even when a helper process
expect(proc.stdout?.destroyed).toBe(true);
expect(proc.stdin?.destroyed).toBe(true);
}, 10_000);

test('send() rejects instead of hanging when the server exits before a large write flushes', async () => {
// A server that never reads stdin and then exits: the write stays buffered,
// and the exit destroys the pipe, so the stream can never flush or drain.
const transport = new StdioClientTransport({
command: process.execPath,
args: ['-e', 'setTimeout(() => process.exit(0), 200)']
});
transport.onerror = () => {};
await transport.start();
const stdin = (transport as unknown as { _process: import('node:child_process').ChildProcess })._process.stdin!;

// 8 MB of params, far past stdin's 16 KB high water mark, so write() returns
// false and the send has to wait for the stream instead of resolving at once.
const pending = transport.send({
jsonrpc: '2.0',
id: 1,
method: 'tools/call',
params: { name: 'echo', arguments: { blob: 'x'.repeat(8 * 1024 * 1024) } }
});

// Bounded so the unfixed behaviour reports as 'hung' rather than as a suite
// timeout. The rejection reason is platform specific (EPIPE, EOF), so only
// the fact that it settles is asserted.
const outcome = await Promise.race([
pending.then(
() => 'resolved' as const,
() => 'rejected' as const
),
new Promise<'hung'>(resolve => {
setTimeout(() => resolve('hung'), 3000).unref();
})
]);

expect(outcome).toBe('rejected');
expect(stdin.listenerCount('drain')).toBe(0);
await transport.close();
}, 15_000);
Loading