feat(ext/fetch): `Request.bytes()` and `Response.bytes()` (#23823)

Closes #23790

4 files changed, 29 insertions, 31 deletions

diff --git a/tests/unit/fetch_test.ts b/tests/unit/fetch_test.ts
index 3202d40fa..4176f39ac 100644
--- a/tests/unit/fetch_test.ts
+++ b/tests/unit/fetch_test.ts
@@ -243,8 +243,8 @@ Deno.test({ permissions: { net: true } }, async function responseClone() {
   assert(response !== response1);
   assertEquals(response.status, response1.status);
   assertEquals(response.statusText, response1.statusText);
-  const u8a = new Uint8Array(await response.arrayBuffer());
-  const u8a1 = new Uint8Array(await response1.arrayBuffer());
+  const u8a = await response.bytes();
+  const u8a1 = await response1.bytes();
   for (let i = 0; i < u8a.byteLength; i++) {
     assertEquals(u8a[i], u8a1[i]);
   }
@@ -675,7 +675,7 @@ Deno.test(
         ["Foo", "Bar"],
       ],
     });
-    await response.arrayBuffer();
+    await response.body?.cancel();
     assertEquals(response.status, 404);
     assertEquals(response.headers.get("Content-Length"), "2");
 
@@ -709,7 +709,7 @@ Deno.test(
         ["Accept-Language", "en-US"],
       ],
     });
-    await response.arrayBuffer();
+    await response.body?.cancel();
     assertEquals(response.status, 404);
     assertEquals(response.headers.get("Content-Length"), "2");
 
@@ -743,7 +743,7 @@ Deno.test(
       ],
       body,
     });
-    await response.arrayBuffer();
+    await response.body?.cancel();
     assertEquals(response.status, 404);
     assertEquals(response.headers.get("Content-Length"), "2");
 
@@ -782,7 +782,7 @@ Deno.test(
       ],
       body,
     });
-    await response.arrayBuffer();
+    await response.body?.cancel();
     assertEquals(response.status, 404);
     assertEquals(response.headers.get("Content-Length"), "2");
 
@@ -816,7 +816,7 @@ Deno.test(
         ["Content-Length", "10"],
       ],
     });
-    await response.arrayBuffer();
+    await response.body?.cancel();
     assertEquals(response.status, 404);
     assertEquals(response.headers.get("Content-Length"), "2");
 
@@ -847,7 +847,7 @@ Deno.test(
         ["Transfer-Encoding", "chunked"],
       ],
     });
-    await response.arrayBuffer();
+    await response.body?.cancel();
     assertEquals(response.status, 404);
     assertEquals(response.headers.get("Content-Length"), "2");
 
