Merge remote-tracking branch 'wkh237/feat_45' into feat_45

* wkh237/feat_45:
  Add test cases #45
  Fix IOS ALAsset upload issue #45
  Add test cases for #45
  Fix cp and stat for assets #45
  Add #45 Android implementation

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

@@ -13,9 +13,12 @@ import java.util.Map;
 public class RNFetchBlob extends ReactContextBaseJavaModule {
 
     String filePathPrefix = "RNFetchBlob-file://";
+    static ReactApplicationContext RCTContext;
 
     public RNFetchBlob(ReactApplicationContext reactContext) {
+
         super(reactContext);
+        RCTContext = reactContext;
     }
 
     @Override

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

@@ -1,10 +1,16 @@
 package com.RNFetchBlob;
 
+import android.app.Application;
+import android.content.CursorLoader;
 import android.content.Intent;
+import android.content.res.AssetFileDescriptor;
+import android.content.res.AssetManager;
+import android.database.Cursor;
 import android.media.MediaScannerConnection;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Environment;
+import android.provider.MediaStore;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
@@ -43,6 +49,7 @@ public class RNFetchBlobFS {
     ReactApplicationContext mCtx;
     DeviceEventManagerModule.RCTDeviceEventEmitter emitter;
     String encoding = "base64";
+    static final String assetPrefix = "bundle-assets://";
     boolean append = false;
     OutputStream writeStreamInstance = null;
     static HashMap<String, RNFetchBlobFS> fileStreams = new HashMap<>();
@@ -134,6 +141,7 @@ public class RNFetchBlobFS {
      * @param promise
      */
     static public void readFile(String path, String encoding, final Promise promise ) {
+        path = normalizePath(path);
         AsyncTask<String, Integer, Integer> task = new AsyncTask<String, Integer, Integer>() {
             @Override
             protected Integer doInBackground(String... strings) {
@@ -141,12 +149,25 @@ public class RNFetchBlobFS {
                 try {
                     String path = strings[0];
                     String encoding = strings[1];
-                    File f = new File(path);
-                    int length = (int) f.length();
-                    byte[] bytes = new byte[length];
-                    FileInputStream in = new FileInputStream(f);
-                    in.read(bytes);
-                    in.close();
+                    byte[] bytes;
+
+                    if(path.startsWith(assetPrefix)) {
+                        String assetName = path.replace(assetPrefix, "");
+                        long length = RNFetchBlob.RCTContext.getAssets().openFd(assetName).getLength();
+                        bytes = new byte[(int) length];
+                        InputStream in = RNFetchBlob.RCTContext.getAssets().open(assetName);
+                        in.read(bytes, 0, (int) length);
+                        in.close();
+                    }
+                    else {
+                        File f = new File(path);
+                        int length = (int) f.length();
+                        bytes = new byte[length];
+                        FileInputStream in = new FileInputStream(f);
+                        in.read(bytes);
+                        in.close();
+                    }
+
                     switch (encoding.toLowerCase()) {
                         case "base64" :
                             promise.resolve(Base64.encodeToString(bytes, 0));
@@ -209,6 +230,7 @@ public class RNFetchBlobFS {
      * @param bufferSize    Buffer size of read stream, default to 4096 (4095 when encode is `base64`)
      */
     public void readStream( String path, String encoding, int bufferSize) {
+        path = normalizePath(path);
         AsyncTask<String, Integer, Integer> task = new AsyncTask<String, Integer, Integer>() {
             @Override
             protected Integer doInBackground(String ... args) {
@@ -221,7 +243,15 @@ public class RNFetchBlobFS {
                     int chunkSize = encoding.equalsIgnoreCase("base64") ? 4095 : 4096;
                     if(bufferSize > 0)
                         chunkSize = bufferSize;
-                    FileInputStream fs = new FileInputStream(new File(path));
+
+                    InputStream fs;
+                    if(path.startsWith(assetPrefix)) {
+                        fs = RNFetchBlob.RCTContext.getAssets().open(path.replace(assetPrefix, ""));
+                    }
+                    else {
+                        fs = new FileInputStream(new File(path));
+                    }
+
                     byte[] buffer = new byte[chunkSize];
                     int cursor = 0;
                     boolean error = false;
@@ -314,7 +344,6 @@ public class RNFetchBlobFS {
         try {
             stream.write(chunk);
             callback.invoke();
-            chunk = null;
         } catch (Exception e) {
             callback.invoke(e.getLocalizedMessage());
         }
@@ -344,7 +373,7 @@ public class RNFetchBlobFS {
     }
 
     /**
-     * Close file stream by ID
+     * Close file write stream by ID
      * @param streamId Stream ID
      * @param callback JS context callback
      */
@@ -395,13 +424,13 @@ public class RNFetchBlobFS {
      * @param callback  JS context callback
      */
     static void cp(String path, String dest, Callback callback) {
+        path = normalizePath(path);
         InputStream in = null;
         OutputStream out = null;
 
         try {
 
-            String destFolder = new File(dest).getPath();
-            if(!new File(path).exists()) {
+            if(!isPathExists(path)) {
                 callback.invoke("cp error: source file at path`" + path + "` not exists");
                 return;
             }
@@ -409,7 +438,7 @@ public class RNFetchBlobFS {
             if(!new File(dest).exists())
                 new File(dest).createNewFile();
 
-            in = new FileInputStream(path);
+            in = inputStreamFromPath(path);
             out = new FileOutputStream(dest);
 
             byte[] buf = new byte[1024];
@@ -454,9 +483,22 @@ public class RNFetchBlobFS {
      * @param callback  JS context callback
      */
     static void exists(String path, Callback callback) {
-        boolean exist = new File(path).exists();
-        boolean isDir = new File(path).isDirectory();;
-        callback.invoke(exist, isDir);
+        path = normalizePath(path);
+        if(isAsset(path)) {
+            try {
+                String filename = path.replace(assetPrefix, "");
+                AssetFileDescriptor fd = RNFetchBlob.RCTContext.getAssets().openFd(filename);
+                callback.invoke(true, false);
+            } catch (IOException e) {
+                callback.invoke(false, false);
+            }
+        }
+        else {
+            boolean exist = new File(path).exists();
+            boolean isDir = new File(path).isDirectory();
+            callback.invoke(exist, isDir);
+        }
+
     }
 
     /**
@@ -465,21 +507,23 @@ public class RNFetchBlobFS {
      * @param callback  JS context callback
      */
     static void ls(String path, Callback callback) {
+        path = normalizePath(path);
         File src = new File(path);
-        if(!src.exists() || !src.isDirectory()) {
+        if (!src.exists() || !src.isDirectory()) {
             callback.invoke("ls error: failed to list path `" + path + "` for it is not exist or it is not a folder");
             return;
         }
-        String [] files = new File(path).list();
+        String[] files = new File(path).list();
         WritableArray arg = Arguments.createArray();
-        for(String i : files) {
+        for (String i : files) {
             arg.pushString(i);
         }
         callback.invoke(null, arg);
     }
 
     static void lstat(String path, final Callback callback) {
-        File src = new File(path);
+        path = normalizePath(path);
+
         new AsyncTask<String, Integer, Integer>() {
             @Override
             protected Integer doInBackground(String ...args) {
@@ -511,24 +555,55 @@ public class RNFetchBlobFS {
      */
     static void stat(String path, Callback callback) {
         try {
-            File target = new File(path);
-            if (!target.exists()) {
-                callback.invoke("stat error: file " + path + " does not exists");
-                return;
-            }
-            WritableMap stat = Arguments.createMap();
-            stat.putString("filename", target.getName());
-            stat.putString("path", target.getPath());
-            stat.putString("type", target.isDirectory() ? "directory" : "file");
-            stat.putString("size", String.valueOf(target.length()));
-            String lastModified = String.valueOf(target.lastModified());
-            stat.putString("lastModified", lastModified);
-            callback.invoke(null, stat);
+            callback.invoke(null, statFile(path));
         } catch(Exception err) {
             callback.invoke(err.getLocalizedMessage());
         }
     }
 
+    /**
+     * Basic stat method
+     * @param path
+     * @return Stat result of a file or path
+     */
+    static WritableMap statFile(String path) {
+        try {
+            path = normalizePath(path);
+            WritableMap stat = Arguments.createMap();
+            if(isAsset(path)) {
+                String name = path.replace(assetPrefix, "");
+                AssetFileDescriptor fd = RNFetchBlob.RCTContext.getAssets().openFd(name);
+                stat.putString("filename", name);
+                stat.putString("path", path);
+                stat.putString("type", "asset");
+                stat.putString("size", String.valueOf(fd.getLength()));
+                stat.putString("lastModified", "0");
+            }
+            else {
+                File target = new File(path);
+                if (!target.exists()) {
+                    return null;
+                }
+                stat.putString("filename", target.getName());
+                stat.putString("path", target.getPath());
+                stat.putString("type", target.isDirectory() ? "directory" : "file");
+                stat.putString("size", String.valueOf(target.length()));
+                String lastModified = String.valueOf(target.lastModified());
+                stat.putString("lastModified", lastModified);
+
+            }
+            return stat;
+        } catch(Exception err) {
+            return null;
+        }
+    }
+
+    /**
+     * Media scanner scan file
+     * @param path
+     * @param mimes
+     * @param callback
+     */
     void scanFile(String [] path, String[] mimes, final Callback callback) {
         try {
             MediaScannerConnection.scanFile(mCtx, path, mimes, new MediaScannerConnection.OnScanCompletedListener() {
@@ -669,18 +744,60 @@ public class RNFetchBlobFS {
         this.emitter.emit("RNFetchBlobStream" + taskId, eventData);
     }
 
-    static WritableMap statFile(String path) {
-        File target = new File(path);
-        if(!target.exists()) {
-            return null;
+    /**
+     * Get input stream of the given path, when the path is a string starts with bundle-assets://
+     * the stream is created by Assets Manager, otherwise use FileInputStream.
+     * @param path
+     * @return
+     * @throws IOException
+     */
+    static InputStream inputStreamFromPath(String path) throws IOException {
+        if (path.startsWith(assetPrefix)) {
+            return RNFetchBlob.RCTContext.getAssets().open(path.replace(assetPrefix, ""));
+        }
+        return new FileInputStream(new File(path));
+    }
+
+    /**
+     * Check if the asset or the file exists
+     * @param path
+     * @return
+     */
+    static boolean isPathExists(String path) {
+        if(path.startsWith(assetPrefix)) {
+            try {
+                RNFetchBlob.RCTContext.getAssets().open(path.replace(assetPrefix, ""));
+            } catch (IOException e) {
+                return false;
+            }
+            return true;
+        }
+        else {
+            return new File(path).exists();
+        }
+
+    }
+
+    static boolean isAsset(String path) {
+        return path.startsWith(assetPrefix);
+    }
+
+    static String normalizePath(String path) {
+        if(path.startsWith("bundle-assets://")) {
+            return path;
+        }
+        else if (path.startsWith("content://")) {
+            String[] proj = { MediaStore.Images.Media.DATA };
+            Uri contentUri = Uri.parse(path);
+            CursorLoader loader = new CursorLoader(RNFetchBlob.RCTContext, contentUri, proj, null, null, null);
+            Cursor cursor = loader.loadInBackground();
+            int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+            cursor.moveToFirst();
+            String result = cursor.getString(column_index);
+            cursor.close();
+            return result;
         }
-        WritableMap stat = Arguments.createMap();
-        stat.putString("filename", target.getName());
-        stat.putString("path", target.getPath());
-        stat.putString("type", target.isDirectory() ? "directory" : "file");
-        stat.putInt("size", (int)target.length());
-        stat.putInt("lastModified", (int)target.lastModified());
-        return stat;
+        return path;
     }
 
 }

src/fs.js

@@ -8,6 +8,7 @@
 import {
   NativeModules,
   DeviceEventEmitter,
+  Platform,
   NativeAppEventEmitter,
 } from 'react-native'
 import RNFetchBlobSession from './class/RNFetchBlobSession'
@@ -47,6 +48,15 @@ function session(name:string):RNFetchBlobSession {
   }
 }
 
+function asset(path:string):string {
+  if(Platform.OS === 'ios') {
+    // path from camera roll
+    if(/^assets-library\:\/\//.test(path))
+      return path
+  }
+  return 'bundle-assets://' + path
+}
+
 function createFile(path:string, data:string, encoding: 'base64' | 'ascii' | 'utf8'):Promise {
   encoding = encoding || 'utf8'
   return new Promise((resolve, reject) => {
@@ -324,5 +334,6 @@ export default {
   stat,
   lstat,
   scanFile,
-  dirs
+  dirs,
+  asset
 }

src/index.js

@@ -272,5 +272,5 @@ export default {
   config,
   session,
   fs,
-  wrap,
+  wrap
 }

src/ios/RNFetchBlob.xcodeproj/project.pbxproj

@@ -12,6 +12,7 @@
 		A158F4301D0539DB006FFD38 /* RNFetchBlobNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = A158F42F1D0539DB006FFD38 /* RNFetchBlobNetwork.m */; };
 		A15C30141CD25C330074CB35 /* RNFetchBlob.m in Sources */ = {isa = PBXBuildFile; fileRef = A15C30131CD25C330074CB35 /* RNFetchBlob.m */; };
 		A166D1AA1CE0647A00273590 /* RNFetchBlob.h in Sources */ = {isa = PBXBuildFile; fileRef = A15C30111CD25C330074CB35 /* RNFetchBlob.h */; };
+		A1AAE2991D300E4D0051D11C /* RNFetchBlobReqBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = A1AAE2981D300E4D0051D11C /* RNFetchBlobReqBuilder.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -36,6 +37,8 @@
 		A15C300E1CD25C330074CB35 /* libRNFetchBlob.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNFetchBlob.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		A15C30111CD25C330074CB35 /* RNFetchBlob.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RNFetchBlob.h; path = RNFetchBlob/RNFetchBlob.h; sourceTree = "<group>"; };
 		A15C30131CD25C330074CB35 /* RNFetchBlob.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RNFetchBlob.m; path = RNFetchBlob/RNFetchBlob.m; sourceTree = "<group>"; };
+		A1AAE2971D300E3E0051D11C /* RNFetchBlobReqBuilder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFetchBlobReqBuilder.h; sourceTree = "<group>"; };
+		A1AAE2981D300E4D0051D11C /* RNFetchBlobReqBuilder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNFetchBlobReqBuilder.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -59,6 +62,8 @@
 		A15C30051CD25C330074CB35 = {
 			isa = PBXGroup;
 			children = (
+				A1AAE2981D300E4D0051D11C /* RNFetchBlobReqBuilder.m */,
+				A1AAE2971D300E3E0051D11C /* RNFetchBlobReqBuilder.h */,
 				A158F42F1D0539DB006FFD38 /* RNFetchBlobNetwork.m */,
 				A158F42E1D0539CE006FFD38 /* RNFetchBlobNetwork.h */,
 				A158F42C1D0535BB006FFD38 /* RNFetchBlobConst.m */,
@@ -140,6 +145,7 @@
 				A158F42D1D0535BB006FFD38 /* RNFetchBlobConst.m in Sources */,
 				A158F4271D052E49006FFD38 /* RNFetchBlobFS.m in Sources */,
 				A158F4301D0539DB006FFD38 /* RNFetchBlobNetwork.m in Sources */,
+				A1AAE2991D300E4D0051D11C /* RNFetchBlobReqBuilder.m in Sources */,
 				A15C30141CD25C330074CB35 /* RNFetchBlob.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

src/ios/RNFetchBlob/RNFetchBlob.m

@@ -12,6 +12,7 @@
 #import "RNFetchBlobFS.h"
 #import "RNFetchBlobNetwork.h"
 #import "RNFetchBlobConst.h"
+#import "RNFetchBlobReqBuilder.h"
 
 
 ////////////////////////////////////////
@@ -61,77 +62,14 @@ RCT_EXPORT_METHOD(fetchBlobForm:(NSDictionary *)options
                   form:(NSArray *)form
                   callback:(RCTResponseSenderBlock)callback)
 {
-    NSString * encodedUrl = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-    // send request
-    NSMutableURLRequest *request = [[NSMutableURLRequest alloc]
-                                    initWithURL:[NSURL
-                                                 URLWithString: encodedUrl]];
     
-    NSMutableDictionary *mheaders = [[NSMutableDictionary alloc] initWithDictionary:[ RNFetchBlobNetwork normalizeHeaders:headers]];
-    
-    
-    NSTimeInterval timeStamp = [[NSDate date] timeIntervalSince1970];
-    NSNumber * timeStampObj = [NSNumber numberWithDouble: timeStamp];
-    
-    // generate boundary
-    NSString * boundary = [NSString stringWithFormat:@"RNFetchBlob%d", timeStampObj];
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        NSMutableData * postData = [[NSMutableData alloc] init];
-        // if method is POST or PUT, convert data string format
-        if([[method lowercaseString] isEqualToString:@"post"] || [[method lowercaseString] isEqualToString:@"put"]) {
-            
-            // combine multipart/form-data body
-            for(id field in form) {
-                NSString * name = [field valueForKey:@"name"];
-                NSString * content = [field valueForKey:@"data"];
-                // field is a text field
-                if([field valueForKey:@"filename"] == nil || content == [NSNull null]) {
-                    [postData appendData:[[NSString stringWithFormat:@"--%@\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
-                    [postData appendData:[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"%@\"\r\n", name] dataUsingEncoding:NSUTF8StringEncoding]];
-                    [postData appendData:[[NSString stringWithFormat:@"Content-Type: text/plain\r\n\r\n"] dataUsingEncoding:NSUTF8StringEncoding]];
-                    [postData appendData:[[NSString stringWithFormat:@"%@\r\n", content] dataUsingEncoding:NSUTF8StringEncoding]];
-                }
-                // field contains a file
-                else {
-                    NSMutableData * blobData;
-                    if(content != nil) {
-                        if([content hasPrefix:self.filePathPrefix]) {
-                            NSString * orgPath = [content substringFromIndex:[self.filePathPrefix length]];
-                            blobData = [[NSData alloc] initWithContentsOfFile:orgPath];
-                        }
-                        else
-                            blobData = [[NSData alloc] initWithBase64EncodedString:content options:0];
-                    }
-                    NSString * filename = [field valueForKey:@"filename"];
-                    [postData appendData:[[NSString stringWithFormat:@"--%@\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
-                    [postData appendData:[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"%@\"; filename=\"%@\"\r\n", name, filename] dataUsingEncoding:NSUTF8StringEncoding]];
-                    [postData appendData:[[NSString stringWithFormat:@"Content-Type: application/octet-stream\r\n\r\n"] dataUsingEncoding:NSUTF8StringEncoding]];
-                    [postData appendData:blobData];
-                    [postData appendData:[[NSString stringWithFormat:@"\r\n"] dataUsingEncoding:NSUTF8StringEncoding]];
-                }
-                
-            }
-            
-            // close form data
-            [postData appendData: [[NSString stringWithFormat:@"--%@--\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
-            [request setHTTPBody:postData];
-            // set content-length
-            [mheaders setValue:[NSString stringWithFormat:@"%d",[postData length]] forKey:@"Content-Length"];
-            [mheaders setValue:[NSString stringWithFormat:@"100-continue",[postData length]] forKey:@"Expect"];
-            // appaned boundary to content-type
-            [mheaders setValue:[NSString stringWithFormat:@"multipart/form-data; charset=utf-8; boundary=%@", boundary] forKey:@"content-type"];
-            
-        }
-        
-        [request setHTTPMethod: method];
-        [request setAllHTTPHeaderFields:mheaders];
-        
-        
+    [RNFetchBlobReqBuilder buildMultipartRequest:options taskId:taskId method:method url:url headers:headers form:form onComplete:^(NSURLRequest *req) {
         // send HTTP request
         RNFetchBlobNetwork * utils = [[RNFetchBlobNetwork alloc] init];
-        [utils sendRequest:options bridge:self.bridge taskId:taskId withRequest:request callback:callback];
+        [utils sendRequest:options bridge:self.bridge taskId:taskId withRequest:req callback:callback];
         utils = nil;
-    });
+    }];
+    
 }
 
 // Fetch blob data request
@@ -142,45 +80,13 @@ RCT_EXPORT_METHOD(fetchBlob:(NSDictionary *)options
                   headers:(NSDictionary *)headers
                   body:(NSString *)body callback:(RCTResponseSenderBlock)callback)
 {
-    NSString * encodedUrl = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-    // send request
-    NSMutableURLRequest *request = [[NSMutableURLRequest alloc]
-                                    initWithURL:[NSURL
-                                                 URLWithString: encodedUrl]];
-    
-    NSMutableDictionary *mheaders = [[NSMutableDictionary alloc] initWithDictionary:[RNFetchBlobNetwork normalizeHeaders:headers]];
-    // move heavy task to another thread
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        NSMutableData * blobData;
-        // if method is POST or PUT, convert data string format
-        if([[method lowercaseString] isEqualToString:@"post"] || [[method lowercaseString] isEqualToString:@"put"]) {
-            // generate octet-stream body
-            if(body != nil) {
-                
-                // when body is a string contains file path prefix, try load file from the path
-                if([body hasPrefix:self.filePathPrefix]) {
-                    NSString * orgPath = [body substringFromIndex:[self.filePathPrefix length]];
-                    [request setHTTPBodyStream: [NSInputStream inputStreamWithFileAtPath:orgPath ]];
-                }
-                // otherwise convert it as BASE64 data string
-                else {
-                    blobData = [[NSData alloc] initWithBase64EncodedString:body options:0];
-                    [request setHTTPBody:blobData];
-                }
-                
-                [mheaders setValue:@"application/octet-stream" forKey:@"content-type"];
-                
-            }
-        }
-        
-        [request setHTTPMethod: method];
-        [request setAllHTTPHeaderFields:mheaders];
-        
+    [RNFetchBlobReqBuilder buildOctetRequest:options taskId:taskId method:method url:url headers:headers body:body onComplete:^(NSURLRequest *req) {
         // send HTTP request
         RNFetchBlobNetwork * utils = [[RNFetchBlobNetwork alloc] init];
-        [utils sendRequest:options bridge:self.bridge taskId:taskId withRequest:request callback:callback];
+        [utils sendRequest:options bridge:self.bridge taskId:taskId withRequest:req callback:callback];
         utils = nil;
-    });
+    }];
+    
 }
 
 RCT_EXPORT_METHOD(createFile:(NSString *)path data:(NSString *)data encoding:(NSString *)encoding callback:(RCTResponseSenderBlock)callback) {
@@ -332,6 +238,9 @@ RCT_EXPORT_METHOD(stat:(NSString *)path callback:(RCTResponseSenderBlock) callba
     BOOL exist = nil;
     BOOL isDir = nil;
     NSError * error = nil;
+    
+    path = [RNFetchBlobFS getPathOfAsset:path];
+    
     exist = [fm fileExistsAtPath:path isDirectory:&isDir];
     if(exist == NO) {
         callback(@[[NSString stringWithFormat:@"failed to list path `%@` for it is not exist or it is not exist", path]]);
@@ -350,6 +259,9 @@ RCT_EXPORT_METHOD(lstat:(NSString *)path callback:(RCTResponseSenderBlock) callb
     NSFileManager* fm = [NSFileManager defaultManager];
     BOOL exist = nil;
     BOOL isDir = nil;
+    
+    path = [RNFetchBlobFS getPathOfAsset:path];
+    
     exist = [fm fileExistsAtPath:path isDirectory:&isDir];
     if(exist == NO) {
         callback(@[[NSString stringWithFormat:@"failed to list path `%@` for it is not exist or it is not exist", path]]);
@@ -378,6 +290,7 @@ RCT_EXPORT_METHOD(lstat:(NSString *)path callback:(RCTResponseSenderBlock) callb
 
 RCT_EXPORT_METHOD(cp:(NSString *)path toPath:(NSString *)dest callback:(RCTResponseSenderBlock) callback) {
     NSError * error = nil;
+    path = [RNFetchBlobFS getPathOfAsset:path];
     BOOL result = [[NSFileManager defaultManager] copyItemAtURL:[NSURL fileURLWithPath:path] toURL:[NSURL fileURLWithPath:dest] error:&error];
     
     if(error == nil)
@@ -410,7 +323,7 @@ RCT_EXPORT_METHOD(mkdir:(NSString *)path callback:(RCTResponseSenderBlock) callb
 
 RCT_EXPORT_METHOD(readFile:(NSString *)path encoding:(NSString *)encoding resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject {
     
-    [RNFetchBlobFS readFile:path encoding:encoding resolver:resolve rejecter:reject];
+    [RNFetchBlobFS readFile:path encoding:encoding resolver:resolve rejecter:reject onComplete:nil];
 })
 
 RCT_EXPORT_METHOD(readStream:(NSString *)path withEncoding:(NSString *)encoding bufferSize:(int)bufferSize) {
@@ -423,14 +336,7 @@ RCT_EXPORT_METHOD(readStream:(NSString *)path withEncoding:(NSString *)encoding
             bufferSize = 4096;
     }
     // read asset stream
-    if([path hasPrefix:@"assets-library://"])
-    {
-        
-    }
-    else
-    {
-        [fileStream readWithPath:path useEncoding:encoding bufferSize:bufferSize];
-    }
+    [fileStream readWithPath:path useEncoding:encoding bufferSize:bufferSize];
 }
 
 RCT_EXPORT_METHOD(getEnvironmentDirs:(RCTResponseSenderBlock) callback) {

src/ios/RNFetchBlobConst.h

@@ -16,7 +16,10 @@ extern NSString *const MSG_EVENT;
 extern NSString *const MSG_EVENT_LOG;
 extern NSString *const MSG_EVENT_WARN;
 extern NSString *const MSG_EVENT_ERROR;
+
 extern NSString *const FILE_PREFIX;
+extern NSString *const ASSET_PREFIX;
+extern NSString *const AL_PREFIX;
 
 // config
 extern NSString *const CONFIG_USE_TEMP;

src/ios/RNFetchBlobConst.m

@@ -8,6 +8,10 @@
 #import "RNFetchBlobConst.h"
 
 extern NSString *const FILE_PREFIX = @"RNFetchBlob-file://";
+extern NSString *const ASSET_PREFIX = @"bundle-assets://";
+extern NSString *const AL_PREFIX = @"assets-library://";
+
+
 
 // fetch configs
 extern NSString *const CONFIG_USE_TEMP = @"fileCache";

src/ios/RNFetchBlobFS.h

@@ -11,6 +11,7 @@
 
 #import <Foundation/Foundation.h>
 #import "RCTBridgeModule.h"
+@import AssetsLibrary;
 
 @interface RNFetchBlobFS : NSObject <NSStreamDelegate>  {
     NSOutputStream * outStream;
@@ -42,6 +43,8 @@
 + (NSString *) getCacheDir;
 + (NSString *) getDocumentDir;
 + (NSString *) getTempPath:(NSString*)taskId withExtension:(NSString *)ext;
++ (NSString *) getPathOfAsset:(NSString *)assetURI;
++ (void) getPathFromUri:(NSString *)uri completionHandler:(void(^)(NSString * path, ALAssetRepresentation *asset)) onComplete;
 
 // fs methods
 + (RNFetchBlobFS *) getFileStreams;
@@ -50,9 +53,8 @@
 + (BOOL) exists:(NSString *) path;
 + (void) writeFileArray:(NSString *)path data:(NSArray *)data append:(BOOL)append resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject;
 + (void) writeFile:(NSString *)path encoding:(NSString *)encoding data:(NSString *)data append:(BOOL)append resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject;
-+ (void) readFile:(NSString *)path encoding:(NSString *)encoding resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject;
++ (void) readFile:(NSString *)path encoding:(NSString *)encoding resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject onComplete:(void (^)(NSData * content))onComplete;
 + (void) readAssetFile:(NSData *)assetUrl completionBlock:(void(^)(NSData * content))completionBlock failBlock:(void(^)(NSError * err))failBlock;
-+ (NSString *) getPathOfAsset:(NSString *)assetURI;
 
 // constructor
 - (id) init;

src/ios/RNFetchBlobFS.m

@@ -16,6 +16,7 @@
 #import "RNFetchBlobConst.h"
 @import AssetsLibrary;
 
+
 NSMutableDictionary *fileStreams = nil;
 
 ////////////////////////////////////////
@@ -53,9 +54,9 @@ NSMutableDictionary *fileStreams = nil;
 +(NSString *) getPathOfAsset:(NSString *)assetURI
 {
     // get file path of an app asset
-    if([assetURI hasPrefix:@"bundle-assets://"])
+    if([assetURI hasPrefix:ASSET_PREFIX])
     {
-        assetURI = [assetURI stringByReplacingOccurrencesOfString:@"bundle-assets://" withString:@""];
+        assetURI = [assetURI stringByReplacingOccurrencesOfString:ASSET_PREFIX withString:@""];
         assetURI = [[NSBundle mainBundle] pathForResource: [assetURI stringByDeletingPathExtension]
                                                ofType: [assetURI pathExtension]];
     }
@@ -97,7 +98,7 @@ NSMutableDictionary *fileStreams = nil;
     return tempPath;
 }
 
-- (void) startAssetReadStream:(NSData *)assetUrl
+- (void) startAssetReadStream:(NSString *)assetUrl
 {
     ALAssetsLibraryAssetForURLResultBlock resultblock = ^(ALAsset *myasset)
     {
@@ -184,34 +185,6 @@ NSMutableDictionary *fileStreams = nil;
     }
 }
 
-// read system asset file
-+ (void) readAssetFile:(NSData *)assetUrl completionBlock:(void(^)(NSData * content))completionBlock failBlock:(void(^)(NSError * err))failBlock
-{
-    
-    ALAssetsLibraryAssetForURLResultBlock resultblock = ^(ALAsset *myasset)
-    {
-        ALAssetRepresentation *rep = [myasset defaultRepresentation];
-        Byte *buffer = (Byte*)malloc(rep.size);
-        NSUInteger buffered = [rep getBytes:buffer fromOffset:0.0 length:rep.size error:nil];
-        NSData *data = [NSData dataWithBytesNoCopy:buffer length:buffered freeWhenDone:YES];
-        completionBlock(data);
-    };
-    
-    ALAssetsLibraryAccessFailureBlock failureblock  = ^(NSError *error)
-    {
-        failBlock(error);
-    };
-    
-    if(assetUrl && [assetUrl length])
-    {
-        NSURL *asseturl = [NSURL URLWithString:assetUrl];
-        ALAssetsLibrary* assetslibrary = [[ALAssetsLibrary alloc] init];
-        [assetslibrary assetForURL:asseturl
-                       resultBlock:resultblock
-                      failureBlock:failureblock];
-    }
-}
-
 + (void) writeFile:(NSString *)path encoding:(NSString *)encoding data:(NSString *)data append:(BOOL)append resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject {
     @try {
         NSFileManager * fm = [NSFileManager defaultManager];
@@ -300,68 +273,62 @@ NSMutableDictionary *fileStreams = nil;
     }
 }
 
-+ (void) readFile:(NSString *)path encoding:(NSString *)encoding resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject {
++ (void) readFile:(NSString *)path encoding:(NSString *)encoding
+         resolver:(RCTPromiseResolveBlock)resolve
+         rejecter:(RCTPromiseRejectBlock)reject
+       onComplete:(void (^)(NSData * content))onComplete
+{
     @try
     {
-        // before start reading file, we have to check if the `path` contains any special prefix
-        // if the `path` begins with the following prefix then it will need special handling.
-        //      "assets-library://" this kind of path usually comes from camera roll, should use it's own readFile implementation
-        //      "bundle-assets://" this means an asset inside app bundle, usually we only have to convert it into normal file path
-        if([path hasPrefix:@"assets-library://"])
-        {
-            [[self class] readAssetFile:path completionBlock:^(NSData * content)
+        [[self class] getPathFromUri:path completionHandler:^(NSString *path, ALAssetRepresentation *asset) {
+            NSData * fileContent;
+            NSError * err;
+            if(asset != nil)
+            {
+                Byte * 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
             {
-                if([[encoding lowercaseString] isEqualToString:@"utf8"]) {
-                    resolve([[NSString alloc] initWithData:content encoding:NSUTF8StringEncoding]);
+                BOOL exists = [[NSFileManager defaultManager] fileExistsAtPath:path];
+                if(!exists) {
+                    reject(@"RNFetchBlobFS readFile error", @"file not exists", path);
+                    return;
                 }
-                else if ([[encoding lowercaseString] isEqualToString:@"base64"]) {
-                    resolve([content base64EncodedStringWithOptions:0]);
+                fileContent = [NSData dataWithContentsOfFile:path];
+            }
+            
+            if([[encoding lowercaseString] isEqualToString:@"utf8"]) {
+                if(resolve != nil)
+                    resolve([[NSString alloc] initWithData:fileContent encoding:NSUTF8StringEncoding]);
+            }
+            else if ([[encoding lowercaseString] isEqualToString:@"base64"]) {
+                if(resolve != nil)
+                    resolve([fileContent base64EncodedStringWithOptions:0]);
+            }
+            else if ([[encoding lowercaseString] isEqualToString:@"ascii"]) {
+                NSMutableArray * resultArray = [NSMutableArray array];
+                char * bytes = [fileContent bytes];
+                for(int i=0;i<[fileContent length];i++) {
+                    [resultArray addObject:[NSNumber numberWithChar:bytes[i]]];
                 }
-                else if ([[encoding lowercaseString] isEqualToString:@"ascii"]) {
-                    NSMutableArray * resultArray = [NSMutableArray array];
-                    char * bytes = [content bytes];
-                    for(int i=0;i<[content length];i++) {
-                        [resultArray addObject:[NSNumber numberWithChar:bytes[i]]];
-                    }
+                if(resolve != nil)
                     resolve(resultArray);
-                }
-            } failBlock:^(NSError *err) {
-                @throw @"RNFetchBlobFS readFile error", @"failed to read asset", path;
-            }];
-            return ;
-        }
-        
-        // normalize the file path
-        path = [[self class]getPathOfAsset:path];
-        
-        NSFileManager * fm = [NSFileManager defaultManager];
-        NSError *err = nil;
-        BOOL exists = [fm fileExistsAtPath:path];
-        if(!exists) {
-            @throw @"RNFetchBlobFS readFile error", @"file not exists", path;
-            return;
-        }
-        if([[encoding lowercaseString] isEqualToString:@"utf8"]) {
-            NSString * utf8Result = [NSString stringWithContentsOfFile:path encoding:NSUTF8StringEncoding error:&err];
-            resolve(utf8Result);
-        }
-        else if ([[encoding lowercaseString] isEqualToString:@"base64"]) {
-            NSData * fileData = [NSData dataWithContentsOfFile:path];
-            resolve([fileData base64EncodedStringWithOptions:0]);
-        }
-        else if ([[encoding lowercaseString] isEqualToString:@"ascii"]) {
-            NSData * resultData = [NSData dataWithContentsOfFile:path];
-            NSMutableArray * resultArray = [NSMutableArray array];
-            char * bytes = [resultData bytes];
-            for(int i=0;i<[resultData length];i++) {
-                [resultArray addObject:[NSNumber numberWithChar:bytes[i]]];
             }
-            resolve(resultArray);
-        }
-
+        }];
     }
     @catch(NSException * e)
     {
+        if(reject != nil)
         reject(@"RNFetchBlobFS readFile error", @"error", [e description]);
     }
 }
@@ -485,9 +452,9 @@ NSMutableDictionary *fileStreams = nil;
     self.path = path;
     self.bufferSize = bufferSize;
     
-    if([path hasPrefix:@"assets-library://"])
+    if([path hasPrefix:AL_PREFIX])
     {
-     
+        [self startAssetReadStream:path];
         return;
     }
     
@@ -630,4 +597,24 @@ NSMutableDictionary *fileStreams = nil;
 
 }
 
++ (void) getPathFromUri:(NSString *)uri completionHandler:(void(^)(NSString * path, ALAssetRepresentation *asset)) onComplete
+{
+    if([uri hasPrefix:AL_PREFIX])
+    {
+        NSURL *asseturl = [NSURL URLWithString:uri];
+        ALAssetsLibrary* assetslibrary = [[ALAssetsLibrary alloc] init];
+        [assetslibrary assetForURL:asseturl
+                       resultBlock:^(ALAsset *asset) {
+                           onComplete(nil, [asset defaultRepresentation]);
+                       }
+                      failureBlock:^(NSError *error) {
+                          onComplete(nil, nil);
+                      }];
+    }
+    else
+    {
+        onComplete([[self class] getPathOfAsset:uri], nil);
+    }
+}
+
 @end

src/ios/RNFetchBlobNetwork.h

@@ -11,6 +11,7 @@
 
 #import <Foundation/Foundation.h>
 #import "RCTBridgeModule.h"
+#import "RNFetchBlobFS.h"
 
 typedef void(^CompletionHander)(NSURL * _Nullable location, NSURLResponse * _Nullable response, NSError * _Nullable error);
 typedef void(^DataTaskCompletionHander) (NSData * _Nullable resp, NSURLResponse * _Nullable response, NSError * _Nullable error);

src/ios/RNFetchBlobReqBuilder.h

@@ -0,0 +1,34 @@
+//
+//  RNFetchBlobReqBuilder.h
+//  RNFetchBlob
+//
+//  Created by Ben Hsieh on 2016/7/9.
+//  Copyright © 2016年 wkh237. All rights reserved.
+//
+
+#ifndef RNFetchBlobReqBuilder_h
+#define RNFetchBlobReqBuilder_h
+
+#import <Foundation/Foundation.h>
+
+@interface RNFetchBlobReqBuilder : NSObject;
+
++(void) buildMultipartRequest:(NSDictionary *)options
+                       taskId:(NSString *)taskId
+                       method:(NSString *)method
+                          url:(NSString *)url
+                      headers:(NSDictionary *)headers
+                         form:(NSArray *)form
+                   onComplete:(void(^)(NSURLRequest * req))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;
+
+@end
+
+#endif /* RNFetchBlobReqBuilder_h */

src/ios/RNFetchBlobReqBuilder.m

@@ -0,0 +1,195 @@
+//
+//  RNFetchBlobReqBuilder.m
+//  RNFetchBlob
+//
+//  Created by Ben Hsieh on 2016/7/9.
+//  Copyright © 2016年 wkh237. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "RNFetchBlobReqBuilder.h"
+#import "RNFetchBlobNetwork.h"
+#import "RNFetchBlobConst.h"
+#import "RNFetchBlobFS.h"
+
+@interface RNFetchBlobReqBuilder()
+{
+    
+}
+@end
+
+@implementation RNFetchBlobReqBuilder
+
+
+// Fetch blob data request
++(void) buildMultipartRequest:(NSDictionary *)options
+                       taskId:(NSString *)taskId
+                       method:(NSString *)method
+                          url:(NSString *)url
+                      headers:(NSDictionary *)headers
+                         form:(NSArray *)form
+                   onComplete:(void(^)(NSURLRequest * req))onComplete
+{
+    NSString * encodedUrl = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    // send request
+    NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString: encodedUrl]];
+    NSMutableDictionary *mheaders = [[NSMutableDictionary alloc] initWithDictionary:[RNFetchBlobNetwork normalizeHeaders:headers]];
+    NSTimeInterval timeStamp = [[NSDate date] timeIntervalSince1970];
+    NSNumber * timeStampObj = [NSNumber numberWithDouble: timeStamp];
+    
+    // generate boundary
+    NSString * boundary = [NSString stringWithFormat:@"RNFetchBlob%d", timeStampObj];
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        NSMutableData * postData = [[NSMutableData alloc] init];
+        // combine multipart/form-data body
+        [[self class] buildFormBody:form boundary:boundary onComplete:^(NSData *formData) {
+            if(formData != nil) {
+                [postData appendData:formData];
+                // close form data
+                [postData appendData: [[NSString stringWithFormat:@"--%@--\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
+                [request setHTTPBody:postData];
+            }
+            // set content-length
+            [mheaders setValue:[NSString stringWithFormat:@"%d",[postData length]] forKey:@"Content-Length"];
+            [mheaders setValue:[NSString stringWithFormat:@"100-continue",[postData length]] forKey:@"Expect"];
+            // appaned boundary to content-type
+            [mheaders setValue:[NSString stringWithFormat:@"multipart/form-data; charset=utf-8; boundary=%@", boundary] forKey:@"content-type"];
+            [request setHTTPMethod: method];
+            [request setAllHTTPHeaderFields:mheaders];
+            onComplete(request);
+        }];
+        
+    });
+}
+
+// Fetch blob data request
++(void) buildOctetRequest:(NSDictionary *)options
+                   taskId:(NSString *)taskId
+                   method:(NSString *)method
+                      url:(NSString *)url
+                  headers:(NSDictionary *)headers
+                     body:(NSString *)body
+               onComplete:(void(^)(NSURLRequest * req))onComplete
+{
+    NSString * encodedUrl = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    // send request
+    NSMutableURLRequest *request = [[NSMutableURLRequest alloc]
+                                    initWithURL:[NSURL
+                                                 URLWithString: encodedUrl]];
+    
+    NSMutableDictionary *mheaders = [[NSMutableDictionary alloc] initWithDictionary:[RNFetchBlobNetwork normalizeHeaders:headers]];
+    // move heavy task to another thread
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        NSMutableData * blobData;
+        // if method is POST or PUT, convert data string format
+        if([[method lowercaseString] isEqualToString:@"post"] || [[method lowercaseString] isEqualToString:@"put"]) {
+            // generate octet-stream body
+            if(body != nil) {
+                
+                // when body is a string contains file path prefix, try load file from the path
+                if([body hasPrefix:FILE_PREFIX]) {
+                    NSString * orgPath = [body substringFromIndex:[FILE_PREFIX length]];
+                    orgPath = [RNFetchBlobFS getPathOfAsset:orgPath];
+                    if([orgPath hasPrefix:AL_PREFIX])
+                    {
+                        [RNFetchBlobFS readFile:orgPath encoding:@"utf8" resolver:nil rejecter:nil onComplete:^(NSData *content) {
+                            [request setHTTPBody:content];
+                            [mheaders setValue:@"application/octet-stream" forKey:@"content-type"];
+                            [request setHTTPMethod: method];
+                            [request setAllHTTPHeaderFields:mheaders];
+                            onComplete(request);
+                        }];
+                        return;
+                    }
+                    [request setHTTPBodyStream: [NSInputStream inputStreamWithFileAtPath:orgPath ]];
+                }
+                // otherwise convert it as BASE64 data string
+                else {
+                    blobData = [[NSData alloc] initWithBase64EncodedString:body options:0];
+                    [request setHTTPBody:blobData];
+                }
+                
+                [mheaders setValue:@"application/octet-stream" forKey:@"content-type"];
+                
+            }
+        }
+        
+        [request setHTTPMethod: method];
+        [request setAllHTTPHeaderFields:mheaders];
+        
+        onComplete(request);
+    });
+}
+
++(void) buildFormBody:(NSArray *)form boundary:(NSString *)boundary onComplete:(void(^)(NSData * formData))onComplete
+{
+    NSMutableData * formData = [[NSMutableData alloc] init];
+    if(form == nil)
+        onComplete(nil);
+    else
+    {
+        __block int i = 0;
+        __block int count = [form count];
+        void __block (^getFieldData)(id field) = ^(id field)
+        {
+            NSString * name = [field valueForKey:@"name"];
+            NSString * content = [field valueForKey:@"data"];
+            // field is a text field
+            if([field valueForKey:@"filename"] == nil || content == [NSNull null]) {
+                [formData appendData:[[NSString stringWithFormat:@"--%@\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
+                [formData appendData:[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"%@\"\r\n", name] dataUsingEncoding:NSUTF8StringEncoding]];
+                [formData appendData:[[NSString stringWithFormat:@"Content-Type: text/plain\r\n\r\n"] dataUsingEncoding:NSUTF8StringEncoding]];
+                [formData appendData:[[NSString stringWithFormat:@"%@\r\n", content] dataUsingEncoding:NSUTF8StringEncoding]];
+            }
+            // field contains a file
+            else {
+                NSMutableData * blobData;
+                if(content != nil)
+                {
+                    // append data from file asynchronously
+                    if([content hasPrefix:FILE_PREFIX])
+                    {
+                        NSString * orgPath = [content substringFromIndex:[FILE_PREFIX length]];
+                        orgPath = [RNFetchBlobFS getPathOfAsset:orgPath];
+                        [RNFetchBlobFS readFile:orgPath encoding:@"utf8" resolver:nil rejecter:nil onComplete:^(NSData *content) {
+                            NSString * filename = [field valueForKey:@"filename"];
+                            [formData appendData:[[NSString stringWithFormat:@"--%@\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
+                            [formData appendData:[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"%@\"; filename=\"%@\"\r\n", name, filename] dataUsingEncoding:NSUTF8StringEncoding]];
+                            [formData appendData:[[NSString stringWithFormat:@"Content-Type: application/octet-stream\r\n\r\n"] dataUsingEncoding:NSUTF8StringEncoding]];
+                            [formData appendData:content];
+                            [formData appendData:[[NSString stringWithFormat:@"\r\n"] dataUsingEncoding:NSUTF8StringEncoding]];
+                            i++;
+                            if(i < count)
+                            {
+                                getFieldData([form objectAtIndex:i]);
+                            }
+                            else
+                                onComplete(formData);
+                        }];
+                        return ;
+                    }
+                    else
+                        blobData = [[NSData alloc] initWithBase64EncodedString:content options:0];
+                }
+                NSString * filename = [field valueForKey:@"filename"];
+                [formData appendData:[[NSString stringWithFormat:@"--%@\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
+                [formData appendData:[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"%@\"; filename=\"%@\"\r\n", name, filename] dataUsingEncoding:NSUTF8StringEncoding]];
+                [formData appendData:[[NSString stringWithFormat:@"Content-Type: application/octet-stream\r\n\r\n"] dataUsingEncoding:NSUTF8StringEncoding]];
+                [formData appendData:blobData];
+                [formData appendData:[[NSString stringWithFormat:@"\r\n"] dataUsingEncoding:NSUTF8StringEncoding]];
+            }
+            i++;
+            if(i < count)
+            {
+                getFieldData([form objectAtIndex:i]);
+            }
+            else
+                onComplete(formData);
+            
+        };
+        getFieldData([form objectAtIndex:i]);
+    }
+}
+
+
+@end

test/test-0.6.2.js

@@ -18,51 +18,132 @@ const { Assert, Comparer, Info, prop } = RNTest
 const describe = RNTest.config({
   group : '0.6.2',
   run : true,
-  expand : true,
+  expand : false,
   timeout : 12000,
 })
-const { TEST_SERVER_URL_SSL, FILENAME, DROPBOX_TOKEN, styles } = prop()
+const { TEST_SERVER_URL, TEST_SERVER_URL_SSL, DROPBOX_TOKEN, styles } = prop()
 const  dirs = RNFetchBlob.fs.dirs
 
 let prefix = ((Platform.OS === 'android') ? 'file://' : '')
+let photo = null
 
-
-describe('access assets from camera roll', (report, done) => {
-  let photo = null
+describe('upload asset from camera roll', (report, done) => {
+  let imgName = `image-from-camera-roll-${Platform.OS}.jpg`
   CameraRoll.getPhotos({first : 10})
     .then((resp) => {
-      photo = resp.edges[0].node.image.uri
-      report(<Info key="items">
-        <Text>{photo}</Text>
-      </Info>)
-      return fs.readFile(photo, 'base64')
+      let url = resp.edges[0].node.image.uri
+      photo = url
+      return RNFetchBlob.fetch('POST', 'https://content.dropboxapi.com/2/files/upload', {
+        Authorization : `Bearer ${DROPBOX_TOKEN}`,
+        'Dropbox-API-Arg': `{\"path\": \"/rn-upload/${imgName}\",\"mode\": \"add\",\"autorename\": false,\"mute\": false}`,
+        'Content-Type' : 'application/octet-stream',
+      }, RNFetchBlob.wrap(url))
+    })
+    .then((resp) => {
+      resp = resp.json()
+      report(
+        <Assert key="confirm the file has been uploaded" expect={imgName} actual={resp.name}/>
+      )
+      done()
+    })
+})
+
+describe('Upload multipart data with file from CameraRoll', (report, done) => {
+    let filename = 'test-from-storage-img-'+Date.now()+'.png'
+    RNFetchBlob.fetch('POST', `${TEST_SERVER_URL}/upload-form`, {
+        'Content-Type' : 'multipart/form-data',
+      }, [
+        { name : 'test-img', filename : filename, data: RNFetchBlob.wrap(photo)},
+        { name : 'test-text', filename : 'test-text.txt', data: RNFetchBlob.base64.encode('hello.txt')},
+        { name : 'field1', data : 'hello !!'},
+        { name : 'field2', data : 'hello2 !!'}
+      ])
+    .then((resp) => {
+      resp = resp.json()
+      report(
+        <Assert key="check posted form data #1" expect="hello !!" actual={resp.fields.field1}/>,
+        <Assert key="check posted form data #2" expect="hello2 !!" actual={resp.fields.field2}/>,
+      )
+      return RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/public/${filename}`)
     })
-    .then((data) => {
-      report(<Info key="asset image">
+    .then((resp) => {
+      report(<Info key="uploaded image">
         <Image
           style={styles.image}
-          source={{uri: `data:image/png;base64, ${data}`}}/>
+          source={{ uri : 'data:image/png;base64, '+ resp.base64()}}/>
       </Info>)
       done()
     })
 })
 
-describe('read asset in app bundle',(report, done) => {
-  let target = 'bundle-assets://test-asset2.png'
-  fs.readFile(target, 'base64')
-  .then((data) => {
-    report(<Info key="asset image">
-      <Image
-        style={styles.image}
-        source={{uri: `data:image/png;base64, ${data}`}}/>
-    </Info>)
-    return fs.readFile('bundle-assets://test-asset1.json', 'utf8')
-  })
-  .then((resp) => {
-    report(
-      <Assert key="asset content verify"
-        expect="asset#1"
-        actual={JSON.parse(resp).secret}/>)
-      done()
-  })
-})
+//
+// describe('access assets from camera roll', (report, done) => {
+//   let photo = null
+//   CameraRoll.getPhotos({first : 10})
+//     .then((resp) => {
+//       photo = resp.edges[0].node.image.uri
+//       report(<Info key="items">
+//         <Text>{photo}</Text>
+//       </Info>)
+//       return fs.readFile(photo, 'base64')
+//     })
+//     .then((data) => {
+//       report(<Info key="asset image">
+//         <Image
+//           style={styles.image}
+//           source={{uri: `data:image/png;base64, ${data}`}}/>
+//       </Info>)
+//       done()
+//     })
+// })
+//
+// describe('read asset in app bundle',(report, done) => {
+//   let target = fs.asset('test-asset2.png')
+//   fs.readFile(target, 'base64')
+//   .then((data) => {
+//     report(<Info key="asset image">
+//       <Image
+//         style={styles.image}
+//         source={{uri: `data:image/png;base64, ${data}`}}/>
+//     </Info>)
+//     return fs.readFile(fs.asset('test-asset1.json'), 'utf8')
+//   })
+//   .then((resp) => {
+//     report(
+//       <Assert key="asset content verify"
+//         expect="asset#1"
+//         actual={JSON.parse(resp).secret}/>)
+//       done()
+//   })
+// })
+//
+// describe('stat assets in app', (report, done) => {
+//   fs.stat(fs.asset('test-asset2.png'))
+//     .then((data) => {
+//       report(<Info key="list of assets">
+//         <Text>{JSON.stringify(data)}</Text>
+//       </Info>)
+//       done()
+//     })
+// })
+//
+// describe('copy asset', (report, done) => {
+//   let dest = `${dirs.DocumentDir}/test-asset-1-${Date.now()}.json`
+//   fs.cp(fs.asset('test-asset1.json'), dest)
+//     .then(() => fs.readFile(dest, 'utf8'))
+//     .then((data) => {
+//       report(<Assert key="asset copied correctly"
+//         expect={'asset#1'}
+//         actual={JSON.parse(data).secret}/>)
+//       return fs.stat(fs.asset('test-asset1.json'))
+//     })
+//     .then((stat) => {
+//       report(<Assert key="file size check"
+//         expect={27}
+//         actual={Math.floor(stat.size)}/>,
+//       <Info key="dest file info">
+//         <Text>{JSON.stringify(stat)}</Text>
+//       </Info>)
+//       done()
+//     })
+// })

test/test-init.js

@@ -18,8 +18,8 @@ const { Assert, Comparer, Info, describe, prop } = RNTest
 // test environment variables
 
 prop('FILENAME', `${Platform.OS}-0.7.0-${Date.now()}.png`)
-prop('TEST_SERVER_URL', 'http://192.168.16.70:8123')
-prop('TEST_SERVER_URL_SSL', 'https://192.168.16.70:8124')
+prop('TEST_SERVER_URL', 'http://192.168.0.11:8123')
+prop('TEST_SERVER_URL_SSL', 'https://192.168.0.11:8124')
 prop('DROPBOX_TOKEN', 'fsXcpmKPrHgAAAAAAAAAoXZhcXYWdgLpQMan6Tb_bzJ237DXhgQSev12hA-gUXt4')
 prop('styles', {
   image : {
@@ -51,10 +51,10 @@ describe('GET image from server', (report, done) => {
     })
 })
 //
-// require('./test-0.1.x-0.4.x')
-// require('./test-0.5.1')
-// require('./test-0.5.2')
-// require('./test-0.6.0')
+require('./test-0.1.x-0.4.x')
+require('./test-0.5.1')
+require('./test-0.5.2')
+require('./test-0.6.0')
 require('./test-0.6.2')
-// require('./test-fs')
-// require('./test-android')
+require('./test-fs')
+require('./test-android')