Merge pull request #128 from Dignifiedquire/headers

Header work

Author: dignifiedquire

src/request-api.js

@@ -16,6 +16,7 @@ function onRes (buffer, cb) {
 
     const stream = !!res.headers['x-stream-output']
     const chunkedObjects = !!res.headers['x-chunked-output']
+    const isJson = res.headers['content-type'] === 'application/json'
 
     if (res.statusCode >= 400 || !res.statusCode) {
       const error = new Error(`Server responded with ${res.statusCode}`)
@@ -33,24 +34,18 @@ function onRes (buffer, cb) {
 
     if (chunkedObjects) {
       const parsed = []
-      res.on('data', chunk => parsed.push(JSON.parse(chunk)))
+      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
     }
 
-    Wreck.read(res, null, (err, payload) => {
-      if (err) return cb(err)
-
-      let parsed
-
-      try {
-        parsed = JSON.parse(payload.toString())
-      } catch (err2) {
-        parsed = payload.toString()
-      }
-
-      cb(null, parsed)
-    })
+    Wreck.read(res, {json: isJson}, cb)
   }
 }
 

tasks/daemons.js

@@ -57,7 +57,15 @@ function startDisposableDaemons (callback) {
             throw err
           }
 
-          ipfsNodes[key].setConfig('API', '{"HTTPHeaders": {"Access-Control-Allow-Origin": ["*"]}}', err => {
+          const headers = {
+            HTTPHeaders: {
+              'Access-Control-Allow-Origin': ['*'],
+              // TODO: When ipfs/go-ipfs#1979 is merged drop these
+              'Access-Control-Allow-Headers': ['X-Stream-Output, X-Chunked-Output'],
+              'Access-Control-Expose-Headers': ['X-Stream-Output, X-Chunked-Output']
+            }
+          }
+          ipfsNodes[key].setConfig('API', JSON.stringify(headers), err => {
             if (err) {
               throw err
             }

test/tests.js

@@ -193,13 +193,6 @@ describe('IPFS Node.js API wrapper tests', () => {
           throw err
         }
 
-        if (!res.on) {
-          // Just  a string
-          assert.equal(res.toString(), testfile)
-          done()
-          return
-        }
-
         let buf = ''
         res
           .on('error', err => { throw err })
@@ -313,7 +306,7 @@ describe('IPFS Node.js API wrapper tests', () => {
           throw err
         }
 
-        assert.equal(res, '')
+        assert.equal(res, null)
         done()
       })
     })
@@ -403,13 +396,6 @@ describe('IPFS Node.js API wrapper tests', () => {
       apiClients['a'].block.get(blorbKey, (err, res) => {
         if (err) throw err
 
-        if (!res.on) {
-          // Just  a string
-          assert.equal(res.toString(), 'blorb')
-          done()
-          return
-        }
-
         let buf = ''
         res
           .on('data', function (data) { buf += data })
@@ -454,13 +440,6 @@ describe('IPFS Node.js API wrapper tests', () => {
       apiClients['a'].object.data(testObjectHash, (err, res) => {
         if (err) throw err
 
-        if (!res.on) {
-          // Just  a string
-          assert.equal(res.toString(), 'testdata')
-          done()
-          return
-        }
-
         let buf = ''
         res
           .on('error', err => { throw err })
@@ -741,6 +720,8 @@ describe('IPFS Node.js API wrapper tests', () => {
           throw err
         }
 
+        assert.equal(typeof res, 'object')
+
         return done()
 
         // non ipns or pk hashes fail to fetch, known bug
@@ -761,6 +742,8 @@ describe('IPFS Node.js API wrapper tests', () => {
         if (err) {
           throw err
         }
+
+        assert.equal(typeof res, 'object')
         assert(res)
         done()
       })