Merge pull request #40 from jbrodriguez/issue-35-NetworkOptimization

Issue 35 network optimization

README.md

@@ -1,4 +1,4 @@
-# react-native-fetch-blob [![npm](https://img.shields.io/npm/v/react-native-fetch-blob.svg?style=flat-square)]() ![](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)]()
+# 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.
 

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

@@ -14,6 +14,7 @@ public class RNFetchBlobConfig {
     public String appendExt;
     public ReadableMap addAndroidDownloads;
     public Boolean trusty;
+    public String key;
 
     RNFetchBlobConfig(ReadableMap options) {
         if(options == null)
@@ -25,6 +26,7 @@ public class RNFetchBlobConfig {
         if(options.hasKey("addAndroidDownloads")) {
             this.addAndroidDownloads = options.getMap("addAndroidDownloads");
         }
+        this.key = options.hasKey("key") ? options.getString("key") : null;
     }
 
 }

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

@@ -27,25 +27,25 @@ public class RNFetchBlobFileHandler extends FileAsyncHttpResponseHandler {
     String mTaskId;
     RNFetchBlobConfig mConfig;
 
-    RNFetchBlobFileHandler(ReactApplicationContext ctx, String taskId, RNFetchBlobConfig config, Callback onResponse) {
-        super(new File( RNFetchBlobFileHandler.getFilePath(ctx, taskId, config)), false, false);
+    RNFetchBlobFileHandler(ReactApplicationContext ctx, String taskId, String key, RNFetchBlobConfig config, Callback onResponse) {
+        super(new File( RNFetchBlobFileHandler.getFilePath(ctx, taskId, key, config)), false, false);
         this.onResponse = onResponse;
         this.mTaskId = taskId;
         this.mConfig = config;
         this.mCtx = ctx;
-        if(!new File(RNFetchBlobFileHandler.getFilePath(ctx, taskId, config)).isFile()) {
+        if(!new File(RNFetchBlobFileHandler.getFilePath(ctx, taskId, key, config)).isFile()) {
             this.isValid = false;
         }
         this.isValid = true;
     }
 
-    static String getFilePath(ReactApplicationContext ctx, String taskId, RNFetchBlobConfig config) {
+    static String getFilePath(ReactApplicationContext ctx, String taskId, String key, RNFetchBlobConfig config) {
         if(config.path != null)
             return config.path;
         else if(config.fileCache && config.appendExt != null)
-            return RNFetchBlobFS.getTmpPath(ctx, taskId) + "." + config.appendExt;
+            return RNFetchBlobFS.getTmpPath(ctx, key) + "." + config.appendExt;
         else
-            return RNFetchBlobFS.getTmpPath(ctx, taskId);
+            return RNFetchBlobFS.getTmpPath(ctx, key);
     }
 
     @Override

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

@@ -20,6 +20,7 @@ import com.loopj.android.http.MySSLSocketFactory;
 
 import java.io.File;
 import java.security.KeyStore;
+import java.security.MessageDigest;
 
 import cz.msebera.android.httpclient.HttpEntity;
 import cz.msebera.android.httpclient.entity.ByteArrayEntity;
@@ -76,6 +77,28 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
         }
     }
 
+    public static String getMD5(String input) {
+        String result = null;
+
+        try {
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            md.update(input.getBytes());
+            byte[] digest = md.digest();
+            
+            StringBuffer sb = new StringBuffer();
+            
+            for (byte b : digest) {
+                sb.append(String.format("%02x", b & 0xff));
+            }
+
+            result = sb.toString();
+        } catch(Exception ex) {
+            ex.printStackTrace();
+        }
+
+        return result;
+    }
+
     @Override
     public void run() {
 
@@ -107,6 +130,20 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
 
         }
 
+        String cacheKey = this.taskId;
+        if (this.options.key != null) {
+            cacheKey = RNFetchBlobReq.getMD5(this.options.key);
+            if (cacheKey == null) {
+                cacheKey = this.taskId;
+            }
+
+            File file = new File(RNFetchBlobFileHandler.getFilePath(ctx, taskId, cacheKey, this.options));
+            if (file.exists()) {
+               callback.invoke(null, file.getAbsolutePath());
+               return;
+            }
+        }
+
         try {
 
             req = new AsyncHttpClient();
@@ -141,7 +178,7 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
 
             // create handler
             if(options.fileCache || options.path != null) {
-                handler = new RNFetchBlobFileHandler(ctx, taskId, options, callback);
+                handler = new RNFetchBlobFileHandler(ctx, taskId, cacheKey, options, callback);
                 // if path format invalid, throw error
                 if (!((RNFetchBlobFileHandler)handler).isValid) {
                     callback.invoke("RNFetchBlob fetch error, configuration path `"+ options.path  +"` is not a valid path.");

src/index.js

@@ -79,6 +79,12 @@ function wrap(path:string):string {
  *                   If this property has a valid string format, resonse data
  *                   will be saved to specific file path. Default string format
  *                   is : `RNFetchBlob-file://path-to-file`
+ *         @property {string} key
+ *                   If this property is set, it will be converted to md5, to
+ *                   check if a file with this name exists.
+ *                   If it exists, the absolute path is returned (no network 
+ *                   activity takes place )
+ *                   If it doesn't exist, the file is downloaded as usual
  *
  * @return {function} This method returns a `fetch` method instance.
  */
@@ -125,7 +131,7 @@ function fetch(...args:any):Promise {
       else {
         let respType = 'base64'
         // response data is saved to storage
-        if(options.path || options.fileCache || options.addAndroidDownloads) {
+        if(options.path || options.fileCache || options.addAndroidDownloads || options.key) {
           respType = 'path'
           if(options.session)
             session(options.session).add(data)