@@ -933,7 +933,7 @@ Deno.test(function responseRedirectTakeURLObjectAsParameter() {
 
 Deno.test(async function responseWithoutBody() {
   const response = new Response();
-  assertEquals(await response.arrayBuffer(), new ArrayBuffer(0));
+  assertEquals(await response.bytes(), new Uint8Array(0));
   const blob = await response.blob();
   assertEquals(blob.size, 0);
   assertEquals(await blob.arrayBuffer(), new ArrayBuffer(0));
@@ -1214,7 +1214,7 @@ Deno.test(
       ],
       body: stream.readable,
     });
-    await response.arrayBuffer();
+    await response.body?.cancel();
     assertEquals(response.status, 404);
     assertEquals(response.headers.get("Content-Length"), "2");
 
@@ -1793,10 +1793,9 @@ Deno.test(
     const listener = invalidServer(addr, body);
     const response = await fetch(`http://${addr}/`);
 
-    const res = await response.arrayBuffer();
+    const res = await response.bytes();
     const buf = new TextEncoder().encode(data);
-    assertEquals(res.byteLength, buf.byteLength);
-    assertEquals(new Uint8Array(res), buf);
+    assertEquals(res, buf);
 
     listener.close();
   },
@@ -1850,10 +1849,10 @@ Deno.test(
 
     // If content-length < totalLength, a maximum of content-length bytes
     // should be returned.
-    const res = await response.arrayBuffer();
+    const res = await response.bytes();
     const buf = new TextEncoder().encode(data);
     assertEquals(res.byteLength, contentLength);
-    assertEquals(new Uint8Array(res), buf.subarray(contentLength));
+    assertEquals(res, buf.subarray(contentLength));
 
     listener.close();
   },
@@ -2029,7 +2028,7 @@ Deno.test(
 Deno.test("Request with subarray TypedArray body", async () => {
   const body = new Uint8Array([1, 2, 3, 4, 5]).subarray(1);
   const req = new Request("https://example.com", { method: "POST", body });
-  const actual = new Uint8Array(await req.arrayBuffer());
+  const actual = await req.bytes();
   const expected = new Uint8Array([2, 3, 4, 5]);
   assertEquals(actual, expected);
 });
@@ -2037,7 +2036,7 @@ Deno.test("Request with subarray TypedArray body", async () => {
 Deno.test("Response with subarray TypedArray body", async () => {
   const body = new Uint8Array([1, 2, 3, 4, 5]).subarray(1);
   const req = new Response(body);
-  const actual = new Uint8Array(await req.arrayBuffer());
+  const actual = await req.bytes();
   const expected = new Uint8Array([2, 3, 4, 5]);
   assertEquals(actual, expected);
 });
diff --git a/tests/unit/http_test.ts b/tests/unit/http_test.ts
index 607f2fc6e..f4fa62fa6 100644
--- a/tests/unit/http_test.ts
+++ b/tests/unit/http_test.ts
@@ -239,7 +239,7 @@ Deno.test(
       headers: { "connection": "close" },
     });
 
-    await resp.arrayBuffer();
+    await resp.body?.cancel();
     await promise;
   },
 );
@@ -963,7 +963,7 @@ Deno.test(
       await respondWith(new Response(f.readable, { status: 200 }));
     })();
     const resp = await fetch(`http://127.0.0.1:${listenPort}/`);
-    const body = await resp.arrayBuffer();
+    const body = await resp.bytes();
     assertEquals(body.byteLength, 70 * 1024);
     await promise;
     httpConn!.close();
@@ -1293,8 +1293,8 @@ Deno.test(
 
     const resp = await fetch(`http://localhost:${listenPort}/`);
     assertEquals(resp.status, 200);
-    const body = await resp.arrayBuffer();
-    assertEquals(new Uint8Array(body), new Uint8Array([128]));
+    const body = await resp.bytes();
+    assertEquals(body, new Uint8Array([128]));
 
     await promise;
     httpConn!.close();
diff --git a/tests/unit/serve_test.ts b/tests/unit/serve_test.ts
index 74628ace1..f7f01076b 100644
--- a/tests/unit/serve_test.ts
+++ b/tests/unit/serve_test.ts
@@ -340,7 +340,7 @@ Deno.test(
       });
 
       const resp = await fetch(`http://localhost:${servePort}`);
-      dataPromise = resp.arrayBuffer();
+      dataPromise = resp.bytes();
     }
 
     assertEquals((await dataPromise).byteLength, 1048576);
@@ -358,7 +358,7 @@ Deno.test(
 
     const [_, data] = await Promise.all([
       server.shutdown(),
-      resp.arrayBuffer(),
+      resp.bytes(),
     ]);
 
     assertEquals(data.byteLength, 1048576);
@@ -1861,13 +1861,12 @@ Deno.test(
       signal: ac.signal,
     });
     const response = await fetch(`http://localhost:${servePort}/`);
-    const body = await response.arrayBuffer();
+    const body = await response.bytes();
     assertEquals(1024 * 1024, body.byteLength);
-    const buffer = new Uint8Array(body);
     for (let i = 0; i < 256; i++) {
       assertEquals(
         i,
-        buffer[i * 4096],
+        body[i * 4096],
         `sentinel mismatch at index ${i * 4096}`,
       );
     }
@@ -2078,8 +2077,8 @@ Deno.test(
     await deferred.promise;
 
     assertEquals(resp.status, 200);
-    const body = await resp.arrayBuffer();
-    assertEquals(new Uint8Array(body), new Uint8Array([128]));
+    const body = await resp.bytes();
+    assertEquals(body, new Uint8Array([128]));
 
     ac.abort();
     await server.finished;
@@ -2694,7 +2693,7 @@ for (const testCase of compressionTestCases) {
             headers: testCase.in as HeadersInit,
           });
           await deferred.promise;
-          const body = await resp.arrayBuffer();
+          const body = await resp.bytes();
           if (testCase.expect == null) {
             assertEquals(body.byteLength, testCase.length);
             assertEquals(
@@ -2731,7 +2730,7 @@ Deno.test(
     const server = Deno.serve({
       handler: async (request) => {
         assertEquals(
-          new Uint8Array(await request.arrayBuffer()),
+          await request.bytes(),
           makeTempData(70 * 1024),
         );
         deferred.resolve();
diff --git a/tests/unit/worker_test.ts b/tests/unit/worker_test.ts
index 33e25f70e..a66eb69a9 100644
--- a/tests/unit/worker_test.ts
+++ b/tests/unit/worker_test.ts
@@ -689,7 +689,7 @@ Deno.test({
 
     assert(worker);
     const response = await fetch("http://localhost:4506");
-    assert(await response.arrayBuffer());
+    assert(await response.bytes());
     worker.terminate();
   },
 });