react-native-blob-util 0.19.9 → 0.19.10

package/ios/ReactNativeBlobUtil/ReactNativeBlobUtil.mm

@@ -680,8 +680,7 @@ RCT_EXPORT_METHOD(readFile:(NSString *)path
         }
         if([encoding isEqualToString:@"ascii"]) {
             resolve((NSMutableArray *)content);
-        }
-        if([encoding isEqualToString:@"base64"]) {
+        } else if([encoding isEqualToString:@"base64"]) {
             resolve([content base64EncodedStringWithOptions:0]);
         } else {
             resolve([[NSString alloc] initWithData:content encoding:NSUTF8StringEncoding]);

package/ios/ReactNativeBlobUtilFS.mm

@@ -581,6 +581,15 @@ NSMutableDictionary *fileStreams = nil;
 
 # pragma mark - hash
 
+typedef enum {
+    HashAlgorithmMD5,
+    HashAlgorithmSHA1,
+    HashAlgorithmSHA224,
+    HashAlgorithmSHA256,
+    HashAlgorithmSHA384,
+    HashAlgorithmSHA512,
+} HashAlgorithm;
+
 + (void) hash:(NSString *)path
                   algorithm:(NSString *)algorithm
                   resolver:(RCTPromiseResolveBlock)resolve
@@ -611,7 +620,11 @@ NSMutableDictionary *fileStreams = nil;
         return;
     }
 
-    NSData *content = [[NSFileManager defaultManager] contentsAtPath:path];
+    NSFileHandle *fileHandle = [NSFileHandle fileHandleForReadingAtPath:path];
+    if (fileHandle == nil) {
+        reject(@"EUNKNOWN", [NSString stringWithFormat:@"Error opening '%@' for reading", path], error);
+        return;
+    }
 
     NSArray *keys = [NSArray arrayWithObjects:@"md5", @"sha1", @"sha224", @"sha256", @"sha384", @"sha512", nil];
 
@@ -634,23 +647,97 @@ NSMutableDictionary *fileStreams = nil;
 
     unsigned char buffer[digestLength];
 
+    const NSUInteger chunkSize = 1024 * 1024; // 1 Megabyte
+    NSData *dataChunk;
+
+    CC_MD5_CTX md5Context;
+    CC_SHA1_CTX sha1Context;
+    CC_SHA256_CTX sha256Context;
+    CC_SHA512_CTX sha512Context;
+    HashAlgorithm hashAlgorithm;
+
     if ([algorithm isEqualToString:@"md5"]) {
-        CC_MD5(content.bytes, (CC_LONG)content.length, buffer);
+        CC_MD5_Init(&md5Context);
+        hashAlgorithm = HashAlgorithmMD5;
     } else if ([algorithm isEqualToString:@"sha1"]) {
-        CC_SHA1(content.bytes, (CC_LONG)content.length, buffer);
+        CC_SHA1_Init(&sha1Context);
+        hashAlgorithm = HashAlgorithmSHA1;
     } else if ([algorithm isEqualToString:@"sha224"]) {
-        CC_SHA224(content.bytes, (CC_LONG)content.length, buffer);
+        CC_SHA224_Init(&sha256Context);
+        hashAlgorithm = HashAlgorithmSHA224;
     } else if ([algorithm isEqualToString:@"sha256"]) {
-        CC_SHA256(content.bytes, (CC_LONG)content.length, buffer);
+        CC_SHA256_Init(&sha256Context);
+        hashAlgorithm = HashAlgorithmSHA256;
     } else if ([algorithm isEqualToString:@"sha384"]) {
-        CC_SHA384(content.bytes, (CC_LONG)content.length, buffer);
+        CC_SHA384_Init(&sha512Context);
+        hashAlgorithm = HashAlgorithmSHA384;
     } else if ([algorithm isEqualToString:@"sha512"]) {
-        CC_SHA512(content.bytes, (CC_LONG)content.length, buffer);
+        CC_SHA512_Init(&sha512Context);
+        hashAlgorithm = HashAlgorithmSHA512;
     } else {
         reject(@"EINVAL", [NSString stringWithFormat:@"Invalid algorithm '%@', must be one of md5, sha1, sha224, sha256, sha384, sha512", algorithm], nil);
         return;
     }
 
