Skip to content

gh-146416: Emscripten: Improve standard stream handling in node_entry.mjs #146417

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
vstinner merged 8 commits into from
Mar 30, 2026
Merged

gh-146416: Emscripten: Improve standard stream handling in node_entry.mjs #146417

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1e4e9c1
gh-146416: Emscripten: Improve standard stream handling in node_entry…
hoodmane Mar 25, 2026
01f9307
More accurate arg name
hoodmane Mar 25, 2026
5473107
Remove debug log
hoodmane Mar 25, 2026
34fc32a
More consistent whitespace
hoodmane Mar 25, 2026
00efa5f
Add nodeFsync definition
hoodmane Mar 30, 2026
1a81834
Fix: rows first then columns
hoodmane Mar 30, 2026
245cb86
Apply suggestions from code review
hoodmane Mar 30, 2026
36a307e
Sleep only 10ms
hoodmane Mar 30, 2026
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
Prev Previous commit
Next Next commit
Add nodeFsync definition
  • Loading branch information
@hoodmane
hoodmane committed Mar 30, 2026
commit 00efa5f4632d075ec4f70debb5741839e01e5ca7
25 changes: 20 additions & 5 deletions Platforms/emscripten/streams.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ const prepareBuffer = (buffer, offset, length) =>

const TTY_OPS = {
ioctl_tiocgwinsz(tty) {
return tty.devops.ioctl_tiocgwinsz();
return tty.devops.ioctl_tiocgwinsz?.();
},
};

Expand Down Expand Up @@ -146,6 +146,25 @@ const stream_ops = {
},
};

function nodeFsync(fd) {
try {
fs.fsyncSync(fd);
} catch (e) {
if (e?.code === "EINVAL") {
return;
}
// On Mac, calling fsync when not isatty returns ENOTSUP
// On Windows, stdin/stdout/stderr may be closed, returning EBADF or EPERM
if (
e?.code === "ENOTSUP" || e?.code === "EBADF" || e?.code === "EPERM"
) {
return;
}

throw e;
}
}

class NodeReader {
constructor(nodeStream) {
this.nodeStream = nodeStream;
Expand All @@ -169,10 +188,6 @@ class NodeReader {
fsync() {
nodeFsync(this.nodeStream.fd);
}

ioctl_tiocgwinsz() {
return [this.nodeStream.columns ?? 24, this.nodeStream.rows ?? 80];
}
}

class NodeWriter {
Expand Down
Loading