Fix file upload total byte bug

wkh237 · wkh237 · commit 0bd9e0efa00c · 2016-07-09T15:34:33.000+08:00
diff --git a/src/ios/RNFetchBlob/RNFetchBlob.m b/src/ios/RNFetchBlob/RNFetchBlob.m
@@ -63,10 +63,10 @@ - (NSDictionary *)constantsToExport
                   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 @@ - (NSDictionary *)constantsToExport
                   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;
     }];
     
diff --git a/src/ios/RNFetchBlobFS.m b/src/ios/RNFetchBlobFS.m
@@ -283,18 +283,17 @@ + (void) readFile:(NSString *)path encoding:(NSString *)encoding
         [[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)
                 {
                     reject(@"RNFetchBlobFS readFile error", @"failed to read asset", [err localizedDescription]);
                     return;
                 }
                 fileContent = [NSData dataWithBytes:buffer length:asset.size];
-                if(onComplete != nil)
-                    onComplete(fileContent);
                 free(buffer);
             }
             else
@@ -305,7 +304,10 @@ + (void) readFile:(NSString *)path encoding:(NSString *)encoding
                     return;
                 }
                 fileContent = [NSData dataWithContentsOfFile:path];
+                
             }
+            if(onComplete != nil)
+                onComplete(fileContent);
             
             if([[encoding lowercaseString] isEqualToString:@"utf8"]) {
                 if(resolve != nil)
@@ -329,7 +331,7 @@ + (void) readFile:(NSString *)path encoding:(NSString *)encoding
     @catch(NSException * e)
     {
         if(reject != nil)
-        reject(@"RNFetchBlobFS readFile error", @"error", [e description]);
+            reject(@"RNFetchBlobFS readFile error", @"error", [e description]);
     }
 }
 
diff --git a/src/ios/RNFetchBlobNetwork.h b/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
diff --git a/src/ios/RNFetchBlobNetwork.m b/src/ios/RNFetchBlobNetwork.m
@@ -69,7 +69,12 @@ + (NSMutableDictionary *) normalizeHeaders:(NSDictionary *)headers {
 }
 
 // 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 @@ - (void) sendRequest:(NSDictionary  * _Nullable )options bridge:(RCTBridge * _Nu
     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 @@ - (void) sendRequest:(NSDictionary  * _Nullable )options bridge:(RCTBridge * _Nu
         respFile = NO;
     }
     NSURLSessionDataTask * task = [session dataTaskWithRequest:req];
+    
     [task resume];
     
     // network status indicator
@@ -191,7 +197,7 @@ - (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didSen
      body:@{
             @"taskId": taskId,
             @"written": [NSString stringWithFormat:@"%d", totalBytesWritten],
-            @"total": [NSString stringWithFormat:@"%d", totalBytesExpectedToWrite]
+            @"total": [NSString stringWithFormat:@"%d", bodyLength]
             }
      ];
 }
diff --git a/src/ios/RNFetchBlobReqBuilder.h b/src/ios/RNFetchBlobReqBuilder.h
@@ -19,15 +19,15 @@
                           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
                    method:(NSString *)method
                       url:(NSString *)url
                   headers:(NSDictionary *)headers
                      body:(NSString *)body
-               onComplete:(void(^)(NSURLRequest * req))onComplete;
+               onComplete:(void(^)(NSURLRequest * req, long bodyLength))onComplete;
 
 @end
 
diff --git a/src/ios/RNFetchBlobReqBuilder.m b/src/ios/RNFetchBlobReqBuilder.m
@@ -28,7 +28,7 @@ +(void) buildMultipartRequest:(NSDictionary *)options
                           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 @@ +(void) buildMultipartRequest:(NSDictionary *)options
             [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 @@ +(void) buildOctetRequest:(NSDictionary *)options
                       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 @@ +(void) buildOctetRequest:(NSDictionary *)options
     // 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 @@ +(void) buildOctetRequest:(NSDictionary *)options
                             [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 @@ +(void) buildOctetRequest:(NSDictionary *)options
         [request setHTTPMethod: method];
         [request setAllHTTPHeaderFields:mheaders];
         
-        onComplete(request);
+        onComplete(request, size);
     });
 }
 
@@ -135,6 +137,7 @@ void __block (^getFieldData)(id field) = ^(id field)
             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]];

Original file line number	Diff line number	Diff line change
`@@ -283,18 +283,17 @@ + (void) readFile:(NSString )path encoding:(NSString )encoding`
`283`	`283`	`[[self class] getPathFromUri:path completionHandler:^(NSString path, ALAssetRepresentation asset) {`
`284`	`284`	`NSData * fileContent;`
`285`	`285`	`NSError * err;`
	`286`	`+ Byte * buffer;`
`286`	`287`	`if(asset != nil)`
`287`	`288`	`{`
`288`		`- Byte * buffer = malloc(asset.size);`
	`289`	`+ buffer = malloc(asset.size);`
`289`	`290`	`[asset getBytes:buffer fromOffset:0 length:asset.size error:&err];`
`290`	`291`	`if(err != nil)`
`291`	`292`	`{`
`292`	`293`	`reject(@"RNFetchBlobFS readFile error", @"failed to read asset", [err localizedDescription]);`
`293`	`294`	`return;`
`294`	`295`	`}`
`295`	`296`	`fileContent = [NSData dataWithBytes:buffer length:asset.size];`
`296`		`- if(onComplete != nil)`
`297`		`- onComplete(fileContent);`
`298`	`297`	`free(buffer);`
`299`	`298`	`}`
`300`	`299`	`else`
`@@ -305,7 +304,10 @@ + (void) readFile:(NSString )path encoding:(NSString )encoding`
`305`	`304`	`return;`
`306`	`305`	`}`
`307`	`306`	`fileContent = [NSData dataWithContentsOfFile:path];`
	`307`	`+`
`308`	`308`	`}`
	`309`	`+ if(onComplete != nil)`
	`310`	`+ onComplete(fileContent);`
`309`	`311`
`310`	`312`	`if([[encoding lowercaseString] isEqualToString:@"utf8"]) {`
`311`	`313`	`if(resolve != nil)`
`@@ -329,7 +331,7 @@ + (void) readFile:(NSString )path encoding:(NSString )encoding`
`329`	`331`	`@catch(NSException * e)`
`330`	`332`	`{`
`331`	`333`	`if(reject != nil)`
`332`		`- reject(@"RNFetchBlobFS readFile error", @"error", [e description]);`
	`334`	`+ reject(@"RNFetchBlobFS readFile error", @"error", [e description]);`
`333`	`335`	`}`
`334`	`336`	`}`
`335`	`337`