#24 Change IOS fetch implementation to NSURLSession API

src/ios/RNFetchBlob/RNFetchBlob.m

@@ -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) {
@@ -129,7 +129,7 @@ RCT_EXPORT_METHOD(fetchBlobForm:(NSDictionary *)options
         
         // send HTTP request
         FetchBlobUtils * utils = [[FetchBlobUtils alloc] init];
-        [utils sendRequest:options bridge:self.bridge taskId:taskId withRequest:request callback:callback];
+        [utils sendRequest:options bridge:self.bridge taskId:taskId withRequest:request withData:postData callback:callback];
     });
 }
 
@@ -149,11 +149,11 @@ RCT_EXPORT_METHOD(fetchBlob:(NSDictionary *)options
     NSMutableDictionary *mheaders = [[NSMutableDictionary alloc] initWithDictionary:[FetchBlobUtils 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]) {
@@ -174,7 +174,7 @@ RCT_EXPORT_METHOD(fetchBlob:(NSDictionary *)options
         
         // send HTTP request
         FetchBlobUtils * utils = [[FetchBlobUtils alloc] init];
-        [utils sendRequest:options bridge:self.bridge taskId:taskId withRequest:request callback:callback];
+        [utils sendRequest:options bridge:self.bridge taskId:taskId withRequest:request withData:blobData callback:callback];
     });
 }
 

src/ios/RNFetchBlobResp.h

@@ -12,7 +12,7 @@
 #import <Foundation/Foundation.h>
 #import "RCTBridgeModule.h"
 
-@interface FetchBlobUtils : NSObject  <NSURLConnectionDelegate, NSURLConnectionDataDelegate> {
+@interface FetchBlobUtils : NSObject  <NSURLSessionDelegate, NSURLSessionTaskDelegate, NSURLSessionDataDelegate> {
     
     NSString * taskId;
     int expectedBytes;
@@ -37,7 +37,7 @@
 - (void) sendRequest;
 
 + (NSMutableDictionary *) normalizeHeaders:(NSDictionary *)headers;
-- (void) sendRequest:(NSDictionary *)options bridge:(RCTBridge *)bridgeRef taskId:(NSString *)taskId withRequest:(NSURLRequest *)req callback:(RCTResponseSenderBlock) callback;
+- (void) sendRequest:(NSDictionary *)options bridge:(RCTBridge *)bridgeRef taskId:(NSString *)taskId withRequest:(NSURLRequest *)req withData:( NSData * _Nullable )data callback:(RCTResponseSenderBlock) callback;
 
 
 @end

src/ios/RNFetchBlobResp.m

@@ -50,7 +50,7 @@
 }
 
 
-- (void) sendRequest:(NSDictionary *)options bridge:(RCTBridge *)bridgeRef taskId:(NSString *)taskId withRequest:(NSURLRequest *)req callback:(RCTResponseSenderBlock) callback {
+- (void) sendRequest:(NSDictionary *)options bridge:(RCTBridge *)bridgeRef taskId:(NSString *)taskId withRequest:(NSURLRequest *)req withData:( NSData * _Nullable )data callback:(RCTResponseSenderBlock) callback {
     self.taskId = taskId;
     self.respData = [[NSMutableData alloc] initWithLength:0];
     self.callback = callback;
@@ -61,52 +61,89 @@
     
     NSString * path = [self.options valueForKey:CONFIG_FILE_PATH];
     NSString * ext = [self.options valueForKey:CONFIG_FILE_EXT];
+
+    NSURLSession * session = [NSURLSession sharedSession];
     
-    // open file stream for write
+    // file will be stored at a specific path
     if( path != nil) {
-        self.fileStream = [[RNFetchBlobFS alloc]initWithCallback:self.callback];
-        [self.fileStream openWithPath:path encode:@"ascii" appendData:YES ];
+        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 ) {
-        self.fileStream = [[RNFetchBlobFS alloc]initWithCallback:self.callback];
-        [self.fileStream openWithPath:[RNFetchBlobFS getTempPath:taskId withExtension:ext] encode:@"ascii" appendData:YES];
+        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];
     }
-    
-    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]]);
+    // 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]]);
+        }];
+//        [session uploadTaskWithRequest:req fromData:data 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];
     }
+//    callback(@[[NSString stringWithFormat:@"RNFetchBlob could not initialize connection"], [NSNull null]]);
 }
 
 
-#pragma mark NSURLConnection delegate methods
+#pragma mark NSURLSession delegate methods
 
-
-- (void) connection:(NSURLConnection *)connection didReceiveResponse:(nonnull NSURLResponse *)response {
-    //    [UIApplication sharedApplication].networkActivityIndicatorVisible = YES;
+- (void) URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask didReceiveResponse:(NSURLResponse *)response completionHandler:(void (^)(NSURLSessionResponseDisposition))completionHandler
+{
     expectedBytes = [response expectedContentLength];
 }
 
-
-- (void) connection:(NSURLConnection *)connection didReceiveData:(nonnull NSData *)data {
+- (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];
-    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 {
+    if(path == nil && fileCache == nil) {
         [respData appendData:data];
     }
     
@@ -120,8 +157,8 @@
      ];
 }
 
-- (void) connection:(NSURLConnection *)connection didSendBodyData:(NSInteger)bytesWritten totalBytesWritten:(NSInteger)totalBytesWritten totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite {
-    
+- (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
@@ -132,57 +169,61 @@
             @"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;
-}
+//- (void) URLSessionDidFinishEventsForBackgroundURLSession:(NSURLSession *)session
+//{
+//
+//}
+
+
+//- (void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
+//    
+//    //    [UIApplication sharedApplication].networkActivityIndicatorVisible = NO;
+//    
+//    [self.fileStream closeInStream];
+//    [self.fileStream closeOutStream];
+//    
+//    callback(@[[error localizedDescription], [NSNull null]]);
+//}
+
+
 
 
 // handle 301 and 302 responses
-- (NSURLRequest *)connection:(NSURLConnection *)connection willSendRequest:(NSURLRequest *)request redirectResponse:response {
-    return request;
-}
+//- (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]]);
-    }
-}
+//- (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