-
-
Notifications
You must be signed in to change notification settings - Fork 35.1k
child_process: watch child_process stdin pipe peer close event #62353
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
base: main
Are you sure you want to change the base?
Changes from all commits
0b741f4
dc21154
ce416a2
554052d
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,6 +28,7 @@ | |
| #include "handle_wrap.h" | ||
| #include "node.h" | ||
| #include "node_buffer.h" | ||
| #include "node_errors.h" | ||
| #include "node_external_reference.h" | ||
| #include "stream_base-inl.h" | ||
| #include "stream_wrap.h" | ||
|
|
@@ -80,6 +81,7 @@ void PipeWrap::Initialize(Local<Object> target, | |
| SetProtoMethod(isolate, t, "listen", Listen); | ||
| SetProtoMethod(isolate, t, "connect", Connect); | ||
| SetProtoMethod(isolate, t, "open", Open); | ||
| SetProtoMethod(isolate, t, "watchPeerClose", WatchPeerClose); | ||
|
|
||
| #ifdef _WIN32 | ||
| SetProtoMethod(isolate, t, "setPendingInstances", SetPendingInstances); | ||
|
|
@@ -110,6 +112,7 @@ void PipeWrap::RegisterExternalReferences(ExternalReferenceRegistry* registry) { | |
| registry->Register(Listen); | ||
| registry->Register(Connect); | ||
| registry->Register(Open); | ||
| registry->Register(WatchPeerClose); | ||
| #ifdef _WIN32 | ||
| registry->Register(SetPendingInstances); | ||
| #endif | ||
|
|
@@ -159,6 +162,11 @@ PipeWrap::PipeWrap(Environment* env, | |
| // Suggestion: uv_pipe_init() returns void. | ||
| } | ||
|
|
||
| PipeWrap::~PipeWrap() { | ||
| peer_close_watching_ = false; | ||
| peer_close_cb_.Reset(); | ||
| } | ||
|
Comment on lines
+165
to
+168
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This doesn't do anything/will just be optimized out by the compiler anyway |
||
|
|
||
| void PipeWrap::Bind(const FunctionCallbackInfo<Value>& args) { | ||
| PipeWrap* wrap; | ||
| ASSIGN_OR_RETURN_UNWRAP(&wrap, args.This()); | ||
|
|
@@ -213,6 +221,97 @@ void PipeWrap::Open(const FunctionCallbackInfo<Value>& args) { | |
| args.GetReturnValue().Set(err); | ||
| } | ||
|
|
||
| void PipeWrap::WatchPeerClose(const FunctionCallbackInfo<Value>& args) { | ||
Tseian marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| PipeWrap* wrap; | ||
| ASSIGN_OR_RETURN_UNWRAP(&wrap, args.This()); | ||
|
|
||
| CHECK_GT(args.Length(), 0); | ||
| CHECK(args[0]->IsBoolean()); | ||
| const bool enable = args[0].As<v8::Boolean>()->Value(); | ||
|
|
||
| // UnwatchPeerClose | ||
| if (!enable) { | ||
| if (!wrap->peer_close_watching_) { | ||
| wrap->peer_close_cb_.Reset(); | ||
| return; | ||
| } | ||
|
|
||
| wrap->peer_close_watching_ = false; | ||
| wrap->peer_close_cb_.Reset(); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Doesn't an empty |
||
| uv_read_stop(wrap->stream()); | ||
| return; | ||
| } | ||
|
|
||
| if (!wrap->IsAlive()) { | ||
| return; | ||
| } | ||
|
|
||
| if (wrap->peer_close_watching_) { | ||
| return; | ||
| } | ||
|
|
||
| CHECK_GT(args.Length(), 1); | ||
| CHECK(args[1]->IsFunction()); | ||
|
|
||
| Environment* env = wrap->env(); | ||
| Isolate* isolate = env->isolate(); | ||
|
|
||
| // Store the JS callback securely so it isn't garbage collected. | ||
| wrap->peer_close_cb_.Reset(isolate, args[1].As<Function>()); | ||
| wrap->peer_close_watching_ = true; | ||
|
|
||
| // Start reading to detect EOF/ECONNRESET from the peer. | ||
| // We use our custom allocator and reader, ignoring actual data. | ||
| int err = uv_read_start(wrap->stream(), PeerCloseAlloc, PeerCloseRead); | ||
| if (err != 0) { | ||
| wrap->peer_close_watching_ = false; | ||
| wrap->peer_close_cb_.Reset(); | ||
| } | ||
| } | ||
|
|
||
| void PipeWrap::PeerCloseAlloc(uv_handle_t* handle, | ||
| size_t suggested_size, | ||
| uv_buf_t* buf) { | ||
| // We only care about EOF, not the actual data. | ||
| // Using a static 1-byte buffer avoids dynamic memory allocation overhead. | ||
| static char scratch; | ||
| *buf = uv_buf_init(&scratch, 1); | ||
| } | ||
|
|
||
| void PipeWrap::PeerCloseRead(uv_stream_t* stream, | ||
| ssize_t nread, | ||
| const uv_buf_t* buf) { | ||
| PipeWrap* wrap = static_cast<PipeWrap*>(stream->data); | ||
| if (wrap == nullptr || !wrap->peer_close_watching_) return; | ||
|
|
||
| // Ignore actual data reads or EAGAIN (0). We only watch for disconnects. | ||
| if (nread > 0 || nread == 0) return; | ||
|
|
||
| // Wait specifically for EOF or connection reset (peer closed). | ||
| if (nread != UV_EOF && nread != UV_ECONNRESET) return; | ||
|
|
||
| // Peer has closed the connection. Stop reading immediately. | ||
| wrap->peer_close_watching_ = false; | ||
| uv_read_stop(stream); | ||
|
|
||
| if (wrap->peer_close_cb_.IsEmpty()) return; | ||
| Environment* env = wrap->env(); | ||
| Isolate* isolate = env->isolate(); | ||
|
|
||
| // Set up V8 context and handles to safely execute the JS callback. | ||
| v8::HandleScope handle_scope(isolate); | ||
| v8::Context::Scope context_scope(env->context()); | ||
| Local<Function> cb = wrap->peer_close_cb_.Get(isolate); | ||
| // Reset before calling to prevent re-entrancy issues | ||
| wrap->peer_close_cb_.Reset(); | ||
|
|
||
| errors::TryCatchScope try_catch(env); | ||
| try_catch.SetVerbose(true); | ||
|
Comment on lines
+308
to
+309
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Shouldn't be necessary, right? We don't do this for other callbacks from libuv events either |
||
|
|
||
| // MakeCallback properly tracks AsyncHooks context and flushes microtasks. | ||
| wrap->MakeCallback(cb, 0, nullptr); | ||
| } | ||
|
|
||
| void PipeWrap::Connect(const FunctionCallbackInfo<Value>& args) { | ||
| Environment* env = Environment::GetCurrent(args); | ||
|
|
||
|
|
@@ -252,7 +351,6 @@ void PipeWrap::Connect(const FunctionCallbackInfo<Value>& args) { | |
|
|
||
| args.GetReturnValue().Set(err); | ||
| } | ||
|
|
||
| } // namespace node | ||
|
|
||
| NODE_BINDING_CONTEXT_AWARE_INTERNAL(pipe_wrap, node::PipeWrap::Initialize) | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -54,6 +54,7 @@ class PipeWrap : public ConnectionWrap<PipeWrap, uv_pipe_t> { | |
| SET_SELF_SIZE(PipeWrap) | ||
|
|
||
| private: | ||
| ~PipeWrap() override; | ||
| PipeWrap(Environment* env, | ||
| v8::Local<v8::Object> object, | ||
| ProviderType provider, | ||
|
|
@@ -64,12 +65,22 @@ class PipeWrap : public ConnectionWrap<PipeWrap, uv_pipe_t> { | |
| static void Listen(const v8::FunctionCallbackInfo<v8::Value>& args); | ||
| static void Connect(const v8::FunctionCallbackInfo<v8::Value>& args); | ||
| static void Open(const v8::FunctionCallbackInfo<v8::Value>& args); | ||
| static void WatchPeerClose(const v8::FunctionCallbackInfo<v8::Value>& args); | ||
| static void PeerCloseAlloc(uv_handle_t* handle, | ||
| size_t suggested_size, | ||
| uv_buf_t* buf); | ||
| static void PeerCloseRead(uv_stream_t* stream, | ||
| ssize_t nread, | ||
| const uv_buf_t* buf); | ||
|
|
||
| #ifdef _WIN32 | ||
| static void SetPendingInstances( | ||
| const v8::FunctionCallbackInfo<v8::Value>& args); | ||
| #endif | ||
| static void Fchmod(const v8::FunctionCallbackInfo<v8::Value>& args); | ||
|
|
||
| bool peer_close_watching_ = false; | ||
| v8::Global<v8::Function> peer_close_cb_; | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit/optional: I'd consider using an internal field over a |
||
| }; | ||
|
|
||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| 'use strict'; | ||
|
|
||
| const common = require('../common'); | ||
| const assert = require('assert'); | ||
| const { spawn } = require('child_process'); | ||
|
|
||
| if (common.isWindows) { | ||
| common.skip('Not applicable on Windows'); | ||
| } | ||
|
|
||
| const child = spawn(process.execPath, [ | ||
| '-e', | ||
| 'require("fs").closeSync(0); setTimeout(() => {}, 2000)', | ||
| ], { stdio: ['pipe', 'ignore', 'ignore'] }); | ||
|
|
||
| const timeout = setTimeout(() => { | ||
| assert.fail('stdin close event was not emitted'); | ||
| }, 1000); | ||
|
|
||
| child.stdin.on('close', common.mustCall(() => { | ||
| clearTimeout(timeout); | ||
| child.kill(); | ||
| })); | ||
|
|
||
| child.on('exit', common.mustCall(() => { | ||
| clearTimeout(timeout); | ||
| })); |
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.
This is quite a bit of extra code, but wouldn't just adding an unconditional
sock.resume();give the same result? That way we keep reading (but not consuming) data from the socket until we hit EOF, and sinceallowHalfOpenisn't set, that should also close the writable side of the stream. In other words, if I'm not missing anything (and which is completely possible), this PR can be shortened to:(plus a comment or so about 'why' we do that, ofc)