Merge branch '0.10.2' of github.com:wkh237/react-native-fetch-blob into 0.10.2

src/ios/RNFetchBlobFS.h

@@ -10,7 +10,6 @@
 #define RNFetchBlobFS_h
 
 #import "RNFetchBlob.h"
-
 #import <Foundation/Foundation.h>
 
 #if __has_include(<React/RCTAssert.h>)

src/ios/RNFetchBlobFS.m

@@ -64,7 +64,7 @@ NSMutableDictionary *fileStreams = nil;
 
 // static member getter
 + (NSArray *) getFileStreams {
-    
+
     if(fileStreams == nil)
         fileStreams = [[NSMutableDictionary alloc] init];
     return fileStreams;
@@ -115,12 +115,12 @@ NSMutableDictionary *fileStreams = nil;
 }
 
 + (NSString *) getTempPath {
-    
+
     return NSTemporaryDirectory();
 }
 
 + (NSString *) getTempPath:(NSString*)taskId withExtension:(NSString *)ext {
-    
+
     NSString * documentDir = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject];
     NSString * filename = [NSString stringWithFormat:@"/RNFetchBlob_tmp/RNFetchBlobTmp_%@", taskId];
     if(ext != nil)
@@ -129,7 +129,7 @@ NSMutableDictionary *fileStreams = nil;
     return tempPath;
 }
 
-#pragma margk - readStream 
+#pragma margk - readStream
 
 + (void) readStream:(NSString *)uri
            encoding:(NSString * )encoding
@@ -139,7 +139,7 @@ NSMutableDictionary *fileStreams = nil;
           bridgeRef:(RCTBridge *)bridgeRef
 {
     [[self class] getPathFromUri:uri completionHandler:^(NSString *path, ALAssetRepresentation *asset) {
-    
+
         __block RCTEventDispatcher * event = bridgeRef.eventDispatcher;
         __block int read = 0;
         __block int backoff = tick *1000;
@@ -193,7 +193,7 @@ NSMutableDictionary *fileStreams = nil;
             // release buffer
             if(buffer != nil)
                 free(buffer);
-            
+
         }
         @catch (NSError * err)
         {
@@ -205,10 +205,10 @@ NSMutableDictionary *fileStreams = nil;
             NSDictionary * payload = @{ @"event": FS_EVENT_END, @"detail": @"" };
             [event sendDeviceEventWithName:streamId body:payload];
         }
-        
+
     }];
-    
-    
+
+
 }
 
 // send read stream chunks via native event emitter
@@ -243,8 +243,8 @@ NSMutableDictionary *fileStreams = nil;
         NSDictionary * payload = @{ @"event": FS_EVENT_DATA,  @"detail" : asciiArray };
         [event sendDeviceEventWithName:streamId body:payload];
     }
-    
-    
+
+
 }
 
 # pragma write file from file
@@ -274,7 +274,7 @@ NSMutableDictionary *fileStreams = nil;
         }
         else if(asset != nil)
         {
-            
+
             __block NSOutputStream * os = [[NSOutputStream alloc] initToFileAtPath:dest append:append];
             int read = 0;
             int cursor = 0;
@@ -293,7 +293,7 @@ NSMutableDictionary *fileStreams = nil;
         else
             callback(@"failed to resolve path", nil);
     }];
-    
+
     return 0;
 }
 
@@ -342,7 +342,7 @@ NSMutableDictionary *fileStreams = nil;
             [content writeToFile:path atomically:YES];
         }
         fm = nil;
-        
+
         resolve([NSNumber numberWithInteger:[content length]]);
     }
     @catch (NSException * e)
@@ -423,16 +423,16 @@ NSMutableDictionary *fileStreams = nil;
             else
             {
                 if(![[NSFileManager defaultManager] fileExistsAtPath:path]) {
-                    
+
                     reject(@"RNFetchBlobFS readFile error", @"file not exists", nil);
                     return;
                 }
                 fileContent = [NSData dataWithContentsOfFile:path];
-                
+
             }
             if(onComplete != nil)
                 onComplete(fileContent);
-            
+
             if([[encoding lowercaseString] isEqualToString:@"utf8"]) {
                 if(resolve != nil) {
                     NSString * utf8 = [[NSString alloc] initWithData:fileContent encoding:NSUTF8StringEncoding];
@@ -480,7 +480,7 @@ NSMutableDictionary *fileStreams = nil;
 
 + (NSDictionary *) stat:(NSString *) path error:(NSError **) error {
 
-    
+
     BOOL isDir = NO;
     NSFileManager * fm = [NSFileManager defaultManager];
     if([fm fileExistsAtPath:path isDirectory:&isDir] == NO) {
@@ -498,7 +498,7 @@ NSMutableDictionary *fileStreams = nil;
              @"lastModified" : [NSNumber numberWithLong:(time_t) [lastModified timeIntervalSince1970]*1000],
              @"type" : isDir ? @"directory" : @"file"
             };
-    
+
 }
 
 # pragma mark - exists
@@ -584,7 +584,7 @@ NSMutableDictionary *fileStreams = nil;
         [self.outStream close];
         self.outStream = nil;
     }
-    
+
 }
 
 // Slice a file into another file, generally for support Blob implementation.
