Fix XMLHttpRequest so that it compatible to WHATWG-Fetch #106

Author: wkh237

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
@@ -307,6 +307,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)
@@ -316,14 +317,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

@@ -8,6 +8,7 @@ import Log from '../utils/log.js'
 const log = new Log('XMLHttpRequestEventTarget')
 
 log.disable()
+// log.level(3)
 
 export default class XMLHttpRequestEventTarget extends EventTarget {
 
@@ -25,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' :
@@ -69,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,66 @@
+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
+// window.fetch = new RNFetchBlob.polyfill.Fetch({
+//   auto : true,
+//   binaryContentTypes : ['image/', 'video/', 'audio/']
+// }).build()
+
+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'
+      }, [
+        { 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('##',res)
+      console.log('## converted')
+      return res.json()
+    })
+    .then((data) => {
+      console.log(data)
+      done()
+    })
+
+})