Merge branch '0.6.3' into 0.7.0

package.json

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

src/ios/RNFetchBlobNetwork.m

@@ -92,7 +92,7 @@ NSOperationQueue *taskQueue;
     
     // the session trust any SSL certification
 
-    NSURLSessionConfiguration *defaultConfigObject = [NSURLSessionConfiguration backgroundSessionConfigurationWithIdentifier:taskId];
+    NSURLSessionConfiguration *defaultConfigObject = [NSURLSessionConfiguration defaultSessionConfiguration];
     session = [NSURLSession sessionWithConfiguration:defaultConfigObject delegate:self delegateQueue:[NSOperationQueue mainQueue]];
     
     if(path != nil || [self.options valueForKey:CONFIG_USE_TEMP]!= nil)
@@ -168,25 +168,21 @@ NSOperationQueue *taskQueue;
             }
      ];
     
-    if(receivedBytes >= expectedBytes)
-    {
-        if(respFile == YES)
-        {
-            [writeStream close];
-            callback(@[[NSNull null], destPath]);
-        }
-        // base64 response
-        else {
-            callback(@[[NSNull null], [respData base64EncodedStringWithOptions:0]]);
-        }
-        [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
-    }
 }
 
 - (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCompleteWithError:(NSError *)error {
     NSLog([error localizedDescription]);
     self.error = error;
     [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
+    if(respFile == YES)
+    {
+        [writeStream close];
+        callback(@[error == nil ? [NSNull null] : [error localizedDescription], destPath]);
+    }
+    // base64 response
+    else {
+        callback(@[error == nil ? [NSNull null] : [error localizedDescription], [respData base64EncodedStringWithOptions:0]]);
+    }
 }
 
 // upload progress handler

src/package.json

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

test-server/server.js

@@ -40,9 +40,10 @@ app.listen(8123, function(err){
     console.log('test server running at port ',8123)
 })
 
+var count = 0
 
 app.use(function(req,res,next){
-  console.log(chalk.green('request url=') + chalk.magenta(req.url))
+  console.log(chalk.green('request url=') + chalk.magenta(req.url), ++count)
   next()
 })
 

test/test-0.5.1.js

@@ -212,13 +212,14 @@ RNTest.config({
     </Info>)
   })
   .then((res) => {
+    try {
     deb = Date.now()
     let promise =  RNFetchBlob.fetch('POST', 'https://content.dropboxapi.com/2/files/upload', {
       Authorization : `Bearer ${DROPBOX_TOKEN}`,
       'Dropbox-API-Arg': '{\"path\": \"/rn-upload/'+filename+'\",\"mode\": \"add\",\"autorename\": true,\"mute\": false}',
       'Content-Type' : 'application/octet-stream',
     }, RNFetchBlob.wrap(res.path()))
-    if(Platform.OS === 'ios')
+    if(Platform.OS === 'ios') {
       promise.progress((now, total) => {
         if(Date.now() - deb < 1000)
           return
@@ -233,7 +234,9 @@ RNTest.config({
           </Text>
         </Info>)
       })
+    }
     return promise
+  } catch(err) { console.log(err) }
   })
   .then((res) => {
     report(<Assert

test/test-0.6.2.js

@@ -55,124 +55,124 @@ describe('upload asset from camera roll', (report, done) => {
       done()
     })
 })
-//
-// describe('Upload multipart data with file from CameraRoll', (report, done) => {
-//     let filename = 'test-from-storage-img-'+Date.now()+'.png'
-//     RNFetchBlob.fetch('POST', `${TEST_SERVER_URL}/upload-form`, {
-//         'Content-Type' : 'multipart/form-data',
-//       }, [
-//         { name : 'test-img', filename : filename, data: RNFetchBlob.wrap(photo)},
-//         { name : 'test-text', filename : 'test-text.txt', data: RNFetchBlob.base64.encode('hello.txt')},
-//         { name : 'field1', data : 'hello !!'},
-//         { name : 'field2', data : 'hello2 !!'}
-//       ])
-//     .then((resp) => {
-//       resp = resp.json()
-//       report(
-//         <Assert key="check posted form data #1" expect="hello !!" actual={resp.fields.field1}/>,
-//         <Assert key="check posted form data #2" expect="hello2 !!" actual={resp.fields.field2}/>,
-//       )
-//       return RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/public/${filename}`)
-//     })
-//     .then((resp) => {
-//       report(<Info key="uploaded image">
-//         <Image
-//           style={styles.image}
-//           source={{ uri : 'data:image/png;base64, '+ resp.base64()}}/>
-//       </Info>)
-//       done()
-//     })
-// })
-//
-//
-// describe('access assets from camera roll', (report, done) => {
-//   let photo = null
-//   CameraRoll.getPhotos({first : 10})
-//     .then((resp) => {
-//       photo = resp.edges[0].node.image.uri
-//       report(<Info key="items">
-//         <Text>{photo}</Text>
-//       </Info>)
-//       return fs.readFile(photo, 'base64')
-//     })
-//     .then((data) => {
-//       report(<Info key="asset image">
-//         <Image
-//           style={styles.image}
-//           source={{uri: `data:image/png;base64, ${data}`}}/>
-//       </Info>)
-//       done()
-//     })
-// })
-//
-// describe('read asset in app bundle',(report, done) => {
-//   let target = fs.asset('test-asset2.png')
-//   fs.readFile(target, 'base64')
-//   .then((data) => {
-//     report(<Info key="asset image">
-//       <Image
-//         style={styles.image}
-//         source={{uri: `data:image/png;base64, ${data}`}}/>
-//     </Info>)
-//     return fs.readFile(fs.asset('test-asset1.json'), 'utf8')
-//   })
-//   .then((resp) => {
-//     report(
-//       <Assert key="asset content verify"
-//         expect="asset#1"
-//         actual={JSON.parse(resp).secret}/>)
-//       done()
-//   })
-// })
-//
-// describe('stat assets in app', (report, done) => {
-//   fs.stat(fs.asset('test-asset2.png'))
-//     .then((data) => {
-//       report(<Info key="list of assets">
-//         <Text>{JSON.stringify(data)}</Text>
-//       </Info>)
-//       done()
-//     })
-// })
-//
-// describe('copy asset', (report, done) => {
-//   let dest = `${dirs.DocumentDir}/test-asset-1-${Date.now()}.json`
-//   fs.cp(fs.asset('test-asset1.json'), dest)
-//     .then(() => fs.readFile(dest, 'utf8'))
-//     .then((data) => {
-//       report(<Assert key="asset copied correctly"
-//         expect={'asset#1'}
-//         actual={JSON.parse(data).secret}/>)
-//       return fs.stat(fs.asset('test-asset1.json'))
-//     })
-//     .then((stat) => {
-//       report(<Assert key="file size check"
-//         expect={27}
-//         actual={Math.floor(stat.size)}/>,
-//       <Info key="dest file info">
-//         <Text>{JSON.stringify(stat)}</Text>
-//       </Info>)
-//       done()
-//     })
-// })
-//
-//
-// 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}`,
-//     'Content-Type' : 'application/octet-stream',
-//   }, RNFetchBlob.wrap(assetName))
-//   .then((resp) => {
-//     resp = resp.json()
-//     report(
-//       <Assert key="file name check"
-//         expect={`file-from-asset-${Platform.OS}.json`}
-//         actual={resp.name}/>)
-//     done()
-//   })
-// })
+
+describe('Upload multipart data with file from CameraRoll', (report, done) => {
+    let filename = 'test-from-storage-img-'+Date.now()+'.png'
+    RNFetchBlob.fetch('POST', `${TEST_SERVER_URL}/upload-form`, {
+        'Content-Type' : 'multipart/form-data',
+      }, [
+        { name : 'test-img', filename : filename, data: RNFetchBlob.wrap(photo)},
+        { name : 'test-text', filename : 'test-text.txt', data: RNFetchBlob.base64.encode('hello.txt')},
+        { name : 'field1', data : 'hello !!'},
+        { name : 'field2', data : 'hello2 !!'}
+      ])
+    .then((resp) => {
+      resp = resp.json()
+      report(
+        <Assert key="check posted form data #1" expect="hello !!" actual={resp.fields.field1}/>,
+        <Assert key="check posted form data #2" expect="hello2 !!" actual={resp.fields.field2}/>,
+      )
+      return RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/public/${filename}`)
+    })
+    .then((resp) => {
+      report(<Info key="uploaded image">
+        <Image
+          style={styles.image}
+          source={{ uri : 'data:image/png;base64, '+ resp.base64()}}/>
+      </Info>)
+      done()
+    })
+})
+
+
+describe('access assets from camera roll', (report, done) => {
+  let photo = null
+  CameraRoll.getPhotos({first : 10})
+    .then((resp) => {
+      photo = resp.edges[0].node.image.uri
+      report(<Info key="items">
+        <Text>{photo}</Text>
+      </Info>)
+      return fs.readFile(photo, 'base64')
+    })
+    .then((data) => {
+      report(<Info key="asset image">
+        <Image
+          style={styles.image}
+          source={{uri: `data:image/png;base64, ${data}`}}/>
+      </Info>)
+      done()
+    })
+})
+
+describe('read asset in app bundle',(report, done) => {
+  let target = fs.asset('test-asset2.png')
+  fs.readFile(target, 'base64')
+  .then((data) => {
+    report(<Info key="asset image">
+      <Image
+        style={styles.image}
+        source={{uri: `data:image/png;base64, ${data}`}}/>
+    </Info>)
+    return fs.readFile(fs.asset('test-asset1.json'), 'utf8')
+  })
+  .then((resp) => {
+    report(
+      <Assert key="asset content verify"
+        expect="asset#1"
+        actual={JSON.parse(resp).secret}/>)
+      done()
+  })
+})
+
+describe('stat assets in app', (report, done) => {
+  fs.stat(fs.asset('test-asset2.png'))
+    .then((data) => {
+      report(<Info key="list of assets">
+        <Text>{JSON.stringify(data)}</Text>
+      </Info>)
+      done()
+    })
+})
+
+describe('copy asset', (report, done) => {
+  let dest = `${dirs.DocumentDir}/test-asset-1-${Date.now()}.json`
+  fs.cp(fs.asset('test-asset1.json'), dest)
+    .then(() => fs.readFile(dest, 'utf8'))
+    .then((data) => {
+      report(<Assert key="asset copied correctly"
+        expect={'asset#1'}
+        actual={JSON.parse(data).secret}/>)
+      return fs.stat(fs.asset('test-asset1.json'))
+    })
+    .then((stat) => {
+      report(<Assert key="file size check"
+        expect={27}
+        actual={Math.floor(stat.size)}/>,
+      <Info key="dest file info">
+        <Text>{JSON.stringify(stat)}</Text>
+      </Info>)
+      done()
+    })
+})
+
+
+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}`,
+    'Content-Type' : 'application/octet-stream',
+  }, RNFetchBlob.wrap(assetName))
+  .then((resp) => {
+    resp = resp.json()
+    report(
+      <Assert key="file name check"
+        expect={`file-from-asset-${Platform.OS}.json`}
+        actual={resp.name}/>)
+    done()
+  })
+})
 
 describe('Check custom MIME type correctness',(report, done) => {
   RNFetchBlob

test/test-0.6.3.js

@@ -0,0 +1,68 @@
+import RNTest from './react-native-testkit/'
+import React from 'react'
+import RNFetchBlob from 'react-native-fetch-blob'
+import Timer from 'react-timer-mixin'
+
+import {
+  StyleSheet,
+  Text,
+  View,
+  ScrollView,
+  CameraRoll,
+  Platform,
+  Dimensions,
+  Image,
+} from 'react-native';
+
+const fs = RNFetchBlob.fs
+const { Assert, Comparer, Info, prop } = RNTest
+const describe = RNTest.config({
+  group : '0.6.3',
+  run : true,
+  expand : true,
+  timeout : 300000000,
+})
+const { TEST_SERVER_URL, TEST_SERVER_URL_SSL, DROPBOX_TOKEN, styles } = prop()
+const  dirs = RNFetchBlob.fs.dirs
+
+let prefix = ((Platform.OS === 'android') ? 'file://' : '')
+
+describe('massive HTTP request', (report, done) => {
+  try {
+  let promises = []
+  let progress = []
+  let begin = Date.now()
+  for(let i=0; i<1500;i++) {
+    let p = RNFetchBlob
+    .config({fileCache : true})
+    .fetch('GET', `${TEST_SERVER_URL}/public/github2.jpg`)
+    // .progress(function(current, total){
+    //   progress[this] = current/total
+    // }.bind(i))
+    promises.push(p)
+  }
+  // let it = Timer.setInterval(() => {
+  //   function pgs() {
+  //     let res = []
+  //     for(var i in progress) {
+  //       res.push(<Text key={`download#${i}`}>{`download #${i} ${Math.floor(progress[i]*100)}%`}</Text>)
+  //     }
+  //     return res
+  //   }
+  //   report(<Info key={`progress monitor`} uid="progress">
+  //     {pgs()}
+  //   </Info>)
+  // }, 1000)
+  Promise.all(promises).then((resps) => {
+    for(let i in resps) {
+      fs.unlink(resps[i].path())
+    }
+    report(<Info key={`time = ${(Date.now() - begin) / 1000} sec`}></Info>)
+    // Timer.clearInterval(it)
+    done()
+  })
+} catch(err) {
+  console.log(err)
+}
+
+})

test/test-init.js

@@ -57,5 +57,6 @@ require('./test-0.5.1')
 require('./test-0.5.2')
 require('./test-0.6.0')
 require('./test-0.6.2')
+require('./test-0.6.3')
 require('./test-fs')
 require('./test-android')