Skip to content

Fix hanging on streams when stdio_client exiting #559

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

Merged
merged 9 commits into from
May 13, 2025
Merged

Fix hanging on streams when stdio_client exiting #559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
22e2b3a
Fix the TaskGroup hanging on stdin_writer when stdio_client exiting
LionNatsu Apr 22, 2025
2774496
Add test_stdio_cm for stdin_writer hanging
LionNatsu Apr 22, 2025
2591f80
Test using simple tee instead of mcp-server-fetch
LionNatsu Apr 22, 2025
474f072
Close write_stream_reader in finally block
LionNatsu Apr 22, 2025
d2f1146
Fix pyright warnings in test_stdio_cm.py
LionNatsu Apr 22, 2025
12d4740
Fix read_stream stream leakage
LionNatsu Apr 22, 2025
15b24eb
Update test_stdio.py
LionNatsu May 8, 2025
a2e3328
Delete tests/client/test_stdio_cm.py
LionNatsu May 8, 2025
a59995e
Update src/mcp/client/stdio/__init__.py
LionNatsu May 9, 2025
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
2 changes: 2 additions & 0 deletions src/mcp/client/stdio/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,8 @@ async def stdin_writer():
await terminate_windows_process(process)
else:
process.terminate()
await read_stream.aclose()
await write_stream.aclose()


def _get_executable_command(command: str) -> str:
Expand Down
7 changes: 7 additions & 0 deletions tests/client/test_stdio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@
tee: str = shutil.which("tee") # type: ignore


@pytest.mark.anyio
@pytest.mark.skipif(tee is None, reason="could not find tee command")
async def test_stdio_context_manager_exiting():
async with stdio_client(StdioServerParameters(command=tee)) as (_, _):
pass


@pytest.mark.anyio
@pytest.mark.skipif(tee is None, reason="could not find tee command")
async def test_stdio_client():
Expand Down
Loading