Skip to content

src: fixup node_messaging error handling #59792

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 1 commit into from
Sep 9, 2025
Merged

src: fixup node_messaging error handling #59792

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 28 additions & 13 deletions src/node_messaging.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,7 @@ class SerializerDelegate : public ValueSerializer::Delegate {
if (JSTransferable::IsJSTransferable(env_, context_, object)) {
BaseObjectPtr<JSTransferable> js_transferable =
JSTransferable::Wrap(env_, object);
if (!js_transferable) return Nothing<bool>();
return WriteHostObject(js_transferable);
}

Expand Down Expand Up @@ -550,6 +551,7 @@ Maybe<bool> Message::Serialize(Environment* env,
return Nothing<bool>();
}
host_object = JSTransferable::Wrap(env, entry);
if (!host_object) return Nothing<bool>();
}

if (env->message_port_constructor_template()->HasInstance(entry) &&
Expand Down Expand Up @@ -1245,27 +1247,38 @@ Local<FunctionTemplate> GetMessagePortConstructorTemplate(
BaseObjectPtr<JSTransferable> JSTransferable::Wrap(Environment* env,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this return a Maybe<BaseObjectPtr<JSTransferable>>? I know BaseObjectPtr has a null state but Maybe is really helpful in resolving the ambiguity between a "regular" null state and the "exception pending" state

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably, but that would be a bit inconsistent with what we do everywhere else (which is rely on BaseObjectPtr's null state). If we want to start switching over to Maybe<BaseObjectPtr<T>> for error signaling in general I'm good with that but we should do so consistently.

Local<Object> target) {
Local<Context> context = env->context();
Local<Value> wrapper_val =
target->GetPrivate(context, env->js_transferable_wrapper_private_symbol())
.ToLocalChecked();
Local<Value> wrapper_val;
if (!target
->GetPrivate(context, env->js_transferable_wrapper_private_symbol())
.ToLocal(&wrapper_val)) {
return {};
}
DCHECK(wrapper_val->IsObject() || wrapper_val->IsUndefined());
BaseObjectPtr<JSTransferable> wrapper;
if (wrapper_val->IsObject()) {
wrapper =
BaseObjectPtr<JSTransferable>{Unwrap<JSTransferable>(wrapper_val)};
} else {
Local<Object> wrapper_obj = env->js_transferable_constructor_template()
->GetFunction(context)
.ToLocalChecked()
->NewInstance(context)
.ToLocalChecked();
Local<Function> ctor;
if (!env->js_transferable_constructor_template()
->GetFunction(context)
.ToLocal(&ctor)) {
return {};
}
Local<Object> wrapper_obj;
if (!ctor->NewInstance(context).ToLocal(&wrapper_obj)) {
return {};
}
// Make sure the JSTransferable wrapper object is not garbage collected
// until the strong BaseObjectPtr's reference count is decreased to 0.
wrapper = MakeDetachedBaseObject<JSTransferable>(env, wrapper_obj, target);
target
->SetPrivate(
context, env->js_transferable_wrapper_private_symbol(), wrapper_obj)
.ToChecked();
if (target
->SetPrivate(context,
env->js_transferable_wrapper_private_symbol(),
wrapper_obj)
.IsNothing()) {
return {};
}
}
return wrapper;
}
Expand Down Expand Up @@ -1396,7 +1409,9 @@ Maybe<BaseObjectPtrList> JSTransferable::NestedTransferables() const {
if (!JSTransferable::IsJSTransferable(env(), context, obj)) {
continue;
}
ret.emplace_back(JSTransferable::Wrap(env(), obj));
auto wrapped = JSTransferable::Wrap(env(), obj);
if (!wrapped) return Nothing<BaseObjectPtrList>();
ret.emplace_back(wrapped);
}
return Just(ret);
}
Expand Down
Loading