Merge branch 'master' into 0.10.0

Author: wkh237

.github/PULL_REQUEST_TEMPLATE

@@ -1,5 +1,5 @@
 Thank you for making a pull request ! Just a gentle reminder :)
 
 1. If the PR is offering a feature please make the request to our "Feature Branch" 0.10.0
-2. Bug fix request to "Bug Fix Branch" 0.9.2
+2. Bug fix request to "Bug Fix Branch" 0.9.4
 3. Correct README.md can directly to master

CONTRIBUTORS.md

@@ -1,10 +1,18 @@
+
 Dmitry Petukhov <[email protected]>
+
 Erik Smartt <[email protected]>
+
 Evgeniy Baraniuk <[email protected]>
+
 Juan B. Rodriguez <[email protected]>
+
 Kaishley <[email protected]>
+
 Nguyen Cao Nhat Linh <[email protected]>
-Tim Suchanek <[email protected]>
+
 follower <[email protected]>
+
 francisco-sanchez-molina <[email protected]>
+
 smartt <[email protected]>

README.md

@@ -41,10 +41,7 @@ cd "${TEST_APP_PATH}"
 npm install --save react-native-fetch-blob
 # libs that requires web API polyfills
 npm install --save firebase
-# libs that requires Node polyfills
-npm install --save oboe
-
-rnpm link
+react-native link
 
 # copy android assets
 cd ${CWD}

img/ios-1.png

@@ -18,7 +18,7 @@ const RNFetchBlob:RNFetchBlobNative = NativeModules.RNFetchBlob
  * @param  {string} mime MIME type string
  * @return {Promise}
  */
