readable wip commit

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

@@ -558,6 +558,7 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
                 DownloadManager dm = (DownloadManager) appCtx.getSystemService(Context.DOWNLOAD_SERVICE);
                 dm.query(query);
                 Cursor c = dm.query(query);
+                String error = null;
                 String filePath = null;
                 // the file exists in media content database
                 if (c.moveToFirst()) {
@@ -568,11 +569,6 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
                     if (cursor != null) {
                         cursor.moveToFirst();
                         filePath = cursor.getString(0);
-                        cursor.close();
-                        if(filePath != null) {
-                            this.callback.invoke(null, RNFetchBlobConst.RNFB_RESPONSE_PATH, filePath);
-                            return;
-                        }
                     }
                 }
                 // When the file is not found in media content database, check if custom path exists
@@ -582,14 +578,13 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
                         boolean exists = new File(customDest).exists();
                         if(!exists)
                             throw new Exception("Download manager download failed, the file does not downloaded to destination.");
-                        callback.invoke(null, RNFetchBlobConst.RNFB_RESPONSE_PATH, customDest);
 
                     } catch(Exception ex) {
-                        this.callback.invoke(ex.getLocalizedMessage(), null, null);
+                        error = ex.getLocalizedMessage();
                     }
                 }
-                else
-                    this.callback.invoke(null, RNFetchBlobConst.RNFB_RESPONSE_PATH, filePath);
+                this.callback.invoke(error, RNFetchBlobConst.RNFB_RESPONSE_PATH, filePath);
+                c.close();
             }
         }
     }

src/polyfill/Readable.js

@@ -0,0 +1,80 @@
+// Copyright 2016 wkh237@github. All rights reserved.
+// Use of this source code is governed by a MIT-style license that can be
+// found in the LICENSE file.
+
+import RNFetchBlob from '../index.js'
+import fs from '../fs.js'
+import getUUID from '../utils/uuid'
+import Log from '../utils/log.js'
+import Stream from './Stream.js'
+import EventEmitter from 'EventEmitter'
+
+const log = new Log('Readable')
+
+// log.disable()
+log.level(3)
+
+/**
+ * A RNFetchBlob style nodejs ReadableStream polyfill class
+ */
+export default class Readable {
+
+  constructor() {
+
+    this._emitter = new EventEmitter()
+    this._encoding = 'utf8'
+    this._readableState = null
+    this._isPaused = true
+
+  }
+
+  pipe(stream:Readable):Readable {
+    this._emitter.addListener('data', (chunk) => {
+      stream.emit('data', chunk)
+    })
+  }
+
+  unpipe(stream:Readable, options:any):Readable {
+
+  }
+
+  setEncoding(encoding:'utf8' | 'base64' | 'ascii'):Readable {
+    this._encoding = encoding
+  }
+
+  resume():Readable {
+    this._readableState = true
+  }
+
+  read(size:number) {
+
+  }
+
+  isPaused():boolean {
+    return this._isPaused
+  }
+
+  pause():Readable {
+    this._readableState = false
+    return this
+  }
+
+  emit(event:string, data:any):Readable {
+    this._emitter.emit(event, data)
+    return this
+  }
+
+  on(event:string, fn:() => void):Readable {
+    this._emitter.addListener(event, fn)
+    return this
+  }
+
+  unshift(chunk:any):Readable {
+
+  }
+
+  wrap(stream:Stream) {
+
+  }
+
+}

src/polyfill/Stream.js

@@ -0,0 +1,19 @@
+// Copyright 2016 wkh237@github. All rights reserved.
+// Use of this source code is governed by a MIT-style license that can be
+// found in the LICENSE file.
+
+import RNFetchBlob from '../index.js'
+import fs from '../fs.js'
+import getUUID from '../utils/uuid'
+import Log from '../utils/log.js'
+
+const log = new Log('Stream')
+
+log.disable()
+// log.level(3)
+
+/**
+ * A RNFetchBlob style nodejs Stream polyfill class
+ */
+export default class Stream {
+}

test/test-android.js

@@ -28,126 +28,126 @@ let prefix = ((Platform.OS === 'android') ? 'file://' : '')
 let tmpFilePath = null
 const dirs = RNFetchBlob.fs.dirs
 