+    while (true) {
+        @autoreleasepool {
+            dataChunk = [fileHandle readDataUpToLength:chunkSize error:&error];
+
+            if (error) {
+                return reject(@"EREAD", [NSString stringWithFormat:@"Error reading file '%@'", path], error);
+                break;
+            }
+            
+            if (dataChunk == nil || dataChunk.length == 0) {
+                break;
+            }
+            
+            switch(hashAlgorithm) {
+                case HashAlgorithmMD5:
+                    CC_MD5_Update(&md5Context, [dataChunk bytes], CC_LONG([dataChunk length]));
+                    break;
+                case HashAlgorithmSHA1:
+                    CC_SHA1_Update(&sha1Context, [dataChunk bytes], CC_LONG([dataChunk length]));
+                    break;
+                case HashAlgorithmSHA224:
+                    CC_SHA224_Update(&sha256Context, [dataChunk bytes], CC_LONG([dataChunk length]));
+                    break;
+                case HashAlgorithmSHA256:
+                    CC_SHA256_Update(&sha256Context, [dataChunk bytes], CC_LONG([dataChunk length]));
+                    break;
+                case HashAlgorithmSHA384:
+                    CC_SHA384_Update(&sha512Context, [dataChunk bytes], CC_LONG([dataChunk length]));
+                    break;
+                case HashAlgorithmSHA512:
+                    CC_SHA512_Update(&sha512Context, [dataChunk bytes], CC_LONG([dataChunk length]));
+                    break;
+            }
+            
+            dataChunk = nil;
+        }
+    }
+
+    switch(hashAlgorithm) {
+        case HashAlgorithmMD5:
+            CC_MD5_Final(buffer, &md5Context);
+            break;
+        case HashAlgorithmSHA1:
+            CC_SHA1_Final(buffer, &sha1Context);
+            break;
+        case HashAlgorithmSHA224:
+            CC_SHA224_Final(buffer, &sha256Context);
+            break;
+        case HashAlgorithmSHA256:
+            CC_SHA256_Final(buffer, &sha256Context);
+            break;
+        case HashAlgorithmSHA384:
+            CC_SHA384_Final(buffer, &sha512Context);
+            break;
+        case HashAlgorithmSHA512:
+            CC_SHA512_Final(buffer, &sha512Context);
+            break;
+    }
+
     NSMutableString *output = [NSMutableString stringWithCapacity:digestLength * 2];
     for(int i = 0; i < digestLength; i++)
         [output appendFormat:@"%02x",buffer[i]];

package/ios/ReactNativeBlobUtilRequest.h

@@ -20,7 +20,7 @@
 #import "RCTBridgeModule.h"
 #endif
 
-@interface ReactNativeBlobUtilRequest : NSObject <NSURLSessionDelegate, NSURLSessionTaskDelegate, NSURLSessionDataDelegate>
+@interface ReactNativeBlobUtilRequest : NSObject <NSURLSessionDelegate, NSURLSessionTaskDelegate, NSURLSessionDataDelegate, NSURLSessionDownloadDelegate>
 
 @property (nullable, nonatomic) NSString * taskId;
 @property (nonatomic) long long expectedBytes;
@@ -33,7 +33,7 @@
 @property (nullable, nonatomic) NSError * error;
 @property (nullable, nonatomic) ReactNativeBlobUtilProgress *progressConfig;
 @property (nullable, nonatomic) ReactNativeBlobUtilProgress *uploadProgressConfig;
-@property (nullable, nonatomic, weak) NSURLSessionDataTask *task;
+@property (nullable, nonatomic, weak) NSURLSessionTask *task;
 
 - (void) sendRequest:(NSDictionary  * _Nullable )options
        contentLength:(long)contentLength

package/ios/ReactNativeBlobUtilRequest.mm

@@ -167,9 +167,15 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
         respFile = NO;
     }
 
-    NSURLSessionDataTask *task = [session dataTaskWithRequest:req];
-    [task resume];
-    self.task = task;
+    if(backgroundTask) {
+        NSURLSessionDownloadTask *task = [session downloadTaskWithRequest:req];
+        [task resume];
+        self.task = task;
+    } else {
+        NSURLSessionDataTask *task = [session dataTaskWithRequest:req];
+        [task resume];
+        self.task = task;
+    }
 
     // network status indicator
     if ([[options objectForKey:CONFIG_INDICATOR] boolValue]) {
@@ -188,6 +194,52 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
 
 #pragma mark NSURLSession delegate methods
 
+- (void)configureWriteStream {
+    if (respFile)
+    {
+        @try{
+            NSFileManager * fm = [NSFileManager defaultManager];
+            NSString * folder = [destPath stringByDeletingLastPathComponent];
+
+            if (![fm fileExistsAtPath:folder]) {
+                [fm createDirectoryAtPath:folder withIntermediateDirectories:YES attributes:NULL error:nil];
+            }
+
+            // if not set overwrite in options, defaults to TRUE
+            BOOL overwrite = [options valueForKey:@"overwrite"] == nil ? YES : [[options valueForKey:@"overwrite"] boolValue];
+            BOOL appendToExistingFile = [destPath containsString:@"?append=true"];
+
+            appendToExistingFile = !overwrite;
+
+            // For solving #141 append response data if the file already exists
+            // base on PR#139 @kejinliang
+            if (appendToExistingFile) {
+                destPath = [destPath stringByReplacingOccurrencesOfString:@"?append=true" withString:@""];
+            }
+
+            if (![fm fileExistsAtPath:destPath]) {
+                [fm createFileAtPath:destPath contents:[[NSData alloc] init] attributes:nil];
+            }
+
+            writeStream = [[NSOutputStream alloc] initToFileAtPath:destPath append:appendToExistingFile];
+            [writeStream scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSRunLoopCommonModes];
+            [writeStream open];
+        }
+        @catch(NSException * ex)
+        {
+            NSLog(@"write file error");
+        }
+    }
+}
+
+- (void)processData:(NSData *)data {
+    if (respFile && ![self ShouldTransformFile]) {
+        [writeStream write:(const uint8_t *)[data bytes] maxLength:[data length]];
+    } else {
+        [respData appendData:data];
+    }
+}
+
 
 #pragma mark - Received Response
 // set expected content length on response received
@@ -278,41 +330,7 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
         NSLog(@"oops");
     }
 