-function actionViewIntent(path:string, mime = 'text/plain':string) {
+function actionViewIntent(path:string, mime:string = 'text/plain') {
   if(Platform.OS === 'android')
     return RNFetchBlob.actionViewIntent(path, mime)
   else

img/ios-2.png

@@ -21,6 +21,8 @@ public class RNFetchBlob extends ReactContextBaseJavaModule {
     static ReactApplicationContext RCTContext;
     static LinkedBlockingQueue<Runnable> taskQueue = new LinkedBlockingQueue<>();
     static ThreadPoolExecutor threadPool = new ThreadPoolExecutor(5, 10, 5000, TimeUnit.MILLISECONDS, taskQueue);
+    static LinkedBlockingQueue<Runnable> fsTaskQueue = new LinkedBlockingQueue<>();
+    static ThreadPoolExecutor fsThreadPool = new ThreadPoolExecutor(2, 10, 5000, TimeUnit.MILLISECONDS, taskQueue);
 
     public RNFetchBlob(ReactApplicationContext reactContext) {
 
@@ -205,11 +207,17 @@ public void run() {
     /**
      * @param path Stream file path
      * @param encoding Stream encoding, should be one of `base64`, `ascii`, and `utf8`
-     * @param bufferSize Stream buffer size, default to 1024 or 1026(base64).
+     * @param bufferSize Stream buffer size, default to 4096 or 4095(base64).
      */
-    public void readStream(String path, String encoding, int bufferSize) {
-        RNFetchBlobFS fs = new RNFetchBlobFS(this.getReactApplicationContext());
-        fs.readStream(path, encoding, bufferSize);
+    public void readStream(final String path, final String encoding, final int bufferSize, final int tick, final String streamId) {
+        final ReactApplicationContext ctx = this.getReactApplicationContext();
+        fsThreadPool.execute(new Runnable() {
+            @Override
+            public void run() {
+                RNFetchBlobFS fs = new RNFetchBlobFS(ctx);
+                fs.readStream(path, encoding, bufferSize, tick, streamId);
+            }
+        });
     }
 
     @ReactMethod

img/ios-3.png

@@ -21,9 +21,6 @@
 import okhttp3.RequestBody;
 import okio.BufferedSink;
 
-/**
- * Created by wkh237 on 2016/7/11.
- */
 public class RNFetchBlobBody extends RequestBody{
 
     InputStream requestStream;
@@ -34,42 +31,35 @@ public class RNFetchBlobBody extends RequestBody{
     RNFetchBlobReq.RequestType requestType;
     MediaType mime;
     File bodyCache;
+    Boolean chunkedEncoding = false;
 
 
-    /**
-     * Single file or raw content request constructor
-     * @param taskId
-     * @param type
-     * @param form
-     * @param contentType
-     */
-    public RNFetchBlobBody(String taskId, RNFetchBlobReq.RequestType type, ReadableArray form, MediaType contentType) {
+    public RNFetchBlobBody(String taskId) {
         this.mTaskId = taskId;
-        this.form = form;
-        requestType = type;
-        mime = contentType;
-        try {
-            bodyCache = createMultipartBodyCache();
-            requestStream = new FileInputStream(bodyCache);
-            contentLength = bodyCache.length();
-        } catch(Exception ex) {
-            ex.printStackTrace();
-            RNFetchBlobUtils.emitWarningEvent("RNFetchBlob failed to create request multipart body :" + ex.getLocalizedMessage());
-        }
+    }
+
+    RNFetchBlobBody chunkedEncoding(boolean val) {
+        this.chunkedEncoding = val;
+        return this;
+    }
+
+    RNFetchBlobBody setMIME(MediaType mime) {
+        this.mime = mime;
+        return this;
+    }
+
+    RNFetchBlobBody setRequestType( RNFetchBlobReq.RequestType type) {
+        this.requestType = type;
+        return this;
     }
 
     /**
-     * Multipart request constructor
-     * @param taskId
-     * @param type
-     * @param rawBody
-     * @param contentType
+     * Set request body
+     * @param body A string represents the request body
+     * @return object itself
      */
-    public RNFetchBlobBody(String taskId, RNFetchBlobReq.RequestType type, String rawBody, MediaType contentType) {
-        this.mTaskId = taskId;
-        requestType = type;
-        this.rawBody = rawBody;
-        mime = contentType;
+    RNFetchBlobBody setBody(String body) {
+        this.rawBody = body;
         if(rawBody == null) {
             this.rawBody = "";
             requestType = RNFetchBlobReq.RequestType.AsIs;
@@ -82,6 +72,7 @@ public RNFetchBlobBody(String taskId, RNFetchBlobReq.RequestType type, String ra
                     break;
                 case AsIs:
                     contentLength = this.rawBody.getBytes().length;
+                    requestStream = new ByteArrayInputStream(this.rawBody.getBytes());
                     break;
                 case Others:
                     break;
@@ -90,12 +81,30 @@ public RNFetchBlobBody(String taskId, RNFetchBlobReq.RequestType type, String ra
             ex.printStackTrace();
             RNFetchBlobUtils.emitWarningEvent("RNFetchBlob failed to create single content request body :" + ex.getLocalizedMessage() + "\r\n");
         }
+        return this;
+    }
 
+    /**
+     * Set request body (Array)
+     * @param body A Readable array contains form data
+     * @return object itself
+     */
+    RNFetchBlobBody setBody(ReadableArray body) {
+        this.form = body;
+        try {
+            bodyCache = createMultipartBodyCache();
+            requestStream = new FileInputStream(bodyCache);
+            contentLength = bodyCache.length();
+        } catch(Exception ex) {
+            ex.printStackTrace();
+            RNFetchBlobUtils.emitWarningEvent("RNFetchBlob failed to create request multipart body :" + ex.getLocalizedMessage());
+        }
+        return this;
     }
 
     @Override
     public long contentLength() {
-        return contentLength;
+        return chunkedEncoding ? -1 : contentLength;
     }
 
     @Override
@@ -106,10 +115,7 @@ public MediaType contentType() {
     @Override
     public void writeTo(BufferedSink sink) {
         try {
-            if (requestType == RNFetchBlobReq.RequestType.AsIs)
-                sink.write(rawBody.getBytes());
-            else
-                pipeStreamToSink(requestStream, sink);
+            pipeStreamToSink(requestStream, sink);
         } catch(Exception ex) {
             RNFetchBlobUtils.emitWarningEvent(ex.getLocalizedMessage());
             ex.printStackTrace();

img/ios-4.png

@@ -5,9 +5,7 @@
 
 import java.util.HashMap;
 
-/**
- * Created by wkh237 on 2016/5/29.
- */
+
 public class RNFetchBlobConfig {
 
     public Boolean fileCache;

img/ios-5.png

@@ -1,10 +1,6 @@
 package com.RNFetchBlob;
 
-import okhttp3.MediaType;
 
-/**
- * Created by wkh237 on 2016/7/11.
- */
 public class RNFetchBlobConst {
     public static final String EVENT_UPLOAD_PROGRESS = "RNFetchBlobProgress-upload";
     public static final String EVENT_PROGRESS = "RNFetchBlobProgress";