fix #3337 (#3338)

* fix #3337

* fixup

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, false)
+ }, instance)
  },
 
  arrayBuffer () {
@@ -318,21 +318,20 @@ function bodyMixinMethods (instance) {
  // given a byte sequence bytes: return a new ArrayBuffer
  // whose contents are bytes.
  return consumeBody(this, (bytes) => {
- // Note: arrayBuffer already cloned.
- return bytes.buffer
- }, instance, true)
+ return new Uint8Array(bytes).buffer
+ }, instance)
  },
 
  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, false)
+ return consumeBody(this, utf8DecodeBytes, instance)
  },
 
  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, false)
+ return consumeBody(this, parseJSONFromBytes, instance)
  },
 
  formData () {
@@ -384,16 +383,16 @@ function bodyMixinMethods (instance) {
  throw new TypeError(
  'Content-Type was not one of "multipart/form-data" or "application/x-www-form-urlencoded".'
  )
- }, instance, false)
+ }, instance)
  },
 
  bytes () {
  // The bytes() method steps are to return the result of running consume body
  // with this and the following step given a byte sequence bytes: return the
  // result of creating a Uint8Array from bytes in this’s relevant realm.
  return consumeBody(this, (bytes) => {
- return new Uint8Array(bytes.buffer, 0, bytes.byteLength)
- }, instance, true)
+ return new Uint8Array(bytes)
+ }, instance)
  }
  }
 
@@ -409,9 +408,8 @@ 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, shouldClone) {
+async function consumeBody (object, convertBytesToJSValue, instance) {
  webidl.brandCheck(object, instance)
 
  // 1. If object is unusable, then return a promise rejected
@@ -449,7 +447,7 @@ async function consumeBody (object, convertBytesToJSValue, instance, shouldClone
 
  // 6. Otherwise, fully read object’s body given successSteps,
  // errorSteps, and object’s relevant global object.
- await fullyReadBody(object[kState].body, successSteps, errorSteps, shouldClone)
+ await fullyReadBody(object[kState].body, successSteps, errorSteps)
 
  // 7. Return promise.
  return promise.promise

lib/web/fetch/util.js

@@ -1029,7 +1029,7 @@ function iteratorMixin (name, object, kInternalIterator, keyIndex = 0, valueInde
 /**
  * @see https://fetch.spec.whatwg.org/#body-fully-read
  */
-async function fullyReadBody (body, processBody, processBodyError, shouldClone) {
+async function fullyReadBody (body, processBody, processBodyError) {
  // 1. If taskDestination is null, then set taskDestination to
  // the result of starting a new parallel queue.
 
@@ -1055,7 +1055,7 @@ async function fullyReadBody (body, processBody, processBodyError, shouldClone)
 
  // 5. Read all bytes from reader, given successSteps and errorSteps.
  try {
- successSteps(await readAllBytes(reader, shouldClone))
+ successSteps(await readAllBytes(reader))
  } catch (e) {
  errorSteps(e)
  }
@@ -1103,9 +1103,8 @@ 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, shouldClone) {
+async function readAllBytes (reader) {
  const bytes = []
  let byteLength = 0
 
@@ -1114,13 +1113,6 @@ async function readAllBytes (reader, shouldClone) {
 
  if (done) {
  // 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)
  }