merge 0.9.7

src/index.js

@@ -241,6 +241,8 @@ function fetch(...args:any):Promise {
       console.log(e , 'EXPIRED!!')
       if(e.taskId === taskId && promise.onExpire) {
         promise.onExpire(e)
+      }
+    })
 
     partEvent = emitter.addListener('RNFetchBlobServerPush', (e) => {
       if(e.taskId === taskId && promise.onPartData) {

src/ios.js

@@ -20,7 +20,7 @@ const RNFetchBlob:RNFetchBlobNative = NativeModules.RNFetchBlob
  */
 function openDocument(path:string, scheme:string) {
   if(Platform.OS === 'ios')
-    return RNFetchBlob.openDocument(path, scheme)
+    return RNFetchBlob.openDocument('file://' + path, scheme)
   else
     return Promise.reject('RNFetchBlob.openDocument only supports IOS.')
 }
@@ -33,7 +33,7 @@ function openDocument(path:string, scheme:string) {
  */
 function previewDocument(path:string, scheme:string) {
   if(Platform.OS === 'ios')
-    return RNFetchBlob.previewDocument(path, scheme)
+    return RNFetchBlob.previewDocument('file://' + path, scheme)
   else
     return Promise.reject('RNFetchBlob.previewDocument only supports IOS.')
 }

src/ios/RNFetchBlobNetwork.m

@@ -42,6 +42,7 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
 {
     BOOL * respFile;
     BOOL isNewPart;
+    BOOL * isIncrement;
     NSMutableData * partBuffer;
     NSString * destPath;
     NSOutputStream * writeStream;
@@ -562,6 +563,7 @@ NSOperationQueue *taskQueue;
     }
 }
 
+
 - (void) URLSessionDidFinishEventsForBackgroundURLSession:(NSURLSession *)session
 {
     NSLog(@"sess done in background");

test-server/public/json-dummy-1.json

@@ -0,0 +1,3 @@
+{
+  "name" : "fetchblob-dev"
+}

test-server/server.js

@@ -66,6 +66,23 @@ app.use(function(req, res, next) {
   next();
 })
 
+
+app.get('/10s-download', (req,res) => {
+  var count = 0
+  var data = ''
+  for(var i =0;i<1024000;i++)
+    data += '1'
+  res.set('Contet-Length', 1024000*10)
+  var it = setInterval(() => {
+    res.write(data)
+    count++
+    if(count == 10) {
+      clearInterval(it)
+      res.end()
+    }
+  }, 1000)
+})
+
 app.get('/video/:count', (req, res) => {
   var count = 0
   res.set('Content-Type', 'multipart/x-mixed-replace; boundary="---osclivepreview---"')

test-server/test.jpeg

@@ -0,0 +1 @@
+undefined

test/test-0.10.0.js

@@ -78,7 +78,7 @@ describe('issue #102', (report, done) => {
     .fetch('GET', `${TEST_SERVER_URL}/public/github.png`)
     .then((res) => {
       tmp = res
-      RNFetchBlob.ios.previewDocument('file://' + res.path(), 'itms-books:')
+      RNFetchBlob.ios.previewDocument(res.path())
       return RNFetchBlob.fetch('POST', `${TEST_SERVER_URL}/upload-form`, {},
       [{ name : String(1), data : RNFetchBlob.wrap(res.path()), filename: '#102-test-image.png' }])
     })

test/test-0.6.2.js

@@ -62,6 +62,7 @@ describe('upload asset from camera roll', (report, done) => {
 
 describe('Upload multipart data with file from CameraRoll', (report, done) => {
     let filename = 'test-from-storage-img-'+Date.now()+'.png'
+    console.log(photo)
     RNFetchBlob.fetch('POST', `${TEST_SERVER_URL}/upload-form`, {
         'Content-Type' : 'multipart/form-data',
       }, [
@@ -165,10 +166,11 @@ describe('upload file from assets',(report, done) => {
   let assetName = fs.asset('test-asset1.json')
   RNFetchBlob.fetch('POST', 'https://content.dropboxapi.com/2/files/upload', {
     Authorization : `Bearer ${DROPBOX_TOKEN}`,
-    'Dropbox-API-Arg': `{\"path\": \"/rn-upload/file-from-asset-${Platform.OS}.json\",\"mode\": \"add\",\"autorename\": false,\"mute\": false}`,
+    'Dropbox-API-Arg': `{\"path\": \"/rn-upload/file-from-asset-${Platform.OS}.json\",\"mode\": \"overwrite\",\"autorename\": false,\"mute\": false}`,
     'Content-Type' : 'application/octet-stream',
   }, RNFetchBlob.wrap(assetName))
   .then((resp) => {
+    console.log(resp)
     resp = resp.json()
     report(
       <Assert key="file name check"

test/test-0.9.4.js

@@ -14,6 +14,10 @@ import {
 
 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
@@ -56,7 +60,7 @@ describe('issue #106', (report, done) => {
       return res.json()
     })
     .then((data) => {
-      // console.log(data)
+      console.log(data)
       report(<Assert key="fetch request success" expect={20000} actual={data.total}/>)
       done()
     })
@@ -64,7 +68,9 @@ describe('issue #106', (report, done) => {
 })
 
 describe('issue #111 get redirect destination', (report, done) => {
-  RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/redirect`)
+  RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/redirect`, {
+    'Cache-Control' : 'no-store'
+  })
   .then((res) => {
     console.log(res.info())
     report(

test/test-0.9.5.js

@@ -30,7 +30,7 @@ let prefix = ((Platform.OS === 'android') ? 'file://' : '')
 
 describe('issue #122 force response data format', (report, done) => {
 
-  RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/public/json-dummy.json`, {
+  RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/public/json-dummy-1.json`, {
     'RNFB-Response' : 'base64'
   })
   .then((res) => {
@@ -38,7 +38,7 @@ describe('issue #122 force response data format', (report, done) => {
     report(
       <Assert key="test data verify" expect="fetchblob-dev" actual={JSON.parse(r).name}/>,
       <Assert key="should successfully decode the data" expect={true} actual={true}/>)
-    return RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/public/json-dummy.json`)
+    return RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/public/json-dummy-1.json`)
   })
   .then((res) => {
     report(
@@ -79,7 +79,7 @@ describe('#129 memory leaking when enable uploadProgress', (report, done) => {
 
 })
 
-false && describe('#131 status code != 200 should not throw an error', (report, done) => {
+describe('#131 status code != 200 should not throw an error', (report, done) => {
 
   let count = 0
   let codes = [404, 500, 501, 403]

test/test-android.js

@@ -148,52 +148,52 @@ const dirs = RNFetchBlob.fs.dirs
 //   })
 // })
 //
-// #75
-describe('APK downloaded from Download Manager should correct', (report, done) => {
-
-  let url  = null
+// // #75
+// describe('APK downloaded from Download Manager should correct', (report, done) => {
+//
+//   let url  = null
+//
+//   RNFetchBlob.config({
+//     addAndroidDownloads : {
+//       useDownloadManager : true,
+//       title : 'test-APK',
+//       description : 'apk install file',
+//       mime : 'application/vnd.android.package-archive',
+//       mediaScannable : true,
+//       notification : true,
+//     }
+//   })
+//   .fetch('GET', `${TEST_SERVER_URL}/public/apk-dummy.apk`)
+//   .then((res) => {
+//     let sendIntent = RNFetchBlob.android.actionViewIntent
+//     return sendIntent(res.path(), 'application/vnd.android.package-archive')
+//   })
+//   .then(() => {
+//     done()
+//   })
+//
+// })
 
+// issue #74
+describe('download file to specific location using DownloadManager', (report, done) => {
+  let dest = dirs.DCIMDir + '/android-download-test-' +Date.now() + '.png'
   RNFetchBlob.config({
     addAndroidDownloads : {
       useDownloadManager : true,
-      title : 'test-APK',
-      description : 'apk install file',
-      mime : 'application/vnd.android.package-archive',
-      mediaScannable : true,
-      notification : true,
+      path : dest,
+      mime : 'image/png',
+      title : 'android-download-path-test.png',
+      description : 'download to specific path #74'
     }
   })
-  .fetch('GET', `${TEST_SERVER_URL}/public/apk-dummy.apk`)
-  .then((res) => {
-    let sendIntent = RNFetchBlob.android.actionViewIntent
-    return sendIntent(res.path(), 'application/vnd.android.package-archive')
-  })
-  .then(() => {
+  .fetch('GET', `${TEST_SERVER_URL}/public/github.png`)
+  .then((res) => fs.stat(res.path()))
+  .then((stat) => {
+    report(
+      <Assert key="file exists at the path"
+        expect={true} actual={true}/>,
+      <Assert key="file size correct"
+        expect="23975" actual={stat.size}/>)
     done()
   })
-
 })
-
-// issue #74
-// describe('download file to specific location using DownloadManager', (report, done) => {
-//   let dest = dirs.DCIMDir + '/android-download-test-' +Date.now() + '.png'
-//   RNFetchBlob.config({
-//     addAndroidDownloads : {
-//       useDownloadManager : true,
-//       path : dest,
-//       mime : 'image/png',
-//       title : 'android-download-path-test.png',
-//       description : 'download to specific path #74'
-//     }
-//   })
-//   .fetch('GET', `${TEST_SERVER_URL}/public/github.png`)
-//   .then((res) => fs.stat(res.path()))
-//   .then((stat) => {
-//     report(
-//       <Assert key="file exists at the path"
-//         expect={true} actual={true}/>,
-//       <Assert key="file size correct"
-//         expect="23975" actual={stat.size}/>)
-//     done()
-//   })
-// })

test/test-init.js

@@ -17,11 +17,11 @@ const { Assert, Comparer, Info, prop } = RNTest
 
 // test environment variables
 
-prop('FILENAME', `${Platform.OS}-0.8.0-${Date.now()}.png`)
-prop('TEST_SERVER_URL', 'http://localhost:8123')
-prop('TEST_SERVER_URL_SSL', 'https://localhost:8124')
-// prop('TEST_SERVER_URL', 'http://192.168.17.194:8123')
-// prop('TEST_SERVER_URL_SSL', 'https://192.168.17.194:8124')
+prop('FILENAME', `${Platform.OS}-0.10.0-${Date.now()}.png`)
+// prop('TEST_SERVER_URL', 'http://localhost:8123')
+// prop('TEST_SERVER_URL_SSL', 'https://localhost:8124')
+prop('TEST_SERVER_URL', 'http://192.168.17.203:8123')
+prop('TEST_SERVER_URL_SSL', 'https://192.168.17.203:8124')
 prop('DROPBOX_TOKEN', 'fsXcpmKPrHgAAAAAAAAAoXZhcXYWdgLpQMan6Tb_bzJ237DXhgQSev12hA-gUXt4')
 prop('styles', {
   image : {
@@ -73,12 +73,14 @@ describe('GET image from server', (report, done) => {
 // require('./test-0.9.4')
 // require('./test-0.9.5')
 // require('./test-0.9.6')
-require('./test-stream')
+// require('./test-0.10.0')
+// require('./test-background.js')
+// require('./test-stream')
 // require('./test-fetch')
 // require('./test-fs')
 // require('./test-xmlhttp')
 // require('./test-blob')
 // require('./test-firebase')
-// require('./test-android')
+require('./test-android')
 // require('./test-stress')
 // require('./benchmark')