-    if (respFile)
-    {
-        @try{
-            NSFileManager * fm = [NSFileManager defaultManager];
-            NSString * folder = [destPath stringByDeletingLastPathComponent];
-
-            if (![fm fileExistsAtPath:folder]) {
-                [fm createDirectoryAtPath:folder withIntermediateDirectories:YES attributes:NULL error:nil];
-            }
-
-            // if not set overwrite in options, defaults to TRUE
-            BOOL overwrite = [options valueForKey:@"overwrite"] == nil ? YES : [[options valueForKey:@"overwrite"] boolValue];
-            BOOL appendToExistingFile = [destPath containsString:@"?append=true"];
-
-            appendToExistingFile = !overwrite;
-
-            // For solving #141 append response data if the file already exists
-            // base on PR#139 @kejinliang
-            if (appendToExistingFile) {
-                destPath = [destPath stringByReplacingOccurrencesOfString:@"?append=true" withString:@""];
-            }
-
-            if (![fm fileExistsAtPath:destPath]) {
-                [fm createFileAtPath:destPath contents:[[NSData alloc] init] attributes:nil];
-            }
-
-            writeStream = [[NSOutputStream alloc] initToFileAtPath:destPath append:appendToExistingFile];
-            [writeStream scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSRunLoopCommonModes];
-            [writeStream open];
-        }
-        @catch(NSException * ex)
-        {
-            NSLog(@"write file error");
-        }
-    }
+    [self configureWriteStream];
 
     completionHandler(NSURLSessionResponseAllow);
 }
@@ -339,11 +357,7 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
 
     // If we need to process the data, we defer writing into the file until the we have all the data, at which point
     // we can perform the processing and then write into the file
-    if (respFile && ![self ShouldTransformFile]) {
-        [writeStream write:(const uint8_t *)[data bytes] maxLength:[data length]];
-    } else {
-        [respData appendData:data];
-    }
+    [self processData:data];
 
     if (expectedBytes == 0) {
         return;
@@ -535,5 +549,36 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
     }
 }
 
+// NSURLSessionDownloadTask delegates
+
+#pragma mark NSURLSessionDownloadTask delegate methods
+
+- (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didFinishDownloadingToURL:(NSURL *)location {
+
+    NSFileManager *fm = [NSFileManager defaultManager];
+    NSData *data = [fm contentsAtPath:location.path];
+
+    [self configureWriteStream];
+
+    [self processData:data];
+
+}
+
+- (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didWriteData:(int64_t)bytesWritten totalBytesWritten:(int64_t)totalBytesWritten totalBytesExpectedToWrite:(int64_t)totalBytesExpectedToWrite {
+    if (totalBytesExpectedToWrite == 0) {
+        return;
+    }
+
+    NSNumber * now =[NSNumber numberWithFloat:((float)totalBytesWritten/(float)totalBytesExpectedToWrite)];
+    if ([self.progressConfig shouldReport:now]) {
+        [self.baseModule emitEventDict:EVENT_PROGRESS
+         body:@{
+                @"taskId": taskId,
+                @"written": [NSString stringWithFormat:@"%lld", (long long) totalBytesWritten],
+                @"total": [NSString stringWithFormat:@"%lld", (long long) totalBytesExpectedToWrite]
+                }
+         ];
+    }
+}
 
 @end

package/package.json

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

package/react-native-blob-util.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.license      = 'MIT'
   s.homepage     = 'n/a'
-  s.source       = { :git => "https://github.com/RonRadtke/react-native-blob-util" }
+  s.source       = { :git => "https://github.com/RonRadtke/react-native-blob-util", :tag => "v#{s.version.to_s}" }
   s.author       = 'RonRadtke'
   s.source_files = 'ios/**/*.{h,m,mm,swift}'
   s.resource_bundles = {