@@ -614,14 +614,14 @@ NSMutableDictionary *fileStreams = nil;
             }
             long size = [fm attributesOfItemAtPath:path error:nil].fileSize;
             long max = MIN(size, [end longValue]);
-            
+
             if(![fm fileExistsAtPath:dest]) {
                 [fm createFileAtPath:dest contents:@"" attributes:nil];
             }
             [handle seekToFileOffset:[start longValue]];
             while(read < expected)
             {
-                
+
                 NSData * chunk;
                 long chunkSize = 0;
                 if([start longValue] + read + 10240 > max)
@@ -639,7 +639,7 @@ NSMutableDictionary *fileStreams = nil;
                 if([chunk length] <= 0)
                     break;
                 long remain = expected - read;
-                
+
                 [os write:[chunk bytes] maxLength:chunkSize];
                 read += [chunk length];
             }
@@ -656,10 +656,10 @@ NSMutableDictionary *fileStreams = nil;
             [os open];
             long size = asset.size;
             long max = MIN(size, [end longValue]);
-            
+
             while(read < expected)
             {
-                
+
                 uint8_t * chunk[10240];
                 long chunkSize = 0;
                 if([start longValue] + read + 10240 > max)
@@ -677,7 +677,7 @@ NSMutableDictionary *fileStreams = nil;
                 if( chunkRead <= 0)
                     break;
                 long remain = expected - read;
-                
+
                 [os write:chunk maxLength:chunkSize];
                 read += chunkRead;
             }
@@ -688,7 +688,7 @@ NSMutableDictionary *fileStreams = nil;
         {
             reject(@"slice error",  [NSString stringWithFormat: @"could not resolve URI %@", path ], nil);
         }
-        
+
     }];
 }
 
@@ -701,7 +701,7 @@ NSMutableDictionary *fileStreams = nil;
         [[RNFetchBlobFS getFileStreams] setValue:nil forKey:self.streamId];
         self.streamId = nil;
     }
-    
+
 }
 
 
@@ -737,7 +737,7 @@ NSMutableDictionary *fileStreams = nil;
     NSError *error = nil;
     NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
     NSDictionary *dictionary = [[NSFileManager defaultManager] attributesOfFileSystemForPath:[paths lastObject] error: &error];
-    
+
     if (dictionary) {
         NSNumber *fileSystemSizeInBytes = [dictionary objectForKey: NSFileSystemSize];
         NSNumber *freeFileSystemSizeInBytes = [dictionary objectForKey:NSFileSystemFreeSize];
@@ -750,7 +750,7 @@ NSMutableDictionary *fileStreams = nil;
     } else {
         callback(@[@"failed to get storage usage."]);
     }
-    
+
 }
 
 + (void) writeAssetToPath:(ALAssetRepresentation * )rep dest:(NSString *)dest

src/ios/RNFetchBlobNetwork.m

@@ -127,7 +127,7 @@ NSOperationQueue *taskQueue;
         [cookieStr appendString:cookie.name];
         [cookieStr appendString:@"="];
         [cookieStr appendString:cookie.value];
-        
+
         if(cookie.expiresDate == nil) {
             [cookieStr appendString:@"; max-age=0"];
         }
@@ -138,18 +138,18 @@ NSOperationQueue *taskQueue;
             NSString *strDate = [dateFormatter stringFromDate:cookie.expiresDate];
             [cookieStr appendString:strDate];
         }
-        
-        
+
+
         [cookieStr appendString:@"; domain="];
         [cookieStr appendString:hostname];
         [cookieStr appendString:@"; path="];
         [cookieStr appendString:cookie.path];
-        
-        
+
+
         if (cookie.isSecure) {
             [cookieStr appendString:@"; secure"];
         }
-        
+
         if (cookie.isHTTPOnly) {
             [cookieStr appendString:@"; httponly"];
         }
@@ -284,7 +284,7 @@ NSOperationQueue *taskQueue;
         respData = [[NSMutableData alloc] init];
         respFile = NO;
     }
-    
+
     __block NSURLSessionDataTask * task = [session dataTaskWithRequest:req];
     [taskTable setObject:task forKey:taskId];
     [task resume];
