Merge pull request #61 from jbrodriguez/encoded

Encoded

README.md

@@ -1,6 +1,6 @@
-# react-native-fetch-blob [![release](https://img.shields.io/github/release/wkh237/react-native-fetch-blob.svg?maxAge=86400&style=flat-square)](https://www.npmjs.com/package/react-native-fetch-blob) [![npm](https://img.shields.io/npm/v/react-native-fetch-blob.svg?style=flat-square)](https://www.npmjs.com/package/react-native-fetch-blob) ![](https://img.shields.io/badge/PR-Welcome-brightgreen.svg?style=flat-square) [![npm](https://img.shields.io/npm/l/express.svg?maxAge=2592000&style=flat-square)]() [![npm](https://img.shields.io/badge/inProgress-0.7.0-yellow.svg?style=flat-square)](https://github.com/wkh237/react-native-fetch-blob/milestones)
+# react-native-fetch-blob [![release](https://img.shields.io/github/release/wkh237/react-native-fetch-blob.svg?maxAge=86400&style=flat-square)](https://www.npmjs.com/package/react-native-fetch-blob) [![npm](https://img.shields.io/npm/v/react-native-fetch-blob.svg?style=flat-square)](https://www.npmjs.com/package/react-native-fetch-blob) ![](https://img.shields.io/badge/PR-Welcome-brightgreen.svg?style=flat-square) [![npm](https://img.shields.io/npm/l/express.svg?maxAge=2592000&style=flat-square)]()
 
