Merge branch '0.9.4' into 0.10.0

Author: wkh237

package.json

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

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

@@ -458,9 +458,7 @@ private void done(Response resp) {
                     // It uses customized response body which is able to report download progress
                     // and write response data to destination path.
                     resp.body().bytes();
-                } catch (Exception ignored) {
-                    ignored.printStackTrace();
-                }
+                } catch (Exception ignored) {  }
                 callback.invoke(null, RNFetchBlobConst.RNFB_RESPONSE_PATH, this.destPath);
                 break;
             default:
@@ -471,8 +469,9 @@ private void done(Response resp) {
                 }
                 break;
         }
-        if(!resp.isSuccessful())
-            resp.body().close();
+//        if(!resp.isSuccessful())
+//            resp.body().close();
+        resp.body().close();
         releaseTaskResource();
     }
 

src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-fetch-blob",
-  "version": "0.9.3",
+  "version": "0.9.4-beta.1",
   "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/XMLHttpRequest.js

@@ -321,6 +321,7 @@ export default class XMLHttpRequest extends XMLHttpRequestEventTarget{
     log.debug('XMLHttpRequest done', this._url, resp, this)
     this._statusText = this._status
     let responseDataReady = () => {
+      log.debug('request done state = 4')
       this.dispatchEvent('load')
       this.dispatchEvent('loadend')
       this._dispatchReadStateChange(XMLHttpRequest.DONE)
@@ -330,14 +331,6 @@ export default class XMLHttpRequest extends XMLHttpRequestEventTarget{
       let info = resp.respInfo || {}
       log.debug(this._url, info, info.respType)
       switch(info.respType) {
-        case 'json' :
-        try{
-          this._responseText = resp.text()
-          this._response = resp.json()
-          responseDataReady()
-        } catch(err) {
-        }
-        break;
         case 'blob' :
           resp.blob().then((b) => {
             this._responseText = resp.text()

src/polyfill/XMLHttpRequestEventTarget.js

@@ -26,6 +26,7 @@ export default class XMLHttpRequestEventTarget extends EventTarget {
   }
 
   dispatchEvent(event:string, e:Event) {
+    log.debug('dispatch event', event, e)
     super.dispatchEvent(event, e)
     switch(event) {
       case 'abort' :
@@ -70,7 +71,7 @@ export default class XMLHttpRequestEventTarget extends EventTarget {
   }
 
   set onload(fn:(e:Event) => void) {
-    log.info('set onload')
+    log.info('set onload', fn)
     this._onload = fn
   }
 

test/test-0.9.4.js

@@ -0,0 +1,63 @@
+import RNTest from './react-native-testkit/'
+import React from 'react'
+import RNFetchBlob from 'react-native-fetch-blob'
+import {
+  StyleSheet,
+  Text,
+  View,
+  ScrollView,
+  Platform,
+  Dimensions,
+  Image,
+} from 'react-native';
+
+window.XMLHttpRequest = RNFetchBlob.polyfill.XMLHttpRequest
+window.Blob = RNFetchBlob.polyfill.Blob
+
+const fs = RNFetchBlob.fs
+const { Assert, Comparer, Info, prop } = RNTest
+const describe = RNTest.config({
+  group : '0.9.4',
+  run : true,
+  expand : true,
+  timeout : 20000,
+})
+const { TEST_SERVER_URL, TEST_SERVER_URL_SSL, FILENAME, DROPBOX_TOKEN, styles } = prop()
+const dirs = RNFetchBlob.fs.dirs
+
+let prefix = ((Platform.OS === 'android') ? 'file://' : '')
+
+describe('issue #105', (report, done) => {
+  let tmp = null
+  RNFetchBlob
+    .config({ fileCache : true })
+    .fetch('GET', `${TEST_SERVER_URL}/public/github.png`)
+    .then((res) => {
+      tmp = res.path()
+      return RNFetchBlob.fetch('POST', `${TEST_SERVER_URL}/upload-form`, {
+        'Content-Type' : 'multipart/form-data',
+        'Expect' : '100-continue'
+      }, [
+        { name : 'data', data : 'issue#105 test' },
+        { name : 'file', filename : 'github.png', data : RNFetchBlob.wrap(tmp) }
+      ])
+    })
+    .then((res) => {
+      done()
+    })
+})
+
+describe('issue #106', (report, done) => {
+
+  fetch('https://rnfb-test-app.firebaseapp.com/6m-json.json')
+    .then((res) => {
+      console.log('## converted')
+      return res.json()
+    })
+    .then((data) => {
+      // console.log(data)
+      report(<Assert key="fetch request success" expect={20000} actual={data.total}/>)
+      done()
+    })
+
+})