@@ -293,7 +293,7 @@ NSOperationQueue *taskQueue;
     if([[options objectForKey:CONFIG_INDICATOR] boolValue] == YES)
         [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
     __block UIApplication * app = [UIApplication sharedApplication];
-    
+
     // #115 handling task expired when application entering backgound for a long time
     UIBackgroundTaskIdentifier tid = [app beginBackgroundTaskWithName:taskId expirationHandler:^{
         NSLog([NSString stringWithFormat:@"session %@ expired", taskId ]);
@@ -316,7 +316,7 @@ NSOperationQueue *taskQueue;
         [bridge.eventDispatcher sendDeviceEventWithName:EVENT_EXPIRE body:args];
 
     }
-    
+
     // clear expired task entries
     [expirationTable removeAllObjects];
     expirationTable = [[NSMapTable alloc] init];
@@ -422,7 +422,7 @@ NSOperationQueue *taskQueue;
                 [cookiesTable setObject:cookies forKey:response.URL.host];
             }
         }
-        
+
         [self.bridge.eventDispatcher
          sendDeviceEventWithName: EVENT_STATE_CHANGE
          body:respInfo
@@ -445,7 +445,7 @@ NSOperationQueue *taskQueue;
             }
             BOOL overwrite = [options valueForKey:@"overwrite"] == nil ? YES : [[options valueForKey:@"overwrite"] boolValue];
             BOOL appendToExistingFile = [destPath RNFBContainsString:@"?append=true"];
-            
+
             appendToExistingFile = !overwrite;
 
             // For solving #141 append response data if the file already exists
@@ -559,7 +559,7 @@ NSOperationQueue *taskQueue;
         // if it turns out not to be `nil` that means the response data contains valid UTF8 string,
         // in order to properly encode the UTF8 string, use URL encoding before BASE64 encoding.
         NSString * utf8 = [[NSString alloc] initWithData:respData encoding:NSUTF8StringEncoding];
-        
+
         if(responseFormat == BASE64)
         {
             rnfbRespType = RESP_TYPE_BASE64;
@@ -652,7 +652,7 @@ NSOperationQueue *taskQueue;
 
 - (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task willPerformHTTPRedirection:(NSHTTPURLResponse *)response newRequest:(NSURLRequest *)request completionHandler:(void (^)(NSURLRequest * _Nullable))completionHandler
 {
-    
+
     if(followRedirect)
     {
         if(request.URL != nil)

src/ios/RNFetchBlobReqBuilder.m

@@ -39,7 +39,7 @@
 {
     //    NSString * encodedUrl = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
     NSString * encodedUrl = url;
-    
+
     // send request
     __block NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString: encodedUrl]];
     __block NSMutableDictionary *mheaders = [[NSMutableDictionary alloc] initWithDictionary:[RNFetchBlobNetwork normalizeHeaders:headers]];
@@ -102,7 +102,7 @@
                 {
                     [mheaders setValue:@"application/octet-stream" forKey:@"Content-Type"];
                 }
-                
+
                 // when body is a string contains file path prefix, try load file from the path
                 if([body hasPrefix:FILE_PREFIX]) {
                     __block NSString * orgPath = [body substringFromIndex:[FILE_PREFIX length]];
@@ -130,7 +130,7 @@
                 }
                 // otherwise convert it as BASE64 data string
                 else {
-                    
+
                     __block NSString * cType = [[self class]getHeaderIgnoreCases:@"content-type" fromHeaders:mheaders];
                     // when content-type is application/octet* decode body string using BASE64 decoder
                     if([[cType lowercaseString] hasPrefix:@"application/octet"] || [[cType lowercaseString] RNFBContainsString:@";base64"])
@@ -253,14 +253,14 @@
 }
 
 +(NSString *) getHeaderIgnoreCases:(NSString *)field fromHeaders:(NSMutableDictionary *) headers {
-    
+
     NSString * normalCase = [headers valueForKey:field];
     NSString * ignoredCase = [headers valueForKey:[field lowercaseString]];
     if( normalCase != nil)
         return normalCase;
     else
         return ignoredCase;
-    
+
 }
 
 

test/test-0.10.2.js

@@ -43,7 +43,7 @@ describe('#227 IOS file modification date correctness', (report, done) => {
     let correct = date/Date.now() > 0.95 || date/Date.now() < 1.05;
     report(<Assert key="modification date should be correct"
       expect={true} actual={correct}/>);
-    done();
+    done()
 
   })
 
@@ -57,7 +57,17 @@ describe('#230 add and option for setting if the request follow redirect or not'
   .then((res) => {
     console.log(res.data)
     report(<Assert key="should not redirect twice" expect={1} actual={res.info().redirects.length}/>);
-    done();
+    done()
   })
 
 })
+
+describe('#241 null header silent failed issue', (report, done) => {
+
+  RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/public/github.png`, {
+    foo : null
+  })
+  .then(() => {
+    done()
+  })
+})