writeFile() Android and iOS: improve errors; ReadStream: Add "ENOENT"…

… (no such file) error event to Android version and add the thus far missing "code" parameter to iOS version

android/src/main/java/com/RNFetchBlob/RNFetchBlobFS.java

@@ -55,27 +55,27 @@ static void writeFile(String path, String encoding, String data, final boolean a
             int written;
             File f = new File(path);
             File dir = f.getParentFile();
-            if(!dir.exists()) {
-                boolean result = dir.mkdirs();
-                if (!result) {
-                    promise.reject("EUNSPECIFIED", "Failed to create parent directory '" + path + "'");
-                    return;
-                }
-            }
+
             if(!f.exists()) {
-                boolean result = f.createNewFile();
-                if (!result) {
-                    promise.reject("EUNSPECIFIED", "Failed to create file '" + path + "'");
+                if(!dir.exists()) {
+                    if (!dir.mkdirs()) {
+                        promise.reject("EUNSPECIFIED", "Failed to create parent directory '" + path + "'");
+                        return;
+                    }
+                }
+                if(!f.createNewFile()) {
+                    promise.reject("ENOENT", "File '" + path + "' does not exist and could not be created");
                     return;
                 }
             }
+
             FileOutputStream fout = new FileOutputStream(f, append);
             // write data from a file
             if(encoding.equalsIgnoreCase(RNFetchBlobConst.DATA_ENCODE_URI)) {
                 String normalizedData = normalizePath(data);
                 File src = new File(normalizedData);
                 if (!src.exists()) {
-                    promise.reject("ENOENT", "No such file '" + normalizedData + "'");
+                    promise.reject("ENOENT", "No such file '" + path + "' " + "('" + normalizedData + "')");
                     fout.close();
                     return;
                 }
@@ -114,20 +114,20 @@ static void writeFile(String path, ReadableArray data, final boolean append, fin
         try {
             File f = new File(path);
             File dir = f.getParentFile();
-            if(!dir.exists()) {
-                boolean result = dir.mkdirs();
-                if (!result) {
-                    promise.reject("EUNSPECIFIED", "Failed to create parent directory '" + path + "'");
-                    return;
-                }
-            }
+
             if(!f.exists()) {
-                boolean result = f.createNewFile();
-                if (!result) {
-                    promise.reject("ENOENT", "File '" + path + "' does not exist and could not be created, or it is a directory");
+                if(!dir.exists()) {
+                    if (!dir.mkdirs()) {
+                        promise.reject("EUNSPECIFIED", "Failed to create parent directory '" + path + "'");
+                        return;
+                    }
+                }
+                if(!f.createNewFile()) {
+                    promise.reject("ENOENT", "File '" + path + "' does not exist and could not be created");
                     return;
                 }
             }
+
             FileOutputStream os = new FileOutputStream(f, append);
             byte[] bytes = new byte[data.size()];
             for(int i=0;i<data.size();i++) {
@@ -138,7 +138,7 @@ static void writeFile(String path, ReadableArray data, final boolean append, fin
             promise.resolve(data.size());
         } catch (FileNotFoundException e) {
             // According to https://docs.oracle.com/javase/7/docs/api/java/io/FileOutputStream.html
-            promise.reject("ENOENT", "File '" + path + "' does not exist and could not be created, or it is a directory");
+            promise.reject("ENOENT", "File '" + path + "' does not exist and could not be created");
         } catch (Exception e) {
             promise.reject("EUNSPECIFIED", e.getLocalizedMessage());
         }
@@ -266,8 +266,8 @@ void readStream(String path, String encoding, int bufferSize, int tick, final St
         String resolved = normalizePath(path);
         if(resolved != null)
             path = resolved;
-        try {
 
+        try {
             int chunkSize = encoding.equalsIgnoreCase("base64") ? 4095 : 4096;
             if(bufferSize > 0)
                 chunkSize = bufferSize;
@@ -276,7 +276,6 @@ void readStream(String path, String encoding, int bufferSize, int tick, final St
 
             if(resolved != null && path.startsWith(RNFetchBlobConst.FILE_PREFIX_BUNDLE_ASSET)) {
                 fs = RNFetchBlob.RCTContext.getAssets().open(path.replace(RNFetchBlobConst.FILE_PREFIX_BUNDLE_ASSET, ""));
-
             }
             // fix issue 287
             else if(resolved == null) {
@@ -336,7 +335,14 @@ else if(resolved == null) {
                 emitStreamEvent(streamId, "end", "");
             fs.close();
             buffer = null;
-
+        } catch (FileNotFoundException err) {
+            emitStreamEvent(
+                    streamId,
+                    "error",
+                    "ENOENT",
+                    "No such file '" + path + "'"
+            );
+        }
         } catch (Exception err) {
             emitStreamEvent(
                     streamId,

ios/RNFetchBlobFS.m

@@ -166,7 +166,7 @@ + (void) readStream:(NSString *)uri
                 if([[NSFileManager defaultManager] fileExistsAtPath:path] == NO)
                 {
                     NSString * message = [NSString stringWithFormat:@"File does not exist at path %@", path];
-                    NSDictionary * payload = @{ @"event": FS_EVENT_ERROR, @"detail": message };
+                    NSDictionary * payload = @{ @"event": FS_EVENT_ERROR, @"code": @"ENOENT", @"detail": message };
                     [event sendDeviceEventWithName:streamId body:payload];
                     free(buffer);
                     return ;
@@ -199,7 +199,7 @@ + (void) readStream:(NSString *)uri
             }
             else
             {
-                NSDictionary * payload = @{ @"event": FS_EVENT_ERROR, @"detail": @"RNFetchBlob.readStream unable to resolve URI" };
+                NSDictionary * payload = @{ @"event": FS_EVENT_ERROR, @"code": @"ENOENT", @"detail": @"Unable to resolve URI" };
                 [event sendDeviceEventWithName:streamId body:payload];
             }
             // release buffer
@@ -209,7 +209,7 @@ + (void) readStream:(NSString *)uri
         }
         @catch (NSError * err)
         {
-            NSDictionary * payload = @{ @"event": FS_EVENT_ERROR, @"detail": [NSString stringWithFormat:@"RNFetchBlob.readStream error %@", [err description]] };
+            NSDictionary * payload = @{ @"event": FS_EVENT_ERROR, @"code": @"EUNSPECIFIED", @"detail": [err description] };
             [event sendDeviceEventWithName:streamId body:payload];
         }
         @finally
@@ -347,15 +347,21 @@ + (void) writeFile:(NSString *)path
         NSString * folder = [path stringByDeletingLastPathComponent];
         encoding = [encoding lowercaseString];
 
-        if(![fm fileExistsAtPath:folder]) {
+        BOOL isDir = NO;
+        BOOL exists = NO;
+        exists = [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory: &isDir];
+
+        if (isDir) {
+            return reject(@"EISDIR", [NSString stringWithFormat:@"Expecting a file but '%@' is a directory", path], nil);
+        }
+
+        if(!exists) {
             [fm createDirectoryAtPath:folder withIntermediateDirectories:YES attributes:NULL error:&err];
             if(err != nil) {
-                reject(@"EUNSPECIFIED", [err description], nil);
-                return;
+                return reject(@"EUNSPECIFIED", @[[NSString stringWithFormat:@"Failed to create parent directory '%@', error: %@", path, [err description]]]], nil);
             }
             if(![fm createFileAtPath:path contents:nil attributes:nil]) {
-                reject(@"ENOENT", [NSString stringWithFormat:@"File '%@' does not exist and could not be created, or it is a directory", path], nil);
-                return;
+                return reject(@"ENOENT", [NSString stringWithFormat:@"File '%@' does not exist and could not be created", path], nil);
             }
         }
 
@@ -408,11 +414,19 @@ + (void) writeFileArray:(NSString *)path
         // check if the folder exists, if not exists, create folders recursively
         // after the folders created, write data into the file
         NSString * folder = [path stringByDeletingLastPathComponent];
-        if(![fm fileExistsAtPath:folder]) {
+
+        BOOL isDir = NO;
+        BOOL exists = NO;
+        exists = [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory: &isDir];
+
+        if (isDir) {
+            return reject(@"EISDIR", [NSString stringWithFormat:@"Expecting a file but '%@' is a directory", path], nil);
+        }
+
+        if(!exists) {
             [fm createDirectoryAtPath:folder withIntermediateDirectories:YES attributes:NULL error:&err];
             if(err != nil) {
-                reject(@"EUNSPECIFIED", [err description], nil);
-                return;
+                return reject(@"EUNSPECIFIED", @[[NSString stringWithFormat:@"Failed to create parent directory '%@', error: %@", path, [err description]]]], nil);
             }
         }
 
@@ -423,8 +437,11 @@ + (void) writeFileArray:(NSString *)path
             bytes[i] = [[data objectAtIndex:i] charValue];
         }
         [fileContent appendBytes:bytes length:data.count];
-        if(![fm fileExistsAtPath:path]) {
-            [fm createFileAtPath:path contents:fileContent attributes:NULL];
+
+        if(!exists) {
+            if(![fm createFileAtPath:path contents:fileContent attributes:NULL]) {
+                return reject(@"ENOENT", [NSString stringWithFormat:@"File '%@' does not exist and could not be created", path], nil);
+            }
         }
         // if file exists, write file
         else {
@@ -513,73 +530,78 @@ + (void) readFile:(NSString *)path
 
 # pragma mark - hash
 
-RCT_EXPORT_METHOD(hash:(NSString *)filepath
+RCT_EXPORT_METHOD(hash:(NSString *)path
                   algorithm:(NSString *)algorithm
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
-  BOOL fileExists = [[NSFileManager defaultManager] fileExistsAtPath:filepath];
-
-  if (!fileExists) {
-    return reject(@"ENOENT", [NSString stringWithFormat:@"No such file '%@'", filepath], nil);
-  }
+    BOOL isDir = NO;
+    BOOL exists = NO;
+    exists = [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory: &isDir];
 
-  NSError *error = nil;
+    if (isDir) {
+        return reject(@"EISDIR", [NSString stringWithFormat:@"Expecting a file but '%@' is a directory", path], nil);
+    }
+    if (!fileExists) {
+        return reject(@"ENOENT", [NSString stringWithFormat:@"No such file '%@'", path], nil);
+    }
 
-  NSDictionary *attributes = [[NSFileManager defaultManager] attributesOfItemAtPath:filepath error:&error];
+    NSError *error = nil;
 
-  if (error) {
-    return [self reject:reject withError:error];
-  }
+    NSDictionary *attributes = [[NSFileManager defaultManager] attributesOfItemAtPath:path error:&error];
 
-  if ([attributes objectForKey:NSFileType] == NSFileTypeDirectory) {
-    return reject(@"EISDIR", [NSString stringWithFormat:@"Expecting a file but '%@' is a directory", filepath], nil);
-  }
+    if (error) {
+        return [self reject:reject withError:error];
+    }
 
-  NSData *content = [[NSFileManager defaultManager] contentsAtPath:filepath];
+    if ([attributes objectForKey:NSFileType] == NSFileTypeDirectory) {
+        return reject(@"EISDIR", [NSString stringWithFormat:@"Expecting a file but '%@' is a directory", path], nil);
+    }
 
-  NSArray *keys = [NSArray arrayWithObjects:@"md5", @"sha1", @"sha224", @"sha256", @"sha384", @"sha512", nil];
+    NSData *content = [[NSFileManager defaultManager] contentsAtPath:path];
 
-  NSArray *digestLengths = [NSArray arrayWithObjects:
-    @CC_MD5_DIGEST_LENGTH,
-    @CC_SHA1_DIGEST_LENGTH,
-    @CC_SHA224_DIGEST_LENGTH,
-    @CC_SHA256_DIGEST_LENGTH,
-    @CC_SHA384_DIGEST_LENGTH,
-    @CC_SHA512_DIGEST_LENGTH,
-    nil];
+    NSArray *keys = [NSArray arrayWithObjects:@"md5", @"sha1", @"sha224", @"sha256", @"sha384", @"sha512", nil];
 
-  NSDictionary *keysToDigestLengths = [NSDictionary dictionaryWithObjects:digestLengths forKeys:keys];
+    NSArray *digestLengths = [NSArray arrayWithObjects:
+        @CC_MD5_DIGEST_LENGTH,
+        @CC_SHA1_DIGEST_LENGTH,
+        @CC_SHA224_DIGEST_LENGTH,
+        @CC_SHA256_DIGEST_LENGTH,
+        @CC_SHA384_DIGEST_LENGTH,
+        @CC_SHA512_DIGEST_LENGTH,
+        nil];
 
-  int digestLength = [[keysToDigestLengths objectForKey:algorithm] intValue];
+    NSDictionary *keysToDigestLengths = [NSDictionary dictionaryWithObjects:digestLengths forKeys:keys];
 
-  if (!digestLength) {
-    return reject(@"EINVAL", [NSString stringWithFormat:@"Invalid algorithm '%@', must be one of md5, sha1, sha224, sha256, sha384, sha512", algorithm], nil);
-  }
+    int digestLength = [[keysToDigestLengths objectForKey:algorithm] intValue];
 
-  unsigned char buffer[digestLength];
+    if (!digestLength) {
+      return reject(@"EINVAL", [NSString stringWithFormat:@"Invalid algorithm '%@', must be one of md5, sha1, sha224, sha256, sha384, sha512", algorithm], nil);
+    }
 
-  if ([algorithm isEqualToString:@"md5"]) {
-    CC_MD5(content.bytes, (CC_LONG)content.length, buffer);
-  } else if ([algorithm isEqualToString:@"sha1"]) {
-    CC_SHA1(content.bytes, (CC_LONG)content.length, buffer);
-  } else if ([algorithm isEqualToString:@"sha224"]) {
-    CC_SHA224(content.bytes, (CC_LONG)content.length, buffer);
-  } else if ([algorithm isEqualToString:@"sha256"]) {
-    CC_SHA256(content.bytes, (CC_LONG)content.length, buffer);
-  } else if ([algorithm isEqualToString:@"sha384"]) {
-    CC_SHA384(content.bytes, (CC_LONG)content.length, buffer);
-  } else if ([algorithm isEqualToString:@"sha512"]) {
-    CC_SHA512(content.bytes, (CC_LONG)content.length, buffer);
-  } else {
-    return reject(@"EINVAL", [NSString stringWithFormat:@"Invalid algorithm '%@', must be one of md5, sha1, sha224, sha256, sha384, sha512", algorithm], nil);
-  }
+    unsigned char buffer[digestLength];
+
+    if ([algorithm isEqualToString:@"md5"]) {
+        CC_MD5(content.bytes, (CC_LONG)content.length, buffer);
+    } else if ([algorithm isEqualToString:@"sha1"]) {
+        CC_SHA1(content.bytes, (CC_LONG)content.length, buffer);
+    } else if ([algorithm isEqualToString:@"sha224"]) {
+        CC_SHA224(content.bytes, (CC_LONG)content.length, buffer);
+    } else if ([algorithm isEqualToString:@"sha256"]) {
+        CC_SHA256(content.bytes, (CC_LONG)content.length, buffer);
+    } else if ([algorithm isEqualToString:@"sha384"]) {
+        CC_SHA384(content.bytes, (CC_LONG)content.length, buffer);
+    } else if ([algorithm isEqualToString:@"sha512"]) {
+        CC_SHA512(content.bytes, (CC_LONG)content.length, buffer);
+    } else {
+        return reject(@"EINVAL", [NSString stringWithFormat:@"Invalid algorithm '%@', must be one of md5, sha1, sha224, sha256, sha384, sha512", algorithm], nil);
+    }
 
-  NSMutableString *output = [NSMutableString stringWithCapacity:digestLength * 2];
-  for(int i = 0; i < digestLength; i++)
-    [output appendFormat:@"%02x",buffer[i]];
+    NSMutableString *output = [NSMutableString stringWithCapacity:digestLength * 2];
+    for(int i = 0; i < digestLength; i++)
+        [output appendFormat:@"%02x",buffer[i]];
 
-  resolve(output);
+    resolve(output);
 }
 
 # pragma mark - mkdir
@@ -740,7 +762,9 @@ + (void)slice:(NSString *)path
             long max = MIN(size, [end longValue]);
 
             if(![fm fileExistsAtPath:dest]) {
-                [fm createFileAtPath:dest contents:@"" attributes:nil];
+                if(![fm createFileAtPath:dest contents:@"" attributes:nil]) {
+                    return reject(@"ENOENT", [NSString stringWithFormat:@"File '%@' does not exist and could not be created", path], nil);
+                }
             }
             [handle seekToFileOffset:[start longValue]];
             while(read < expected) {