Fetch: bytes() method on Body mixin

bakkot · web-flow · commit 1b9332c3c8a8 · 2024-05-14T07:53:16.000Z
For whatwg/fetch#1753.
diff --git a/fetch/api/abort/general.any.js b/fetch/api/abort/general.any.js
@@ -4,7 +4,7 @@
 // META: script=/common/get-host-info.sub.js
 // META: script=../request/request-error.js
 
-const BODY_METHODS = ['arrayBuffer', 'blob', 'formData', 'json', 'text'];
+const BODY_METHODS = ['arrayBuffer', 'blob', 'bytes', 'formData', 'json', 'text'];
 
 const error1 = new Error('error1');
 error1.name = 'error1';
diff --git a/fetch/api/abort/serviceworker-intercepted.https.html b/fetch/api/abort/serviceworker-intercepted.https.html
@@ -11,7 +11,7 @@
 <script>
   // Duplicating this resource to make service worker scoping simpler.
   const SCOPE = '../resources/basic.html';
-  const BODY_METHODS = ['arrayBuffer', 'blob', 'formData', 'json', 'text'];
+  const BODY_METHODS = ['arrayBuffer', 'blob', 'bytes', 'formData', 'json', 'text'];
 
   const error1 = new Error('error1');
   error1.name = 'error1';
diff --git a/fetch/api/request/request-consume.any.js b/fetch/api/request/request-consume.any.js
@@ -27,6 +27,14 @@ function checkBodyArrayBuffer(request, expectedBody) {
   });
 }
 
+function checkBodyBytes(request, expectedBody) {
+  return request.bytes().then(function(bodyAsUint8Array) {
+    assert_true(bodyAsUint8Array instanceof Uint8Array);
+    validateBufferFromString(bodyAsUint8Array.buffer, expectedBody, "Retrieve and verify request's body");
+    assert_true(request.bodyUsed, "body as bytes: bodyUsed turned true");
+  });
+}
+
 function checkBodyJSON(request, expectedBody) {
   return request.json().then(function(bodyAsJSON) {
     var strBody = JSON.stringify(bodyAsJSON)
@@ -58,6 +66,11 @@ function checkRequestBody(body, expected, bodyType) {
     assert_false(request.bodyUsed, "bodyUsed is false at init");
     return checkBodyArrayBuffer(request, expected);
   }, "Consume " + bodyType  + " request's body as arrayBuffer");
+  promise_test(function(test) {
+    var request = new Request("", {"method": "POST", "body": body });
+    assert_false(request.bodyUsed, "bodyUsed is false at init");
+    return checkBodyBytes(request, expected);
+  }, "Consume " + bodyType  + " request's body as bytes");
   promise_test(function(test) {
     var request = new Request("", {"method": "POST", "body": body });
     assert_false(request.bodyUsed, "bodyUsed is false at init");
@@ -113,6 +126,7 @@ checkBlobResponseBody(blob, textData, "blob", checkBodyBlob);
 checkBlobResponseBody(blob, textData, "text", checkBodyText);
 checkBlobResponseBody(blob, textData, "json", checkBodyJSON);
 checkBlobResponseBody(blob, textData, "arrayBuffer", checkBodyArrayBuffer);
+checkBlobResponseBody(blob, textData, "bytes", checkBodyBytes);
 checkBlobResponseBody(new Blob([""]), "", "blob (empty blob as input)", checkBodyBlob);
 
 var goodJSONValues = ["null", "1", "true", "\"string\""];
diff --git a/fetch/api/response/response-blob-realm.any.js b/fetch/api/response/response-blob-realm.any.js
@@ -0,0 +1,23 @@
+// META: title=realm of Response bytes()
+
+"use strict";
+
+promise_test(async () => {
+  await new Promise(resolve => {
+    onload = resolve;
+  });
+
+  let iframe = document.createElement("iframe");
+  document.body.appendChild(iframe);
+  iframe.srcdoc = "<!doctype html>";
+  await new Promise(resolve => {
+    iframe.onload = resolve;
+  });
+
+  let otherRealm = iframe.contentWindow;
+
+  let ab = await window.Response.prototype.bytes.call(new otherRealm.Response(""));
+
+  assert_true(ab instanceof otherRealm.Uint8Array, "Uint8Array should be created in receiver's realm");
+  assert_false(ab instanceof Uint8Array, "Uint8Array should not be created in the bytes() methods's realm");
+}, "realm of the Uint8Array from Response bytes()");
diff --git a/fetch/api/response/response-error-from-stream.any.js b/fetch/api/response/response-error-from-stream.any.js
@@ -47,13 +47,15 @@ promise_test(test => {
 // test start() errors for all Body reader methods
 runRequestPromiseTest(newStreamWithStartError(), 'arrayBuffer', 'ReadableStream start() Error propagates to Response.arrayBuffer() Promise');
 runRequestPromiseTest(newStreamWithStartError(), 'blob',        'ReadableStream start() Error propagates to Response.blob() Promise');
+runRequestPromiseTest(newStreamWithStartError(), 'bytes',       'ReadableStream start() Error propagates to Response.bytes() Promise');
 runRequestPromiseTest(newStreamWithStartError(), 'formData',    'ReadableStream start() Error propagates to Response.formData() Promise');
 runRequestPromiseTest(newStreamWithStartError(), 'json',        'ReadableStream start() Error propagates to Response.json() Promise');
 runRequestPromiseTest(newStreamWithStartError(), 'text',        'ReadableStream start() Error propagates to Response.text() Promise');
 
 // test pull() errors for all Body reader methods
 runRequestPromiseTest(newStreamWithPullError(), 'arrayBuffer', 'ReadableStream pull() Error propagates to Response.arrayBuffer() Promise');
 runRequestPromiseTest(newStreamWithPullError(), 'blob',        'ReadableStream pull() Error propagates to Response.blob() Promise');
+runRequestPromiseTest(newStreamWithPullError(), 'bytes',       'ReadableStream pull() Error propagates to Response.bytes() Promise');
 runRequestPromiseTest(newStreamWithPullError(), 'formData',    'ReadableStream pull() Error propagates to Response.formData() Promise');
 runRequestPromiseTest(newStreamWithPullError(), 'json',        'ReadableStream pull() Error propagates to Response.json() Promise');
 runRequestPromiseTest(newStreamWithPullError(), 'text',        'ReadableStream pull() Error propagates to Response.text() Promise');
diff --git a/fetch/api/response/response-stream-bad-chunk.any.js b/fetch/api/response/response-stream-bad-chunk.any.js
@@ -19,6 +19,7 @@ function runChunkTest(responseReaderMethod, testDescription) {
 
 runChunkTest('arrayBuffer', 'ReadableStream with non-Uint8Array chunk passed to Response.arrayBuffer() causes TypeError');
 runChunkTest('blob',        'ReadableStream with non-Uint8Array chunk passed to Response.blob() causes TypeError');
+runChunkTest('bytes',       'ReadableStream with non-Uint8Array chunk passed to Response.bytes() causes TypeError');
 runChunkTest('formData',    'ReadableStream with non-Uint8Array chunk passed to Response.formData() causes TypeError');
 runChunkTest('json',        'ReadableStream with non-Uint8Array chunk passed to Response.json() causes TypeError');
 runChunkTest('text',        'ReadableStream with non-Uint8Array chunk passed to Response.text() causes TypeError');
