Add support of switch chunked transfer encoding #117

Author: wkh237

src/android/src/main/java/com/RNFetchBlob/RNFetchBlobBody.java

@@ -34,42 +34,35 @@ public class RNFetchBlobBody extends RequestBody{
     RNFetchBlobReq.RequestType requestType;
     MediaType mime;
     File bodyCache;
+    Boolean chunkedEncoding = false;
 
 
-    /**
-     * Single file or raw content request constructor
-     * @param taskId
-     * @param type
-     * @param form
-     * @param contentType
-     */
-    public RNFetchBlobBody(String taskId, RNFetchBlobReq.RequestType type, ReadableArray form, MediaType contentType) {
+    public RNFetchBlobBody(String taskId) {
         this.mTaskId = taskId;
-        this.form = form;
-        requestType = type;
-        mime = contentType;
-        try {
-            bodyCache = createMultipartBodyCache();
-            requestStream = new FileInputStream(bodyCache);
-            contentLength = bodyCache.length();
-        } catch(Exception ex) {
-            ex.printStackTrace();
-            RNFetchBlobUtils.emitWarningEvent("RNFetchBlob failed to create request multipart body :" + ex.getLocalizedMessage());
-        }
+    }
+
+    RNFetchBlobBody chunkedEncoding(boolean val) {
+        this.chunkedEncoding = val;
+        return this;
+    }
+
+    RNFetchBlobBody setMIME(MediaType mime) {
+        this.mime = mime;
+        return this;
+    }
+
+    RNFetchBlobBody setRequestType( RNFetchBlobReq.RequestType type) {
+        this.requestType = type;
+        return this;
     }
 
     /**
-     * Multipart request constructor
-     * @param taskId
-     * @param type
-     * @param rawBody
-     * @param contentType
+     * Set request body
+     * @param body A string represents the request body
+     * @return object itself
      */
-    public RNFetchBlobBody(String taskId, RNFetchBlobReq.RequestType type, String rawBody, MediaType contentType) {
-        this.mTaskId = taskId;
-        requestType = type;
-        this.rawBody = rawBody;
-        mime = contentType;
+    RNFetchBlobBody setBody(String body) {
+        this.rawBody = body;
         if(rawBody == null) {
             this.rawBody = "";
             requestType = RNFetchBlobReq.RequestType.AsIs;
@@ -90,19 +83,37 @@ public RNFetchBlobBody(String taskId, RNFetchBlobReq.RequestType type, String ra
             ex.printStackTrace();
             RNFetchBlobUtils.emitWarningEvent("RNFetchBlob failed to create single content request body :" + ex.getLocalizedMessage() + "\r\n");
         }
+        return this;
+    }
 
+    /**
+     * Set request body (Array)
+     * @param body A Readable array contains form data
+     * @return object itself
+     */
+    RNFetchBlobBody setBody(ReadableArray body) {
+        this.form = body;
+        try {
+            bodyCache = createMultipartBodyCache();
+            requestStream = new FileInputStream(bodyCache);
+            contentLength = bodyCache.length();
+        } catch(Exception ex) {
+            ex.printStackTrace();
+            RNFetchBlobUtils.emitWarningEvent("RNFetchBlob failed to create request multipart body :" + ex.getLocalizedMessage());
+        }
+        return this;
     }
 
     @Override
     public long contentLength() {
-        return contentLength;
+        return chunkedEncoding ? -1 : contentLength;
     }
 
     @Override
     public MediaType contentType() {
         return mime;
     }
-    
+
     @Override
     public void writeTo(BufferedSink sink) {
         try {

src/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java

@@ -17,7 +17,6 @@
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
-import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
@@ -33,7 +32,6 @@
 import java.nio.charset.CharacterCodingException;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.concurrent.TimeUnit;
 
@@ -74,7 +72,6 @@ enum ResponseType {
 
     ReactApplicationContext ctx;
     RNFetchBlobConfig options;
-    ArrayList<String> redirects = new ArrayList<>();
     String taskId;
     String method;
     String url;
@@ -107,7 +104,7 @@ public RNFetchBlobReq(ReadableMap options, String taskId, String method, String
             responseType = ResponseType.KeepInMemory;
 
 
-		if (body != null)
+        if (body != null)
             requestType = RequestType.SingleFile;
         else if (arrayBody != null)
             requestType = RequestType.Form;
@@ -159,21 +156,21 @@ public void run() {
 
         // find cached result if `key` property exists
         String cacheKey = this.taskId;
-		String ext = this.options.appendExt.isEmpty() ? "." + this.options.appendExt : "";
+        String ext = this.options.appendExt.isEmpty() ? "." + this.options.appendExt : "";
 
-       	if (this.options.key != null) {
-           cacheKey = RNFetchBlobUtils.getMD5(this.options.key);
-           if (cacheKey == null) {
-               cacheKey = this.taskId;
-           }
+        if (this.options.key != null) {
+            cacheKey = RNFetchBlobUtils.getMD5(this.options.key);
+            if (cacheKey == null) {
+                cacheKey = this.taskId;
+            }
 
-           File file = new File(RNFetchBlobFS.getTmpPath(RNFetchBlob.RCTContext, cacheKey) + ext);
+            File file = new File(RNFetchBlobFS.getTmpPath(RNFetchBlob.RCTContext, cacheKey) + ext);
 
-           if (file.exists()) {
-               callback.invoke(null, RNFetchBlobConst.RNFB_RESPONSE_PATH, file.getAbsolutePath());
-               return;
-           }
-       }
+            if (file.exists()) {
+                callback.invoke(null, RNFetchBlobConst.RNFB_RESPONSE_PATH, file.getAbsolutePath());
+                return;
+            }
+        }
 
         if(this.options.path != null)
             this.destPath = this.options.path;
@@ -239,35 +236,33 @@ else if(cType.isEmpty()) {
                 requestType = RequestType.WithoutBody;
             }
 
+            boolean isChunkedRequest = getHeaderIgnoreCases(mheaders, "Transfer-Encoding").equalsIgnoreCase("chunked");
 
             // set request body
             switch (requestType) {
                 case SingleFile:
-                    requestBody = new RNFetchBlobBody(
-                            taskId,
-                            requestType,
-                            rawRequestBody,
-                            MediaType.parse(getHeaderIgnoreCases(mheaders, "content-type"))
-                    );
+                    requestBody = new RNFetchBlobBody(taskId)
+                            .chunkedEncoding(isChunkedRequest)
+                            .setRequestType(requestType)
+                            .setBody(rawRequestBody)
+                            .setMIME(MediaType.parse(getHeaderIgnoreCases(mheaders, "content-type")));
                     builder.method(method, requestBody);
                     break;
                 case AsIs:
-                    requestBody = new RNFetchBlobBody(
-                            taskId,
-                            requestType,
-                            rawRequestBody,
-                            MediaType.parse(getHeaderIgnoreCases(mheaders, "content-type"))
-                    );
+                    requestBody = new RNFetchBlobBody(taskId)
+                            .chunkedEncoding(isChunkedRequest)
+                            .setRequestType(requestType)
+                            .setBody(rawRequestBody)
+                            .setMIME(MediaType.parse(getHeaderIgnoreCases(mheaders, "content-type")));
                     builder.method(method, requestBody);
                     break;
                 case Form:
                     String boundary = "RNFetchBlob-" + taskId;
-                    requestBody = new RNFetchBlobBody(
-                            taskId,
-                            requestType,
-                            rawRequestBodyArray,
-                            MediaType.parse("multipart/form-data; boundary="+ boundary)
-                    );
+                    requestBody = new RNFetchBlobBody(taskId)
+                            .chunkedEncoding(isChunkedRequest)
+                            .setRequestType(requestType)
+                            .setBody(rawRequestBodyArray)
+                            .setMIME(MediaType.parse("multipart/form-data; boundary="+ boundary));
                     builder.method(method, requestBody);
                     break;
 
@@ -283,15 +278,6 @@ else if(cType.isEmpty()) {
 
             final Request req = builder.build();
 
-            // intercept network redirections
-            clientBuilder.addNetworkInterceptor(new Interceptor() {
-                @Override
-                public Response intercept(Chain chain) throws IOException {
-                    redirects.add(chain.request().url().toString());
-                    return chain.proceed(chain.request());
-                }
-            });
-
             // Add request interceptor for upload progress event
             clientBuilder.addInterceptor(new Interceptor() {
                 @Override
@@ -468,7 +454,9 @@ private void done(Response resp) {
                     // It uses customized response body which is able to report download progress
                     // and write response data to destination path.
                     resp.body().bytes();
-                } catch (Exception ignored) {  }
+                } catch (Exception ignored) {
+                    ignored.printStackTrace();
+                }
                 callback.invoke(null, RNFetchBlobConst.RNFB_RESPONSE_PATH, this.destPath);
                 break;
             default:
@@ -521,11 +509,6 @@ private WritableMap getResponseInfo(Response resp, boolean isBlobResp) {
             headers.putString(resp.headers().name(i), resp.headers().value(i));
         }
         info.putMap("headers", headers);
-        WritableArray redirectList = Arguments.createArray();
-        for(String r : redirects) {
-            redirectList.pushString(r);
-        }
-        info.putArray("redirects", redirectList);
         Headers h = resp.headers();
         if(isBlobResp) {
             info.putString("respType", "blob");

src/ios/RNFetchBlobReqBuilder.m

@@ -90,6 +90,7 @@ +(void) buildOctetRequest:(NSDictionary *)options
             // generate octet-stream body
             if(body != nil) {
                 __block NSString * cType = [[self class] getHeaderIgnoreCases:@"content-type" fromHeaders:mheaders];
+                __block NSString * transferEncoding = [[self class] getHeaderIgnoreCases:@"transfer-encoding" fromHeaders:mheaders];
                 // when headers does not contain a key named "content-type" (case ignored), use default content type
                 if(cType == nil)
                 {
@@ -111,7 +112,14 @@ +(void) buildOctetRequest:(NSDictionary *)options
                         return;
                     }
                     size = [[[NSFileManager defaultManager] attributesOfItemAtPath:orgPath error:nil] fileSize];
-                    [request setHTTPBodyStream: [NSInputStream inputStreamWithFileAtPath:orgPath ]];
+                    if(transferEncoding != nil && [[transferEncoding lowercaseString] isEqualToString:@"chunked"])
+                    {
+                        [request setHTTPBodyStream: [NSInputStream inputStreamWithFileAtPath:orgPath ]];
+                    }
+                    else
+                    {
+                        [request setHTTPBody:[NSData dataWithContentsOfFile:orgPath ]];
+                    }
                 }
                 // otherwise convert it as BASE64 data string
                 else {