-describe('Download with notification', (report, done) => {
-  let filePath = null
-  let filename = `test-${Date.now()}.png`
-
-  filePath = `${dirs.DownloadDir}/${filename}`
-  RNFetchBlob.config({
-    path : filePath,
-    addAndroidDownloads : {
-      title : 'RNFetchBlob test download success',
-      description : `File description added by RNFetchblob`,
-      mediaScannable : true,
-      mime : "image/png",
-      notification : true
-    }
-  })
-  .fetch('GET', `${TEST_SERVER_URL}/public/github2.jpg`)
-  .then((resp) => {
-    tmpFilePath = resp.path()
-    report(<Info key={`image from ${tmpFilePath}`}>
-      <Image
-        source={{ uri : prefix + tmpFilePath}}
-        style={styles.image}/>
-    </Info>)
-    done()
-  })
-
-})
-
-describe('MediaScanner tests ', (report, done) => {
-  let filename = `scannable-test-${Date.now()}.png`
-  let filePath = `${dirs.DownloadDir}/${filename}`
-  RNFetchBlob.config({
-    path : filePath,
-  })
-  .fetch('GET', `${TEST_SERVER_URL}/public/github2.jpg`)
-  .then((resp) => {
-    tmpFilePath = resp.path()
-    return RNFetchBlob.fs.scanFile([
-      { path:resp.path() }
-    ])
-  })
-  .then(() => {
-    report(<Assert key={`scan image success, there should be a new file in Picture app named "${filename}"`} expect={true} actual={true}/>)
-    return RNFetchBlob
-            .config({
-              path : dirs.DCIMDir + '/beethoven-'+ Date.now() +'.mp3'
-            })
-            .fetch('GET', `${TEST_SERVER_URL}/public/beethoven.mp3`)
-  })
-  .then((resp) => {
-    fs.scanFile([{
-      path : resp.path()
-    }])
-    .then(() => {
-      report(<Assert
-        key={`scan mp3 file success, there exist a new file named "beethoven-${Date.now()}.mp3" in Music app`}
-        expect={true}
-        actual={true}/>)
-      done()
-    })
-  })
-
-})
-
-describe('android download manager', (report, done) => {
-  RNFetchBlob.config({
-    addAndroidDownloads : {
-      useDownloadManager : true,
-      title : 'RNFetchBlob test download manager test',
-      description : `File description added by RNFetchblob`,
-      mediaScannable : true,
-      notification : true
-    }
-  })
-  .fetch('GET', `${TEST_SERVER_URL}/public/beethoven.mp3`).then((resp) => {
-    report(
-      <Assert key="download manager complete handler" expect={true} actual={true}/>
-    )
-    return resp.readStream('ascii')
-  })
-  .then((stream) => {
-    stream.open();
-    let len = 0
-    stream.onData((chunk) => {
-      len += chunk.length
-    })
-    stream.onEnd(() => {
-      report(
-        <Assert key="download manager URI is readable"
-          expect={len}
-          comparer={Comparer.greater}
-          actual={0}/>
-      )
-      done()
-    })
-  })
-})
-
-describe('open a file from intent', (report, done) => {
-  let url  = null
-  RNFetchBlob.config({
-    addAndroidDownloads : {
-      useDownloadManager : true,
-      title : 'test-image',
-      description : 'open it from intent !',
-      mime : 'image/png',
-      mediaScannable : true,
-      notification : true,
-    }
-  })
-  .fetch('GET', `${TEST_SERVER_URL}/public/github.png`)
-  .then((res) => {
-    let sendIntent = RNFetchBlob.android.actionViewIntent
-    return sendIntent(res.path(), 'image/png')
-  })
-  .then(() => {
-    done()
-  })
-})
-
+// describe('Download with notification', (report, done) => {
+//   let filePath = null
+//   let filename = `test-${Date.now()}.png`
+//
+//   filePath = `${dirs.DownloadDir}/${filename}`
+//   RNFetchBlob.config({
+//     path : filePath,
+//     addAndroidDownloads : {
+//       title : 'RNFetchBlob test download success',
+//       description : `File description added by RNFetchblob`,
+//       mediaScannable : true,
+//       mime : "image/png",
+//       notification : true
+//     }
+//   })
+//   .fetch('GET', `${TEST_SERVER_URL}/public/github2.jpg`)
+//   .then((resp) => {
+//     tmpFilePath = resp.path()
+//     report(<Info key={`image from ${tmpFilePath}`}>
+//       <Image
+//         source={{ uri : prefix + tmpFilePath}}
+//         style={styles.image}/>
+//     </Info>)
+//     done()
+//   })
+//
+// })
+//
+// describe('MediaScanner tests ', (report, done) => {
+//   let filename = `scannable-test-${Date.now()}.png`
+//   let filePath = `${dirs.DownloadDir}/${filename}`
+//   RNFetchBlob.config({
+//     path : filePath,
+//   })
+//   .fetch('GET', `${TEST_SERVER_URL}/public/github2.jpg`)
+//   .then((resp) => {
+//     tmpFilePath = resp.path()
+//     return RNFetchBlob.fs.scanFile([
+//       { path:resp.path() }
+//     ])
+//   })
+//   .then(() => {
+//     report(<Assert key={`scan image success, there should be a new file in Picture app named "${filename}"`} expect={true} actual={true}/>)
+//     return RNFetchBlob
+//             .config({
+//               path : dirs.DCIMDir + '/beethoven-'+ Date.now() +'.mp3'
+//             })
+//             .fetch('GET', `${TEST_SERVER_URL}/public/beethoven.mp3`)
+//   })
+//   .then((resp) => {
+//     fs.scanFile([{
+//       path : resp.path()
+//     }])
+//     .then(() => {
+//       report(<Assert
+//         key={`scan mp3 file success, there exist a new file named "beethoven-${Date.now()}.mp3" in Music app`}
+//         expect={true}
+//         actual={true}/>)
+//       done()
+//     })
+//   })
+//
+// })
+//
+// describe('android download manager', (report, done) => {
+//   RNFetchBlob.config({
+//     addAndroidDownloads : {
+//       useDownloadManager : true,
+//       title : 'RNFetchBlob test download manager test',
+//       description : `File description added by RNFetchblob`,
+//       mediaScannable : true,
+//       notification : true
+//     }
+//   })
+//   .fetch('GET', `${TEST_SERVER_URL}/public/beethoven.mp3`).then((resp) => {
+//     report(
+//       <Assert key="download manager complete handler" expect={true} actual={true}/>
+//     )
+//     return resp.readStream('ascii')
+//   })
+//   .then((stream) => {
+//     stream.open();
+//     let len = 0
+//     stream.onData((chunk) => {
+//       len += chunk.length
+//     })
+//     stream.onEnd(() => {
+//       report(
+//         <Assert key="download manager URI is readable"
+//           expect={len}
+//           comparer={Comparer.greater}
+//           actual={0}/>
+//       )
+//       done()
+//     })
+//   })
+// })
+//
+// describe('open a file from intent', (report, done) => {
+//   let url  = null
+//   RNFetchBlob.config({
+//     addAndroidDownloads : {
+//       useDownloadManager : true,
+//       title : 'test-image',
+//       description : 'open it from intent !',
+//       mime : 'image/png',
+//       mediaScannable : true,
+//       notification : true,
+//     }
+//   })
+//   .fetch('GET', `${TEST_SERVER_URL}/public/github.png`)
+//   .then((res) => {
+//     let sendIntent = RNFetchBlob.android.actionViewIntent
+//     return sendIntent(res.path(), 'image/png')
+//   })
+//   .then(() => {
+//     done()
+//   })
+// })
+//
 // #75
 describe('APK downloaded from Download Manager should correct', (report, done) => {
 
@@ -175,25 +175,25 @@ describe('APK downloaded from Download Manager should correct', (report, 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()
-  })
-})
+// 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

