Merge branch 'master' into 0.10.0

Author: wkh237

README.md

@@ -38,9 +38,9 @@ A project committed to make file acess and data transfer easier, efficient for R
 
 ## About
 
-This project was initially for solving the issue [facebook/react-native#854](https://github.com/facebook/react-native/issues/854), because React Native lack of `Blob` implementation and it will cause some problem when transfering binary data. Now, this project is committed to make file access and transfer more easier, efficient for React Native developers. We've implemented highly customizable filesystem and network module which plays well together. For example, upload and download data directly from/to storage which is much more efficient in some cases(especially for large ones). The file system supports file stream, so you don't have to worry about OOM problem when accessing large files.
+This project was initially for solving the issue [facebook/react-native#854](https://github.com/facebook/react-native/issues/854), because React Native lack of `Blob` implementation and it will cause some problem when transferring binary data. Now, this project is committed to make file access and transfer more easier, efficient for React Native developers. We've implemented highly customizable filesystem and network module which plays well together. For example, upload and download data directly from/to storage which is much more efficient in some cases(especially for large ones). The file system supports file stream, so you don't have to worry about OOM problem when accessing large files.
 
-In `0.8.0` we introduced experimential Web API polyfills that make it possible to use browser-based libraries in React Native, for example, [FireBase JS SDK](https://github.com/wkh237/rn-firebase-storage-upload-sample)
+In `0.8.0` we introduced experimental Web API polyfills that make it possible to use browser-based libraries in React Native, such as, [FireBase JS SDK](https://github.com/wkh237/rn-firebase-storage-upload-sample)
 
 
 ## Installation

package.json

@@ -1,7 +1,6 @@
 {
   "name": "fetchblob-dev",
-  "author": "wkh237 <[email protected]>",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "private": true,
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",

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

@@ -1,7 +1,6 @@
 package com.RNFetchBlob;
 
 import android.util.Base64;
-import android.util.Log;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -13,23 +12,14 @@
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.nio.MappedByteBuffer;
 import java.util.ArrayList;
-import java.util.HashMap;
 
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
-import okhttp3.FormBody;
-import okio.Buffer;
 import okio.BufferedSink;
-import okio.ForwardingSink;
-import okio.Okio;
-import okio.Sink;
 
 /**
  * Created by wkh237 on 2016/7/11.
@@ -38,7 +28,6 @@ public class RNFetchBlobBody extends RequestBody{
 
     InputStream requestStream;
     long contentLength = 0;
-    long bytesWritten = 0;
     ReadableArray form;
     String mTaskId;
     String rawBody;
@@ -47,58 +36,84 @@ public class RNFetchBlobBody extends RequestBody{
     File bodyCache;
 
 
+    /**
+     * 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) {
         this.mTaskId = taskId;
         this.form = form;
         requestType = type;
         mime = contentType;
         try {
             bodyCache = createMultipartBodyCache();
+            requestStream = new FileInputStream(bodyCache);
             contentLength = bodyCache.length();
-        } catch (IOException e) {
-            e.printStackTrace();
+        } catch(Exception ex) {
+            ex.printStackTrace();
+            RNFetchBlobUtils.emitWarningEvent("RNFetchBlob failed to create request multipart body :" + ex.getLocalizedMessage());
         }
     }
 
+    /**
+     * Multipart request constructor
+     * @param taskId
+     * @param type
+     * @param rawBody
+     * @param contentType
+     */
     public RNFetchBlobBody(String taskId, RNFetchBlobReq.RequestType type, String rawBody, MediaType contentType) {
         this.mTaskId = taskId;
         requestType = type;
         this.rawBody = rawBody;
         mime = contentType;
-        if(rawBody != null) {
-            if(requestType == RNFetchBlobReq.RequestType.AsIs)
-                contentLength = rawBody.length();
-            else
-                contentLength = caculateOctetContentLength();
+        if(rawBody == null) {
+            this.rawBody = "";
+            requestType = RNFetchBlobReq.RequestType.AsIs;
+        }
+        try {
+            switch (requestType) {
+                case SingleFile:
+                    requestStream = getReuqestStream();
+                    contentLength = requestStream.available();
+                    break;
+                case AsIs:
+                    contentLength = this.rawBody.getBytes().length;
+                    break;
+                case Others:
+                    break;
+            }
+        } catch(Exception ex) {
+            ex.printStackTrace();
+            RNFetchBlobUtils.emitWarningEvent("RNFetchBlob failed to create single content request body :" + ex.getLocalizedMessage() + "\r\n");
         }
+
     }
 
-    // ${RN 0.26+ ONLY} @Override
-    // ${RN 0.26+ ONLY} public long contentLength() { return contentLength; }
+    @Override
+    public long contentLength() {
+        return contentLength;
+    }
 
     @Override
     public MediaType contentType() {
         return mime;
     }
 
     @Override
-    public void writeTo(BufferedSink sink) throws IOException {
-
-        ProgressReportingSource source = new ProgressReportingSource(sink, mTaskId);
-        BufferedSink buffer = Okio.buffer(source);
-        switch (requestType) {
-            case Form:
-                pipeStreamToSink(new FileInputStream(bodyCache), sink);
-                break;
-            case SingleFile:
-                if(requestStream != null)
-                    pipeStreamToSink(requestStream, sink);
-                break;
-            case AsIs:
-				writeRawData(sink);
-				break;
+    public void writeTo(BufferedSink sink) {
+        try {
+            if (requestType == RNFetchBlobReq.RequestType.AsIs)
+                sink.write(rawBody.getBytes());
+            else
+                pipeStreamToSink(requestStream, sink);
+        } catch(Exception ex) {
+            RNFetchBlobUtils.emitWarningEvent(ex.getLocalizedMessage());
+            ex.printStackTrace();
         }
-        buffer.flush();
     }
 
     boolean clearRequestBody() {
@@ -113,8 +128,8 @@ boolean clearRequestBody() {
         return true;
     }
 
-    private long caculateOctetContentLength() {
-        long total = 0;
+    private InputStream getReuqestStream() throws Exception {
+
         // upload from storage
         if (rawBody.startsWith(RNFetchBlobConst.FILE_PREFIX)) {
             String orgPath = rawBody.substring(RNFetchBlobConst.FILE_PREFIX.length());
@@ -123,32 +138,30 @@ private long caculateOctetContentLength() {
             if (RNFetchBlobFS.isAsset(orgPath)) {
                 try {
                     String assetName = orgPath.replace(RNFetchBlobConst.FILE_PREFIX_BUNDLE_ASSET, "");
-                    total += RNFetchBlob.RCTContext.getAssets().openFd(assetName).getLength();
-                    requestStream = RNFetchBlob.RCTContext.getAssets().open(assetName);
-                } catch (IOException e) {
-                    RNFetchBlobUtils.emitWarningEvent(e.getLocalizedMessage());
+                    return RNFetchBlob.RCTContext.getAssets().open(assetName);
+                } catch (Exception e) {
+                    throw new Exception("error when getting request stream from asset : " +e.getLocalizedMessage());
                 }
             } else {
                 File f = new File(RNFetchBlobFS.normalizePath(orgPath));
                 try {
                     if(!f.exists())
                         f.createNewFile();
-                    total += f.length();
-                    requestStream = new FileInputStream(f);
+                    return new FileInputStream(f);
                 } catch (Exception e) {
-                    RNFetchBlobUtils.emitWarningEvent("RNetchBlob error when counting content length: " +e.getLocalizedMessage());
+                    throw new Exception("error when getting request stream: " +e.getLocalizedMessage());
                 }
             }
-        } else {
+        }
+        // base 64 encoded
+        else {
             try {
                 byte[] bytes = Base64.decode(rawBody, 0);
-                requestStream = new ByteArrayInputStream(bytes);
-                total += requestStream.available();
+                return  new ByteArrayInputStream(bytes);
             } catch(Exception ex) {
-                RNFetchBlobUtils.emitWarningEvent("RNetchBlob error when counting content length: " +ex.getLocalizedMessage());
+                throw new Exception("error when getting request stream: " + ex.getLocalizedMessage());
             }
         }
-        return total;
     }
 
     /**
@@ -191,7 +204,7 @@ private File createMultipartBodyCache() throws IOException {
                             InputStream in = ctx.getAssets().open(assetName);
                             pipeStreamToFileStream(in, os);
                         } catch (IOException e) {
-                            RNFetchBlobUtils.emitWarningEvent("RNFetchBlob Failed to create form data asset :" + orgPath + ", " + e.getLocalizedMessage() );
+                            RNFetchBlobUtils.emitWarningEvent("Failed to create form data asset :" + orgPath + ", " + e.getLocalizedMessage() );
                         }
                     }
                     // data from normal files
@@ -202,16 +215,14 @@ private File createMultipartBodyCache() throws IOException {
                             pipeStreamToFileStream(fs, os);
                         }
                         else {
-                            RNFetchBlobUtils.emitWarningEvent("RNFetchBlob Failed to create form data from path :" + orgPath + ", file not exists.");
+                            RNFetchBlobUtils.emitWarningEvent("Failed to create form data from path :" + orgPath + ", file not exists.");
                         }
                     }
                 }
                 // base64 embedded file content
                 else {
                     byte[] b = Base64.decode(data, 0);
                     os.write(b);
-                    bytesWritten += b.length;
-                    emitUploadProgress();
                 }
 
             }
@@ -221,7 +232,6 @@ private File createMultipartBodyCache() throws IOException {
                 header += "Content-Type: " + field.mime + "\r\n\r\n";
                 os.write(header.getBytes());
                 byte[] fieldData = field.data.getBytes();
-                bytesWritten += fieldData.length;
                 os.write(fieldData);
             }
             // form end
@@ -235,28 +245,22 @@ private File createMultipartBodyCache() throws IOException {
         return outputFile;
     }
 
-	/**
-     * Write data to request body as-is
-     * @param sink
-     */
-	private void writeRawData(BufferedSink sink) throws IOException {
-        byte[] bytes = rawBody.getBytes();
-        contentLength = bytes.length;
-		sink.write(bytes);
-	}
-
     /**
      * Pipe input stream to request body output stream
      * @param stream    The input stream
      * @param sink      The request body buffer sink
      * @throws IOException
      */
-    private void pipeStreamToSink(InputStream stream, BufferedSink sink) throws IOException {
+    private void pipeStreamToSink(InputStream stream, BufferedSink sink) throws Exception {
+
         byte [] chunk = new byte[10240];
+        int totalWritten = 0;
         int read;
         while((read = stream.read(chunk, 0, 10240)) > 0) {
             if(read > 0) {
                 sink.write(chunk, 0, read);
+                totalWritten += read;
+                emitUploadProgress(totalWritten);
             }
         }
         stream.close();
@@ -355,45 +359,19 @@ public FormField(ReadableMap rawData) {
         }
     }
 
-    private void emitUploadProgress() {
+    /**
+     * Emit progress event
+     * @param written
+     */
+    private void emitUploadProgress(int written) {
         WritableMap args = Arguments.createMap();
         args.putString("taskId", mTaskId);
-        args.putString("written", String.valueOf(bytesWritten));
+        args.putString("written", String.valueOf(written));
         args.putString("total", String.valueOf(contentLength));
 
         // emit event to js context
         RNFetchBlob.RCTContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
                 .emit(RNFetchBlobConst.EVENT_UPLOAD_PROGRESS, args);
     }
 
-    private final class ProgressReportingSource extends ForwardingSink {
-
-        private long bytesWritten = 0;
-        private String mTaskId;
-        private Sink delegate;
-
-        public ProgressReportingSource (Sink delegate, String taskId) {
-            super(delegate);
-            this.mTaskId = taskId;
-            this.delegate = delegate;
-        }
-
-        @Override
-        public void write(Buffer source, long byteCount) throws IOException {
-            delegate.write(source, byteCount);
-            // on progress, emit RNFetchBlobProgress upload progress event with ticketId,
-            // bytesWritten, and totalSize
-            bytesWritten += byteCount;
-            WritableMap args = Arguments.createMap();
-            args.putString("taskId", mTaskId);
-            args.putString("written", String.valueOf(bytesWritten));
-            args.putString("total", String.valueOf(contentLength));
-
-            if(RNFetchBlobReq.isReportUploadProgress(mTaskId)) {
-                // emit event to js context
-                RNFetchBlob.RCTContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                        .emit(RNFetchBlobConst.EVENT_UPLOAD_PROGRESS, args);
-            }
-        }
-    }
 }

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

@@ -332,7 +332,7 @@ public Response intercept(Chain chain) throws IOException {
             clientBuilder.retryOnConnectionFailure(false);
             clientBuilder.followRedirects(true);
 
-            OkHttpClient client = clientBuilder.build();
+            OkHttpClient client = clientBuilder.retryOnConnectionFailure(true).build();
             Call call =  client.newCall(req);
             taskTable.put(taskId, call);
             call.enqueue(new okhttp3.Callback() {

src/class/StatefulPromise.js

@@ -0,0 +1,8 @@
+// Copyright 2016 wkh237@github. All rights reserved.
+// Use of this source code is governed by a MIT-style license that can be
+// found in the LICENSE file.
+// @flow
+
+export default class StatefulPromise extends Promise {
+
+}

src/index.js

@@ -16,6 +16,7 @@ import type {
   RNFetchBlobStream,
   RNFetchBlobResponseInfo
 } from './types'
+import StatefulPromise from './class/StatefulPromise.js'
 import fs from './fs'
 import getUUID from './utils/uuid'
 import base64 from 'base-64'
@@ -167,6 +168,13 @@ function fetch(...args:any):Promise {
       subscription.remove()
       subscriptionUpload.remove()
       stateEvent.remove()
+      delete promise['progress']
+      delete promise['uploadProgress']
+      delete promise['stateChange']
+      delete promise['cancel']
+      promise.cancel = () => {
+        console.warn('finished request could not be canceled')
+      }
 
       if(err)
         reject(new Error(err, respInfo))