fix streaming

Author: daviddias

src/request-api.js

@@ -2,12 +2,13 @@
 
 const request = require('request')
 const getFilesStream = require('./get-files-stream')
+const stream = require('stream')
 
 const isNode = !global.window
 
 // -- Internal
 
-function onEnd (buffer, result, cb) {
+function onEnd (buffer, result, passThrough, cb) {
   return (err, res, body) => {
     if (err) {
       return cb(err)
@@ -17,6 +18,13 @@ function onEnd (buffer, result, cb) {
       return cb(new Error(`Server responded with ${res.statusCode}: ${body}`))
     }
 
+    if (result.stream) {
+      cb(null, passThrough)
+      passThrough.resume()
+      passThrough.end()
+      return
+    }
+
     if ((result.stream && !buffer) ||
         (result.chunkedObjects && buffer)) {
       return cb(null, body)
@@ -33,8 +41,12 @@ function onEnd (buffer, result, cb) {
   }
 }
 
-function onData (result) {
+function onData (result, passThrough) {
   return chunk => {
+    if (result.stream) {
+      passThrough.write(chunk)
+      return
+    }
     if (!result.chunkedObjects) return
 
     try {
@@ -63,8 +75,10 @@ function makeRequest (opts, buffer, cb) {
     objects: []
   }
 
-  return request(opts, onEnd(buffer, result, cb))
-    .on('data', onData(result))
+  var passThrough = new stream.PassThrough()
+
+  return request(opts, onEnd(buffer, result, passThrough, cb))
+    .on('data', onData(result, passThrough))
     .on('response', onResponse(result))
 }
 

test/tests.js

@@ -156,23 +156,21 @@ describe('IPFS Node.js API wrapper tests', function () {
           throw err
         }
 
-        if (isNode) {
-          var buf = ''
-          res
-            .on('error', function (err) { throw err })
-            .on('data', function (data) { buf += data })
-            .on('end', function () {
-              assert.equal(buf, testfile)
-              done()
-            })
-        } else {
-          if (typeof res === 'string') {
-            // Just  a string
-            assert.equal(res, testfile)
-            done()
-            return
-          }
+        if (typeof res === 'string') {
+          // Just  a string
+          assert.equal(res, testfile)
+          done()
+          return
         }
+
+        var buf = ''
+        res
+          .on('error', function (err) { throw err })
+          .on('data', function (data) { buf += data })
+          .on('end', function () {
+            assert.equal(buf, testfile)
+            done()
+          })
       })
     })
   })