OSSForks/node
1
0
Fork 0
mirror of https://github.com/zebrajr/node.git synced 2025-12-06 00:20:08 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

deps: V8: cherry-pick e3df60f3f5ab

Browse Source 
Original commit message:

    [objects] allow host defined serializer of JSError

    Allow host defined serializer and deserializer of JSError in
    ValueSerializer API. This allows hosts that implement DOMException
    in JS to support `Error.isError` proposal and `structuredClone`.

    Refs: https://github.com/nodejs/node/pull/58691
    Change-Id: I022821c9abd659970c4d449b3c69c5fb54d0618a
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/6637876
    Reviewed-by: Camillo Bruni <cbruni@chromium.org>
    Commit-Queue: Chengzhong Wu <cwu631@bloomberg.net>
    Cr-Commit-Position: refs/heads/main@{#100894}

Refs: e3df60f3f5
PR-URL: https://github.com/nodejs/node/pull/58691
Fixes: https://github.com/nodejs/node/issues/56497
Refs: https://github.com/nodejs/node/pull/58138
Reviewed-By: Jason Zhang <xzha4350@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
Reviewed-By: Ethan Arrowood <ethan@arrowood.dev>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Chengzhong Wu 2025-06-19 11:54:14 +01:00 committed by Node.js GitHub Bot
parent 11222f1a27
commit c1c36731ce
3 changed files with 75 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.gypi
View File

@ -38,7 +38,7 @@
# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.13',
'v8_embedder_string': '-node.14',
##### V8 defaults for Node.js #####

13
deps/v8/src/objects/value-serializer.cc vendored
View File

@ -654,8 +654,17 @@ Maybe<bool> ValueSerializer::WriteJSReceiver(
case JS_DATA_VIEW_TYPE:
case JS_RAB_GSAB_DATA_VIEW_TYPE:
return WriteJSArrayBufferView(Cast<JSArrayBufferView>(*receiver));
case JS_ERROR_TYPE:
return WriteJSError(Cast<JSObject>(receiver));
case JS_ERROR_TYPE: {
DirectHandle<JSObject> js_error = Cast<JSObject>(receiver);
Maybe<bool> is_host_object = IsHostObject(js_error);
if (is_host_object.IsNothing()) {
return is_host_object;
}
if (is_host_object.FromJust()) {
return WriteHostObject(js_error);
}
return WriteJSError(js_error);
}
case JS_SHARED_ARRAY_TYPE:
return WriteJSSharedArray(Cast<JSSharedArray>(receiver));
case JS_SHARED_STRUCT_TYPE:

63
deps/v8/test/unittests/objects/value-serializer-unittest.cc vendored
View File

@ -3141,6 +3141,69 @@ TEST_F(ValueSerializerTestWithHostObject, RoundTripHostJSObject) {
ExpectScriptTrue("result.a === result.b");
}
TEST_F(ValueSerializerTestWithHostObject, RoundTripJSErrorObject) {
i::DisableHandleChecksForMockingScope mocking_scope;
EXPECT_CALL(serializer_delegate_, HasCustomHostObject(isolate()))
.WillOnce(Invoke([](Isolate* isolate) { return true; }));
EXPECT_CALL(serializer_delegate_, IsHostObject(isolate(), _))
.WillRepeatedly(Invoke([this](Isolate* isolate, Local<Object> object) {
EXPECT_TRUE(object->IsObject());
Local<Context> context = isolate->GetCurrentContext();
return object->Has(context, StringFromUtf8("my_host_object"));
}));
// Read/Write HostObject methods are not invoked for non-host JSErrors.
EXPECT_CALL(serializer_delegate_, WriteHostObject(isolate(), _)).Times(0);
EXPECT_CALL(deserializer_delegate_, ReadHostObject(isolate())).Times(0);
RoundTripTest(
"var e = new Error('before serialize');"
"({ a: e, get b() { return this.a; } })");
ExpectScriptTrue("!('my_host_object' in result)");
ExpectScriptTrue("!('my_host_object' in result.a)");
ExpectScriptTrue("result.a.message === 'before serialize'");
ExpectScriptTrue("result.a instanceof Error");
ExpectScriptTrue("result.a === result.b");
}
TEST_F(ValueSerializerTestWithHostObject, RoundTripHostJSErrorObject) {
i::DisableHandleChecksForMockingScope mocking_scope;
EXPECT_CALL(serializer_delegate_, HasCustomHostObject(isolate()))
.WillOnce(Invoke([](Isolate* isolate) { return true; }));
EXPECT_CALL(serializer_delegate_, IsHostObject(isolate(), _))
.WillRepeatedly(Invoke([this](Isolate* isolate, Local<Object> object) {
EXPECT_TRUE(object->IsObject());
Local<Context> context = isolate->GetCurrentContext();
return object->Has(context, StringFromUtf8("my_host_object"));
}));
EXPECT_CALL(serializer_delegate_, WriteHostObject(isolate(), _))
.WillOnce(Invoke([this](Isolate*, Local<Object> object) {
EXPECT_TRUE(object->IsObject());
WriteExampleHostObjectTag();
return Just(true);
}));
EXPECT_CALL(deserializer_delegate_, ReadHostObject(isolate()))
.WillOnce(Invoke([this](Isolate* isolate) {
EXPECT_TRUE(ReadExampleHostObjectTag());
Local<Context> context = isolate->GetCurrentContext();
Local<Object> obj =
v8::Exception::Error(StringFromUtf8("deserialized")).As<Object>();
obj->Set(context, StringFromUtf8("my_host_object"), v8::True(isolate))
.Check();
return obj;
}));
RoundTripTest(
"var e = new Error('before serialize');"
"e.my_host_object = true;"
"({ a: e, get b() { return this.a; } })");
ExpectScriptTrue("!('my_host_object' in result)");
ExpectScriptTrue("result.a.my_host_object");
ExpectScriptTrue("result.a.message === 'deserialized'");
ExpectScriptTrue("result.a instanceof Error");
ExpectScriptTrue("result.a === result.b");
}
class ValueSerializerTestWithHostArrayBufferView
: public ValueSerializerTestWithHostObject {
protected: