ipfs-inactive · Nov 21, 2015 · Nov 21, 2015
Showing with 27 additions and 22 deletions.

+1 −0 package.json

+15 −10 src/request-api.js

+11 −12 test/tests.js
diff --git a/package.json b/package.json
@@ -52,6 +52,7 @@
     "require-dir": "^0.3.0",
     "rimraf": "^2.4.3",
     "run-sequence": "^1.1.4",
+    "stream-equal": "^0.1.7",
     "stream-http": "^2.0.2",
     "uglify-js": "^2.4.24",
     "vinyl-buffer": "^1.0.0",

diff --git a/src/request-api.js b/src/request-api.js
@@ -8,6 +8,18 @@ const isNode = !global.window
 
 // -- Internal
 
+function parseChunkedJson (res, cb) {
+  const parsed = []
+  res.on('data', chunk => {
+    try {
+      parsed.push(JSON.parse(chunk))
+    } catch (err) {
+      // Browser quirks emit more than needed sometimes
+    }
+  })
+  res.on('end', () => cb(null, parsed))
+}
+
 function onRes (buffer, cb) {
   return (err, res) => {
     if (err) {
@@ -33,16 +45,9 @@ function onRes (buffer, cb) {
     if (stream && !buffer) return cb(null, res)
 
     if (chunkedObjects) {
-      const parsed = []
-      res.on('data', chunk => {
-        try {
-          parsed.push(JSON.parse(chunk))
-        } catch (err) {
-          // Browser quirks emit more than needed sometimes
-        }
-      })
-      res.on('end', () => cb(null, parsed))
-      return
+      if (isJson) return parseChunkedJson(res, cb)
+
+      return Wreck.read(res, null, cb)
     }
 
     Wreck.read(res, {json: isJson}, cb)

diff --git a/test/tests.js b/test/tests.js
@@ -3,6 +3,7 @@
 /* global describe it before */
 
 const ipfsAPI = require('../src/index.js')
+const streamEqual = require('stream-equal')
 const assert = require('assert')
 const path = require('path')
 const File = require('vinyl')
@@ -16,7 +17,7 @@ let testfileBig
 
 if (isNode) {
   testfile = require('fs').readFileSync(__dirname + '/testfile.txt')
-  testfileBig = require('fs').readFileSync(__dirname + '/100mb.random')
+  testfileBig = require('fs').createReadStream(__dirname + '/100mb.random', { bufferSize: 128 })
 } else {
   testfile = require('raw!./testfile.txt')
   // browser goes nuts with a 100mb in memory
@@ -132,8 +133,7 @@ describe('IPFS Node.js API wrapper tests', () => {
       }
       this.timeout(10000)
 
-      let buf = new Buffer(testfileBig)
-      apiClients['a'].add(buf, (err, res) => {
+      apiClients['a'].add(testfileBig, (err, res) => {
         if (err) throw err
 
         // assert.equal(res.length, 1)
@@ -229,21 +229,20 @@ describe('IPFS Node.js API wrapper tests', () => {
       if (!isNode) {
         return done()
       }
-      this.timeout(10000)
+      this.timeout(60000)
 
       apiClients['a'].cat('Qmaw8jKK2vdd1gxiYqfyXJgVwfibiXiH3H81eVViJRXMJj', (err, res) => {
         if (err) {
           throw err
         }
 
-        let buf = ''
-        res
-          .on('error', err => { throw err })
-          .on('data', data => buf += data)
-          .on('end', () => {
-            assert.equal(buf, testfileBig)
-            done()
-          })
+        // Do not blow out the memory of nodejs :)
+        streamEqual(res, testfileBig, (err, equal) => {
+          console.log('compare done', err, equal)
+          if (err) throw err
+          assert(equal)
+          done()
+        })
       })
     })
   })