Follow spec and fix tests

Author: slightlytyler

src/Body.js

@@ -6,6 +6,7 @@ class Body {
         this._bodyInit = body;
 
         if (!body) {
+            this._bodyNull = true;
             this._bodyText = "";
             return this;
         }
@@ -179,6 +180,10 @@ class Body {
     }
 
     get body() {
+        if (this._bodyNull) {
+            return null;
+        }
+
         if (this._bodyReadableStream) {
             return this._bodyReadableStream;
         }
@@ -228,6 +233,16 @@ class Body {
             },
         });
     }
+
+    clone() {
+        if (this._bodyReadableStream) {
+            const [stream1, stream2] = this._bodyReadableStream.tee();
+            this._bodyReadableStream = stream1;
+            return new Body(stream2);
+        } else {
+            return new Body(this._bodyInit);
+        }
+    }
 }
 
 export default Body;

src/Fetch.js

@@ -4,7 +4,6 @@ import Request from "./Request";
 import Response from "./Response";
 import BlobResponse from "./BlobResponse";
 import ArrayBufferResponse from "./ArrayBufferResponse";
-import StreamControllersController from "./StreamControllersController";
 
 class AbortError extends Error {
     constructor() {
@@ -14,6 +13,22 @@ class AbortError extends Error {
     }
 }
 
+function createStream(cancel) {
+    let streamController;
+
+    const stream = new ReadableStream({
+        start(controller) {
+            streamController = controller;
+        },
+        cancel,
+    });
+
+    return {
+        stream,
+        streamController,
+    };
+}
+
 class Fetch {
     _nativeNetworkSubscriptions = new Set();
     _nativeResponseType = "blob";
@@ -124,11 +139,9 @@ class Fetch {
             return;
         }
 
-        const streamController = new StreamControllersController({
-            cancelRequest: () => {
-                this.__clearNetworkSubscriptions();
-                Networking.abortRequest(this._requestId);
-            },
+        const { stream, streamController } = createStream(() => {
+            this.__clearNetworkSubscriptions();
+            Networking.abortRequest(this._requestId);
         });
 
         this._streamController = streamController;
@@ -137,7 +150,7 @@ class Fetch {
         this._responseUrl = url;
 
         if (this._nativeResponseType === "text") {
-            this._response = new Response(streamController, {
+            this._response = new Response(stream, {
                 status,
                 headers,
                 url,

src/Response.js

@@ -1,7 +1,5 @@
 import Body from "./Body";
 import Headers from "./Headers";
-import StreamControllersController from "./StreamControllersController";
-import { createStream } from "./utils";
 
 class Response {
     constructor(bodyInit, options = {}) {
@@ -11,16 +9,7 @@ class Response {
         this.statusText = options.statusText ?? "";
         this.headers = new Headers(options.headers);
         this.url = options.url ?? "";
-        this._bodyInit = bodyInit;
-        if (bodyInit instanceof StreamControllersController) {
-            const { stream, streamController } = createStream(() => {
-                bodyInit.cancelRequest();
-            });
-            bodyInit.registerController(streamController);
-            this._body = new Body(stream);
-        } else {
-            this._body = new Body(bodyInit);
-        }
+        this._body = new Body(bodyInit);
 
         if (!this.headers.has("content-type") && this._body._mimeType) {
             this.headers.set("content-type", this._body._mimeType);
@@ -32,12 +21,14 @@ class Response {
     }
 
     clone() {
-        return new Response(this._bodyInit, {
+        const newResponse = new Response(null, {
             status: this.status,
             statusText: this.statusText,
             headers: new Headers(this.headers),
             url: this.url,
         });
+        newResponse._body = this._body.clone();
+        return newResponse;
     }
 
     blob() {

src/StreamControllersController.js

@@ -21,22 +21,6 @@ function createBlobReader(blob) {
     };
 }
 
-function createStream(cancel) {
-    let streamController;
-
-    const stream = new ReadableStream({
-        start(controller) {
-            streamController = controller;
-        },
-        cancel,
-    });
-
-    return {
-        stream,
-        streamController,
-    };
-}
-
 async function drainStream(stream) {
     const chunks = [];
     const reader = stream.getReader();
@@ -67,4 +51,4 @@ function readArrayBufferAsText(array) {
     return decoder.decode(array);
 }
 
-export { createBlobReader, createStream, drainStream, readArrayBufferAsText };
+export { createBlobReader, drainStream, readArrayBufferAsText };

src/utils.js

@@ -1015,7 +1015,7 @@ test("response", (t) => {
         }
     );
 
-    t.skip("consume request body as stream when input is stream", async (t) => {
+    t.test("consume request body as stream when input is stream", async (t) => {
         const rs = new ReadableStream({
             async pull(c) {
                 await delay(100);
@@ -1033,7 +1033,7 @@ test("response", (t) => {
         t.eq(text, "Hello world!");
     });
 
-    t.skip("consume request body as text when input is stream", async (t) => {
+    t.test("consume request body as text when input is stream", async (t) => {
         const rs = new ReadableStream({
             async pull(c) {
                 await delay(100);
@@ -1070,7 +1070,7 @@ test("response", (t) => {
         t.eq(text, "Hello world!");
     });
 
-    t.skip(
+    t.test(
         "consume request body as ArrayBuffer when input is stream",
         async (t) => {
             const rs = new ReadableStream({
@@ -1858,7 +1858,7 @@ test("fetch method", (t) => {
     });
 
     t.test("cloning", (t) => {
-        t.skip("cloning response from text stream", async (t) => {
+        t.test("cloning response from text stream", async (t) => {
             const url = new URL("/stream", BASE_URL);
             const res = await fetch(url, {
                 reactNative: { textStreaming: true },