Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 36.4k
src: implement structuredClone in native#50330
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
Uh oh!
There was an error while loading. Please reload this page.
Changes from all commits
b69261c571f8b9f3dc8f40a090f5File filter
Filter by extension
Conversations
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| 'use strict'; | ||
| const common = require('../common.js'); | ||
| const assert = require('assert'); | ||
| const bench = common.createBenchmark(main, { | ||
| type: ['string', 'object', 'arraybuffer'], | ||
| n: [1e4], | ||
| }); | ||
| function main({ n, type }) { | ||
| const data = []; | ||
| switch (type) { | ||
| case 'string': | ||
| for (let i = 0; i < n; ++i) { | ||
| data.push(new Date().toISOString()); | ||
| } | ||
| break; | ||
| case 'object': | ||
| for (let i = 0; i < n; ++i) { | ||
| data.push({ ...process.config }); | ||
| } | ||
| break; | ||
| case 'arraybuffer': | ||
| for (let i = 0; i < n; ++i) { | ||
| data.push(new ArrayBuffer(10)); | ||
| } | ||
| break; | ||
| default: | ||
| throw new Error('Unsupported payload type'); | ||
| } | ||
| const run = type === 'arraybuffer' ? (i) => { | ||
| data[i] = structuredClone(data[i], { transfer: [ data[i] ] }); | ||
| } : (i) => { | ||
| data[i] = structuredClone(data[i]); | ||
| }; | ||
| bench.start(); | ||
| for (let i = 0; i < n; ++i) { | ||
| run(i); | ||
| } | ||
| bench.end(n); | ||
| assert.strictEqual(data.length, n); | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -172,7 +172,7 @@ rules: | ||
| - name: setTimeout | ||
| message: Use `const { setTimeout } = require('timers');` instead of the global. | ||
| - name: structuredClone | ||
| message: Use `const { structuredClone } = require('internal/structured_clone');` instead of the global. | ||
| message: Use `const { structuredClone } = internalBinding('messaging');` instead of the global. | ||
| - name: SubtleCrypto | ||
joyeecheung marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| message: Use `const { SubtleCrypto } = require('internal/crypto/webcrypto');` instead of the global. | ||
| no-restricted-modules: | ||
This file was deleted.
Uh oh!
There was an error while loading. Please reload this page.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1008,6 +1008,47 @@ static Maybe<bool> ReadIterable(Environment* env, | ||
| return Just(true); | ||
| } | ||
| bool GetTransferList(Environment* env, | ||
| Local<Context> context, | ||
| Local<Value> transfer_list_v, | ||
| TransferList* transfer_list_out) { | ||
| if (transfer_list_v->IsNullOrUndefined()) { | ||
| // Browsers ignore null or undefined, and otherwise accept an array or an | ||
| // options object. | ||
| return true; | ||
| } | ||
| if (!transfer_list_v->IsObject()) { | ||
| THROW_ERR_INVALID_ARG_TYPE( | ||
| env, "Optional transferList argument must be an iterable"); | ||
| return false; | ||
| } | ||
| bool was_iterable; | ||
| if (!ReadIterable(env, context, *transfer_list_out, transfer_list_v) | ||
| .To(&was_iterable)) | ||
| return false; | ||
| if (!was_iterable) { | ||
| Local<Value> transfer_option; | ||
| if (!transfer_list_v.As<Object>() | ||
| ->Get(context, env->transfer_string()) | ||
| .ToLocal(&transfer_option)) | ||
| return false; | ||
| if (!transfer_option->IsUndefined()) { | ||
| if (!ReadIterable(env, context, *transfer_list_out, transfer_option) | ||
| .To(&was_iterable)) | ||
| return false; | ||
| if (!was_iterable) { | ||
| THROW_ERR_INVALID_ARG_TYPE( | ||
| env, "Optional options.transfer argument must be an iterable"); | ||
| return false; | ||
| } | ||
| } | ||
| } | ||
| return true; | ||
| } | ||
| void MessagePort::PostMessage(const FunctionCallbackInfo<Value>& args) { | ||
| Environment* env = Environment::GetCurrent(args); | ||
| Local<Object> obj = args.This(); | ||
| @@ -1018,33 +1059,10 @@ void MessagePort::PostMessage(const FunctionCallbackInfo<Value>& args) { | ||
| "MessagePort.postMessage"); | ||
| } | ||
| if (!args[1]->IsNullOrUndefined() && !args[1]->IsObject()) { | ||
| // Browsers ignore null or undefined, and otherwise accept an array or an | ||
| // options object. | ||
| return THROW_ERR_INVALID_ARG_TYPE(env, | ||
| "Optional transferList argument must be an iterable"); | ||
| } | ||
| TransferList transfer_list; | ||
| if (args[1]->IsObject()) { | ||
| bool was_iterable; | ||
| if (!ReadIterable(env, context, transfer_list, args[1]).To(&was_iterable)) | ||
| return; | ||
| if (!was_iterable) { | ||
| Local<Value> transfer_option; | ||
| if (!args[1].As<Object>()->Get(context, env->transfer_string()) | ||
| .ToLocal(&transfer_option)) return; | ||
| if (!transfer_option->IsUndefined()) { | ||
| if (!ReadIterable(env, context, transfer_list, transfer_option) | ||
| .To(&was_iterable)) return; | ||
| if (!was_iterable) { | ||
| return THROW_ERR_INVALID_ARG_TYPE(env, | ||
| "Optional options.transfer argument must be an iterable"); | ||
| } | ||
| } | ||
| } | ||
| if (!GetTransferList(env, context, args[1], &transfer_list)) { | ||
| return; | ||
| } | ||
| MessagePort* port = Unwrap<MessagePort>(args.This()); | ||
| // Even if the backing MessagePort object has already been deleted, we still | ||
| // want to serialize the message to ensure spec-compliant behavior w.r.t. | ||
| @@ -1535,6 +1553,48 @@ static void SetDeserializerCreateObjectFunction( | ||
| env->set_messaging_deserialize_create_object(args[0].As<Function>()); | ||
| } | ||
| static void StructuredClone(const FunctionCallbackInfo<Value>& args) { | ||
| Isolate* isolate = args.GetIsolate(); | ||
| Local<Context> context = isolate->GetCurrentContext(); | ||
| Realm* realm = Realm::GetCurrent(context); | ||
| Environment* env = realm->env(); | ||
| if (args.Length() == 0) { | ||
| return THROW_ERR_MISSING_ARGS(env, "The value argument must be specified"); | ||
| } | ||
| Local<Value> value = args[0]; | ||
| TransferList transfer_list; | ||
| if (!args[1]->IsNullOrUndefined()) { | ||
| if (!args[1]->IsObject()) { | ||
| return THROW_ERR_INVALID_ARG_TYPE( | ||
| env, "The options argument must be either an object or undefined"); | ||
joyeecheung marked this conversation as resolved.
Outdated
Uh oh!There was an error while loading. Please reload this page. | ||
| } | ||
| Local<Object> options = args[1].As<Object>(); | ||
| Local<Value> transfer_list_v; | ||
| if (!options->Get(context, env->transfer_string()) | ||
| .ToLocal(&transfer_list_v)) { | ||
| return; | ||
| } | ||
| // TODO(joyeecheung): implement this in JS land to avoid the C++ -> JS | ||
| // cost to convert a sequence into an array. | ||
| if (!GetTransferList(env, context, transfer_list_v, &transfer_list)) { | ||
| return; | ||
| } | ||
| } | ||
| std::shared_ptr<Message> msg = std::make_shared<Message>(); | ||
| Local<Value> result; | ||
| if (msg->Serialize(env, context, value, transfer_list, Local<Object>()) | ||
| .IsNothing() || | ||
| !msg->Deserialize(env, context, nullptr).ToLocal(&result)) { | ||
| return; | ||
| } | ||
| args.GetReturnValue().Set(result); | ||
| } | ||
| static void MessageChannel(const FunctionCallbackInfo<Value>& args) { | ||
| Environment* env = Environment::GetCurrent(args); | ||
| if (!args.IsConstructCall()) { | ||
| @@ -1615,6 +1675,7 @@ static void InitMessaging(Local<Object> target, | ||
| "setDeserializerCreateObjectFunction", | ||
| SetDeserializerCreateObjectFunction); | ||
| SetMethod(context, target, "broadcastChannel", BroadcastChannel); | ||
| SetMethod(context, target, "structuredClone", StructuredClone); | ||
| { | ||
| Local<Function> domexception = GetDOMException(context).ToLocalChecked(); | ||
| @@ -1638,6 +1699,7 @@ static void RegisterExternalReferences(ExternalReferenceRegistry* registry) { | ||
| registry->Register(MessagePort::ReceiveMessage); | ||
| registry->Register(MessagePort::MoveToContext); | ||
| registry->Register(SetDeserializerCreateObjectFunction); | ||
| registry->Register(StructuredClone); | ||
| } | ||
| } // anonymous namespace | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,17 @@ | ||
| // Flags: --expose-internals | ||
| 'use strict'; | ||
| /* eslint-disable no-global-assign */ | ||
| require('../common'); | ||
| const assert = require('assert'); | ||
| const { | ||
| structuredClone: _structuredClone, | ||
| } = require('internal/structured_clone'); | ||
| assert.throws(() => structuredClone(), { code: 'ERR_MISSING_ARGS' }); | ||
| assert.throws(() => structuredClone(undefined, ''), { code: 'ERR_INVALID_ARG_TYPE' }); | ||
| assert.throws(() => structuredClone(undefined, 1), { code: 'ERR_INVALID_ARG_TYPE' }); | ||
| assert.throws(() => structuredClone(undefined, { transfer: 1 }), { code: 'ERR_INVALID_ARG_TYPE' }); | ||
| assert.throws(() => structuredClone(undefined, { transfer: '' }), { code: 'ERR_INVALID_ARG_TYPE' }); | ||
| const { | ||
| strictEqual, | ||
| throws, | ||
| } = require('assert'); | ||
| strictEqual(globalThis.structuredClone, _structuredClone); | ||
| structuredClone = undefined; | ||
| strictEqual(globalThis.structuredClone, undefined); | ||
| // Restore the value for the known globals check. | ||
| structuredClone = _structuredClone; | ||
| throws(() => _structuredClone(), /ERR_MISSING_ARGS/); | ||
| // Options can be null or undefined. | ||
| assert.strictEqual(structuredClone(undefined), undefined); | ||
| assert.strictEqual(structuredClone(undefined, null), undefined); | ||
| // Transfer can be null or undefined. | ||
| assert.strictEqual(structuredClone(undefined, { transfer: null }), undefined); | ||
| assert.strictEqual(structuredClone(undefined, { }), undefined); |
Uh oh!
There was an error while loading. Please reload this page.