Merge branch '0.5.2'

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

@@ -160,18 +160,10 @@ public class RNFetchBlob extends ReactContextBaseJavaModule {
         RNFetchBlobConfig config = new RNFetchBlobConfig(options);
 
         try {
-            Uri uri = Uri.parse(url);
             AsyncHttpClient req = new AsyncHttpClient();
 
-            // set params
-            RequestParams params = new RequestParams();
             AbstractHttpEntity entity = null;
 
-            // set params
-            for (String paramName : uri.getQueryParameterNames()) {
-                params.put(paramName, uri.getQueryParameter(paramName));
-            }
-
             // set headers
             ReadableMapKeySetIterator it = headers.keySetIterator();
             while (it.hasNextKey()) {
@@ -212,7 +204,7 @@ public class RNFetchBlob extends ReactContextBaseJavaModule {
             // send request
             switch(method.toLowerCase()) {
                 case "get" :
-                    req.get(url, params, handler);
+                    req.get(url, handler);
                     break;
                 case "post" :
                     req.post(this.getReactApplicationContext(), url, entity, "octet-stream", handler);
@@ -221,7 +213,7 @@ public class RNFetchBlob extends ReactContextBaseJavaModule {
                     req.put(this.getReactApplicationContext(), url, entity, "octet-stream",handler);
                     break;
                 case "delete" :
-                    req.delete(url, params, handler);
+                    req.delete(url, handler);
                     break;
             }
         } catch(Exception error) {
@@ -235,16 +227,10 @@ public class RNFetchBlob extends ReactContextBaseJavaModule {
 
         RNFetchBlobConfig config = new RNFetchBlobConfig(options);
         try {
-            Uri uri = Uri.parse(url);
+
             AsyncHttpClient req = new AsyncHttpClient();
 
-            // set params
-            RequestParams params = new RequestParams();
             HttpEntity entity = null;
-            // set params
-            for (String paramName : uri.getQueryParameterNames()) {
-                params.put(paramName, uri.getQueryParameter(paramName));
-            }
 
             // set headers
             if(headers != null) {
@@ -307,7 +293,7 @@ public class RNFetchBlob extends ReactContextBaseJavaModule {
             // send request
             switch(method.toLowerCase()) {
                 case "get" :
-                    req.get(url, params, handler);
+                    req.get(url, handler);
                     break;
                 case "post" :
                     req.post(this.getReactApplicationContext(), url, entity, "multipart/form-data; charset=utf8", handler);
@@ -316,7 +302,7 @@ public class RNFetchBlob extends ReactContextBaseJavaModule {
                     req.put(this.getReactApplicationContext(), url, entity, "multipart/form-data",handler);
                     break;
                 case "delete" :
-                    req.delete(url, params, handler);
+                    req.delete(url, handler);
                     break;
             }
         } catch(Exception error) {

src/index.js

@@ -104,7 +104,6 @@ function fetch(...args:any):Promise {
   let options = this || {}
 
   let promise = new Promise((resolve, reject) => {
-
     let [method, url, headers, body] = [...args]
     let nativeMethodName = Array.isArray(body) ? 'fetchBlobForm' : 'fetchBlob'
 

src/ios/RNFetchBlob.xcodeproj/project.pbxproj

@@ -9,7 +9,7 @@
 /* Begin PBXBuildFile section */
 		A158F4271D052E49006FFD38 /* RNFetchBlobFS.m in Sources */ = {isa = PBXBuildFile; fileRef = A158F4261D052E49006FFD38 /* RNFetchBlobFS.m */; };
 		A158F42D1D0535BB006FFD38 /* RNFetchBlobConst.m in Sources */ = {isa = PBXBuildFile; fileRef = A158F42C1D0535BB006FFD38 /* RNFetchBlobConst.m */; };
-		A158F4301D0539DB006FFD38 /* RNFetchBlobResp.m in Sources */ = {isa = PBXBuildFile; fileRef = A158F42F1D0539DB006FFD38 /* RNFetchBlobResp.m */; };
+		A158F4301D0539DB006FFD38 /* RNFetchBlobNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = A158F42F1D0539DB006FFD38 /* RNFetchBlobNetwork.m */; };
 		A15C30141CD25C330074CB35 /* RNFetchBlob.m in Sources */ = {isa = PBXBuildFile; fileRef = A15C30131CD25C330074CB35 /* RNFetchBlob.m */; };
 		A166D1AA1CE0647A00273590 /* RNFetchBlob.h in Sources */ = {isa = PBXBuildFile; fileRef = A15C30111CD25C330074CB35 /* RNFetchBlob.h */; };
 /* End PBXBuildFile section */
@@ -31,8 +31,8 @@
 		A158F4281D052E57006FFD38 /* RNFetchBlobFS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFetchBlobFS.h; sourceTree = "<group>"; };
 		A158F4291D0534A9006FFD38 /* RNFetchBlobConst.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFetchBlobConst.h; sourceTree = "<group>"; };
 		A158F42C1D0535BB006FFD38 /* RNFetchBlobConst.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNFetchBlobConst.m; sourceTree = "<group>"; };
-		A158F42E1D0539CE006FFD38 /* RNFetchBlobResp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFetchBlobResp.h; sourceTree = "<group>"; };
-		A158F42F1D0539DB006FFD38 /* RNFetchBlobResp.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNFetchBlobResp.m; sourceTree = "<group>"; };
+		A158F42E1D0539CE006FFD38 /* RNFetchBlobNetwork.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFetchBlobNetwork.h; sourceTree = "<group>"; };
+		A158F42F1D0539DB006FFD38 /* RNFetchBlobNetwork.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNFetchBlobNetwork.m; sourceTree = "<group>"; };
 		A15C300E1CD25C330074CB35 /* libRNFetchBlob.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNFetchBlob.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		A15C30111CD25C330074CB35 /* RNFetchBlob.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RNFetchBlob.h; path = RNFetchBlob/RNFetchBlob.h; sourceTree = "<group>"; };
 		A15C30131CD25C330074CB35 /* RNFetchBlob.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RNFetchBlob.m; path = RNFetchBlob/RNFetchBlob.m; sourceTree = "<group>"; };
@@ -59,8 +59,8 @@
 		A15C30051CD25C330074CB35 = {
 			isa = PBXGroup;
 			children = (
-				A158F42F1D0539DB006FFD38 /* RNFetchBlobResp.m */,
-				A158F42E1D0539CE006FFD38 /* RNFetchBlobResp.h */,
+				A158F42F1D0539DB006FFD38 /* RNFetchBlobNetwork.m */,
+				A158F42E1D0539CE006FFD38 /* RNFetchBlobNetwork.h */,
 				A158F42C1D0535BB006FFD38 /* RNFetchBlobConst.m */,
 				A158F4291D0534A9006FFD38 /* RNFetchBlobConst.h */,
 				A158F4281D052E57006FFD38 /* RNFetchBlobFS.h */,
@@ -139,7 +139,7 @@
 				A166D1AA1CE0647A00273590 /* RNFetchBlob.h in Sources */,
 				A158F42D1D0535BB006FFD38 /* RNFetchBlobConst.m in Sources */,
 				A158F4271D052E49006FFD38 /* RNFetchBlobFS.m in Sources */,
-				A158F4301D0539DB006FFD38 /* RNFetchBlobResp.m in Sources */,
+				A158F4301D0539DB006FFD38 /* RNFetchBlobNetwork.m in Sources */,
 				A15C30141CD25C330074CB35 /* RNFetchBlob.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

src/ios/RNFetchBlob/RNFetchBlob.m

@@ -10,7 +10,7 @@
 #import "RCTBridge.h"
 #import "RCTEventDispatcher.h"
 #import "RNFetchBlobFS.h"
-#import "RNFetchBlobResp.h"
+#import "RNFetchBlobNetwork.h"
 #import "RNFetchBlobConst.h"
 
 
@@ -61,13 +61,13 @@ RCT_EXPORT_METHOD(fetchBlobForm:(NSDictionary *)options
                   form:(NSArray *)form
                   callback:(RCTResponseSenderBlock)callback)
 {
-    
+    NSString * encodedUrl = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
     // send request
     NSMutableURLRequest *request = [[NSMutableURLRequest alloc]
                                     initWithURL:[NSURL
-                                                 URLWithString: url]];
+                                                 URLWithString: encodedUrl]];
     
-    NSMutableDictionary *mheaders = [[NSMutableDictionary alloc] initWithDictionary:[ FetchBlobUtils normalizeHeaders:headers]];
+    NSMutableDictionary *mheaders = [[NSMutableDictionary alloc] initWithDictionary:[ RNFetchBlobNetwork normalizeHeaders:headers]];
     
     
     NSTimeInterval timeStamp = [[NSDate date] timeIntervalSince1970];
@@ -76,9 +76,9 @@ RCT_EXPORT_METHOD(fetchBlobForm:(NSDictionary *)options
     // generate boundary
     NSString * boundary = [NSString stringWithFormat:@"RNFetchBlob%d", timeStampObj];
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        NSMutableData * postData = [[NSMutableData alloc] init];
         // if method is POST or PUT, convert data string format
         if([[method lowercaseString] isEqualToString:@"post"] || [[method lowercaseString] isEqualToString:@"put"]) {
-            NSMutableData * postData = [[NSMutableData alloc] init];
             
             // combine multipart/form-data body
             for(id field in form) {
@@ -128,7 +128,7 @@ RCT_EXPORT_METHOD(fetchBlobForm:(NSDictionary *)options
         
         
         // send HTTP request
-        FetchBlobUtils * utils = [[FetchBlobUtils alloc] init];
+        RNFetchBlobNetwork * utils = [[RNFetchBlobNetwork alloc] init];
         [utils sendRequest:options bridge:self.bridge taskId:taskId withRequest:request callback:callback];
     });
 }
@@ -141,29 +141,33 @@ RCT_EXPORT_METHOD(fetchBlob:(NSDictionary *)options
                   headers:(NSDictionary *)headers
                   body:(NSString *)body callback:(RCTResponseSenderBlock)callback)
 {
+    NSString * encodedUrl = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
     // send request
     NSMutableURLRequest *request = [[NSMutableURLRequest alloc]
                                     initWithURL:[NSURL
-                                                 URLWithString: url]];
+                                                 URLWithString: encodedUrl]];
     
-    NSMutableDictionary *mheaders = [[NSMutableDictionary alloc] initWithDictionary:[FetchBlobUtils normalizeHeaders:headers]];
+    NSMutableDictionary *mheaders = [[NSMutableDictionary alloc] initWithDictionary:[RNFetchBlobNetwork normalizeHeaders:headers]];
     // move heavy task to another thread
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        NSMutableData * blobData;
         // if method is POST or PUT, convert data string format
         if([[method lowercaseString] isEqualToString:@"post"] || [[method lowercaseString] isEqualToString:@"put"]) {
             // generate octet-stream body
             if(body != nil) {
-                NSMutableData * blobData;
                 
                 // when body is a string contains file path prefix, try load file from the path
                 if([body hasPrefix:self.filePathPrefix]) {
                     NSString * orgPath = [body substringFromIndex:[self.filePathPrefix length]];
-                    blobData = [[NSData alloc] initWithContentsOfFile:orgPath];
+                    [request setHTTPBodyStream: [NSInputStream inputStreamWithFileAtPath:orgPath ]];
+//                    blobData = [[NSData alloc] initWithContentsOfFile:orgPath];
                 }
                 // otherwise convert it as BASE64 data string
-                else
+                else {
                     blobData = [[NSData alloc] initWithBase64EncodedString:body options:0];
-                [request setHTTPBody:blobData];
+                    [request setHTTPBody:blobData];
+                }
+                
                 [mheaders setValue:@"application/octet-stream" forKey:@"content-type"];
                 
             }
@@ -173,7 +177,7 @@ RCT_EXPORT_METHOD(fetchBlob:(NSDictionary *)options
         [request setAllHTTPHeaderFields:mheaders];
         
         // send HTTP request
-        FetchBlobUtils * utils = [[FetchBlobUtils alloc] init];
+        RNFetchBlobNetwork * utils = [[RNFetchBlobNetwork alloc] init];
         [utils sendRequest:options bridge:self.bridge taskId:taskId withRequest:request callback:callback];
     });
 }

src/ios/RNFetchBlobResp.h → src/ios/RNFetchBlobNetwork.h

@@ -1,9 +1,9 @@
 //
-//  RNFetchBlobResp.h
+//  RNFetchBlobNetwork.h
 //  RNFetchBlob
 //
-//  Created by Ben Hsieh on 2016/6/6.
-//  Copyright © 2016年 suzuri04x2. All rights reserved.
+//  Created by wkh237 on 2016/6/6.
+//  Copyright © 2016 wkh237. All rights reserved.
 //
 
 #ifndef RNFetchBlobResp_h
@@ -12,7 +12,7 @@
 #import <Foundation/Foundation.h>
 #import "RCTBridgeModule.h"
 
-@interface FetchBlobUtils : NSObject  <NSURLConnectionDelegate, NSURLConnectionDataDelegate> {
+@interface RNFetchBlobNetwork : NSObject  <NSURLSessionDelegate, NSURLSessionTaskDelegate, NSURLSessionDataDelegate> {
     
     NSString * taskId;
     int expectedBytes;

src/ios/RNFetchBlobNetwork.m

@@ -0,0 +1,180 @@
+//
+//  RNFetchBlobNetwork.m
+//  RNFetchBlob
+//
+//  Created by wkh237 on 2016/6/6.
+//  Copyright © 2016 wkh237. All rights reserved.
+//
+
+#import "RCTConvert.h"
+#import "RCTLog.h"
+#import <Foundation/Foundation.h>
+#import "RCTBridge.h"
+#import "RCTEventDispatcher.h"
+#import "RNFetchBlobFS.h"
+#import "RNFetchBlobNetwork.h"
+#import "RNFetchBlobConst.h"
+
+////////////////////////////////////////
+//
+//  HTTP request handler
+//
+////////////////////////////////////////
+
+@implementation RNFetchBlobNetwork
+
+
+@synthesize taskId;
+@synthesize expectedBytes;
+@synthesize receivedBytes;
+@synthesize respData;
+@synthesize callback;
+@synthesize bridge;
+@synthesize options;
+
+// constructor
+- (id)init {
+    self = [super init];
+    return self;
+}
+
+
+// removing case from headers
++ (NSMutableDictionary *) normalizeHeaders:(NSDictionary *)headers {
+    
+    NSMutableDictionary * mheaders = [[NSMutableDictionary alloc]init];
+    for(NSString * key in headers) {
+        [mheaders setValue:[headers valueForKey:key] forKey:[key lowercaseString]];
+    }
+    
+    return mheaders;
+}
+
+// send HTTP request
+- (void) sendRequest:(NSDictionary *)options bridge:(RCTBridge *)bridgeRef taskId:(NSString *)taskId withRequest:(NSURLRequest *)req callback:(RCTResponseSenderBlock) callback {
+    self.taskId = taskId;
+    self.respData = [[NSMutableData alloc] initWithLength:0];
+    self.callback = callback;
+    self.bridge = bridgeRef;
+    self.expectedBytes = 0;
+    self.receivedBytes = 0;
+    self.options = options;
+    
+    NSString * path = [self.options valueForKey:CONFIG_FILE_PATH];
+    NSString * ext = [self.options valueForKey:CONFIG_FILE_EXT];
+
+    NSURLSession * session = [NSURLSession sharedSession];
+    
+    // file will be stored at a specific path
+    if( path != nil) {
+        NSURLSessionDownloadTask * task = [session downloadTaskWithRequest:req completionHandler:^(NSURL * _Nullable location, NSURLResponse * _Nullable response, NSError * _Nullable error) {
+            if(error != nil) {
+                callback(@[[error localizedDescription]]);
+                return;
+            }
+            NSError * taskErr;
+            NSFileManager * fm = [NSFileManager defaultManager];
+            // move temp file to desination
+            [fm moveItemAtURL:location toURL:[NSURL fileURLWithPath:path] error:&taskErr];
+            if(taskErr != nil) {
+                callback(@[[taskErr localizedDescription]]);
+                return;
+            }
+            callback(@[[NSNull null], path]);
+        }];
+        [task resume];
+    }
+    // file will be stored at tmp path
+    else if ( [self.options valueForKey:CONFIG_USE_TEMP]!= nil ) {
+        NSURLSessionDownloadTask * task = [session downloadTaskWithRequest:req completionHandler:^(NSURL * _Nullable location, NSURLResponse * _Nullable response, NSError * _Nullable error) {
+            if(error != nil) {
+                callback(@[[error localizedDescription]]);
+                return;
+            }
+            NSError * taskErr;
+            NSFileManager * fm = [NSFileManager defaultManager];
+            NSString * tmpPath = [RNFetchBlobFS getTempPath:self.taskId withExtension:[self.options valueForKey:CONFIG_FILE_EXT]];
+            // move temp file to desination
+            [fm moveItemAtURL:location toURL:[NSURL fileURLWithPath:tmpPath] error:&taskErr];
+            if(taskErr != nil) {
+                callback(@[[taskErr localizedDescription]]);
+                return;
+            }
+            callback(@[[NSNull null], tmpPath]);
+        }];
+        [task resume];
+    }
+    // base64 response
+    else {
+        NSURLSessionUploadTask * task =
+        
+        [session dataTaskWithRequest:req completionHandler:^(NSData * _Nullable resp, NSURLResponse * _Nullable response, NSError * _Nullable error) {
+            if(error != nil) {
+                callback(@[[error localizedDescription]]);
+                return;
+            }
+            else {
+                callback(@[[NSNull null], [resp base64EncodedStringWithOptions:0]]);
+            }
+        }];
+        [task resume];
+    }
+}
+
+////////////////////////////////////////
+//
+//  NSURLSession delegates
+//
+////////////////////////////////////////
+
+
+#pragma mark NSURLSession delegate methods
+
+// set expected content length on response received
+- (void) URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask didReceiveResponse:(NSURLResponse *)response completionHandler:(void (^)(NSURLSessionResponseDisposition))completionHandler
+{
+    expectedBytes = [response expectedContentLength];
+}
+
+// download progress handler
+- (void) URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask didReceiveData:(NSData *)data
+{
+    receivedBytes += [data length];
+    
+    Boolean fileCache = [self.options valueForKey:CONFIG_USE_TEMP];
+    NSString * path = [self.options valueForKey:CONFIG_FILE_PATH];
+    // cache data in memory
+    if(path == nil && fileCache == nil) {
+        [respData appendData:data];
+    }
+    
+    [self.bridge.eventDispatcher
+     sendDeviceEventWithName:@"RNFetchBlobProgress"
+     body:@{
+            @"taskId": taskId,
+            @"written": [NSString stringWithFormat:@"%d", receivedBytes],
+            @"total": [NSString stringWithFormat:@"%d", expectedBytes]
+            }
+     ];
+}
+
+- (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCompleteWithError:(NSError *)error {
+    NSLog([error localizedDescription]);
+}
+
+// upload progress handler
+- (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didSendBodyData:(int64_t)bytesSent totalBytesSent:(int64_t)totalBytesWritten totalBytesExpectedToSend:(int64_t)totalBytesExpectedToWrite
+{
+    expectedBytes = totalBytesExpectedToWrite;
+    receivedBytes += totalBytesWritten;
+    [self.bridge.eventDispatcher
+     sendDeviceEventWithName:@"RNFetchBlobProgress"
+     body:@{
+            @"taskId": taskId,
+            @"written": [NSString stringWithFormat:@"%d", receivedBytes],
+            @"total": [NSString stringWithFormat:@"%d", expectedBytes]
+            }
+     ];
+}
+
+@end

src/ios/RNFetchBlobResp.m

@@ -1,188 +0,0 @@
-//
-//  RNFetchBlobResp.m
-//  RNFetchBlob
-//
-//  Created by Ben Hsieh on 2016/6/6.
-//  Copyright © 2016年 suzuri04x2. All rights reserved.
-//
-
-#import "RCTConvert.h"
-#import "RCTLog.h"
-#import <Foundation/Foundation.h>
-#import "RCTBridge.h"
-#import "RCTEventDispatcher.h"
-#import "RNFetchBlobFS.h"
-#import "RNFetchBlobResp.h"
-#import "RNFetchBlobConst.h"
-
-////////////////////////////////////////
-//
-//  HTTP request handler
-//
-////////////////////////////////////////
-
-@implementation FetchBlobUtils
-
-
-@synthesize taskId;
-@synthesize expectedBytes;
-@synthesize receivedBytes;
-@synthesize respData;
-@synthesize callback;
-@synthesize bridge;
-@synthesize options;
-
-
-// removing case from headers
-+ (NSMutableDictionary *) normalizeHeaders:(NSDictionary *)headers {
-    
-    NSMutableDictionary * mheaders = [[NSMutableDictionary alloc]init];
-    for(NSString * key in headers) {
-        [mheaders setValue:[headers valueForKey:key] forKey:[key lowercaseString]];
-    }
-    
-    return mheaders;
-}
-
-- (id)init {
-    self = [super init];
-    return self;
-}
-
-
-- (void) sendRequest:(NSDictionary *)options bridge:(RCTBridge *)bridgeRef taskId:(NSString *)taskId withRequest:(NSURLRequest *)req callback:(RCTResponseSenderBlock) callback {
-    self.taskId = taskId;
-    self.respData = [[NSMutableData alloc] initWithLength:0];
-    self.callback = callback;
-    self.bridge = bridgeRef;
-    self.expectedBytes = 0;
-    self.receivedBytes = 0;
-    self.options = options;
-    
-    NSString * path = [self.options valueForKey:CONFIG_FILE_PATH];
-    NSString * ext = [self.options valueForKey:CONFIG_FILE_EXT];
-    
-    // open file stream for write
-    if( path != nil) {
-        self.fileStream = [[RNFetchBlobFS alloc]initWithCallback:self.callback];
-        [self.fileStream openWithPath:path encode:@"ascii" appendData:YES ];
-    }
-    else if ( [self.options valueForKey:CONFIG_USE_TEMP]!= nil ) {
-        self.fileStream = [[RNFetchBlobFS alloc]initWithCallback:self.callback];
-        [self.fileStream openWithPath:[RNFetchBlobFS getTempPath:taskId withExtension:ext] encode:@"ascii" appendData:YES];
-    }
-    
-    NSURLConnection *conn = [[NSURLConnection alloc] initWithRequest:req delegate:self startImmediately:NO];
-    [conn scheduleInRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
-    [conn start];
-    
-    if(!conn) {
-        callback(@[[NSString stringWithFormat:@"RNFetchBlob could not initialize connection"], [NSNull null]]);
-    }
-}
-
-
-#pragma mark NSURLConnection delegate methods
-
-
-- (void) connection:(NSURLConnection *)connection didReceiveResponse:(nonnull NSURLResponse *)response {
-    //    [UIApplication sharedApplication].networkActivityIndicatorVisible = YES;
-    expectedBytes = [response expectedContentLength];
-}
-
-
-- (void) connection:(NSURLConnection *)connection didReceiveData:(nonnull NSData *)data {
-    receivedBytes += [data length];
-    
-    Boolean fileCache = [self.options valueForKey:CONFIG_USE_TEMP];
-    NSString * path = [self.options valueForKey:CONFIG_FILE_PATH];
-    if(path != nil) {
-        
-        [self.fileStream write:data];
-    }
-    // write to tmp file
-    else if( fileCache != nil) {
-        NSString * ext = [self.options valueForKey:CONFIG_FILE_EXT];
-        [self.fileStream write:data];
-    }
-    // cache data in memory
-    else {
-        [respData appendData:data];
-    }
-    
-    [self.bridge.eventDispatcher
-     sendDeviceEventWithName:@"RNFetchBlobProgress"
-     body:@{
-            @"taskId": taskId,
-            @"written": [NSString stringWithFormat:@"%d", receivedBytes],
-            @"total": [NSString stringWithFormat:@"%d", expectedBytes]
-            }
-     ];
-}
-
-- (void) connection:(NSURLConnection *)connection didSendBodyData:(NSInteger)bytesWritten totalBytesWritten:(NSInteger)totalBytesWritten totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite {
-    
-    expectedBytes = totalBytesExpectedToWrite;
-    receivedBytes += totalBytesWritten;
-    [self.bridge.eventDispatcher
-     sendDeviceEventWithName:@"RNFetchBlobProgress"
-     body:@{
-            @"taskId": taskId,
-            @"written": [NSString stringWithFormat:@"%d", receivedBytes],
-            @"total": [NSString stringWithFormat:@"%d", expectedBytes]
-            }
-     ];
-    
-}
-
-- (void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
-    
-    //    [UIApplication sharedApplication].networkActivityIndicatorVisible = NO;
-    
-    [self.fileStream closeInStream];
-    [self.fileStream closeOutStream];
-    
-    callback(@[[error localizedDescription], [NSNull null]]);
-}
-
-- (NSCachedURLResponse *) connection:(NSURLConnection *)connection willCacheResponse: (NSCachedURLResponse *)cachedResponse {
-    return nil;
-}
-
-
-// handle 301 and 302 responses
-- (NSURLRequest *)connection:(NSURLConnection *)connection willSendRequest:(NSURLRequest *)request redirectResponse:response {
-    return request;
-}
-
-// request complete
-- (void) connectionDidFinishLoading:(NSURLConnection *)connection {
-    
-    NSData * data;
-    if(respData != nil)
-        data = [NSData dataWithData:respData];
-    else
-        data = [[NSData alloc] init];
-    
-    NSString * path = [self.options valueForKey:CONFIG_FILE_PATH];
-    NSString * ext = [self.options valueForKey:CONFIG_FILE_EXT];
-    Boolean useCache = [self.options valueForKey:CONFIG_USE_TEMP];
-    
-    [self.fileStream closeInStream];
-    
-    // if fileCache is true or file path is given, return a path
-    if( path != nil ) {
-        callback(@[[NSNull null], path]);
-    }
-    // when fileCache option is set but no path specified, save to tmp path
-    else if( [self.options valueForKey:CONFIG_USE_TEMP] != nil) {
-        NSString * tmpPath = [RNFetchBlobFS getTempPath:taskId withExtension:ext];
-        callback(@[[NSNull null], tmpPath]);
-    }
-    // otherwise return base64 string
-    else {
-        callback(@[[NSNull null], [data base64EncodedStringWithOptions:0]]);
-    }
-}
-
-@end

src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-fetch-blob",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "A module provides upload, download, and files access API. Supports file stream read/write for process large files.",
   "main": "index.js",
   "scripts": {

test-server/server.js

@@ -41,19 +41,19 @@ app.use('/public', express.static('./public'))
 app.get('/redirect', function(req, res) {
   res.redirect('/public/github.png')
 })
-// handle octet-stream request
-app.post('/upload', function(req, res){
-
-  console.log(req.headers)
-  console.log(req.body)
-  fs.writeFile('./uploads/file'+Date.now()+'.png', req.body,function(err){
-    if(!err)
-      res.status(200).send({ message : 'ok'})
-    else
-      res.status(500).send({ message : err})
-  })
 
+app.all('/params', function(req, res) {
+  console.log(req.url)
+    var resp =
+      {
+         time : req.query.time,
+         name : req.query.name,
+         lang : req.query.lang
+      }
+    console.log(resp)
+    res.send(resp)
 })
+
 // return an empty response
 app.all('/empty', function(req, res) {
   res.send('')

test/test-0.5.x.js → test/test-0.5.1.js

@@ -15,7 +15,7 @@ import {
 const fs = RNFetchBlob.fs
 const { Assert, Comparer, Info, prop } = RNTest
 const describe = RNTest.config({
-  group : '0.5.x',
+  group : '0.5.1',
   run : true,
   expand : false,
 })
@@ -35,6 +35,7 @@ describe('Download file to storage with custom file extension', (report, done) =
     })
     .fetch('GET', `${TEST_SERVER_URL}/public/github2.jpg`)
     .then((resp) => {
+      console.log(resp.path())
       tmpFilePath = resp.path()
       report(<Info key={`image from ${tmpFilePath}`}>
         <Image
@@ -145,6 +146,69 @@ describe('Upload multipart data with file from storage', (report, done) => {
     })
 })
 
+describe('Upload and download at the same time', (report, done) => {
+
+  let content = 'POST and PUT calls with headers and body should also work correctly'
+  let filename = 'download-header-test-' + Date.now()
+  let body = RNFetchBlob.base64.encode(content)
+
+  RNFetchBlob
+    .config({
+      fileCache : true,
+    })
+    .fetch('POST', 'https://content.dropboxapi.com/2/files/upload', {
+      Authorization : `Bearer ${DROPBOX_TOKEN}`,
+      'Dropbox-API-Arg': '{\"path\": \"/rn-upload/'+filename+'\",\"mode\": \"add\",\"autorename\": true,\"mute\": false}',
+      'Content-Type' : 'application/octet-stream',
+    }, body)
+    .then((resp) =>  {
+      return RNFetchBlob.fs.readStream(resp.path(), 'utf8')
+    })
+    .then((stream) => {
+      let actual = ''
+      stream.open()
+      stream.onData((chunk) => {
+        actual += chunk
+      })
+      stream.onEnd(() => {
+        report(
+          <Assert
+            key="response data should be the filename"
+            expect={filename}
+            actual={JSON.parse(actual).name} />)
+        done()
+      })
+    })
+
+})
+
+RNTest.config({
+  group : '0.5.1',
+  run : true,
+  expand : false,
+  timeout : 30000,
+})('Upload and download large file', (report, done) => {
+  let filename = '22mb-dummy-' + Date.now()
+  RNFetchBlob.config({
+    fileCache : true
+  })
+  .fetch('GET', `${TEST_SERVER_URL}/public/22mb-dummy`)
+  .then((res) => {
+    return RNFetchBlob.fetch('POST', 'https://content.dropboxapi.com/2/files/upload', {
+      Authorization : `Bearer ${DROPBOX_TOKEN}`,
+      'Dropbox-API-Arg': '{\"path\": \"/rn-upload/'+filename+'\",\"mode\": \"add\",\"autorename\": true,\"mute\": false}',
+      'Content-Type' : 'application/octet-stream',
+    }, RNFetchBlob.wrap(res.path()))
+  })
+  .then((res) => {
+    report(<Assert
+      key="upload should success withou crashing app"
+      expect={filename}
+      actual={res.json().name}/>)
+    done()
+  })
+})
+
 describe('Session create mechanism test', (report, done) => {
   let sessionName = 'foo-' + Date.now()
   testSessionName = sessionName
@@ -158,7 +222,7 @@ describe('Session create mechanism test', (report, done) => {
     })
     .fetch('GET', `${TEST_SERVER_URL}/public/github.png`)
   let p3 = RNFetchBlob.config({
-      path : sysDirs.DocumentDir + '/session-test.png'
+      path : sysDirs.DocumentDir + '/session-test'+Date.now()+'.png'
     })
     .fetch('GET', `${TEST_SERVER_URL}/public/github.png`)
 

test/test-0.5.2.js

@@ -0,0 +1,86 @@
+import RNTest from './react-native-testkit/'
+import React from 'react'
+import RNFetchBlob from 'react-native-fetch-blob'
+
+import {
+  StyleSheet,
+  Text,
+  View,
+  ScrollView,
+  Platform,
+  Dimensions,
+  Image,
+} from 'react-native';
+
+const fs = RNFetchBlob.fs
+const { Assert, Comparer, Info, prop } = RNTest
+const describe = RNTest.config({
+  group : '0.5.2',
+  run : true,
+  expand : false,
+})
+const { TEST_SERVER_URL, FILENAME, DROPBOX_TOKEN, styles } = prop()
+
+let prefix = ((Platform.OS === 'android') ? 'file://' : '')
+
+
+describe('GET request with params', (report, done) => {
+  let time = Date.now()
+  RNFetchBlob.config({ fileCache : true })
+    .fetch('GET', `${TEST_SERVER_URL}/params?time=${time}&name=RNFetchBlobParams&lang=中文`)
+    .then((resp) => {
+      let file = resp.path()
+      return RNFetchBlob.fs.readStream(resp.path(), 'utf8')
+    })
+    .then((stream) => {
+      let result = ''
+      stream.open()
+      stream.onData((chunk) => {
+        result += chunk
+      })
+      stream.onEnd(() => {
+        result = JSON.parse(result)
+        report(<Assert key="param#1 should correct"
+          expect={parseInt(time)}
+          actual={parseInt(result.time)}/>,
+        <Assert key="param#2 should correct"
+          expect={'RNFetchBlobParams'}
+          actual={result.name}/>,
+        <Assert key="param contains unicode data should correct"
+          expect={'中文'}
+          actual={result.lang}/>)
+          done()
+      })
+    })
+})
+
+
+describe('POST request with params', (report, done) => {
+  let time = Date.now()
+  RNFetchBlob.config({ fileCache : true })
+    .fetch('POST', `${TEST_SERVER_URL}/params?time=${time}&name=RNFetchBlobParams&lang=中文`)
+    .then((resp) => {
+      let file = resp.path()
+      return RNFetchBlob.fs.readStream(resp.path(), 'utf8')
+    })
+    .then((stream) => {
+      let result = ''
+      stream.open()
+      stream.onData((chunk) => {
+        result += chunk
+      })
+      stream.onEnd(() => {
+        result = JSON.parse(result)
+        report(<Assert key="param#1 should correct"
+          expect={parseInt(time)}
+          actual={parseInt(result.time)}/>,
+        <Assert key="param#2 should correct"
+          expect={'RNFetchBlobParams'}
+          actual={result.name}/>,
+        <Assert key="param contains unicode data should correct"
+          expect={'中文'}
+          actual={result.lang}/>)
+          done()
+      })
+    })
+})

test/test-init.js

@@ -18,7 +18,7 @@ const { Assert, Comparer, Info, describe, prop } = RNTest
 // test environment variables
 
 prop('FILENAME', `${Platform.OS}-0.5.0-${Date.now()}.png`)
-prop('TEST_SERVER_URL', 'http://192.168.16.70:8123')
+prop('TEST_SERVER_URL', 'http://localhost:8123')
 prop('DROPBOX_TOKEN', 'fsXcpmKPrHgAAAAAAAAAoXZhcXYWdgLpQMan6Tb_bzJ237DXhgQSev12hA-gUXt4')
 prop('styles', {
   image : {
@@ -39,7 +39,6 @@ describe('GET image from server', (report, done) => {
       Authorization : 'Bearer abde123eqweje'
     })
     .then((resp) => {
-
       RNTest.prop('image', resp.base64())
       report(
         <Info key="Response image">
@@ -51,8 +50,8 @@ describe('GET image from server', (report, done) => {
     })
 })
 
-
-require('./test-fs')
 require('./test-0.1.x-0.4.x')
-require('./test-0.5.x')
+require('./test-0.5.1')
+require('./test-0.5.2')
+require('./test-fs')
 require('./test-android')