tests passing

Author: dignifiedquire

.travis.yml

@@ -18,7 +18,7 @@ before_install:
 
 script:
   - npm run lint
-  - npm run test:node
+  - npm run test
   - npm run coverage
 
 before_script:

README.md

@@ -99,6 +99,8 @@ If are using this module in a browser with something like browserify, then you w
 
 ```bash
 $ ipfs config --json API.HTTPHeaders.Access-Control-Allow-Origin "[\"http://example.com\"]"
+$ ipfs config --json API.HTTPHeaders.Access-Control-Allow-Credentials "\"true\""
+$ ipfs config --json API.HTTPHeaders.Access-Control-Allow-Methods "[\"PUT\", \"POST\", \"GET\"]"
 ```
 
 ## Usage

package.json

@@ -6,8 +6,7 @@
   "browser": {
     "glob": false,
     "fs": false,
-    "http": "stream-http",
-    "https": "https-browserify"
+    "stream": "readable-stream"
   },
   "scripts": {
     "test": "gulp test",
@@ -28,19 +27,18 @@
     "detect-node": "^2.0.3",
     "flatmap": "0.0.3",
     "glob": "^7.1.1",
-    "https-browserify": "0.0.1",
     "ipfs-block": "^0.5.0",
     "ipld-dag-pb": "^0.8.0",
     "is-ipfs": "^0.2.1",
     "isstream": "^0.1.2",
     "multiaddr": "^2.0.3",
     "multipart-stream": "^2.0.1",
     "ndjson": "^1.4.3",
+    "once": "^1.4.0",
     "peer-id": "^0.8.0",
     "peer-info": "^0.8.0",
     "promisify-es6": "^1.0.2",
     "qs": "^6.3.0",
-    "stream-http": "^2.4.1",
     "streamifier": "^0.1.1",
     "tar-stream": "^1.5.2",
     "wreck": "^10.0.0"

test/factory/daemon-spawner.js

@@ -2,7 +2,9 @@
 
 // const defaultConfig = require('./default-config.json')
 const ipfsd = require('ipfsd-ctl')
-const series = require('run-series')
+const series = require('async/series')
+const eachSeries = require('async/eachSeries')
+const once = require('once')
 
 module.exports = Factory
 
@@ -11,7 +13,7 @@ function Factory () {
     return new Factory()
   }
 
-  const nodes = []
+  let nodes = []
 
   this.spawnNode = (repoPath, config, callback) => {
     if (typeof repoPath === 'function') {
@@ -44,11 +46,18 @@ function Factory () {
     })
   }
 
-  this.dismantle = function (callback) {
-    series(
-      nodes.map((node) => {
-        return node.stopDaemon
-      }), callback)
+  this.dismantle = (callback) => {
+    eachSeries(nodes, (node, cb) => {
+      cb = once(cb)
+      node.stopDaemon(cb)
+    }, (err) => {
+      if (err) {
+        return callback(err)
+      }
+      nodes = []
+
+      callback()
+    })
   }
 }
 
@@ -62,23 +71,19 @@ function spawnEphemeralNode (callback) {
     // doesn't work as expected
     series([
       (cb) => {
-        node.setConfig('Bootstrap', null, cb)
-      },
-      (cb) => {
-        node.setConfig('Discovery', '{}', cb)
-      },
-      (cb) => {
-        const headers = {
-          HTTPHeaders: {
-            'Access-Control-Allow-Origin': ['*'],
-            'Access-Control-Allow-Credentials': 'true'
-          }
+        const configValues = {
+          // Bootstrap: [],
+          Discovery: {},
+          'HTTPHeaders.Access-Control-Allow-Origin': ['*'],
+          'HTTPHeaders.Access-Control-Allow-Credentials': 'true',
+          'HTTPHeaders.Access-Control-Allow-Methods': ['PUT', 'POST', 'GET']
         }
-        node.setConfig('API', JSON.stringify(headers), cb)
+
+        eachSeries(Object.keys(configValues), (configKey, cb) => {
+          node.setConfig(`API.${configKey}`, JSON.stringify(configValues[configKey]), cb)
+        }, cb)
       },
-      (cb) => {
-        node.startDaemon(cb)
-      }
+      (cb) => node.startDaemon(cb)
     ], (err) => {
       if (err) {
         return callback(err)

test/setup/spawn-daemons.js

@@ -6,89 +6,69 @@ const gulp = require('gulp')
 const fs = require('fs')
 const path = require('path')
 const ipfsd = require('ipfsd-ctl')
+const eachSeries = require('async/eachSeries')
+const parallel = require('async/parallel')
 
 let daemons
 
 function startDisposableDaemons (callback) {
   // a, b, c
   const ipfsNodes = {}
 
-  // a, b, c
-  const apiAddrs = {}
-
-  let counter = 0
-
-  function finish () {
-    counter++
-    if (counter === 3) {
-      const targetPath = path.join(__dirname, '/tmp-disposable-nodes-addrs.json')
-      fs.writeFileSync(targetPath, JSON.stringify(apiAddrs))
-      callback(ipfsNodes)
-    }
-  }
-
-  function startIndependentNode (nodes, addrs, key, cb) {
+  function startIndependentNode (nodes, key, cb) {
     ipfsd.disposable((err, node) => {
       if (err) {
-        throw err
+        return cb(err)
       }
 
       nodes[key] = node
 
       console.log('  ipfs init done - (bootstrap and mdns off) - ' + key)
 
-      nodes[key].setConfig('Bootstrap', null, (err) => {
+      const configValues = {
+        // Bootstrap: [],
+        Discovery: {},
+        'HTTPHeaders.Access-Control-Allow-Origin': ['*'],
+        'HTTPHeaders.Access-Control-Allow-Credentials': 'true',
+        'HTTPHeaders.Access-Control-Allow-Methods': ['PUT', 'POST', 'GET']
+      }
+
+      eachSeries(Object.keys(configValues), (configKey, cb) => {
+        nodes[key].setConfig(`API.${configKey}`, JSON.stringify(configValues[configKey]), cb)
+      }, (err) => {
         if (err) {
-          throw err
+          return cb(err)
         }
-        nodes[key].setConfig('Discovery', '{}', (err) => {
-          if (err) {
-            throw err
-          }
-
-          const headers = {
-            HTTPHeaders: {
-              'Access-Control-Allow-Origin': ['*']
-            }
-          }
-          nodes[key].setConfig('API', JSON.stringify(headers), (err) => {
-            if (err) {
-              throw err
-            }
 
-            nodes[key].startDaemon((err, ignore) => {
-              if (err) {
-                throw err
-              }
-
-              addrs[key] = nodes[key].apiAddr
-              cb()
-            })
-          })
-        })
+        nodes[key].startDaemon(cb)
       })
     })
   }
 
-  startIndependentNode(ipfsNodes, apiAddrs, 'a', finish)
-  startIndependentNode(ipfsNodes, apiAddrs, 'b', finish)
-  startIndependentNode(ipfsNodes, apiAddrs, 'c', finish)
+  parallel([
+    (cb) => startIndependentNode(ipfsNodes, 'a', cb),
+    (cb) => startIndependentNode(ipfsNodes, 'b', cb),
+    (cb) => startIndependentNode(ipfsNodes, 'c', cb)
+  ], (err) => {
+    if (err) {
+      return callback(err)
+    }
+    const targetPath = path.join(__dirname, '/tmp-disposable-nodes-addrs.json')
+    fs.writeFileSync(targetPath, JSON.stringify({
+      a: ipfsNodes.a.apiAddr,
+      b: ipfsNodes.b.apiAddr,
+      c: ipfsNodes.c.apiAddr
+    }))
+    callback(null, ipfsNodes)
+  })
 }
 
 function stopDisposableDaemons (ds, callback) {
-  let counter = 0
-  function finish () {
-    counter++
-    if (counter === 3) {
-      callback()
-    }
-  }
-
-  function stopIPFSNode (list, key, cb) {
+  function stopIPFSNode (node, cb) {
     let nodeStopped
-    list[key].stopDaemon((err) => {
+    node.stopDaemon((err) => {
       if (err) {
-        throw err
+        return cb(err)
       }
       if (!nodeStopped) {
         nodeStopped = true
@@ -97,20 +77,28 @@ function stopDisposableDaemons (ds, callback) {
     })
   }
 
-  stopIPFSNode(ds, 'a', finish)
-  stopIPFSNode(ds, 'b', finish)
-  stopIPFSNode(ds, 'c', finish)
+  parallel([
+    (cb) => stopIPFSNode(ds.a, cb),
+    (cb) => stopIPFSNode(ds.b, cb),
+    (cb) => stopIPFSNode(ds.c, cb)
+  ], callback)
 }
 
 gulp.task('daemons:start', (done) => {
-  startDisposableDaemons((d) => {
+  startDisposableDaemons((err, d) => {
+    if (err) {
+      return done(err)
+    }
     daemons = d
     done()
   })
 })
 
 gulp.task('daemons:stop', (done) => {
-  stopDisposableDaemons(daemons, () => {
+  stopDisposableDaemons(daemons, (err) => {
+    if (err) {
+      return done(err)
+    }
     daemons = null
     done()
   })