From cfcbce86e393983fd1c0ce265dcfc4709459e395 Mon Sep 17 00:00:00 2001 From: tsctx <91457664+tsctx@users.noreply.github.com> Date: Sun, 14 Apr 2024 19:42:13 +0900 Subject: [PATCH] perf: avoid unnecessary clone --- lib/web/fetch/body.js | 15 ++++++++------- lib/web/fetch/util.js | 10 +++++++--- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/lib/web/fetch/body.js b/lib/web/fetch/body.js index eb77b8733c4..e6af47c9a45 100644 --- a/lib/web/fetch/body.js +++ b/lib/web/fetch/body.js @@ -309,7 +309,7 @@ function bodyMixinMethods (instance) { // Return a Blob whose contents are bytes and type attribute // is mimeType. return new Blob([bytes], { type: mimeType }) - }, instance) + }, instance, false) }, arrayBuffer () { @@ -320,19 +320,19 @@ function bodyMixinMethods (instance) { return consumeBody(this, (bytes) => { // Note: arrayBuffer already cloned. return bytes.buffer - }, instance) + }, instance, true) }, text () { // The text() method steps are to return the result of running // consume body with this and UTF-8 decode. - return consumeBody(this, utf8DecodeBytes, instance) + return consumeBody(this, utf8DecodeBytes, instance, false) }, json () { // The json() method steps are to return the result of running // consume body with this and parse JSON from bytes. - return consumeBody(this, parseJSONFromBytes, instance) + return consumeBody(this, parseJSONFromBytes, instance, false) }, formData () { @@ -384,7 +384,7 @@ function bodyMixinMethods (instance) { throw new TypeError( 'Content-Type was not one of "multipart/form-data" or "application/x-www-form-urlencoded".' ) - }, instance) + }, instance, false) } } @@ -400,8 +400,9 @@ function mixinBody (prototype) { * @param {Response|Request} object * @param {(value: unknown) => unknown} convertBytesToJSValue * @param {Response|Request} instance + * @param {boolean} [shouldClone] */ -async function consumeBody (object, convertBytesToJSValue, instance) { +async function consumeBody (object, convertBytesToJSValue, instance, shouldClone) { webidl.brandCheck(object, instance) // 1. If object is unusable, then return a promise rejected @@ -439,7 +440,7 @@ async function consumeBody (object, convertBytesToJSValue, instance) { // 6. Otherwise, fully read object’s body given successSteps, // errorSteps, and object’s relevant global object. - await fullyReadBody(object[kState].body, successSteps, errorSteps) + await fullyReadBody(object[kState].body, successSteps, errorSteps, shouldClone) // 7. Return promise. return promise.promise diff --git a/lib/web/fetch/util.js b/lib/web/fetch/util.js index 7bccc7d4993..a95475a36fc 100644 --- a/lib/web/fetch/util.js +++ b/lib/web/fetch/util.js @@ -1043,7 +1043,7 @@ function iteratorMixin (name, object, kInternalIterator, keyIndex = 0, valueInde /** * @see https://fetch.spec.whatwg.org/#body-fully-read */ -async function fullyReadBody (body, processBody, processBodyError) { +async function fullyReadBody (body, processBody, processBodyError, shouldClone) { // 1. If taskDestination is null, then set taskDestination to // the result of starting a new parallel queue. @@ -1069,7 +1069,7 @@ async function fullyReadBody (body, processBody, processBodyError) { // 5. Read all bytes from reader, given successSteps and errorSteps. try { - successSteps(await readAllBytes(reader)) + successSteps(await readAllBytes(reader, shouldClone)) } catch (e) { errorSteps(e) } @@ -1117,8 +1117,9 @@ function isomorphicEncode (input) { * @see https://streams.spec.whatwg.org/#readablestreamdefaultreader-read-all-bytes * @see https://streams.spec.whatwg.org/#read-loop * @param {ReadableStreamDefaultReader} reader + * @param {boolean} [shouldClone] */ -async function readAllBytes (reader) { +async function readAllBytes (reader, shouldClone) { const bytes = [] let byteLength = 0 @@ -1129,6 +1130,9 @@ async function readAllBytes (reader) { // 1. Call successSteps with bytes. if (bytes.length === 1) { const { buffer, byteOffset, byteLength } = bytes[0] + if (shouldClone === false) { + return Buffer.from(buffer, byteOffset, byteLength) + } return Buffer.from(buffer.slice(byteOffset, byteOffset + byteLength), 0, byteLength) } return Buffer.concat(bytes, byteLength)