Fix file upload total byte bug

src/ios/RNFetchBlob/RNFetchBlob.m

@@ -63,10 +63,10 @@ RCT_EXPORT_METHOD(fetchBlobForm:(NSDictionary *)options
                   callback:(RCTResponseSenderBlock)callback)
 {
     
-    [RNFetchBlobReqBuilder buildMultipartRequest:options taskId:taskId method:method url:url headers:headers form:form onComplete:^(NSURLRequest *req) {
+    [RNFetchBlobReqBuilder buildMultipartRequest:options taskId:taskId method:method url:url headers:headers form:form onComplete:^(NSURLRequest *req, long bodyLength) {
         // send HTTP request
         RNFetchBlobNetwork * utils = [[RNFetchBlobNetwork alloc] init];
-        [utils sendRequest:options bridge:self.bridge taskId:taskId withRequest:req callback:callback];
+        [utils sendRequest:options contentLength:bodyLength bridge:self.bridge taskId:taskId withRequest:req callback:callback];
         utils = nil;
     }];
     
@@ -80,10 +80,10 @@ RCT_EXPORT_METHOD(fetchBlob:(NSDictionary *)options
                   headers:(NSDictionary *)headers
                   body:(NSString *)body callback:(RCTResponseSenderBlock)callback)
 {
-    [RNFetchBlobReqBuilder buildOctetRequest:options taskId:taskId method:method url:url headers:headers body:body onComplete:^(NSURLRequest *req) {
+    [RNFetchBlobReqBuilder buildOctetRequest:options taskId:taskId method:method url:url headers:headers body:body onComplete:^(NSURLRequest *req, long bodyLength) {
         // send HTTP request
         RNFetchBlobNetwork * utils = [[RNFetchBlobNetwork alloc] init];
-        [utils sendRequest:options bridge:self.bridge taskId:taskId withRequest:req callback:callback];
+        [utils sendRequest:options contentLength:bodyLength bridge:self.bridge taskId:taskId withRequest:req callback:callback];
         utils = nil;
     }];
     

src/ios/RNFetchBlobFS.m

@@ -283,9 +283,10 @@ NSMutableDictionary *fileStreams = nil;
         [[self class] getPathFromUri:path completionHandler:^(NSString *path, ALAssetRepresentation *asset) {
             NSData * fileContent;
             NSError * err;
+            Byte * buffer;
             if(asset != nil)
             {
-                Byte * buffer = malloc(asset.size);
+                buffer = malloc(asset.size);
                 [asset getBytes:buffer fromOffset:0 length:asset.size error:&err];
                 if(err != nil)
                 {
@@ -293,8 +294,6 @@ NSMutableDictionary *fileStreams = nil;
                     return;
                 }
                 fileContent = [NSData dataWithBytes:buffer length:asset.size];
-                if(onComplete != nil)
-                    onComplete(fileContent);
                 free(buffer);
             }
             else
@@ -305,7 +304,10 @@ NSMutableDictionary *fileStreams = nil;
                     return;
                 }
                 fileContent = [NSData dataWithContentsOfFile:path];
+                
             }
+            if(onComplete != nil)
+                onComplete(fileContent);
             
             if([[encoding lowercaseString] isEqualToString:@"utf8"]) {
                 if(resolve != nil)
@@ -329,7 +331,7 @@ NSMutableDictionary *fileStreams = nil;
     @catch(NSException * e)
     {
         if(reject != nil)
-        reject(@"RNFetchBlobFS readFile error", @"error", [e description]);
+            reject(@"RNFetchBlobFS readFile error", @"error", [e description]);
     }
 }
 

src/ios/RNFetchBlobNetwork.h

@@ -35,7 +35,7 @@ typedef void(^DataTaskCompletionHander) (NSData * _Nullable resp, NSURLResponse
 - (void) sendRequest;
 
 + (NSMutableDictionary  * _Nullable ) normalizeHeaders:(NSDictionary * _Nullable)headers;
-- (void) sendRequest:(NSDictionary  * _Nullable )options bridge:(RCTBridge * _Nullable)bridgeRef taskId:(NSString * _Nullable)taskId withRequest:(NSURLRequest * _Nullable)req callback:(_Nullable RCTResponseSenderBlock) callback;
+- (void) sendRequest:(NSDictionary  * _Nullable )options contentLength:(long)contentLength bridge:(RCTBridge * _Nullable)bridgeRef taskId:(NSString * _Nullable)taskId withRequest:(NSURLRequest * _Nullable)req callback:(_Nullable RCTResponseSenderBlock) callback;
 
 
 @end

src/ios/RNFetchBlobNetwork.m

@@ -69,7 +69,12 @@ NSOperationQueue *taskQueue;
 }
 
 // send HTTP request
-- (void) sendRequest:(NSDictionary  * _Nullable )options bridge:(RCTBridge * _Nullable)bridgeRef taskId:(NSString * _Nullable)taskId withRequest:(NSURLRequest * _Nullable)req callback:(_Nullable RCTResponseSenderBlock) callback
+- (void) sendRequest:(NSDictionary  * _Nullable )options
+       contentLength:(long) contentLength
+              bridge:(RCTBridge * _Nullable)bridgeRef
+              taskId:(NSString * _Nullable)taskId
+         withRequest:(NSURLRequest * _Nullable)req
+            callback:(_Nullable RCTResponseSenderBlock) callback
 {
     self.taskId = taskId;
     self.respData = [[NSMutableData alloc] initWithLength:0];
@@ -83,7 +88,7 @@ NSOperationQueue *taskQueue;
     NSString * ext = [self.options valueForKey:CONFIG_FILE_EXT];
     NSURLSession * session;
     
-    bodyLength = [[req HTTPBody] length];
+    bodyLength = contentLength;
     
     // the session trust any SSL certification
 
@@ -104,6 +109,7 @@ NSOperationQueue *taskQueue;
         respFile = NO;
     }
     NSURLSessionDataTask * task = [session dataTaskWithRequest:req];
+    
     [task resume];
     
     // network status indicator
@@ -191,7 +197,7 @@ NSOperationQueue *taskQueue;
      body:@{
             @"taskId": taskId,
             @"written": [NSString stringWithFormat:@"%d", totalBytesWritten],
-            @"total": [NSString stringWithFormat:@"%d", totalBytesExpectedToWrite]
+            @"total": [NSString stringWithFormat:@"%d", bodyLength]
             }
      ];
 }

src/ios/RNFetchBlobReqBuilder.h

@@ -19,7 +19,7 @@
                           url:(NSString *)url
                       headers:(NSDictionary *)headers
                          form:(NSArray *)form
-                   onComplete:(void(^)(NSURLRequest * req))onComplete;
+                   onComplete:(void(^)(NSURLRequest * req, long bodyLength))onComplete;
 
 +(void) buildOctetRequest:(NSDictionary *)options
                    taskId:(NSString *)taskId
@@ -27,7 +27,7 @@
                       url:(NSString *)url
                   headers:(NSDictionary *)headers
                      body:(NSString *)body
-               onComplete:(void(^)(NSURLRequest * req))onComplete;
+               onComplete:(void(^)(NSURLRequest * req, long bodyLength))onComplete;
 
 @end
 

src/ios/RNFetchBlobReqBuilder.m

@@ -28,7 +28,7 @@
                           url:(NSString *)url
                       headers:(NSDictionary *)headers
                          form:(NSArray *)form
-                   onComplete:(void(^)(NSURLRequest * req))onComplete
+                   onComplete:(void(^)(NSURLRequest * req, long bodyLength))onComplete
 {
     NSString * encodedUrl = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
     // send request
@@ -56,7 +56,7 @@
             [mheaders setValue:[NSString stringWithFormat:@"multipart/form-data; charset=utf-8; boundary=%@", boundary] forKey:@"content-type"];
             [request setHTTPMethod: method];
             [request setAllHTTPHeaderFields:mheaders];
-            onComplete(request);
+            onComplete(request, [formData length]);
         }];
         
     });
@@ -69,7 +69,7 @@
                       url:(NSString *)url
                   headers:(NSDictionary *)headers
                      body:(NSString *)body
-               onComplete:(void(^)(NSURLRequest * req))onComplete
+               onComplete:(void(^)(NSURLRequest * req, long bodyLength))onComplete
 {
     NSString * encodedUrl = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
     // send request
@@ -81,6 +81,7 @@
     // move heavy task to another thread
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         NSMutableData * blobData;
+        long size = -1;
         // if method is POST or PUT, convert data string format
         if([[method lowercaseString] isEqualToString:@"post"] || [[method lowercaseString] isEqualToString:@"put"]) {
             // generate octet-stream body
@@ -97,10 +98,11 @@
                             [mheaders setValue:@"application/octet-stream" forKey:@"content-type"];
                             [request setHTTPMethod: method];
                             [request setAllHTTPHeaderFields:mheaders];
-                            onComplete(request);
+                            onComplete(request, [content length]);
                         }];
                         return;
                     }
+                    size = [[[NSFileManager defaultManager] attributesOfItemAtPath:orgPath error:nil] fileSize];
                     [request setHTTPBodyStream: [NSInputStream inputStreamWithFileAtPath:orgPath ]];
                 }
                 // otherwise convert it as BASE64 data string
@@ -117,7 +119,7 @@
         [request setHTTPMethod: method];
         [request setAllHTTPHeaderFields:mheaders];
         
-        onComplete(request);
+        onComplete(request, size);
     });
 }
 
@@ -135,6 +137,7 @@
             NSString * name = [field valueForKey:@"name"];
             NSString * content = [field valueForKey:@"data"];
             NSString * contentType = [field valueForKey:@"type"];
+            contentType = contentType == nil ? @"application/octet-stream" : contentType;
             // field is a text field
             if([field valueForKey:@"filename"] == nil || content == [NSNull null]) {
                 [formData appendData:[[NSString stringWithFormat:@"--%@\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];