#1 Change progress API usage

Author: wkh237

src/README.md

@@ -1,6 +1,6 @@
 # react-native-fetch-blob [![npm version](https://badge.fury.io/js/react-native-fetch-blob.svg)](https://badge.fury.io/js/react-native-fetch-blob)
 
-A react-native module for fetch file/image with custom headers, supports blob response data.
+A react-native module for fetch file/image with custom headers, supports blob response data, and upload/download progress.
 
 If you're dealing with image or file server that requires an `Authorization` token in the header, or you're having problem with `fetch` API when receiving blob data, you might try this module (this is also the reason why I made this).
 
@@ -10,13 +10,23 @@ This module enables you upload/download binary data in js, see [Examples](#user-
 
 The source code is very simple, just an implementation of native HTTP request, supports both Android (uses awesome native library  [AsyncHttpClient](https://github.com/AsyncHttpClient/async-http-client])) and IOS.
 
+## Major Changes
+
+| Version | |
+|---|---|
+| 0.3 | Upload/Download octet-stream and form-data |
+| 0.4 | Add base-64 encode/decode library and API |
+| 0.4.1 | Fixe upload form-data missing file extension problem on Android |
+| 0.4.2 | Supports upload/download progress |
+
 ## Usage
 
 * [Installation](#user-content-installation)
 * [Examples](#user-content-usage)
  * [Download file](#user-content-download-example--fetch-files-that-needs-authorization-token)
  * [Upload file](#user-content-upload-example--dropbox-files-upload-api)
  * [Multipart/form upload](#user-content-multipartform-data-example--post-form-data-with-file-and-data)
+ * [Upload/Download progress](#user-content-uploaaddownload-progress)
 * [API](#user-content-api)
 
 ## Installation
@@ -114,9 +124,30 @@ Elements have property `filename` will be transformed into binary format, otherw
   })
 ```
 
+#### Upload/Download progress
+
+In `version >= 0.4.2` it is possible to know the upload/download progress.
+
+```js
+  RNFetchBlob.fetch('POST', 'http://www.example.com/upload', {
+      ... some headers,
+      'Content-Type' : 'octet-stream'
+    }, base64DataString)
+    .progress((received, total) => {
+        console.log('progress', received / total)
+    })
+    .then((resp) => {
+      // ...
+    })
+    .catch((err) => {
+      // ...
+    })
+```
+
+
 ## API
 
-#### `fetch(method, url, headers, body):Promise<FetchBlobResponse> `
+#### `fetch(method, url, headers, body):Promise<FetchBlobResponse>`
 
 Send a HTTP request uses given headers and body, and return a Promise.
 
@@ -128,9 +159,16 @@ HTTP request destination url.
 Headers of HTTP request, value of headers should be `stringified`, if you're uploading binary files, content-type should be `application/octet-stream` or `multipart/form-data`(see examples above).
 #### body:`string | Array<Object>` (Optional)
 Body of the HTTP request, body can either be a BASE64 string, or an array contains object elements, each element have 2  required property `name`, and `data`, and 1 optional property `filename`, once `filename` is set, content in `data` property will be consider as BASE64 string that will be converted into byte array later.
-
 When body is a base64 string , this string will be converted into byte array in native code, and the request body will be sent as `application/octet-stream`.
 
+### `fetch(...).progress(eventListener):Promise<FetchBlobResponse>` added in `0.4.2`
+
+Register on progress event handler for a fetch request.
+
+#### eventListener:`(sendOrReceivedBytes:number, totalBytes:number)`
+
+A function that triggers when there's data received/sent, first argument is the number of sent/received bytes, and second argument is expected total bytes number.
+
 #### `base64`
 
 A helper object simply uses [base-64](https://github.com/mathiasbynens/base64) for decode and encode BASE64 data.
@@ -152,7 +190,8 @@ When `fetch` success, it resolve a `FetchBlobResponse` object as first argument.
   returns decoded base64 string (done in js context)
 
 
-### TODO
+### Upcoming Features
 
-* Save file to storage
+* Save file to storage directly
+* Upload file from storage directly
 * Custom MIME type in form data

src/index.js

@@ -1,6 +1,6 @@
 /**
  * @author wkh237
- * @version 0.3.3
+ * @version 0.4.2
  */
 
 import {
@@ -15,34 +15,43 @@ const emitter = (Platform.OS === 'android' ? DeviceEventEmitter : NativeAppEvent
 const RNFetchBlob = NativeModules.RNFetchBlob
 
 // Show warning if native module not detected
-if(RNFetchBlob === void 0) {
+if(!RNFetchBlob || !RNFetchBlob.fetchBlobForm || !RNFetchBlob.fetchBlob) {
   console.warn(
-    'react-native-fetch-blob could not find native module.',
+    'react-native-fetch-blob could not find valid native module.',
     'please make sure you have linked native modules using `rnpm link`,',
     'and restart RN packager or manually compile IOS/Android project.'
   )
 }
 
+const config = function(options) {
+  return { fetch : fetch.bind(options) }
+}
+
 // Promise wrapper function
-const fetch = (...args) => {
+const fetch = function(...args) {
+
+  let options = this || {}
 
   // create task ID for receiving progress event
   let taskId = getUUID()
+
   let promise = new Promise((resolve, reject) => {
 
     let [method, url, headers, body] = [...args]
     let nativeMethodName = Array.isArray(body) ? 'fetchBlobForm' : 'fetchBlob'
+
+    // on progress event listener
     let subscription = emitter.addListener('RNFetchBlobProgress', (e) => {
       if(e.taskId === taskId && promise.onProgress) {
         promise.onProgress(e.written, e.total)
       }
     })
 
-    RNFetchBlob[nativeMethodName](taskId, method, url, headers || {}, body, (err, ...data) => {
+    let req = RNFetchBlob[nativeMethodName]
+    req(taskId, method, url, headers || {}, body, (err, ...data) => {
 
       // task done, remove event listener
       subscription.remove()
-
       if(err)
         reject(new Error(err, ...data))
       else
@@ -52,7 +61,10 @@ const fetch = (...args) => {
 
   })
 
-  promise.onProgress = null
+  promise.progress = (fn) => {
+    promise.onProgress = fn
+    return promise
+  }
 
   return promise
 

src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-fetch-blob",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "A react-native plugin for fetch blob data via HTTP.",
   "main": "index.js",
   "scripts": {