@@ -18,8 +18,8 @@ const { Assert, Comparer, Info, prop } = RNTest
 // test environment variables
 
 prop('FILENAME', `${Platform.OS}-0.8.0-${Date.now()}.png`)
-prop('TEST_SERVER_URL', 'http://192.168.16.70:8123')
-prop('TEST_SERVER_URL_SSL', 'https://192.168.16.70:8124')
+prop('TEST_SERVER_URL', 'http://192.168.0.11:8123')
+prop('TEST_SERVER_URL_SSL', 'https://192.168.0.11:8124')
 prop('DROPBOX_TOKEN', 'fsXcpmKPrHgAAAAAAAAAoXZhcXYWdgLpQMan6Tb_bzJ237DXhgQSev12hA-gUXt4')
 prop('styles', {
   image : {
@@ -59,19 +59,81 @@ describe('GET image from server', (report, done) => {
 })
 
 
-require('./test-0.1.x-0.4.x')
-require('./test-0.5.1')
-require('./test-0.5.2')
-require('./test-0.6.0')
-require('./test-0.6.2')
+describe('Upload octet-stream image to Dropbox', (report, done) => {
+  let image = prop('image')
+  let tmp = null
+  let etag = ''
+  // upload a file to dropbox
+  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',
+  }, image)
+  .then((resp) => {
+    resp = resp.json()
+    report(
+      <Assert key="confirm the file has been uploaded" expect={FILENAME} actual={resp.name}/>
+    )
+    // detect range request support
+    return RNFetchBlob
+    .config({
+      path : RNFetchBlob.fs.dirs.DocumentDir + '/part1.png'
+    })
+    .fetch('GET', 'https://content.dropboxapi.com/1/files/auto'+'/rn-upload/'+FILENAME, {
+      Authorization : `Bearer ${DROPBOX_TOKEN}`,
+      'Cache-Control' : 'no-store',
+      'Range' : 'bytes=0-22975'
+    })
+  })
+  .then((res) => {
+
+    console.log('first chunk', res.info().headers,res.info().headers['Content-Length'])
+    // get first range
+    return RNFetchBlob
+    .config({
+      path : RNFetchBlob.fs.dirs.DocumentDir + '/part2.png'
+    })
+    .fetch('GET', 'https://content.dropboxapi.com/1/files/auto/rn-upload/'+FILENAME, {
+      Authorization : `Bearer ${DROPBOX_TOKEN}`,
+      'Cache-Control' : 'no-store',
+      'Range' : 'bytes=22976-'
+    })
+  })
+  .then((res) => {
+    tmp = res
+    console.log('second chunk', res.info().headers, res.info().headers['Content-Length'])
+    // get second range
+    return RNFetchBlob.fs.appendFile(RNFetchBlob.fs.dirs.DocumentDir + '/part1.png', RNFetchBlob.fs.dirs.DocumentDir + '/part2.png', 'uri')
+  })
+  .then(() => {
+    return RNFetchBlob.fs.stat(RNFetchBlob.fs.dirs.DocumentDir + '/part1.png')
+  })
+  .then((stat) => {
+    tmp.flush()
+    console.log('combined', stat)
+    report(<Info key="combined image">
+      <Text>{stat.size}</Text>
+      <Image key="combined image" style={styles.image} source={{uri :RNFetchBlob.fs.dirs.DocumentDir + '/part1.png' }}/>
+    </Info>)
+    done()
+  })
+
+})
+
+// require('./test-0.1.x-0.4.x')
+// 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-0.7.0')
-require('./test-0.8.0')
-require('./test-0.9.0')
-require('./test-fetch')
-require('./test-fs')
-require('./test-xmlhttp')
-require('./test-blob')
-require('./test-firebase')
-require('./test-android')
+// require('./test-0.7.0')
+// require('./test-0.8.0')
+// require('./test-0.9.0')
+// require('./test-fetch')
+// require('./test-fs')
+// require('./test-xmlhttp')
+// require('./test-blob')
+// require('./test-firebase')
+// require('./test-android')
+// require('./test-readable')
 // require('./benchmark')

test/test-readable.js

@@ -0,0 +1,40 @@
+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';
+
+import EventEmitter from 'EventEmitter'
+
+const fs = RNFetchBlob.fs
+
+const Readable = RNFetchBlob.polyfill.Readable
+const { Assert, Comparer, Info, prop } = RNTest
+const describe = RNTest.config({
+  group : 'Blob',
+  run : true,
+  expand : false,
+  timeout : 20000,
+})
+const { TEST_SERVER_URL, TEST_SERVER_URL_SSL, DROPBOX_TOKEN, styles } = prop()
+const  dirs = RNFetchBlob.fs.dirs
+
+let prefix = ((Platform.OS === 'android') ? 'file://' : '')
+let file = RNTest.prop('image')
+
+describe('first test', (report, done) => {
+  let e = new EventEmitter()
+  console.log(e)
+  e.addListener('aaa', (data) => { console.log(data) })
+  e.emit('aaa', 123)
+})