Fix XMLHttp RequesText

Author: wkh237

README.md

@@ -1,4 +1,4 @@
-# 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/react-native-fetch-blob.svg?maxAge=2592000&style=flat-square)]()
+# react-native-fetch-blob [![release](https://img.shields.io/github/release/wkh237/react-native-fetch-blob.svg?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/react-native-fetch-blob.svg?maxAge=2592000&style=flat-square)]()
 
 A project committed to make file acess and data transfer easier, effiecient for React Native developers.
 
@@ -7,7 +7,7 @@ A project committed to make file acess and data transfer easier, effiecient for
 - File API supports normal files, Asset files, and CameraRoll files
 - Native-to-native file manipulation API, reduce JS bridging performance loss
 - File stream support for dealing with large file
-- Blob, File, XMLHttpRequest polyfills that make browser-based library available in RN
+- Blob, File, XMLHttpRequest polyfills that make browser-based library available in RN (experimental)
 
 ## TOC
 * [About](#user-content-about)
@@ -61,7 +61,7 @@ Open `android/settings.gradle`, and add these lines which will app RNFetchBlob A
 ```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')                        
++ project(':react-native-fetch-blob').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fetch-blob/android')                        
 ```
 
 Add this line to `MainApplication.java`, so that RNFetchBlob package becomes part of react native package.
@@ -654,7 +654,7 @@ After `0.8.0` we've made some [Web API polyfills](https://github.com/wkh237/reac
 
 ---
 
-**Reduce RCT Bridge Overhead and BASE64 Time**
+**Reduce RCT Bridge and BASE64 Overheard**
 
 React Native connects JS and Native context by passing JSON through React bridge, therefore there will be an overhead to convert data before they sent. When data is large, this will be quite a performance impact to your app, it's recommended to use file storage instead of BASE64 if possible. The following chart shows how much faster when loading data from storage than BASE64 encoded string on iphone 6.
 
@@ -676,6 +676,7 @@ If you're going to concatenate files, you don't have to read the data to JS cont
 
 | Version | |
 |---|---|
+| 0.8.2 | Fix Android RN 0.31 installation issue #78 |
 | 0.8.1 | Remove Web API log and fix ios progress report function. |
 | 0.8.0 | Added Web API polyfills, support regular request, added timeout option. |
 | 0.7.5 | Fix installation script that make it compatible to react-native < 0.28 |

package.json

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

src/README.md

@@ -678,6 +678,7 @@ If you're going to concatenate files, you don't have to read the data to JS cont
 
 | Version | |
 |---|---|
+| 0.8.2 | Fix Android RN 0.31 installation issue #78 |
 | 0.8.1 | Remove Web API log and fix ios progress report function. |
 | 0.8.0 | Added Web API polyfills, support regular request, added timeout option. |
 | 0.7.5 | Fix installation script that make it compatible to react-native < 0.28 |

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

@@ -45,6 +45,7 @@
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 
+
 /**
  * Created by wkh237 on 2016/6/21.
  */

src/package.json

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

src/polyfill/Blob.js

@@ -11,8 +11,8 @@ import EventTarget from './EventTarget'
 const log = new Log('Blob')
 const blobCacheDir = fs.dirs.DocumentDir + '/RNFetchBlob-blobs/'
 
-log.disable()
-// log.level(3)
+// log.disable()
+log.level(3)
 
 /**
  * A RNFetchBlob style Blob polyfill class, this is a Blob which compatible to
@@ -258,6 +258,7 @@ function getBlobName() {
  * @return {Promise}
  */
 function createMixedBlobData(ref, dataArray) {
+  // create an empty file for store blob data
   let p = fs.writeFile(ref, '')
   let args = []
   let size = 0
@@ -275,17 +276,27 @@ function createMixedBlobData(ref, dataArray) {
     else if (Array.isArray(part))
       args.push([ref, part, 'ascii'])
   }
-  return p.then(() => {
-    let promises = args.map((p) => {
-      log.verbose('mixed blob write', ...p)
-      return fs.appendFile.call(this, ...p)
-    })
-    return Promise.all(promises).then((sizes) => {
-      log.verbose('blob write size', sizes)
-      for(let i in sizes) {
-        size += sizes[i]
-      }
-      return Promise.resolve(size)
-    })
-  })
+  // start write blob data
+  // return p.then(() => {
+    for(let i in args) {
+      p = p.then((written) => {
+        if(written)
+          size += written
+        log.verbose('mixed blob write', ...args[i], written)
+        return fs.appendFile.call(this, ...args[i])
+      })
+    }
+    return p.then(() => Promise.resolve(size))
+    // let promises = args.map((p) => {
+    //   log.verbose('mixed blob write', ...p)
+    //   return fs.appendFile.call(this, ...p)
+    // })
+    // return Promise.all(promises).then((sizes) => {
+    //   log.verbose('blob write size', sizes)
+    //   for(let i in sizes) {
+    //     size += sizes[i]
+    //   }
+    //   return Promise.resolve(size)
+    // })
+  // })
 }

src/polyfill/XMLHttpRequest.js

@@ -11,7 +11,7 @@ import ProgressEvent from './ProgressEvent.js'
 const log = new Log('XMLHttpRequest')
 
 log.disable()
-// log.level(2)
+// log.level(3)
 
 const UNSENT = 0
 const OPENED = 1
@@ -39,7 +39,7 @@ export default class XMLHttpRequest extends XMLHttpRequestEventTarget{
   _responseXML : null = '';
   _status : number = 0;
   _statusText : string = '';
-  _timeout : number = 0;
+  _timeout : number = 60000;
   _sendFlag : boolean = false;
   _uploadStarted : boolean = false;
 
@@ -299,11 +299,13 @@ export default class XMLHttpRequest extends XMLHttpRequestEventTarget{
       let info = resp.respInfo || {}
       switch(info.respType) {
         case 'json' :
+          this._responseText = resp.text()
           this._response = resp.json()
           responseDataReady()
         break;
         case 'blob' :
           resp.blob().then((b) => {
+            this._responseText = resp.text()
             this.response = b
             responseDataReady()
           })

test.sh

@@ -38,7 +38,7 @@ node -e "var fs=require('fs'); var pkg = JSON.parse(fs.readFileSync('./RNFetchBl
 # install module
 cd "${TEST_APP_PATH}"
 # npm install --save "${CWD}/src"
-npm install --save react-native-fetch-blob@0.7.0-dev.1
+npm install --save react-native-fetch-blob
 npm install --save firebase
 rnpm link