chore: add body mixin tests

Author: acostalima

package-lock.json

@@ -21,14 +21,16 @@
     "eslint": "^6.5.1",
     "eslint-config-prettier": "^6.15.0",
     "eslint-plugin-flowtype": "^5.2.0",
+    "execa": "^5.0.0",
     "flow-bin": "^0.136.0",
     "querystring": "^0.2.0",
     "react-native-polyfill-globals": "^1.0.7",
     "react-native-test-runner": "^1.0.8"
   },
   "files": [
     "src",
-    "fetch.js"
+    "fetch.js",
+    "fetch.js.flow"
   ],
   "scripts": {
     "flow": "flow",

package.json

@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+const execa = require("execa");
+const createServer = require("./test/server");
+
+async function run() {
+    createServer();
+
+    try {
+        const result = await execa("rn-test", process.argv.slice(2), {
+            preferLocal: true,
+            stdio: ["ignore", "inherit", "inherit"],
+        });
+        process.exit(result.exitCode);
+    } catch (error) {
+        process.exit(error.exitCode);
+    }
+}
+
+run();

run-tests.js

@@ -46,9 +46,6 @@ class Fetch {
 
     constructor(resource, options = {}) {
         this._request = new Request(resource, options);
-        this._nativeResponseType = options.reactNative?.textStreaming
-            ? "text"
-            : this._nativeResponseType;
         this._abortFn = this.__abort.bind(this);
         this._deferredPromise = pDefer();
 
@@ -60,11 +57,23 @@ class Fetch {
             throw new AbortError();
         }
 
+        this.__setNativeResponseType(options);
         this.__doFetch();
 
         return this._deferredPromise.promise;
     }
 
+    __setNativeResponseType(options) {
+        if (options.textStreaming) {
+            this._nativeResponseType = "text";
+
+            return;
+        }
+
+        this._nativeResponseType =
+            options.__nativeResponseType ?? this._nativeResponseType;
+    }
+
     __subscribeToNetworkEvents() {
         [
             "didReceiveNetworkResponse",
@@ -113,17 +122,18 @@ class Fetch {
     }
 
     __didCreateRequest(requestId) {
-        console.log("fetch __didCreateRequest", { requestId });
+        // console.log("fetch __didCreateRequest", { requestId });
         this._requestId = requestId;
     }
 
     __didReceiveNetworkResponse(requestId, status, headers, url) {
-        console.log("fetch __didReceiveNetworkResponse", {
-            requestId,
-            status,
-            headers,
-            url,
-        });
+        // console.log("fetch __didReceiveNetworkResponse", {
+        //     requestId,
+        //     status,
+        //     headers,
+        //     url,
+        // });
+
         if (requestId !== this._requestId) {
             return;
         }
@@ -146,7 +156,7 @@ class Fetch {
     }
 
     __didReceiveNetworkData(requestId, response) {
-        console.log("fetch __didReceiveNetworkData", { requestId, response });
+        // console.log("fetch __didReceiveNetworkData", { requestId, response });
         if (requestId !== this._requestId) {
             return;
         }
@@ -160,12 +170,12 @@ class Fetch {
         progress,
         total
     ) {
-        console.log("fetch __didReceiveNetworkIncrementalData", {
-            requestId,
-            responseText,
-            progress,
-            total,
-        });
+        // console.log("fetch __didReceiveNetworkIncrementalData", {
+        //     requestId,
+        //     responseText,
+        //     progress,
+        //     total,
+        // });
         if (requestId !== this._requestId) {
             return;
         }
@@ -184,11 +194,12 @@ class Fetch {
     // }
 
     async __didCompleteNetworkResponse(requestId, errorMessage, didTimeOut) {
-        console.log("fetch __didCompleteNetworkResponse", {
-            requestId,
-            errorMessage,
-            didTimeOut,
-        });
+        // console.log("fetch __didCompleteNetworkResponse", {
+        //     requestId,
+        //     errorMessage,
+        //     didTimeOut,
+        // });
+
         if (requestId !== this._requestId) {
             return;
         }
@@ -223,19 +234,23 @@ class Fetch {
             ResponseClass = StreamArrayBufferResponse;
         }
 
-        this._response = await new ResponseClass(
-            this._nativeResponse,
-            this._stream,
-            this._streamController,
-            {
-                status: this._responseStatus,
-                url: this._responseUrl,
-                headers: this._nativeResponseHeaders,
-            }
-        );
-
-        this._deferredPromise.resolve(this._response);
-        this.__closeStream();
+        try {
+            this._response = await new ResponseClass(
+                this._nativeResponse,
+                this._stream,
+                this._streamController,
+                {
+                    status: this._responseStatus,
+                    url: this._responseUrl,
+                    headers: this._nativeResponseHeaders,
+                }
+            );
+            this._deferredPromise.resolve(this._response);
+        } catch (error) {
+            this._deferredPromise.reject(error);
+        } finally {
+            this.__closeStream();
+        }
     }
 
     __closeStream() {

src/Fetch.js

@@ -3,24 +3,29 @@ import Response from "./Response";
 import { createBlobReader } from "./utils";
 
 class StreamBlobResponse {
-    constructor(blobData, stream, streamController, options, blobArrayBuffer) {
+    constructor(
+        blobData,
+        stream,
+        streamController,
+        options /* , blobArrayBuffer */
+    ) {
         const blob = BlobManager.createFromOptions(blobData);
         this._blobData = blobData;
         this._blobResponse = new Response(blob, options);
         this._streamResponse = new Response(stream, options);
 
-        if (blobArrayBuffer) {
-            this._blobArrayBuffer = blobArrayBuffer;
-            this._arrayBufferResponse = new Response(blobArrayBuffer, options);
-            streamController.enqueue(new Uint8Array(blobArrayBuffer));
+        // if (blobArrayBuffer) {
+        //     this._blobArrayBuffer = blobArrayBuffer;
+        //     this._arrayBufferResponse = new Response(blobArrayBuffer, options);
+        //     streamController.enqueue(new Uint8Array(blobArrayBuffer));
 
-            return this;
-        }
+        //     return this;
+        // }
 
         return createBlobReader(blob)
             .readAsArrayBuffer()
             .then((arrayBuffer) => {
-                this._blobArrayBuffer = arrayBuffer;
+                // this._blobArrayBuffer = arrayBuffer;
                 this._arrayBufferResponse = new Response(arrayBuffer, options);
                 streamController.enqueue(new Uint8Array(arrayBuffer));