-A module provides upload, download, and files access API. Supports file stream read/write for process large files.
+A project committed to make file acess and transfer easier and effiecient for React Native developers.
 
 ## TOC
 * [About](#user-content-about)
@@ -20,7 +20,7 @@ A module provides upload, download, and files access API. Supports file stream r
 * [API References](https://github.com/wkh237/react-native-fetch-blob/wiki/Fetch-API)
 * [Trouble Shooting](https://github.com/wkh237/react-native-fetch-blob/wiki/Trouble-Shooting)
 * [Development](#user-content-development)
- 
+
 ## About
 
 React Native does not support `Blob` object at this moment, which means if you're going to send/receive binary data via `fetch` API, that might not work as you expect. See [facebook/react-native#854](https://github.com/facebook/react-native/issues/854).
@@ -47,9 +47,17 @@ Link package using [rnpm](https://github.com/rnpm/rnpm)
 rnpm link
 ```
 
-### For React Native >= 0.29.0 (Android)
+### Manually link package
+
+If rnpm link command failed to link the package automatically, you might try manually link the package.
+
+Edit add package to`android/settings.gradle`
 
-> If you're using react-native >= `0.29.0`, the package might not be able to link through `rnpm link`, and you might see an error screen similar to [#51](https://github.com/wkh237/react-native-fetch-blob/issues/51), this is because [a bug in 0.29.0](https://github.com/facebook/react-native/commit/4dabb575b1b311ba541fae7eabbd49f08b5391b3), someone has already fixed it, but the solution does not work on our project, you may have to manually add the package yourself.
+```diff
+include ':app'      
++ include ':react-native-fetch-blob'                                                                                                  
++ project(':react-native-fetch-blob').projectDir = new File(rootProject.projectDir,' ../node_modules/react-native-fetch-blob/android')                        
+```
 
 Add this code to `MainApplication.java`
 
@@ -595,6 +603,7 @@ RNFetchBlob.config({
 
 | Version | |
 |---|---|
+| 0.7.1 | Fix #57 ios module could not compile on ios version <= 9.3 |
 | 0.7.0 | Add support of Android upload progress, and remove AsyncHttpClient dependency from Android native implementation. |
 | 0.6.4 | Fix rnpm link script. |
 | 0.6.3 | Fix performance issue on IOS, increase max concurrent request limitation from 1. |

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fetchblob",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "private": true,
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",

src/README.md

@@ -597,6 +597,7 @@ RNFetchBlob.config({
 
 | Version | |
 |---|---|
+| 0.7.1 | Fix #57 ios module could not compile on ios version <= 9.3 |
 | 0.7.0 | Add support of Android upload progress, and remove AsyncHttpClient dependency from Android native implementation. |
 | 0.6.4 | Fix rnpm link script. |
 | 0.6.3 | Fix performance issue on IOS, increase max concurrent request limitation from 1. |

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

@@ -171,4 +171,3 @@ public class RNFetchBlob extends ReactContextBaseJavaModule {
     }
 
 }
-

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

@@ -20,6 +20,7 @@ import java.util.HashMap;
 
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
+import okhttp3.FormBody;
 import okio.Buffer;
 import okio.BufferedSink;
 import okio.ForwardingSink;
@@ -71,11 +72,14 @@ public class RNFetchBlobBody extends RequestBody{
             case SingleFile:
                 writeOctetData(sink);
                 break;
+			case Encoded:
+				writeEncodedData(sink);
+				break;
         }
         buffer.flush();
     }
 
-    private void writeFormData(BufferedSink sink) throws IOException {
+	private void writeFormData(BufferedSink sink) throws IOException {
         String boundary = "RNFetchBlob-" + mTaskId;
         ArrayList<FormField> fields = countFormDataLength();
         ReactApplicationContext ctx = RNFetchBlob.RCTContext;
@@ -184,6 +188,33 @@ public class RNFetchBlobBody extends RequestBody{
 
     }
 
+
+	/**
+     * Write form-encoded data to request body
+     * @param sink
+     */
+	 // This is NOT working since sink.write, creates a Transfer-Encoding: chunked
+	 // header, which is not expected from servers
+	private void writeEncodedData(BufferedSink sink) throws IOException {
+		FormBody.Builder body = new FormBody.Builder();
+
+		// String[] pairs = rawBody.split("&");
+		// for ( String pair : pairs ) {
+		// 	String[] kv = pair.split("=");
+		// 	body.add(kv[0], kv[1]);
+		// }
+		// body.build().writeTo(sink);
+
+		// String header = "Content-Disposition: form-data; \r\n";
+		// String header = "Content-Type: application/x-www-form-urlencoded\r\n\r\n";
+		// sink.write(header.getBytes());
+		// byte[] fieldData = field.data.getBytes();
+		// bytesWritten += fieldData.length;
+		sink.write(rawBody.getBytes());
+
+
+	}
+
     /**
      * Pipe input stream to request body output stream
      * @param stream    The input stream

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

@@ -11,7 +11,7 @@ public class RNFetchBlobConst {
     public static final String FILE_PREFIX = "RNFetchBlob-file://";
     public static final MediaType MIME_OCTET = MediaType.parse("application/octet-stream");
     public static final MediaType MIME_MULTIPART = MediaType.parse("multipart/form-data");
+	public static final MediaType MIME_ENCODED = MediaType.parse("application/x-www-form-urlencoded");
     public static final String FILE_PREFIX_BUNDLE_ASSET = "bundle-assets://";
     public static final String FILE_PREFIX_CONTENT = "content://";
-
 }

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

@@ -799,5 +799,3 @@ public class RNFetchBlobFS {
     }
 
 }
-
-

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

@@ -8,6 +8,7 @@ import android.content.IntentFilter;
 import android.database.Cursor;
 import android.net.Uri;
 import android.util.Base64;
+import android.util.Log;
 
 import com.RNFetchBlob.Response.RNFetchBlobDefaultResp;
 import com.RNFetchBlob.Response.RNFetchBlobFileResp;
@@ -34,6 +35,7 @@ import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
+import okhttp3.FormBody;
 
 /**
  * Created by wkh237 on 2016/6/21.
@@ -42,6 +44,7 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
 
     enum RequestType  {
         Form,
+		Encoded,
         SingleFile,
         WithoutBody,
         Others
@@ -85,7 +88,9 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
         else
             responseType = ResponseType.KeepInMemory;
 
-        if (body != null)
+        if (body != null && headers.hasKey("content-type") && "application/x-www-form-urlencoded".equals(headers.getString("content-type")))
+			requestType = RequestType.Encoded;
+		else if (body != null)
             requestType = RequestType.SingleFile;
         else if (arrayBody != null)
             requestType = RequestType.Form;
@@ -135,23 +140,26 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
 
         // find cached result if `key` property exists
         String cacheKey = this.taskId;
-//        if (this.options.key != null) {
-//            cacheKey = RNFetchBlobUtils.getMD5(this.options.key);
-//            if (cacheKey == null) {
-//                cacheKey = this.taskId;
-//            }
-//
-//            File file = new File(RNFetchBlobFS.getTmpPath(ctx, cacheKey));
-//            if (file.exists()) {
-//                callback.invoke(null, file.getAbsolutePath());
-//                return;
-//            }
-//        }
+		String ext = this.options.appendExt != "" ? "." + this.options.appendExt : "";
+
+       	if (this.options.key != null) {
+           cacheKey = RNFetchBlobUtils.getMD5(this.options.key);
+           if (cacheKey == null) {
+               cacheKey = this.taskId;
+           }
+
+           File file = new File(RNFetchBlobFS.getTmpPath(RNFetchBlob.RCTContext, cacheKey) + ext);
+
+           if (file.exists()) {
+               callback.invoke(null, file.getAbsolutePath());
+               return;
+           }
+       }
 
         if(this.options.path != null)
             this.destPath = this.options.path;
         else if(this.options.fileCache == true)
-            this.destPath = RNFetchBlobFS.getTmpPath(RNFetchBlob.RCTContext, cacheKey);
+            this.destPath = RNFetchBlobFS.getTmpPath(RNFetchBlob.RCTContext, cacheKey) + ext;
 
         OkHttpClient.Builder clientBuilder;
 
@@ -197,6 +205,21 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
                             MediaType.parse("multipart/form-data; boundary=RNFetchBlob-" + taskId)
                     ));
                     break;
+				case Encoded:
+					// rawRequestBody has an expected format of
+					// key1=value1&key2=value&...
+					FormBody.Builder formBuilder = new FormBody.Builder();
+
+					String[] pairs = rawRequestBody.split("&");
+					for ( String pair : pairs ) {
+						String[] kv = pair.split("=");
+						formBuilder.add(kv[0], kv[1]);
+					}
+
+					RequestBody body = formBuilder.build();
+
+					builder.method(method, body);
+					break;
                 case WithoutBody:
                     builder.method(method, null);
                     break;

src/ios/RNFetchBlob.xcodeproj/project.pbxproj

@@ -190,7 +190,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -228,7 +228,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;

src/ios/RNFetchBlob/RNFetchBlob.m

@@ -62,14 +62,14 @@ RCT_EXPORT_METHOD(fetchBlobForm:(NSDictionary *)options
                   form:(NSArray *)form
                   callback:(RCTResponseSenderBlock)callback)
 {
-    
+
     [RNFetchBlobReqBuilder buildMultipartRequest:options taskId:taskId method:method url:url headers:headers form:form onComplete:^(NSURLRequest *req, long bodyLength) {
         // send HTTP request
         RNFetchBlobNetwork * utils = [[RNFetchBlobNetwork alloc] init];
         [utils sendRequest:options contentLength:bodyLength bridge:self.bridge taskId:taskId withRequest:req callback:callback];
         utils = nil;
     }];
-    
+
 }
 
 // Fetch blob data request
@@ -80,20 +80,29 @@ RCT_EXPORT_METHOD(fetchBlob:(NSDictionary *)options
                   headers:(NSDictionary *)headers
                   body:(NSString *)body callback:(RCTResponseSenderBlock)callback)
 {
-    [RNFetchBlobReqBuilder buildOctetRequest:options taskId:taskId method:method url:url headers:headers body:body onComplete:^(NSURLRequest *req, long bodyLength) {
-        // send HTTP request
-        RNFetchBlobNetwork * utils = [[RNFetchBlobNetwork alloc] init];
-        [utils sendRequest:options contentLength:bodyLength bridge:self.bridge taskId:taskId withRequest:req callback:callback];
-        utils = nil;
-    }];
-    
+	NSString *cType = [headers valueForKey:"content-type"]
+	if (cType != nil && cType == @"application/x-www-form-urlencoded") {
+		[RNFetchBlobReqBuilder buildEncodedRequest:options taskId:taskId method:method url:url headers:headers body:body onComplete:^(NSURLRequest *req, long bodyLength) {
+	        // send HTTP request
+	        RNFetchBlobNetwork * utils = [[RNFetchBlobNetwork alloc] init];
+	        [utils sendRequest:options contentLength:bodyLength bridge:self.bridge taskId:taskId withRequest:req callback:callback];
+	        utils = nil;
+	    }];
+	} else {
+		[RNFetchBlobReqBuilder buildOctetRequest:options taskId:taskId method:method url:url headers:headers body:body onComplete:^(NSURLRequest *req, long bodyLength) {
+	        // send HTTP request
+	        RNFetchBlobNetwork * utils = [[RNFetchBlobNetwork alloc] init];
+	        [utils sendRequest:options contentLength:bodyLength 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) {
-    
+
     NSFileManager * fm = [NSFileManager defaultManager];
     NSData * fileContent = nil;
-    
+
     if([[encoding lowercaseString] isEqualToString:@"utf8"]) {
         fileContent = [[NSData alloc] initWithData:[data dataUsingEncoding:NSUTF8StringEncoding allowLossyConversion:YES]];
     }
@@ -103,18 +112,18 @@ RCT_EXPORT_METHOD(createFile:(NSString *)path data:(NSString *)data encoding:(NS
     else {
         fileContent = [[NSData alloc] initWithData:[data dataUsingEncoding:NSASCIIStringEncoding allowLossyConversion:YES]];
     }
-    
+
     BOOL success = [fm createFileAtPath:path contents:fileContent attributes:NULL];
     if(success == YES)
         callback(@[[NSNull null]]);
     else
         callback(@[[NSString stringWithFormat:@"failed to create new file at path %@ please ensure the folder exists"]]);
-    
+
 }
 
 // method for create file with ASCII content
 RCT_EXPORT_METHOD(createFileASCII:(NSString *)path data:(NSArray *)dataArray callback:(RCTResponseSenderBlock)callback) {
-    
+
     NSFileManager * fm = [NSFileManager defaultManager];
     NSMutableData * fileContent = [NSMutableData alloc];
     // prevent stack overflow, alloc on heap
@@ -130,7 +139,7 @@ RCT_EXPORT_METHOD(createFileASCII:(NSString *)path data:(NSArray *)dataArray cal
         callback(@[[NSNull null]]);
     else
         callback(@[[NSString stringWithFormat:@"failed to create new file at path %@ please ensure the folder exists"]]);
-    
+
 }
 
 
@@ -139,7 +148,7 @@ RCT_EXPORT_METHOD(exists:(NSString *)path callback:(RCTResponseSenderBlock)callb
     BOOL exists = NO;
     exists = [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory: &isDir];
     callback(@[@(exists), @(isDir)]);
-    
+
 }
 
 RCT_EXPORT_METHOD(writeFile:(NSString *)path encoding:(NSString *)encoding data:(NSString *)data append:(BOOL)append resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject {
@@ -202,7 +211,7 @@ RCT_EXPORT_METHOD(unlink:(NSString *)path callback:(RCTResponseSenderBlock) call
 RCT_EXPORT_METHOD(removeSession:(NSArray *)paths callback:(RCTResponseSenderBlock) callback) {
     NSError * error = nil;
     NSString * tmpPath = nil;
-    
+
     for(NSString * path in paths) {
         [[NSFileManager defaultManager] removeItemAtPath:path error:&error];
         if(error != nil) {
@@ -211,7 +220,7 @@ RCT_EXPORT_METHOD(removeSession:(NSArray *)paths callback:(RCTResponseSenderBloc
         }
     }
     callback(@[[NSNull null]]);
-    
+
 }
 
 RCT_EXPORT_METHOD(ls:(NSString *)path callback:(RCTResponseSenderBlock) callback) {
@@ -225,12 +234,12 @@ RCT_EXPORT_METHOD(ls:(NSString *)path callback:(RCTResponseSenderBlock) callback
     }
     NSError * error = nil;
     NSArray * result = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:path error:&error];
-    
+
     if(error == nil)
         callback(@[[NSNull null], result == nil ? [NSNull null] :result ]);
     else
         callback(@[[error localizedDescription], [NSNull null]]);
-    
+
 }
 
 RCT_EXPORT_METHOD(stat:(NSString *)path callback:(RCTResponseSenderBlock) callback) {
@@ -238,30 +247,30 @@ 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]]);
         return ;
     }
     NSData * res = [RNFetchBlobFS stat:path error:&error];
-    
+
     if(error == nil)
         callback(@[[NSNull null], res]);
     else
         callback(@[[error localizedDescription], [NSNull null]]);
-    
+
 }
 
 RCT_EXPORT_METHOD(lstat:(NSString *)path callback:(RCTResponseSenderBlock) callback) {
     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]]);
@@ -269,7 +278,7 @@ RCT_EXPORT_METHOD(lstat:(NSString *)path callback:(RCTResponseSenderBlock) callb
     }
     NSError * error = nil;
     NSArray * files = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:path error:&error];
-    
+
     NSMutableArray * res = [[NSMutableArray alloc] init];
     if(isDir == YES) {
         for(NSString * p in files) {
@@ -280,35 +289,35 @@ RCT_EXPORT_METHOD(lstat:(NSString *)path callback:(RCTResponseSenderBlock) callb
     else {
         [res addObject:[RNFetchBlobFS stat:path error:&error]];
     }
-    
+
     if(error == nil)
         callback(@[[NSNull null], res == nil ? [NSNull null] :res ]);
     else
         callback(@[[error localizedDescription], [NSNull null]]);
-    
+
 }
 
 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)
         callback(@[[NSNull null], @YES]);
     else
         callback(@[[error localizedDescription], @NO]);
-    
+
 }
 
 RCT_EXPORT_METHOD(mv:(NSString *)path toPath:(NSString *)dest callback:(RCTResponseSenderBlock) callback) {
     NSError * error = nil;
     BOOL result = [[NSFileManager defaultManager] moveItemAtURL:[NSURL fileURLWithPath:path] toURL:[NSURL fileURLWithPath:dest] error:&error];
-    
+
     if(error == nil)
         callback(@[[NSNull null], @YES]);
     else
         callback(@[[error localizedDescription], @NO]);
-    
+
 }
 
 RCT_EXPORT_METHOD(mkdir:(NSString *)path callback:(RCTResponseSenderBlock) callback) {
@@ -322,12 +331,12 @@ 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 onComplete:nil];
 })
 
 RCT_EXPORT_METHOD(readStream:(NSString *)path withEncoding:(NSString *)encoding bufferSize:(int)bufferSize) {
-    
+
     RNFetchBlobFS *fileStream = [[RNFetchBlobFS alloc] initWithBridgeRef:self.bridge];
     if(bufferSize == nil) {
         if([[encoding lowercaseString] isEqualToString:@"base64"])
@@ -340,7 +349,7 @@ RCT_EXPORT_METHOD(readStream:(NSString *)path withEncoding:(NSString *)encoding
 }
 
 RCT_EXPORT_METHOD(getEnvironmentDirs:(RCTResponseSenderBlock) callback) {
-    
+
     callback(@[
                [RNFetchBlobFS getDocumentDir],
                [RNFetchBlobFS getCacheDir],
@@ -350,7 +359,7 @@ RCT_EXPORT_METHOD(getEnvironmentDirs:(RCTResponseSenderBlock) callback) {
 RCT_EXPORT_METHOD(cancelRequest:(NSString *)taskId callback:(RCTResponseSenderBlock)callback) {
     [RNFetchBlobNetwork cancelRequest:taskId];
     callback(@[[NSNull null], taskId]);
-    
+
 }
 
 #pragma mark RNFetchBlob private methods

src/ios/RNFetchBlobConst.h

@@ -27,6 +27,7 @@ extern NSString *const CONFIG_FILE_PATH;
 extern NSString *const CONFIG_FILE_EXT;
 extern NSString *const CONFIG_TRUSTY;
 extern NSString *const CONFIG_INDICATOR;
+extern NSString *const CONFIG_KEY;
 
 // fs events
 extern NSString *const FS_EVENT_DATA;

src/ios/RNFetchBlobConst.m

@@ -19,6 +19,7 @@ extern NSString *const CONFIG_FILE_PATH = @"path";
 extern NSString *const CONFIG_FILE_EXT = @"appendExt";
 extern NSString *const CONFIG_TRUSTY = @"trusty";
 extern NSString *const CONFIG_INDICATOR = @"indicator";
+extern NSString *const CONFIG_KEY = "@key";
 
 
 extern NSString *const MSG_EVENT = @"RNFetchBlobMessage";

src/ios/RNFetchBlobNetwork.m

@@ -14,6 +14,7 @@
 #import "RNFetchBlobFS.h"
 #import "RNFetchBlobNetwork.h"
 #import "RNFetchBlobConst.h"
+#import <CommonCrypto/CommonDigest.h>
 
 ////////////////////////////////////////
 //
@@ -64,15 +65,27 @@ NSOperationQueue *taskQueue;
 
 // removing case from headers
 + (NSMutableDictionary *) normalizeHeaders:(NSDictionary *)headers {
-    
+
     NSMutableDictionary * mheaders = [[NSMutableDictionary alloc]init];
     for(NSString * key in headers) {
         [mheaders setValue:[headers valueForKey:key] forKey:[key lowercaseString]];
     }
-    
+
     return mheaders;
 }
 
+- (NSString *)md5 {
+    const char* str = [self UTF8String];
+    unsigned char result[CC_MD5_DIGEST_LENGTH];
+    CC_MD5(str, (CC_LONG)strlen(str), result);
+
+    NSMutableString *ret = [NSMutableString stringWithCapacity:CC_MD5_DIGEST_LENGTH*2];
+    for(int i = 0; i<CC_MD5_DIGEST_LENGTH; i++) {
+        [ret appendFormat:@"%02x",result[i]];
+    }
+    return ret;
+}
+
 // send HTTP request
 - (void) sendRequest:(NSDictionary  * _Nullable )options
        contentLength:(long) contentLength
@@ -88,25 +101,41 @@ NSOperationQueue *taskQueue;
     self.expectedBytes = 0;
     self.receivedBytes = 0;
     self.options = options;
-    
+
     NSString * path = [self.options valueForKey:CONFIG_FILE_PATH];
     NSString * ext = [self.options valueForKey:CONFIG_FILE_EXT];
+	NSString * key = [self.options valueForKey:CONFIG_KEY];
     NSURLSession * session;
-    
+
     bodyLength = contentLength;
-    
+
     // the session trust any SSL certification
 
     NSURLSessionConfiguration *defaultConfigObject = [NSURLSessionConfiguration defaultSessionConfiguration];
     session = [NSURLSession sessionWithConfiguration:defaultConfigObject delegate:self delegateQueue:[NSOperationQueue mainQueue]];
-    
+
     if(path != nil || [self.options valueForKey:CONFIG_USE_TEMP]!= nil)
     {
         respFile = YES;
+
+		NSString* cacheKey = taskId;
+		if (key != nil) {
+			cacheKey = [key md5];
+			if (cacheKey == nil) {
+				cacheKey = taskId;
+			}
+
+			destPath = [RNFetchBlobFS getTempPath:cacheKey withExtension:[self.options valueForKey:CONFIG_FILE_EXT]];
+            if ([[NSFileManager defaultManager] fileExistsAtPath:destPath]) {
+				callback([NSNull null], destPath]);
+                return;
+            }
+		}
+
         if(path != nil)
             destPath = path;
-        else
-            destPath = [RNFetchBlobFS getTempPath:taskId withExtension:[self.options valueForKey:CONFIG_FILE_EXT]];
+        // else
+        //     destPath = [RNFetchBlobFS getTempPath:cacheKey withExtension:[self.options valueForKey:CONFIG_FILE_EXT]];
     }
     else
     {
@@ -116,7 +145,7 @@ NSOperationQueue *taskQueue;
     NSURLSessionDataTask * task = [session dataTaskWithRequest:req];
     [taskTable setValue:task forKey:taskId];
     [task resume];
-    
+
     // network status indicator
     if([[options objectForKey:CONFIG_INDICATOR] boolValue] == YES)
         [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
@@ -135,7 +164,7 @@ NSOperationQueue *taskQueue;
 - (void) URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask didReceiveResponse:(NSURLResponse *)response completionHandler:(void (^)(NSURLSessionResponseDisposition))completionHandler
 {
     expectedBytes = [response expectedContentLength];
-    
+
     if(respFile == YES)
     {
         NSFileManager * fm = [NSFileManager defaultManager];
@@ -163,7 +192,7 @@ NSOperationQueue *taskQueue;
     {
         [writeStream write:[data bytes] maxLength:[data length]];
     }
-    
+
     [self.bridge.eventDispatcher
      sendDeviceEventWithName:@"RNFetchBlobProgress"
      body:@{
@@ -172,7 +201,7 @@ NSOperationQueue *taskQueue;
             @"total": [NSString stringWithFormat:@"%d", expectedBytes]
             }
      ];
-    
+
 }
 
 - (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCompleteWithError:(NSError *)error {
@@ -211,7 +240,7 @@ NSOperationQueue *taskQueue;
 }
 
 //- (void) application:(UIApplication *)application handleEventsForBackgroundURLSession:(NSString *)identifier completionHandler:(void (^)())completionHandler {
-//    
+//
 //}
 
 //- (void) URLSessionDidFinishEventsForBackgroundURLSession:(NSURLSession *)session
@@ -257,4 +286,4 @@ NSOperationQueue *taskQueue;
     }
 }
 
-@end
+@end

src/ios/RNFetchBlobReqBuilder.h

@@ -29,6 +29,15 @@
                      body:(NSString *)body
                onComplete:(void(^)(NSURLRequest * req, long bodyLength))onComplete;
 
++(void) buildEncodedRequest:(NSDictionary *)options
+                      taskId:(NSString *)taskId
+                      method:(NSString *)method
+                         url:(NSString *)url
+                     headers:(NSDictionary *)headers
+                        form:(NSString *)body
+                  onComplete:(void(^)(NSURLRequest * req, long bodyLength))onComplete;
+
+
 @end
 
 #endif /* RNFetchBlobReqBuilder_h */

src/ios/RNFetchBlobReqBuilder.m

@@ -14,7 +14,7 @@
 
 @interface RNFetchBlobReqBuilder()
 {
-    
+
 }
 @end
 
@@ -36,7 +36,7 @@
     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), ^{
@@ -58,7 +58,7 @@
             [request setAllHTTPHeaderFields:mheaders];
             onComplete(request, [formData length]);
         }];
-        
+
     });
 }
 
@@ -76,7 +76,7 @@
     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), ^{
@@ -86,7 +86,7 @@
         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]];
@@ -110,19 +110,33 @@
                     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, size);
     });
 }
 
++(void) buildEncodedRequest:(NSDictionary *)options
+                   taskId:(NSString *)taskId
+                   method:(NSString *)method
+                      url:(NSString *)url
+                  headers:(NSDictionary *)headers
+                     body:(NSString *)body
+               onComplete:(void(^)(NSURLRequest * req, long bodyLength))onComplete
+{
+	NSMutableData * formData = [[NSMutableData alloc] init];
+	[formData appendData:[[NSString stringWithFormat:@"%@", body] dataUsingEncoding:NSUTF8StringEncoding]];
+	onComplete(formData);
+}
+
+
 +(void) buildFormBody:(NSArray *)form boundary:(NSString *)boundary onComplete:(void(^)(NSData * formData))onComplete
 {
     NSMutableData * formData = [[NSMutableData alloc] init];
@@ -189,7 +203,7 @@
             }
             else
                 onComplete(formData);
-            
+
         };
         getFieldData([form objectAtIndex:i]);
     }

src/package.json

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

test.sh

@@ -42,6 +42,7 @@ npm install --save react-native-fetch-blob@0.7.0-dev.1
 rnpm link
 
 # copy android assets
+cd ${CWD}
 cp -R ./test/assets/ ./RNFetchBlobTest/android/app/src/main/assets/
 
 # start RN