-
Notifications
You must be signed in to change notification settings - Fork 232
fix(cli): ensure blocking stdio #2173
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.
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
wan9chi
wants to merge
1
commit into
agent/test-stdio-backpressure-e2e
Choose a base branch
from
agent/fix-blocking-stdio
base: agent/test-stdio-backpressure-e2e
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /// Ensure inherited standard streams use the blocking semantics expected by | ||
| /// Rust's standard library and by the tools embedded in Vite+. | ||
| /// | ||
| /// Node.js marks non-TTY stdio as non-blocking, and child processes inherit | ||
| /// that flag through the shared open file description. Clear `O_NONBLOCK` | ||
| /// once at process entry so unowned writers do not panic or truncate output | ||
| /// when a consumer applies backpressure. | ||
| #[cfg(unix)] | ||
| pub fn ensure_blocking_stdio() { | ||
| use std::{io, os::fd::AsFd}; | ||
|
|
||
| let stdin = io::stdin(); | ||
| let stdout = io::stdout(); | ||
| let stderr = io::stderr(); | ||
|
|
||
| for fd in [stdin.as_fd(), stdout.as_fd(), stderr.as_fd()] { | ||
| ensure_blocking_fd(fd); | ||
| } | ||
| } | ||
|
|
||
| #[cfg(unix)] | ||
| fn ensure_blocking_fd(fd: std::os::fd::BorrowedFd<'_>) { | ||
| use nix::{ | ||
| fcntl::{FcntlArg, OFlag, fcntl}, | ||
| unistd::isatty, | ||
| }; | ||
|
|
||
| if isatty(fd).unwrap_or(false) { | ||
| return; | ||
| } | ||
|
|
||
| let Ok(flags) = fcntl(fd, FcntlArg::F_GETFL) else { | ||
| return; | ||
| }; | ||
| let flags = OFlag::from_bits_retain(flags); | ||
| if flags.contains(OFlag::O_NONBLOCK) { | ||
| let _ = fcntl(fd, FcntlArg::F_SETFL(flags.difference(OFlag::O_NONBLOCK))); | ||
| } | ||
| } | ||
|
|
||
| #[cfg(not(unix))] | ||
| pub fn ensure_blocking_stdio() {} | ||
|
|
||
| #[cfg(all(test, unix))] | ||
| mod tests { | ||
| use std::os::{fd::AsFd, unix::net::UnixStream}; | ||
|
|
||
| use nix::fcntl::{FcntlArg, OFlag, fcntl}; | ||
|
|
||
| use super::ensure_blocking_fd; | ||
|
|
||
| #[test] | ||
| fn clears_nonblocking_from_a_non_tty_file_description() { | ||
| let (stream, _peer) = UnixStream::pair().unwrap(); | ||
| stream.set_nonblocking(true).unwrap(); | ||
|
|
||
| ensure_blocking_fd(stream.as_fd()); | ||
|
|
||
| let flags = fcntl(&stream, FcntlArg::F_GETFL).unwrap(); | ||
| assert!(!OFlag::from_bits_retain(flags).contains(OFlag::O_NONBLOCK)); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fresh evidence beyond the earlier module-init concern: Node sets
O_NONBLOCKlazily whenprocess.stdout/stderris first used, so clearing it only here can be undone by later JS output before another NAPI export spawns a child. For examplevp create --no-interactive --verbose <remote-template>logsRunning: ...inpackages/cli/src/create/templates/remote.tsbefore callingrunCommandAndDetectProjectDir, which then enters therunCommandNAPI path and spawns with inherited stdio; under the same backpressured pipe scenario, that child can still inherit nonblocking stdout/stderr. Re-run this guard immediately before NAPI entrypoints that spawn or write through stdio, not just at module load.Useful? React with 👍 / 👎.