From d6c6d12e952f2fe06cb350969eaa5c616eecc820 Mon Sep 17 00:00:00 2001
From: Gavin McDermott <gavinmcdermott@gmail.com>
Date: Fri, 11 Nov 2016 21:18:20 -0800
Subject: [PATCH 01/46] fix cli test typo

---
 test/utils/ipfs-exec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/utils/ipfs-exec.js b/test/utils/ipfs-exec.js
index 0525d0c7fa..371435850a 100644
--- a/test/utils/ipfs-exec.js
+++ b/test/utils/ipfs-exec.js
@@ -20,7 +20,7 @@ module.exports = (repoPath, opts) => {
   env.IPFS_PATH = repoPath
 
   const config = Object.assign({}, {
-    stipEof: true,
+    stripEof: true,
     env: env,
     timeout: 60 * 1000
   }, opts)

From 641fe1cf7978c4463e7bb954c81a618d99a9558c Mon Sep 17 00:00:00 2001
From: Gavin McDermott <gavinmcdermott@gmail.com>
Date: Sat, 12 Nov 2016 00:29:49 -0800
Subject: [PATCH 02/46] wip: floodsub now in api-routes, api-resources, and
 core-components

---
 package.json                       |  1 +
 src/core/components/floodsub.js    | 56 ++++++++++++++++++++++++++++++
 src/core/components/go-online.js   |  1 +
 src/core/index.js                  |  2 ++
 src/http-api/resources/floodsub.js | 53 ++++++++++++++++++++++++++++
 src/http-api/resources/index.js    |  1 +
 src/http-api/routes/floodsub.js    | 38 ++++++++++++++++++++
 src/http-api/routes/index.js       |  1 +
 8 files changed, 153 insertions(+)
 create mode 100644 src/core/components/floodsub.js
 create mode 100644 src/http-api/resources/floodsub.js
 create mode 100644 src/http-api/routes/floodsub.js

diff --git a/package.json b/package.json
index a7be2c131a..b3711638c3 100644
--- a/package.json
+++ b/package.json
@@ -81,6 +81,7 @@
     "ipld-resolver": "^0.1.1",
     "isstream": "^0.1.2",
     "joi": "^9.0.4",
+    "libp2p-floodsub": "0.3.0",
     "libp2p-ipfs": "^0.14.1",
     "libp2p-ipfs-browser": "^0.15.1",
     "lodash.flatmap": "^4.5.0",
diff --git a/src/core/components/floodsub.js b/src/core/components/floodsub.js
new file mode 100644
index 0000000000..c25da15c17
--- /dev/null
+++ b/src/core/components/floodsub.js
@@ -0,0 +1,56 @@
+'use strict'
+
+const FloodSub = require('libp2p-floodsub')
+const promisify = require('promisify-es6')
+const Stream = require('stream')
+
+const OFFLINE_ERROR = require('../utils').OFFLINE_ERROR
+
+module.exports = function floodsub (self) {
+  let fsub
+
+  return {
+    start: promisify((libp2pNode) => {
+      fsub = new FloodSub(libp2pNode)
+    }),
+
+    sub: promisify((topic, options, callback) => {
+      // TODO: Clarify with @diasdavid what to do with the `options.discover` param
+      // Ref: https://github.com/ipfs/js-ipfs-api/pull/377/files#diff-f0c61c06fd5dc36b6f760b7ea97b1862R50
+      if (typeof options === 'function') {
+        callback = options
+        options = {}
+      }
+
+      if (!self.isOnline()) {
+        throw OFFLINE_ERROR
+      }
+
+      let rs = new Stream()
+      rs.readable = true
+      rs._read = () => {}
+      rs.cancel = () => fsub.unsubscribe(topic)
+
+      fsub.on(topic, (data) => {
+        rs.emit('data', {
+          data: data.toString(),
+          topicIDs: [topic]
+        })
+      })
+
+      fsub.subscribe(topic)
+      callback(null, rs)
+    }),
+
+    pub: promisify((topic, data, callback) => {
+      if (!self.isOnline()) {
+        throw OFFLINE_ERROR
+      }
+
+      const buf = Buffer.isBuffer(data) ? data : new Buffer(data)
+
+      fsub.publish(topic, data)
+      callback(null)
+    })
+  }
+}
diff --git a/src/core/components/go-online.js b/src/core/components/go-online.js
index 793a0269a5..693b047ea5 100644
--- a/src/core/components/go-online.js
+++ b/src/core/components/go-online.js
@@ -21,6 +21,7 @@ module.exports = function goOnline (self) {
       )
       self._bitswap.start()
       self._blockService.goOnline(self._bitswap)
+      self.floodsub.start(self._libp2pNode)
       cb()
     })
   }
diff --git a/src/core/index.js b/src/core/index.js
index a58836c10c..3ac9d0ec95 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -23,6 +23,7 @@ const swarm = require('./components/swarm')
 const ping = require('./components/ping')
 const files = require('./components/files')
 const bitswap = require('./components/bitswap')
+const floodsub = require('./components/floodsub')
 
 exports = module.exports = IPFS
 
@@ -67,4 +68,5 @@ function IPFS (repoInstance) {
   this.files = files(this)
   this.bitswap = bitswap(this)
   this.ping = ping(this)
+  this.floodsub = floodsub(this)
 }
diff --git a/src/http-api/resources/floodsub.js b/src/http-api/resources/floodsub.js
new file mode 100644
index 0000000000..bfd4c1e4aa
--- /dev/null
+++ b/src/http-api/resources/floodsub.js
@@ -0,0 +1,53 @@
+'use strict'
+
+const debug = require('debug')
+const log = debug('http-api:floodsub')
+log.error = debug('http-api:floodsub:error')
+
+exports = module.exports
+
+exports.sub = {
+  handler: (request, reply) => {
+    const discover = request.query.discover
+    const topic = request.params.topic
+
+    console.log('API RESC: SUBSCRIBE')
+    console.log('discover',discover)
+    console.log('topic',topic)
+
+    request.server.app.ipfs.floodsub.sub(topic, { discover }, (err, stream) => {
+      if (err) {
+        log.error(err)
+        return reply({
+          Message: `Failed to subscribe to topic ${topic}: ${err}`,
+          Code: 0
+        }).code(500)
+      }
+
+      return reply(stream)
+    })
+  }
+}
+
+exports.pub = {
+  handler: (request, reply) => {
+    const buf = request.query.buf
+    const topic = request.query.topic
+
+    console.log('API RESC: PUBLISH')
+    console.log('buf',buf)
+    console.log('topic',topic)
+
+    request.server.app.ipfs.floodsub.pub(topic, buf, (err) => {
+      if (err) {
+        log.error(err)
+        return reply({
+          Message: `Failed to publish to topic ${topic}: ${err}`,
+          Code: 0
+        }).code(500)
+      }
+
+      return reply(true)
+    })
+  }
+}
diff --git a/src/http-api/resources/index.js b/src/http-api/resources/index.js
index b90a9d912c..2f8f273aac 100644
--- a/src/http-api/resources/index.js
+++ b/src/http-api/resources/index.js
@@ -10,3 +10,4 @@ exports.block = require('./block')
 exports.swarm = require('./swarm')
 exports.bitswap = require('./bitswap')
 exports.files = require('./files')
+exports.floodsub = require('./floodsub')
diff --git a/src/http-api/routes/floodsub.js b/src/http-api/routes/floodsub.js
new file mode 100644
index 0000000000..41a3bd31f1
--- /dev/null
+++ b/src/http-api/routes/floodsub.js
@@ -0,0 +1,38 @@
+'use strict'
+
+const Joi = require('joi')
+const resources = require('./../resources')
+
+module.exports = (server) => {
+  const api = server.select('API')
+
+  api.route({
+    method: '*',
+    path: '/api/v0/pubsub/sub/{topic}',
+    config: {
+      handler: resources.floodsub.sub,
+      validate: {
+        params: {
+          topic: Joi.string().required()
+        },
+        query: {
+          discover: Joi.boolean()
+        },
+      }
+    }
+  })
+
+  api.route({
+    method: '*',
+    path: '/api/v0/floodsub/pub',
+    config: {
+      handler: resources.floodsub.pub,
+      validate: {
+        query: {
+          topic: Joi.string().required(),
+          buf: Joi.binary().required()
+        },
+      }
+    }
+  })
+}
diff --git a/src/http-api/routes/index.js b/src/http-api/routes/index.js
index 587f25de77..15dde6116c 100644
--- a/src/http-api/routes/index.js
+++ b/src/http-api/routes/index.js
@@ -11,4 +11,5 @@ module.exports = (server) => {
   require('./swarm')(server)
   require('./bitswap')(server)
   require('./files')(server)
+  require('./floodsub')(server)
 }

From d3c4f021ff0b723fcea66dc3d0037da61fcb2048 Mon Sep 17 00:00:00 2001
From: Gavin McDermott <gavinmcdermott@gmail.com>
Date: Wed, 16 Nov 2016 00:15:46 -0800
Subject: [PATCH 03/46] Initial core tests pass

---
 ...8zSuBmuS4z925WZfrqQ1qHaJ56DQaTfyMUF7F8ff5o |  1 -
 package.json                                  |  2 +-
 src/core/components/floodsub.js               | 26 +++++-
 src/core/components/go-online.js              |  2 +-
 src/http-api/resources/floodsub.js            |  8 --
 src/http-api/routes/floodsub.js               |  8 +-
 test/core/both/test-floodsub.js               | 93 +++++++++++++++++++
 7 files changed, 120 insertions(+), 20 deletions(-)
 delete mode 100644 QmT78zSuBmuS4z925WZfrqQ1qHaJ56DQaTfyMUF7F8ff5o
 create mode 100644 test/core/both/test-floodsub.js

diff --git a/QmT78zSuBmuS4z925WZfrqQ1qHaJ56DQaTfyMUF7F8ff5o b/QmT78zSuBmuS4z925WZfrqQ1qHaJ56DQaTfyMUF7F8ff5o
deleted file mode 100644
index 3b18e512db..0000000000
--- a/QmT78zSuBmuS4z925WZfrqQ1qHaJ56DQaTfyMUF7F8ff5o
+++ /dev/null
@@ -1 +0,0 @@
-hello world
diff --git a/package.json b/package.json
index b3711638c3..d9f6d15287 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
   },
   "homepage": "https://github.com/ipfs/js-ipfs#readme",
   "devDependencies": {
-    "aegir": "^8.1.2",
+    "aegir": "9.1.2",
     "buffer-loader": "0.0.1",
     "chai": "^3.5.0",
     "execa": "^0.5.0",
diff --git a/src/core/components/floodsub.js b/src/core/components/floodsub.js
index c25da15c17..df4ce3635f 100644
--- a/src/core/components/floodsub.js
+++ b/src/core/components/floodsub.js
@@ -1,6 +1,7 @@
 'use strict'
 
-const FloodSub = require('libp2p-floodsub')
+// const FloodSub = require('libp2p-floodsub')
+const FloodSub = require('./../../../node_modules/libp2p-floodsub/src')
 const promisify = require('promisify-es6')
 const Stream = require('stream')
 
@@ -10,8 +11,13 @@ module.exports = function floodsub (self) {
   let fsub
 
   return {
-    start: promisify((libp2pNode) => {
-      fsub = new FloodSub(libp2pNode)
+    start: promisify(() => {
+      if (!self.isOnline()) {
+        throw OFFLINE_ERROR
+      }
+
+      fsub = new FloodSub(self._libp2pNode)
+      return self._libp2pNode
     }),
 
     sub: promisify((topic, options, callback) => {
@@ -38,7 +44,12 @@ module.exports = function floodsub (self) {
         })
       })
 
-      fsub.subscribe(topic)
+      try {
+        fsub.subscribe(topic)
+      } catch (err) {
+        return callback(err)
+      }
+
       callback(null, rs)
     }),
 
@@ -49,7 +60,12 @@ module.exports = function floodsub (self) {
 
       const buf = Buffer.isBuffer(data) ? data : new Buffer(data)
 
-      fsub.publish(topic, data)
+      try {
+        fsub.publish(topic, buf)
+      } catch (err) {
+        return callback(err)
+      }
+
       callback(null)
     })
   }
diff --git a/src/core/components/go-online.js b/src/core/components/go-online.js
index 693b047ea5..fc5a6f1821 100644
--- a/src/core/components/go-online.js
+++ b/src/core/components/go-online.js
@@ -13,6 +13,7 @@ module.exports = function goOnline (self) {
         return cb(err)
       }
 
+      self.floodsub.start()
       self._bitswap = new Bitswap(
         self._libp2pNode.peerInfo,
         self._libp2pNode,
@@ -21,7 +22,6 @@ module.exports = function goOnline (self) {
       )
       self._bitswap.start()
       self._blockService.goOnline(self._bitswap)
-      self.floodsub.start(self._libp2pNode)
       cb()
     })
   }
diff --git a/src/http-api/resources/floodsub.js b/src/http-api/resources/floodsub.js
index bfd4c1e4aa..64fcbb58b0 100644
--- a/src/http-api/resources/floodsub.js
+++ b/src/http-api/resources/floodsub.js
@@ -11,10 +11,6 @@ exports.sub = {
     const discover = request.query.discover
     const topic = request.params.topic
 
-    console.log('API RESC: SUBSCRIBE')
-    console.log('discover',discover)
-    console.log('topic',topic)
-
     request.server.app.ipfs.floodsub.sub(topic, { discover }, (err, stream) => {
       if (err) {
         log.error(err)
@@ -34,10 +30,6 @@ exports.pub = {
     const buf = request.query.buf
     const topic = request.query.topic
 
-    console.log('API RESC: PUBLISH')
-    console.log('buf',buf)
-    console.log('topic',topic)
-
     request.server.app.ipfs.floodsub.pub(topic, buf, (err) => {
       if (err) {
         log.error(err)
diff --git a/src/http-api/routes/floodsub.js b/src/http-api/routes/floodsub.js
index 41a3bd31f1..d7af9a2b78 100644
--- a/src/http-api/routes/floodsub.js
+++ b/src/http-api/routes/floodsub.js
@@ -10,14 +10,14 @@ module.exports = (server) => {
     method: '*',
     path: '/api/v0/pubsub/sub/{topic}',
     config: {
-      handler: resources.floodsub.sub,
+      handler: resources.floodsub.sub.handler,
       validate: {
         params: {
           topic: Joi.string().required()
         },
         query: {
           discover: Joi.boolean()
-        },
+        }
       }
     }
   })
@@ -26,12 +26,12 @@ module.exports = (server) => {
     method: '*',
     path: '/api/v0/floodsub/pub',
     config: {
-      handler: resources.floodsub.pub,
+      handler: resources.floodsub.pub.handler,
       validate: {
         query: {
           topic: Joi.string().required(),
           buf: Joi.binary().required()
-        },
+        }
       }
     }
   })
diff --git a/test/core/both/test-floodsub.js b/test/core/both/test-floodsub.js
new file mode 100644
index 0000000000..33f155c3c0
--- /dev/null
+++ b/test/core/both/test-floodsub.js
@@ -0,0 +1,93 @@
+/* eslint max-nested-callbacks: ["error", 8] */
+/* eslint-env mocha */
+'use strict'
+
+const expect = require('chai').expect
+const Stream = require('stream')
+const IPFSFactory = require('../../utils/factory-core')
+const factory = new IPFSFactory()
+
+describe('floodsub', () => {
+  let nodeOffline
+  let nodeA
+  let subscription
+
+  const topic = 'nonscents'
+
+  before((done) => {
+    factory.spawnNode((err, ipfsOff) => {
+      expect(err).to.not.exist
+      ipfsOff.goOffline((err) => {
+        expect(err).to.not.exist
+        nodeOffline = ipfsOff
+        factory.spawnNode((err, ipfs) => {
+          expect(err).to.not.exist
+          nodeA = ipfs
+          done()
+        })
+      })
+    })
+  })
+
+  after((done) => {
+    factory.dismantle(() => done())
+  })
+
+  describe('Floodsub API', () => {
+    describe('start', () => {
+      it('throws if offline', () => {
+        expect(() => nodeOffline.floodsub.start()).to.throw
+      })
+
+      it('success', () => {
+        expect(nodeA.floodsub.start()).to.exist
+      })
+    })
+
+    describe('sub', () => {
+      it('throws if offline', () => {
+        expect(() => nodeOffline.floodsub.sub()).to.throw
+      })
+
+      it('throws without a topic', () => {
+        expect(() => nodeA.floodsub.sub()).to.throw
+      })
+
+      it('success', (done) => {
+        nodeA.floodsub.sub(topic, (err, stream) => {
+          expect(err).to.not.exist
+          expect(stream.readable).to.eql(true)
+          expect(typeof stream._read).to.eql('function')
+          expect(typeof stream.cancel).to.eql('function')
+          expect(stream instanceof Stream).to.eql(true)
+          subscription = stream
+          done()
+        })
+      })
+    })
+
+    describe('pub', () => {
+      it('throws if offline', () => {
+        expect(() => nodeOffline.floodsub.pub()).to.throw
+      })
+
+      it('throws without a topic', () => {
+        expect(() => nodeA.floodsub.sub()).to.throw
+      })
+
+      it('throws without data', () => {
+        expect(() => nodeA.floodsub.sub(topic)).to.throw
+      })
+
+      it('success', (done) => {
+        const published = true
+
+        subscription.on('data', () => done())
+
+        nodeA.floodsub.pub(topic, 'some data', () => {
+          expect(published).to.eql(true)
+        })
+      })
+    })
+  })
+})

From 9b7da97dfcf69d29742658d14b37de78ea82c037 Mon Sep 17 00:00:00 2001
From: Gavin McDermott <gavinmcdermott@gmail.com>
Date: Thu, 17 Nov 2016 12:59:04 -0800
Subject: [PATCH 04/46] feat(api, cli, core): add floodsub

Add initial floodsub implementation
---
 package.json                          |   7 +-
 src/cli/commands/floodsub.js          |  17 ++++
 src/cli/commands/floodsub/pub.js      |  28 ++++++
 src/cli/commands/floodsub/start.js    |  27 ++++++
 src/cli/commands/floodsub/sub.js      |  30 ++++++
 src/cli/commands/floodsub/unsub.js    |  28 ++++++
 src/core/components/floodsub.js       |  52 ++++++++---
 src/core/components/go-online.js      |   1 -
 src/core/index.js                     |   1 +
 src/http-api/resources/floodsub.js    |  46 +++++++++-
 src/http-api/routes/floodsub.js       |  23 ++++-
 test/cli/test-commands.js             |  10 +-
 test/cli/test-floodsub.js             |  79 ++++++++++++++++
 test/core/both/test-floodsub.js       |  65 +++++++++++--
 test/http-api/inject/test-floodsub.js | 126 ++++++++++++++++++++++++++
 15 files changed, 506 insertions(+), 34 deletions(-)
 create mode 100644 src/cli/commands/floodsub.js
 create mode 100644 src/cli/commands/floodsub/pub.js
 create mode 100644 src/cli/commands/floodsub/start.js
 create mode 100644 src/cli/commands/floodsub/sub.js
 create mode 100644 src/cli/commands/floodsub/unsub.js
 create mode 100644 test/cli/test-floodsub.js
 create mode 100644 test/http-api/inject/test-floodsub.js

diff --git a/package.json b/package.json
index e38f7748d9..1dff8f50c4 100644
--- a/package.json
+++ b/package.json
@@ -50,8 +50,7 @@
   },
   "homepage": "https://github.com/ipfs/js-ipfs#readme",
   "devDependencies": {
-
-    "aegir": "9.1.2",
+    "aegir": "^9.1.2",
     "buffer-loader": "0.0.1",
     "chai": "^3.5.0",
     "detect-node": "^2.0.3",
@@ -91,7 +90,7 @@
     "ipld-resolver": "^0.2.0",
     "isstream": "^0.1.2",
     "joi": "^9.2.0",
-    "libp2p-floodsub": "0.3.0",
+    "libp2p-floodsub": "0.3.1",
     "libp2p-ipfs": "^0.15.0",
     "libp2p-ipfs-browser": "^0.16.0",
     "lodash.flatmap": "^4.5.0",
@@ -149,4 +148,4 @@
     "nginnever <ginneversource@gmail.com>",
     "npmcdn-to-unpkg-bot <npmcdn-to-unpkg-bot@users.noreply.github.com>"
   ]
-}
\ No newline at end of file
+}
diff --git a/src/cli/commands/floodsub.js b/src/cli/commands/floodsub.js
new file mode 100644
index 0000000000..63af3fa21a
--- /dev/null
+++ b/src/cli/commands/floodsub.js
@@ -0,0 +1,17 @@
+'use strict'
+
+// NOTE: Floodsub CLI is not tested. Tests will not be run until
+// https://github.com/ipfs/js-ipfs-api/pull/377
+// is merged
+module.exports = {
+  command: 'floodsub',
+
+  description: 'floodsub commands',
+
+  builder (yargs) {
+    return yargs
+      .commandDir('floodsub')
+  },
+
+  handler (argv) {}
+}
diff --git a/src/cli/commands/floodsub/pub.js b/src/cli/commands/floodsub/pub.js
new file mode 100644
index 0000000000..a7d5cc9387
--- /dev/null
+++ b/src/cli/commands/floodsub/pub.js
@@ -0,0 +1,28 @@
+'use strict'
+
+const utils = require('../../utils')
+const debug = require('debug')
+const log = debug('cli:floodsub')
+log.error = debug('cli:floodsub:error')
+
+module.exports = {
+  command: 'pub <topic> <message>',
+
+  describe: 'Publish a message to a topic',
+
+  builder: {},
+
+  handler (argv) {
+    utils.getIPFS((err, ipfs) => {
+      if (err) {
+        throw err
+      }
+
+      ipfs.floodsub.pub(argv.topic, argv.message, (err) => {
+        if (err) {
+          throw err
+        }
+      })
+    })
+  }
+}
diff --git a/src/cli/commands/floodsub/start.js b/src/cli/commands/floodsub/start.js
new file mode 100644
index 0000000000..7d4fe5103e
--- /dev/null
+++ b/src/cli/commands/floodsub/start.js
@@ -0,0 +1,27 @@
+'use strict'
+
+const utils = require('../../utils')
+const debug = require('debug')
+const log = debug('cli:floodsub')
+log.error = debug('cli:floodsub:error')
+
+module.exports = {
+  command: 'start',
+
+  describe: 'Start FloodSub',
+
+  builder: {},
+
+  handler (argv) {
+    utils.getIPFS((err, ipfs) => {
+      if (err) {
+        throw err
+      }
+
+      const fsub = ipfs.floodsub.start()
+      if (fsub) {
+        console.log(fsub.toString())
+      }
+    })
+  }
+}
diff --git a/src/cli/commands/floodsub/sub.js b/src/cli/commands/floodsub/sub.js
new file mode 100644
index 0000000000..703ba90ecf
--- /dev/null
+++ b/src/cli/commands/floodsub/sub.js
@@ -0,0 +1,30 @@
+'use strict'
+
+const utils = require('../../utils')
+const debug = require('debug')
+const log = debug('cli:floodsub')
+log.error = debug('cli:floodsub:error')
+
+module.exports = {
+  command: 'sub <topic>',
+
+  describe: 'Subscribe to a topic',
+
+  builder: {},
+
+  handler (argv) {
+    utils.getIPFS((err, ipfs) => {
+      if (err) {
+        throw err
+      }
+
+      ipfs.floodsub.sub(argv.topic, (err, stream) => {
+        if (err) {
+          throw err
+        }
+
+        console.log(stream.toString())
+      })
+    })
+  }
+}
diff --git a/src/cli/commands/floodsub/unsub.js b/src/cli/commands/floodsub/unsub.js
new file mode 100644
index 0000000000..212ae68e4c
--- /dev/null
+++ b/src/cli/commands/floodsub/unsub.js
@@ -0,0 +1,28 @@
+'use strict'
+
+const utils = require('../../utils')
+const debug = require('debug')
+const log = debug('cli:floodsub')
+log.error = debug('cli:floodsub:error')
+
+module.exports = {
+  command: 'unsub <topic>',
+
+  describe: 'Unsubscribe from a topic',
+
+  builder: {},
+
+  handler (argv) {
+    utils.getIPFS((err, ipfs) => {
+      if (err) {
+        throw err
+      }
+
+      ipfs.floodsub.unsub(argv.topic, (err) => {
+        if (err) {
+          throw err
+        }
+      })
+    })
+  }
+}
diff --git a/src/core/components/floodsub.js b/src/core/components/floodsub.js
index df4ce3635f..1accd305a1 100644
--- a/src/core/components/floodsub.js
+++ b/src/core/components/floodsub.js
@@ -1,23 +1,21 @@
 'use strict'
 
-// const FloodSub = require('libp2p-floodsub')
-const FloodSub = require('./../../../node_modules/libp2p-floodsub/src')
+const FloodSub = require('libp2p-floodsub')
 const promisify = require('promisify-es6')
-const Stream = require('stream')
+const Readable = require('stream').Readable
 
 const OFFLINE_ERROR = require('../utils').OFFLINE_ERROR
+const FSUB_ERROR = new Error(`FloodSub is not started.`)
 
 module.exports = function floodsub (self) {
-  let fsub
-
   return {
-    start: promisify(() => {
+    start: promisify((callback) => {
       if (!self.isOnline()) {
         throw OFFLINE_ERROR
       }
 
-      fsub = new FloodSub(self._libp2pNode)
-      return self._libp2pNode
+      self._floodsub = new FloodSub(self._libp2pNode)
+      return callback(null, self._floodsub)
     }),
 
     sub: promisify((topic, options, callback) => {
@@ -32,12 +30,14 @@ module.exports = function floodsub (self) {
         throw OFFLINE_ERROR
       }
 
-      let rs = new Stream()
-      rs.readable = true
-      rs._read = () => {}
-      rs.cancel = () => fsub.unsubscribe(topic)
+      if (!self._floodsub) {
+        throw FSUB_ERROR
+      }
+
+      let rs = new Readable()
+      rs.cancel = () => self._floodsub.subscribe(topic)
 
-      fsub.on(topic, (data) => {
+      self._floodsub.on(topic, (data) => {
         rs.emit('data', {
           data: data.toString(),
           topicIDs: [topic]
@@ -45,7 +45,7 @@ module.exports = function floodsub (self) {
       })
 
       try {
-        fsub.subscribe(topic)
+        self._floodsub.subscribe(topic)
       } catch (err) {
         return callback(err)
       }
@@ -58,10 +58,32 @@ module.exports = function floodsub (self) {
         throw OFFLINE_ERROR
       }
 
+      if (!self._floodsub) {
+        throw FSUB_ERROR
+      }
+
       const buf = Buffer.isBuffer(data) ? data : new Buffer(data)
 
       try {
-        fsub.publish(topic, buf)
+        self._floodsub.publish(topic, buf)
+      } catch (err) {
+        return callback(err)
+      }
+
+      callback(null)
+    }),
+
+    unsub: promisify((topic, callback) => {
+      if (!self.isOnline()) {
+        throw OFFLINE_ERROR
+      }
+
+      if (!self._floodsub) {
+        throw FSUB_ERROR
+      }
+
+      try {
+        self._floodsub.unsubscribe(topic)
       } catch (err) {
         return callback(err)
       }
diff --git a/src/core/components/go-online.js b/src/core/components/go-online.js
index fc5a6f1821..793a0269a5 100644
--- a/src/core/components/go-online.js
+++ b/src/core/components/go-online.js
@@ -13,7 +13,6 @@ module.exports = function goOnline (self) {
         return cb(err)
       }
 
-      self.floodsub.start()
       self._bitswap = new Bitswap(
         self._libp2pNode.peerInfo,
         self._libp2pNode,
diff --git a/src/core/index.js b/src/core/index.js
index 3ac9d0ec95..d53394c55b 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -45,6 +45,7 @@ function IPFS (repoInstance) {
   this._bitswap = null
   this._blockService = new BlockService(this._repo)
   this._ipldResolver = new IPLDResolver(this._blockService)
+  this._floodsub = null
 
   // IPFS Core exposed components
 
diff --git a/src/http-api/resources/floodsub.js b/src/http-api/resources/floodsub.js
index 64fcbb58b0..30a1cfc9bf 100644
--- a/src/http-api/resources/floodsub.js
+++ b/src/http-api/resources/floodsub.js
@@ -6,9 +6,25 @@ log.error = debug('http-api:floodsub:error')
 
 exports = module.exports
 
+exports.start = {
+  handler: (request, reply) => {
+    request.server.app.ipfs.floodsub.start((err, floodsub) => {
+      if (err) {
+        log.error(err)
+        return reply({
+          Message: `Failed to start: ${err}`,
+          Code: 0
+        }).code(500)
+      }
+
+      return reply(floodsub)
+    })
+  }
+}
+
 exports.sub = {
   handler: (request, reply) => {
-    const discover = request.query.discover
+    const discover = request.query.discover || null
     const topic = request.params.topic
 
     request.server.app.ipfs.floodsub.sub(topic, { discover }, (err, stream) => {
@@ -20,6 +36,14 @@ exports.sub = {
         }).code(500)
       }
 
+      // hapi is not very clever and throws if no
+      // - _read method
+      // - _readableState object
+      // are there :(
+      if (!stream._read) {
+        stream._read = () => {}
+        stream._readableState = {}
+      }
       return reply(stream)
     })
   }
@@ -39,7 +63,25 @@ exports.pub = {
         }).code(500)
       }
 
-      return reply(true)
+      return reply()
+    })
+  }
+}
+
+exports.unsub = {
+  handler: (request, reply) => {
+    const topic = request.params.topic
+
+    request.server.app.ipfs.floodsub.unsub(topic, (err) => {
+      if (err) {
+        log.error(err)
+        return reply({
+          Message: `Failed to subscribe to topic ${topic}: ${err}`,
+          Code: 0
+        }).code(500)
+      }
+
+      return reply()
     })
   }
 }
diff --git a/src/http-api/routes/floodsub.js b/src/http-api/routes/floodsub.js
index d7af9a2b78..6af23791a8 100644
--- a/src/http-api/routes/floodsub.js
+++ b/src/http-api/routes/floodsub.js
@@ -6,6 +6,14 @@ const resources = require('./../resources')
 module.exports = (server) => {
   const api = server.select('API')
 
+  api.route({
+    method: '*',
+    path: '/api/v0/pubsub/start',
+    config: {
+      handler: resources.floodsub.start.handler
+    }
+  })
+
   api.route({
     method: '*',
     path: '/api/v0/pubsub/sub/{topic}',
@@ -24,7 +32,7 @@ module.exports = (server) => {
 
   api.route({
     method: '*',
-    path: '/api/v0/floodsub/pub',
+    path: '/api/v0/pubsub/pub',
     config: {
       handler: resources.floodsub.pub.handler,
       validate: {
@@ -35,4 +43,17 @@ module.exports = (server) => {
       }
     }
   })
+
+  api.route({
+    method: '*',
+    path: '/api/v0/pubsub/unsub/{topic}',
+    config: {
+      handler: resources.floodsub.unsub.handler,
+      validate: {
+        params: {
+          topic: Joi.string().required()
+        }
+      }
+    }
+  })
 }
diff --git a/test/cli/test-commands.js b/test/cli/test-commands.js
index da484580d1..fce0681302 100644
--- a/test/cli/test-commands.js
+++ b/test/cli/test-commands.js
@@ -7,11 +7,17 @@ const ipfsBase = require('../utils/ipfs-exec')
 const ipfs = ipfsBase(repoPath)
 const describeOnlineAndOffline = require('../utils/on-and-off')
 
+// NOTE: Floodsub CLI tests will not be run until
+// https://github.com/ipfs/js-ipfs-api/pull/377
+// is merged. But we have the files ready to go
+// so the command count is bumped from 56 to 61
+const commandCount = 61
+
 describe('commands', () => {
   describeOnlineAndOffline(repoPath, () => {
     it('list the commands', () => {
       return ipfs('commands').then((out) => {
-        expect(out.split('\n')).to.have.length(56)
+        expect(out.split('\n')).to.have.length(commandCount)
       })
     })
   })
@@ -20,7 +26,7 @@ describe('commands', () => {
     return ipfsBase(repoPath, {
       cwd: '/tmp'
     })('commands').then((out) => {
-      expect(out.split('\n').length).to.equal(56)
+      expect(out.split('\n').length).to.equal(commandCount)
     })
   })
 })
diff --git a/test/cli/test-floodsub.js b/test/cli/test-floodsub.js
new file mode 100644
index 0000000000..9311bd6a9d
--- /dev/null
+++ b/test/cli/test-floodsub.js
@@ -0,0 +1,79 @@
+/* eslint max-nested-callbacks: ["error", 8] */
+/* eslint-env mocha */
+'use strict'
+
+const expect = require('chai').expect
+const HttpAPI = require('../../src/http-api')
+const createTempNode = require('../utils/temp-node')
+const repoPath = require('./index').repoPath
+const ipfs = require('../utils/ipfs-exec')(repoPath)
+
+// NOTE: Floodsub CLI tests will not be run until
+// https://github.com/ipfs/js-ipfs-api/pull/377
+// is merged
+describe.skip('floodsub', function () {
+  this.timeout(30 * 1000)
+  let node
+
+  const topic = 'nonscents'
+  const message = new Buffer('Some non cents.')
+
+  before((done) => {
+    createTempNode(1, (err, _node) => {
+      expect(err).to.not.exist
+      node = _node
+      node.goOnline((err) => {
+        expect(err).to.not.exist
+        done()
+      })
+    })
+  })
+
+  after((done) => {
+    node.goOffline(done)
+  })
+
+  describe('api running', () => {
+    let httpAPI
+    const called = true
+
+    before((done) => {
+      httpAPI = new HttpAPI(repoPath)
+      httpAPI.start((err) => {
+        expect(err).to.not.exist
+        done()
+      })
+    })
+
+    after((done) => {
+      httpAPI.stop((err) => {
+        expect(err).to.not.exist
+        done()
+      })
+    })
+
+    it('start', () => {
+      return ipfs('floodsub', 'start').then((out) => {
+        expect(called).to.eql(true)
+      })
+    })
+
+    it('sub', () => {
+      return ipfs('floodsub', 'sub', topic).then((out) => {
+        expect(out).to.have.length.above(0)
+      })
+    })
+
+    it('pub', () => {
+      return ipfs('floodsub', 'pub', topic, message).then((out) => {
+        expect(called).to.eql(true)
+      })
+    })
+
+    it('unsub', () => {
+      return ipfs('floodsub', 'unsub', topic).then((out) => {
+        expect(called).to.eql(true)
+      })
+    })
+  })
+})
diff --git a/test/core/both/test-floodsub.js b/test/core/both/test-floodsub.js
index 33f155c3c0..903c1c53eb 100644
--- a/test/core/both/test-floodsub.js
+++ b/test/core/both/test-floodsub.js
@@ -9,10 +9,14 @@ const factory = new IPFSFactory()
 
 describe('floodsub', () => {
   let nodeOffline
-  let nodeA
+  let nodeUnstarted
+  let nodeStarted
+
   let subscription
+  let floodsub
 
   const topic = 'nonscents'
+  const message = 'Some message'
 
   before((done) => {
     factory.spawnNode((err, ipfsOff) => {
@@ -22,8 +26,12 @@ describe('floodsub', () => {
         nodeOffline = ipfsOff
         factory.spawnNode((err, ipfs) => {
           expect(err).to.not.exist
-          nodeA = ipfs
-          done()
+          nodeStarted = ipfs
+          factory.spawnNode((err, ipfs) => {
+            expect(err).to.not.exist
+            nodeUnstarted = ipfs
+            done()
+          })
         })
       })
     })
@@ -40,7 +48,11 @@ describe('floodsub', () => {
       })
 
       it('success', () => {
-        expect(nodeA.floodsub.start()).to.exist
+        nodeStarted.floodsub.start((err, _floodsub) => {
+          expect(err).to.not.exist
+          expect(_floodsub).to.exist
+          floodsub = _floodsub
+        })
       })
     })
 
@@ -49,18 +61,26 @@ describe('floodsub', () => {
         expect(() => nodeOffline.floodsub.sub()).to.throw
       })
 
+      it('throws if not started', () => {
+        expect(() => nodeUnstarted.floodsub.sub(topic)).to.throw
+      })
+
       it('throws without a topic', () => {
-        expect(() => nodeA.floodsub.sub()).to.throw
+        expect(() => nodeStarted.floodsub.sub()).to.throw
       })
 
       it('success', (done) => {
-        nodeA.floodsub.sub(topic, (err, stream) => {
+        nodeStarted.floodsub.sub(topic, (err, stream) => {
           expect(err).to.not.exist
           expect(stream.readable).to.eql(true)
           expect(typeof stream._read).to.eql('function')
           expect(typeof stream.cancel).to.eql('function')
           expect(stream instanceof Stream).to.eql(true)
+
           subscription = stream
+
+          const nodeSubs = floodsub.getSubscriptions()
+          expect(nodeSubs.length).to.eql(1)
           done()
         })
       })
@@ -71,12 +91,16 @@ describe('floodsub', () => {
         expect(() => nodeOffline.floodsub.pub()).to.throw
       })
 
+      it('throws if not started', () => {
+        expect(() => nodeUnstarted.floodsub.pub(topic, message)).to.throw
+      })
+
       it('throws without a topic', () => {
-        expect(() => nodeA.floodsub.sub()).to.throw
+        expect(() => nodeStarted.floodsub.sub()).to.throw
       })
 
       it('throws without data', () => {
-        expect(() => nodeA.floodsub.sub(topic)).to.throw
+        expect(() => nodeStarted.floodsub.sub(topic)).to.throw
       })
 
       it('success', (done) => {
@@ -84,10 +108,33 @@ describe('floodsub', () => {
 
         subscription.on('data', () => done())
 
-        nodeA.floodsub.pub(topic, 'some data', () => {
+        nodeStarted.floodsub.pub(topic, message, () => {
           expect(published).to.eql(true)
         })
       })
     })
+
+    describe('unsub', () => {
+      it('throws if offline', () => {
+        expect(() => nodeOffline.floodsub.unsub()).to.throw
+      })
+
+      it('throws if not started', () => {
+        expect(() => nodeUnstarted.floodsub.unsub(topic)).to.throw
+      })
+
+      it('throws without a topic', () => {
+        expect(() => nodeStarted.floodsub.unsub()).to.throw
+      })
+
+      it('success', (done) => {
+        nodeStarted.floodsub.unsub(topic, (err) => {
+          expect(err).to.not.exist
+          const nodeSubs = floodsub.getSubscriptions()
+          expect(nodeSubs.length).to.eql(0)
+          done()
+        })
+      })
+    })
   })
 })
diff --git a/test/http-api/inject/test-floodsub.js b/test/http-api/inject/test-floodsub.js
new file mode 100644
index 0000000000..a300a814d5
--- /dev/null
+++ b/test/http-api/inject/test-floodsub.js
@@ -0,0 +1,126 @@
+/* eslint max-nested-callbacks: ["error", 8] */
+/* eslint-env mocha */
+'use strict'
+
+const expect = require('chai').expect
+const createTempNode = require('./../../utils/temp-node')
+
+module.exports = (http) => {
+  describe('/pubsub', () => {
+    let api
+    let tmpNode
+
+    const buf = new Buffer('some message')
+    const topic = 'nonScents'
+
+    before((done) => {
+      api = http.api.server.select('API')
+
+      createTempNode(47, (err, _ipfs) => {
+        expect(err).to.not.exist
+        tmpNode = _ipfs
+        tmpNode.goOnline((err) => {
+          expect(err).to.not.exist
+          done()
+        })
+      })
+    })
+
+    after((done) => {
+      setTimeout(() => {
+        tmpNode.goOffline(done)
+      }, 1000)
+    })
+
+    describe('/pubsub/start', () => {
+      it('returns 200', (done) => {
+        api.inject({
+          method: 'POST',
+          url: `/api/v0/pubsub/start`
+        }, (res) => {
+          expect(res.statusCode).to.equal(200)
+          expect(res.result).to.be.an('object')
+          done()
+        })
+      })
+    })
+
+    describe('/pubsub/sub/{topic}', () => {
+      it('returns 404 if no topic is provided', (done) => {
+        api.inject({
+          method: 'GET',
+          url: `/api/v0/pubsub/sub`
+        }, (res) => {
+          expect(res.statusCode).to.equal(404)
+          done()
+        })
+      })
+
+      it('returns 200 with topic', (done) => {
+        api.inject({
+          method: 'GET',
+          url: `/api/v0/pubsub/sub/${topic}`
+        }, (res) => {
+          expect(res.statusCode).to.equal(200)
+          done()
+        })
+      })
+    })
+
+    describe('/pubsub/pub', () => {
+      it('returns 400 if no buffer is provided', (done) => {
+        api.inject({
+          method: 'POST',
+          url: `/api/v0/pubsub/pub?topic=${topic}`
+        }, (res) => {
+          expect(res.statusCode).to.equal(400)
+          expect(res.statusMessage).to.equal('Bad Request')
+          done()
+        })
+      })
+
+      it('returns 400 if no topic is provided', (done) => {
+        api.inject({
+          method: 'POST',
+          url: `/api/v0/pubsub/pub?buf=${buf}`
+        }, (res) => {
+          expect(res.statusCode).to.equal(400)
+          expect(res.statusMessage).to.equal('Bad Request')
+          done()
+        })
+      })
+
+      it('returns 200 with topic and buffer', (done) => {
+        api.inject({
+          method: 'POST',
+          url: `/api/v0/pubsub/pub?buf=${buf}&topic=${topic}`
+        }, (res) => {
+          expect(res.statusCode).to.equal(200)
+          done()
+        })
+      })
+    })
+
+    describe('/pubsub/unsub/{topic}', () => {
+      it('returns 404 if no topic is provided', (done) => {
+        api.inject({
+          method: 'GET',
+          url: `/api/v0/pubsub/unsub`
+        }, (res) => {
+          expect(res.statusCode).to.equal(404)
+          done()
+        })
+      })
+
+      it('returns 200 with topic', (done) => {
+        api.inject({
+          method: 'GET',
+          url: `/api/v0/pubsub/unsub/${topic}`
+        }, (res) => {
+          expect(res.statusCode).to.equal(200)
+          done()
+        })
+      })
+    })
+  })
+}

From 94bbc43b538941391ca86133eed46e38ce15603c Mon Sep 17 00:00:00 2001
From: Gavin McDermott <gavinmcdermott@gmail.com>
Date: Sat, 19 Nov 2016 23:14:18 -0800
Subject: [PATCH 05/46] refactor(api, cli, core): update floodsub to a full
 name API

---
 .../commands/floodsub/{pub.js => publish.js}  |  6 ++--
 .../floodsub/{sub.js => subscribe.js}         |  4 +--
 .../floodsub/{unsub.js => unsubscribe.js}     |  4 +--
 src/core/components/floodsub.js               |  8 ++---
 src/http-api/resources/floodsub.js            | 14 ++++----
 src/http-api/routes/floodsub.js               | 12 +++----
 test/cli/test-floodsub.js                     | 12 +++----
 test/core/both/test-floodsub.js               | 32 +++++++++----------
 test/http-api/inject/test-floodsub.js         | 20 ++++++------
 9 files changed, 56 insertions(+), 56 deletions(-)
 rename src/cli/commands/floodsub/{pub.js => publish.js} (72%)
 rename src/cli/commands/floodsub/{sub.js => subscribe.js} (82%)
 rename src/cli/commands/floodsub/{unsub.js => unsubscribe.js} (81%)

diff --git a/src/cli/commands/floodsub/pub.js b/src/cli/commands/floodsub/publish.js
similarity index 72%
rename from src/cli/commands/floodsub/pub.js
rename to src/cli/commands/floodsub/publish.js
index a7d5cc9387..6ef45dcd6e 100644
--- a/src/cli/commands/floodsub/pub.js
+++ b/src/cli/commands/floodsub/publish.js
@@ -6,9 +6,9 @@ const log = debug('cli:floodsub')
 log.error = debug('cli:floodsub:error')
 
 module.exports = {
-  command: 'pub <topic> <message>',
+  command: 'publish <topic> <data>',
 
-  describe: 'Publish a message to a topic',
+  describe: 'Publish data to a topic',
 
   builder: {},
 
@@ -18,7 +18,7 @@ module.exports = {
         throw err
       }
 
-      ipfs.floodsub.pub(argv.topic, argv.message, (err) => {
+      ipfs.floodsub.publish(argv.topic, argv.data, (err) => {
         if (err) {
           throw err
         }
diff --git a/src/cli/commands/floodsub/sub.js b/src/cli/commands/floodsub/subscribe.js
similarity index 82%
rename from src/cli/commands/floodsub/sub.js
rename to src/cli/commands/floodsub/subscribe.js
index 703ba90ecf..16e3eeda4b 100644
--- a/src/cli/commands/floodsub/sub.js
+++ b/src/cli/commands/floodsub/subscribe.js
@@ -6,7 +6,7 @@ const log = debug('cli:floodsub')
 log.error = debug('cli:floodsub:error')
 
 module.exports = {
-  command: 'sub <topic>',
+  command: 'subscribe <topic>',
 
   describe: 'Subscribe to a topic',
 
@@ -18,7 +18,7 @@ module.exports = {
         throw err
       }
 
-      ipfs.floodsub.sub(argv.topic, (err, stream) => {
+      ipfs.floodsub.subscribe(argv.topic, (err, stream) => {
         if (err) {
           throw err
         }
diff --git a/src/cli/commands/floodsub/unsub.js b/src/cli/commands/floodsub/unsubscribe.js
similarity index 81%
rename from src/cli/commands/floodsub/unsub.js
rename to src/cli/commands/floodsub/unsubscribe.js
index 212ae68e4c..27d52d4a59 100644
--- a/src/cli/commands/floodsub/unsub.js
+++ b/src/cli/commands/floodsub/unsubscribe.js
@@ -6,7 +6,7 @@ const log = debug('cli:floodsub')
 log.error = debug('cli:floodsub:error')
 
 module.exports = {
-  command: 'unsub <topic>',
+  command: 'unsubscribe <topic>',
 
   describe: 'Unsubscribe from a topic',
 
@@ -18,7 +18,7 @@ module.exports = {
         throw err
       }
 
-      ipfs.floodsub.unsub(argv.topic, (err) => {
+      ipfs.floodsub.unsubscribe(argv.topic, (err) => {
         if (err) {
           throw err
         }
diff --git a/src/core/components/floodsub.js b/src/core/components/floodsub.js
index 1accd305a1..8ec4132665 100644
--- a/src/core/components/floodsub.js
+++ b/src/core/components/floodsub.js
@@ -18,7 +18,7 @@ module.exports = function floodsub (self) {
       return callback(null, self._floodsub)
     }),
 
-    sub: promisify((topic, options, callback) => {
+    subscribe: promisify((topic, options, callback) => {
       // TODO: Clarify with @diasdavid what to do with the `options.discover` param
       // Ref: https://github.com/ipfs/js-ipfs-api/pull/377/files#diff-f0c61c06fd5dc36b6f760b7ea97b1862R50
       if (typeof options === 'function') {
@@ -35,7 +35,7 @@ module.exports = function floodsub (self) {
       }
 
       let rs = new Readable()
-      rs.cancel = () => self._floodsub.subscribe(topic)
+      rs.cancel = () => self._floodsub.unsubscribe(topic)
 
       self._floodsub.on(topic, (data) => {
         rs.emit('data', {
@@ -53,7 +53,7 @@ module.exports = function floodsub (self) {
       callback(null, rs)
     }),
 
-    pub: promisify((topic, data, callback) => {
+    publish: promisify((topic, data, callback) => {
       if (!self.isOnline()) {
         throw OFFLINE_ERROR
       }
@@ -73,7 +73,7 @@ module.exports = function floodsub (self) {
       callback(null)
     }),
 
-    unsub: promisify((topic, callback) => {
+    unsubscribe: promisify((topic, callback) => {
       if (!self.isOnline()) {
         throw OFFLINE_ERROR
       }
diff --git a/src/http-api/resources/floodsub.js b/src/http-api/resources/floodsub.js
index 30a1cfc9bf..9ddcf4fdc9 100644
--- a/src/http-api/resources/floodsub.js
+++ b/src/http-api/resources/floodsub.js
@@ -22,12 +22,12 @@ exports.start = {
   }
 }
 
-exports.sub = {
+exports.subscribe = {
   handler: (request, reply) => {
     const discover = request.query.discover || null
     const topic = request.params.topic
 
-    request.server.app.ipfs.floodsub.sub(topic, { discover }, (err, stream) => {
+    request.server.app.ipfs.floodsub.subscribe(topic, { discover }, (err, stream) => {
       if (err) {
         log.error(err)
         return reply({
@@ -49,12 +49,12 @@ exports.sub = {
   }
 }
 
-exports.pub = {
+exports.publish = {
   handler: (request, reply) => {
     const buf = request.query.buf
     const topic = request.query.topic
 
-    request.server.app.ipfs.floodsub.pub(topic, buf, (err) => {
+    request.server.app.ipfs.floodsub.publish(topic, buf, (err) => {
       if (err) {
         log.error(err)
         return reply({
@@ -68,15 +68,15 @@ exports.pub = {
   }
 }
 
-exports.unsub = {
+exports.unsubscribe = {
   handler: (request, reply) => {
     const topic = request.params.topic
 
-    request.server.app.ipfs.floodsub.unsub(topic, (err) => {
+    request.server.app.ipfs.floodsub.unsubscribe(topic, (err) => {
       if (err) {
         log.error(err)
         return reply({
-          Message: `Failed to subscribe to topic ${topic}: ${err}`,
+          Message: `Failed to unsubscribe from topic ${topic}: ${err}`,
           Code: 0
         }).code(500)
       }
diff --git a/src/http-api/routes/floodsub.js b/src/http-api/routes/floodsub.js
index 6af23791a8..74eedbe725 100644
--- a/src/http-api/routes/floodsub.js
+++ b/src/http-api/routes/floodsub.js
@@ -16,9 +16,9 @@ module.exports = (server) => {
 
   api.route({
     method: '*',
-    path: '/api/v0/pubsub/sub/{topic}',
+    path: '/api/v0/pubsub/subscribe/{topic}',
     config: {
-      handler: resources.floodsub.sub.handler,
+      handler: resources.floodsub.subscribe.handler,
       validate: {
         params: {
           topic: Joi.string().required()
@@ -32,9 +32,9 @@ module.exports = (server) => {
 
   api.route({
     method: '*',
-    path: '/api/v0/pubsub/pub',
+    path: '/api/v0/pubsub/publish',
     config: {
-      handler: resources.floodsub.pub.handler,
+      handler: resources.floodsub.publish.handler,
       validate: {
         query: {
           topic: Joi.string().required(),
@@ -46,9 +46,9 @@ module.exports = (server) => {
 
   api.route({
     method: '*',
-    path: '/api/v0/pubsub/unsub/{topic}',
+    path: '/api/v0/pubsub/unsubscribe/{topic}',
     config: {
-      handler: resources.floodsub.unsub.handler,
+      handler: resources.floodsub.unsubscribe.handler,
       validate: {
         params: {
           topic: Joi.string().required()
diff --git a/test/cli/test-floodsub.js b/test/cli/test-floodsub.js
index 9311bd6a9d..820ab8a049 100644
--- a/test/cli/test-floodsub.js
+++ b/test/cli/test-floodsub.js
@@ -58,20 +58,20 @@ describe.skip('floodsub', function () {
       })
     })
 
-    it('sub', () => {
-      return ipfs('floodsub', 'sub', topic).then((out) => {
+    it('subscribe', () => {
+      return ipfs('floodsub', 'subscribe', topic).then((out) => {
         expect(out).to.have.length.above(0)
       })
     })
 
-    it('pub', () => {
-      return ipfs('floodsub', 'pub', topic, message).then((out) => {
+    it('publish', () => {
+      return ipfs('floodsub', 'publish', topic, message).then((out) => {
         expect(called).to.eql(true)
       })
     })
 
-    it('unsub', () => {
-      return ipfs('floodsub', 'unsub', topic).then((out) => {
+    it('unsubscribe', () => {
+      return ipfs('floodsub', 'unsubscribe', topic).then((out) => {
         expect(called).to.eql(true)
       })
     })
diff --git a/test/core/both/test-floodsub.js b/test/core/both/test-floodsub.js
index 903c1c53eb..6a53810e6c 100644
--- a/test/core/both/test-floodsub.js
+++ b/test/core/both/test-floodsub.js
@@ -56,21 +56,21 @@ describe('floodsub', () => {
       })
     })
 
-    describe('sub', () => {
+    describe('subscribe', () => {
       it('throws if offline', () => {
-        expect(() => nodeOffline.floodsub.sub()).to.throw
+        expect(() => nodeOffline.floodsub.subscribe()).to.throw
       })
 
       it('throws if not started', () => {
-        expect(() => nodeUnstarted.floodsub.sub(topic)).to.throw
+        expect(() => nodeUnstarted.floodsub.subscribe(topic)).to.throw
       })
 
       it('throws without a topic', () => {
-        expect(() => nodeStarted.floodsub.sub()).to.throw
+        expect(() => nodeStarted.floodsub.subscribe()).to.throw
       })
 
       it('success', (done) => {
-        nodeStarted.floodsub.sub(topic, (err, stream) => {
+        nodeStarted.floodsub.subscribe(topic, (err, stream) => {
           expect(err).to.not.exist
           expect(stream.readable).to.eql(true)
           expect(typeof stream._read).to.eql('function')
@@ -86,21 +86,21 @@ describe('floodsub', () => {
       })
     })
 
-    describe('pub', () => {
+    describe('publish', () => {
       it('throws if offline', () => {
-        expect(() => nodeOffline.floodsub.pub()).to.throw
+        expect(() => nodeOffline.floodsub.publish()).to.throw
       })
 
       it('throws if not started', () => {
-        expect(() => nodeUnstarted.floodsub.pub(topic, message)).to.throw
+        expect(() => nodeUnstarted.floodsub.publish(topic, message)).to.throw
       })
 
       it('throws without a topic', () => {
-        expect(() => nodeStarted.floodsub.sub()).to.throw
+        expect(() => nodeStarted.floodsub.publish()).to.throw
       })
 
       it('throws without data', () => {
-        expect(() => nodeStarted.floodsub.sub(topic)).to.throw
+        expect(() => nodeStarted.floodsub.publish(topic)).to.throw
       })
 
       it('success', (done) => {
@@ -108,27 +108,27 @@ describe('floodsub', () => {
 
         subscription.on('data', () => done())
 
-        nodeStarted.floodsub.pub(topic, message, () => {
+        nodeStarted.floodsub.publish(topic, message, () => {
           expect(published).to.eql(true)
         })
       })
     })
 
-    describe('unsub', () => {
+    describe('unsubscribe', () => {
       it('throws if offline', () => {
-        expect(() => nodeOffline.floodsub.unsub()).to.throw
+        expect(() => nodeOffline.floodsub.unsubscribe()).to.throw
       })
 
       it('throws if not started', () => {
-        expect(() => nodeUnstarted.floodsub.unsub(topic)).to.throw
+        expect(() => nodeUnstarted.floodsub.unsubscribe(topic)).to.throw
       })
 
       it('throws without a topic', () => {
-        expect(() => nodeStarted.floodsub.unsub()).to.throw
+        expect(() => nodeStarted.floodsub.unsubscribe()).to.throw
       })
 
       it('success', (done) => {
-        nodeStarted.floodsub.unsub(topic, (err) => {
+        nodeStarted.floodsub.unsubscribe(topic, (err) => {
           expect(err).to.not.exist
           const nodeSubs = floodsub.getSubscriptions()
           expect(nodeSubs.length).to.eql(0)
diff --git a/test/http-api/inject/test-floodsub.js b/test/http-api/inject/test-floodsub.js
index a300a814d5..159054a133 100644
--- a/test/http-api/inject/test-floodsub.js
+++ b/test/http-api/inject/test-floodsub.js
@@ -45,11 +45,11 @@ module.exports = (http) => {
       })
     })
 
-    describe('/pubsub/sub/{topic}', () => {
+    describe('/pubsub/subscribe/{topic}', () => {
       it('returns 404 if no topic is provided', (done) => {
         api.inject({
           method: 'GET',
-          url: `/api/v0/pubsub/sub`
+          url: `/api/v0/pubsub/subscribe`
         }, (res) => {
           expect(res.statusCode).to.equal(404)
           done()
@@ -59,7 +59,7 @@ module.exports = (http) => {
       it('returns 200 with topic', (done) => {
         api.inject({
           method: 'GET',
-          url: `/api/v0/pubsub/sub/${topic}`
+          url: `/api/v0/pubsub/subscribe/${topic}`
         }, (res) => {
           expect(res.statusCode).to.equal(200)
           done()
@@ -67,11 +67,11 @@ module.exports = (http) => {
       })
     })
 
-    describe('/pubsub/pub', () => {
+    describe('/pubsub/publish', () => {
       it('returns 400 if no buffer is provided', (done) => {
         api.inject({
           method: 'POST',
-          url: `/api/v0/pubsub/pub?topic=${topic}`
+          url: `/api/v0/pubsub/publish?topic=${topic}`
         }, (res) => {
           expect(res.statusCode).to.equal(400)
           expect(res.statusMessage).to.equal('Bad Request')
@@ -82,7 +82,7 @@ module.exports = (http) => {
       it('returns 400 if no topic is provided', (done) => {
         api.inject({
           method: 'POST',
-          url: `/api/v0/pubsub/pub?buf=${buf}`
+          url: `/api/v0/pubsub/publish?buf=${buf}`
         }, (res) => {
           expect(res.statusCode).to.equal(400)
           expect(res.statusMessage).to.equal('Bad Request')
@@ -93,7 +93,7 @@ module.exports = (http) => {
       it('returns 200 with topic and buffer', (done) => {
         api.inject({
           method: 'POST',
-          url: `/api/v0/pubsub/pub?buf=${buf}&topic=${topic}`
+          url: `/api/v0/pubsub/publish?buf=${buf}&topic=${topic}`
         }, (res) => {
           expect(res.statusCode).to.equal(200)
           done()
@@ -101,11 +101,11 @@ module.exports = (http) => {
       })
     })
 
-    describe('/pubsub/unsub/{topic}', () => {
+    describe('/pubsub/unsubscribe/{topic}', () => {
       it('returns 404 if no topic is provided', (done) => {
         api.inject({
           method: 'GET',
-          url: `/api/v0/pubsub/unsub`
+          url: `/api/v0/pubsub/unsubscribe`
         }, (res) => {
           expect(res.statusCode).to.equal(404)
           done()
@@ -115,7 +115,7 @@ module.exports = (http) => {
       it('returns 200 with topic', (done) => {
         api.inject({
           method: 'GET',
-          url: `/api/v0/pubsub/unsub/${topic}`
+          url: `/api/v0/pubsub/unsubscribe/${topic}`
         }, (res) => {
           expect(res.statusCode).to.equal(200)
           done()

From 5031470f0d2a5e677a2f082f95f99a26d05d06a8 Mon Sep 17 00:00:00 2001
From: Gavin McDermott <gavinmcdermott@gmail.com>
Date: Thu, 8 Dec 2016 12:28:05 -0800
Subject: [PATCH 06/46] chore: address CR comments

---
 package.json                                  |   9 +-
 src/cli/commands/floodsub.js                  |  17 ---
 src/cli/commands/floodsub/start.js            |  27 ----
 src/cli/commands/pubsub.js                    |  17 +++
 .../{floodsub/unsubscribe.js => pubsub/ls.js} |  12 +-
 src/cli/commands/pubsub/peers.js              |  30 ++++
 .../commands/{floodsub => pubsub}/publish.js  |   6 +-
 .../{floodsub => pubsub}/subscribe.js         |   8 +-
 src/core/components/floodsub.js               |  94 ------------
 src/core/components/go-online.js              |   6 +
 src/core/components/pubsub.js                 | 131 ++++++++++++++++
 src/core/index.js                             |   6 +-
 src/http-api/resources/index.js               |   2 +-
 .../resources/{floodsub.js => pubsub.js}      |  53 +++----
 src/http-api/routes/index.js                  |   2 +-
 .../routes/{floodsub.js => pubsub.js}         |  28 ++--
 test/cli/test-commands.js                     |   9 +-
 test/cli/{test-floodsub.js => test-pubsub.js} |  51 +++++--
 test/core/both/index.js                       |   1 +
 test/core/both/test-floodsub.js               | 140 ------------------
 test/core/both/test-pubsub.js                 |  19 +++
 .../{test-floodsub.js => test-pubsub.js}      |  48 +++---
 22 files changed, 336 insertions(+), 380 deletions(-)
 delete mode 100644 src/cli/commands/floodsub.js
 delete mode 100644 src/cli/commands/floodsub/start.js
 create mode 100644 src/cli/commands/pubsub.js
 rename src/cli/commands/{floodsub/unsubscribe.js => pubsub/ls.js} (54%)
 create mode 100644 src/cli/commands/pubsub/peers.js
 rename src/cli/commands/{floodsub => pubsub}/publish.js (72%)
 rename src/cli/commands/{floodsub => pubsub}/subscribe.js (72%)
 delete mode 100644 src/core/components/floodsub.js
 create mode 100644 src/core/components/pubsub.js
 rename src/http-api/resources/{floodsub.js => pubsub.js} (65%)
 rename src/http-api/routes/{floodsub.js => pubsub.js} (67%)
 rename test/cli/{test-floodsub.js => test-pubsub.js} (60%)
 delete mode 100644 test/core/both/test-floodsub.js
 create mode 100644 test/core/both/test-pubsub.js
 rename test/http-api/inject/{test-floodsub.js => test-pubsub.js} (79%)

diff --git a/package.json b/package.json
index 071857738d..2e334f4782 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "form-data": "^2.1.2",
     "fs-pull-blob-store": "^0.4.1",
     "gulp": "^3.9.1",
-    "interface-ipfs-core": "^0.22.0",
+    "interface-ipfs-core": "git+https://github.com/ipfs/interface-ipfs-core.git#5c7df414a8f627f8adb50a52ef8d2b629381285f",
     "left-pad": "^1.1.3",
     "lodash": "^4.17.2",
     "ncp": "^2.0.0",
@@ -80,7 +80,7 @@
     "hapi": "^16.0.0",
     "hapi-set-header": "^1.0.2",
     "idb-pull-blob-store": "^0.5.1",
-    "ipfs-api": "^12.0.0",
+    "ipfs-api": "git+https://github.com/ipfs/js-ipfs-api.git#01044a1f59fb866e4e08b06aae4e74d968615931",
     "ipfs-bitswap": "^0.8.1",
     "ipfs-block": "^0.5.0",
     "ipfs-block-service": "^0.7.0",
@@ -90,10 +90,10 @@
     "ipfs-unixfs-engine": "^0.14.0",
     "ipld-resolver": "^0.3.0",
     "isstream": "^0.1.2",
-    "libp2p-floodsub": "0.3.1",
     "joi": "^10.0.1",
-    "libp2p-ipfs-nodejs": "^0.16.1",
+    "libp2p-floodsub": "0.3.1",
     "libp2p-ipfs-browser": "^0.17.0",
+    "libp2p-ipfs-nodejs": "^0.16.1",
     "lodash.flatmap": "^4.5.0",
     "lodash.get": "^4.4.2",
     "lodash.has": "^4.5.2",
@@ -103,6 +103,7 @@
     "mafmt": "^2.1.2",
     "multiaddr": "^2.1.1",
     "multihashes": "^0.3.0",
+    "ndjson": "1.5.0",
     "path-exists": "^3.0.0",
     "peer-book": "^0.3.0",
     "peer-id": "^0.8.0",
diff --git a/src/cli/commands/floodsub.js b/src/cli/commands/floodsub.js
deleted file mode 100644
index 63af3fa21a..0000000000
--- a/src/cli/commands/floodsub.js
+++ /dev/null
@@ -1,17 +0,0 @@
-'use strict'
-
-// NOTE: Floodsub CLI is not tested. Tests will not be run until
-// https://github.com/ipfs/js-ipfs-api/pull/377
-// is merged
-module.exports = {
-  command: 'floodsub',
-
-  description: 'floodsub commands',
-
-  builder (yargs) {
-    return yargs
-      .commandDir('floodsub')
-  },
-
-  handler (argv) {}
-}
diff --git a/src/cli/commands/floodsub/start.js b/src/cli/commands/floodsub/start.js
deleted file mode 100644
index 7d4fe5103e..0000000000
--- a/src/cli/commands/floodsub/start.js
+++ /dev/null
@@ -1,27 +0,0 @@
-'use strict'
-
-const utils = require('../../utils')
-const debug = require('debug')
-const log = debug('cli:floodsub')
-log.error = debug('cli:floodsub:error')
-
-module.exports = {
-  command: 'start',
-
-  describe: 'Start FloodSub',
-
-  builder: {},
-
-  handler (argv) {
-    utils.getIPFS((err, ipfs) => {
-      if (err) {
-        throw err
-      }
-
-      const fsub = ipfs.floodsub.start()
-      if (fsub) {
-        console.log(fsub.toString())
-      }
-    })
-  }
-}
diff --git a/src/cli/commands/pubsub.js b/src/cli/commands/pubsub.js
new file mode 100644
index 0000000000..7102b9af67
--- /dev/null
+++ b/src/cli/commands/pubsub.js
@@ -0,0 +1,17 @@
+'use strict'
+
+// The command count bump from 56 to 60 depends on:
+// ipfs/interface-ipfs-core.git#5c7df414a8f627f8adb50a52ef8d2b629381285f
+// ipfs/js-ipfs-api.git#01044a1f59fb866e4e08b06aae4e74d968615931
+module.exports = {
+  command: 'pubsub',
+
+  description: 'pubsub commands',
+
+  builder (yargs) {
+    return yargs
+      .commandDir('pubsub')
+  },
+
+  handler (argv) {}
+}
diff --git a/src/cli/commands/floodsub/unsubscribe.js b/src/cli/commands/pubsub/ls.js
similarity index 54%
rename from src/cli/commands/floodsub/unsubscribe.js
rename to src/cli/commands/pubsub/ls.js
index 27d52d4a59..0a53b01ce3 100644
--- a/src/cli/commands/floodsub/unsubscribe.js
+++ b/src/cli/commands/pubsub/ls.js
@@ -2,13 +2,13 @@
 
 const utils = require('../../utils')
 const debug = require('debug')
-const log = debug('cli:floodsub')
-log.error = debug('cli:floodsub:error')
+const log = debug('cli:pubsub')
+log.error = debug('cli:pubsub:error')
 
 module.exports = {
-  command: 'unsubscribe <topic>',
+  command: 'ls',
 
-  describe: 'Unsubscribe from a topic',
+  describe: 'Get your list of subscriptions',
 
   builder: {},
 
@@ -18,10 +18,12 @@ module.exports = {
         throw err
       }
 
-      ipfs.floodsub.unsubscribe(argv.topic, (err) => {
+      ipfs.pubsub.ls((err, subscriptions) => {
         if (err) {
           throw err
         }
+
+        console.log(JSON.stringify(subscriptions, null, 2))
       })
     })
   }
diff --git a/src/cli/commands/pubsub/peers.js b/src/cli/commands/pubsub/peers.js
new file mode 100644
index 0000000000..0f4052b27e
--- /dev/null
+++ b/src/cli/commands/pubsub/peers.js
@@ -0,0 +1,30 @@
+'use strict'
+
+const utils = require('../../utils')
+const debug = require('debug')
+const log = debug('cli:pubsub')
+log.error = debug('cli:pubsub:error')
+
+module.exports = {
+  command: 'peers <topic>',
+
+  describe: 'Get all peers subscribed to a topic',
+
+  builder: {},
+
+  handler (argv) {
+    utils.getIPFS((err, ipfs) => {
+      if (err) {
+        throw err
+      }
+
+      ipfs.pubsub.peers(argv.topic, (err, peers) => {
+        if (err) {
+          throw err
+        }
+
+        console.log(JSON.stringify(peers, null, 2))
+      })
+    })
+  }
+}
diff --git a/src/cli/commands/floodsub/publish.js b/src/cli/commands/pubsub/publish.js
similarity index 72%
rename from src/cli/commands/floodsub/publish.js
rename to src/cli/commands/pubsub/publish.js
index 6ef45dcd6e..4f0e141270 100644
--- a/src/cli/commands/floodsub/publish.js
+++ b/src/cli/commands/pubsub/publish.js
@@ -2,8 +2,8 @@
 
 const utils = require('../../utils')
 const debug = require('debug')
-const log = debug('cli:floodsub')
-log.error = debug('cli:floodsub:error')
+const log = debug('cli:pubsub')
+log.error = debug('cli:pubsub:error')
 
 module.exports = {
   command: 'publish <topic> <data>',
@@ -18,7 +18,7 @@ module.exports = {
         throw err
       }
 
-      ipfs.floodsub.publish(argv.topic, argv.data, (err) => {
+      ipfs.pubsub.publish(argv.topic, argv.data, (err) => {
         if (err) {
           throw err
         }
diff --git a/src/cli/commands/floodsub/subscribe.js b/src/cli/commands/pubsub/subscribe.js
similarity index 72%
rename from src/cli/commands/floodsub/subscribe.js
rename to src/cli/commands/pubsub/subscribe.js
index 16e3eeda4b..5bab470c17 100644
--- a/src/cli/commands/floodsub/subscribe.js
+++ b/src/cli/commands/pubsub/subscribe.js
@@ -2,12 +2,14 @@
 
 const utils = require('../../utils')
 const debug = require('debug')
-const log = debug('cli:floodsub')
-log.error = debug('cli:floodsub:error')
+const log = debug('cli:pubsub')
+log.error = debug('cli:pubsub:error')
 
 module.exports = {
   command: 'subscribe <topic>',
 
+  alias : 'sub',
+
   describe: 'Subscribe to a topic',
 
   builder: {},
@@ -18,7 +20,7 @@ module.exports = {
         throw err
       }
 
-      ipfs.floodsub.subscribe(argv.topic, (err, stream) => {
+      ipfs.pubsub.subscribe(argv.topic, (err, stream) => {
         if (err) {
           throw err
         }
diff --git a/src/core/components/floodsub.js b/src/core/components/floodsub.js
deleted file mode 100644
index 8ec4132665..0000000000
--- a/src/core/components/floodsub.js
+++ /dev/null
@@ -1,94 +0,0 @@
-'use strict'
-
-const FloodSub = require('libp2p-floodsub')
-const promisify = require('promisify-es6')
-const Readable = require('stream').Readable
-
-const OFFLINE_ERROR = require('../utils').OFFLINE_ERROR
-const FSUB_ERROR = new Error(`FloodSub is not started.`)
-
-module.exports = function floodsub (self) {
-  return {
-    start: promisify((callback) => {
-      if (!self.isOnline()) {
-        throw OFFLINE_ERROR
-      }
-
-      self._floodsub = new FloodSub(self._libp2pNode)
-      return callback(null, self._floodsub)
-    }),
-
-    subscribe: promisify((topic, options, callback) => {
-      // TODO: Clarify with @diasdavid what to do with the `options.discover` param
-      // Ref: https://github.com/ipfs/js-ipfs-api/pull/377/files#diff-f0c61c06fd5dc36b6f760b7ea97b1862R50
-      if (typeof options === 'function') {
-        callback = options
-        options = {}
-      }
-
-      if (!self.isOnline()) {
-        throw OFFLINE_ERROR
-      }
-
-      if (!self._floodsub) {
-        throw FSUB_ERROR
-      }
-
-      let rs = new Readable()
-      rs.cancel = () => self._floodsub.unsubscribe(topic)
-
-      self._floodsub.on(topic, (data) => {
-        rs.emit('data', {
-          data: data.toString(),
-          topicIDs: [topic]
-        })
-      })
-
-      try {
-        self._floodsub.subscribe(topic)
-      } catch (err) {
-        return callback(err)
-      }
-
-      callback(null, rs)
-    }),
-
-    publish: promisify((topic, data, callback) => {
-      if (!self.isOnline()) {
-        throw OFFLINE_ERROR
-      }
-
-      if (!self._floodsub) {
-        throw FSUB_ERROR
-      }
-
-      const buf = Buffer.isBuffer(data) ? data : new Buffer(data)
-
-      try {
-        self._floodsub.publish(topic, buf)
-      } catch (err) {
-        return callback(err)
-      }
-
-      callback(null)
-    }),
-
-    unsubscribe: promisify((topic, callback) => {
-      if (!self.isOnline()) {
-        throw OFFLINE_ERROR
-      }
-
-      if (!self._floodsub) {
-        throw FSUB_ERROR
-      }
-
-      try {
-        self._floodsub.unsubscribe(topic)
-      } catch (err) {
-        return callback(err)
-      }
-
-      callback(null)
-    })
-  }
-}
diff --git a/src/core/components/go-online.js b/src/core/components/go-online.js
index 793a0269a5..3e0aa18d4c 100644
--- a/src/core/components/go-online.js
+++ b/src/core/components/go-online.js
@@ -2,6 +2,7 @@
 
 const series = require('async/series')
 const Bitswap = require('ipfs-bitswap')
+const FloodSub = require('libp2p-floodsub')
 
 module.exports = function goOnline (self) {
   return (cb) => {
@@ -21,6 +22,11 @@ module.exports = function goOnline (self) {
       )
       self._bitswap.start()
       self._blockService.goOnline(self._bitswap)
+
+      //
+      self._pubsub = new FloodSub(self._libp2pNode)
+      //
+
       cb()
     })
   }
diff --git a/src/core/components/pubsub.js b/src/core/components/pubsub.js
new file mode 100644
index 0000000000..9f85929061
--- /dev/null
+++ b/src/core/components/pubsub.js
@@ -0,0 +1,131 @@
+'use strict'
+
+const promisify = require('promisify-es6')
+const Readable = require('stream').Readable
+const _values = require('lodash.values')
+
+const OFFLINE_ERROR = require('../utils').OFFLINE_ERROR
+
+let subscriptions = {}
+
+const addSubscription = (topic, request, stream) => {
+  subscriptions[topic] = { request: request, stream: stream }
+}
+
+const removeSubscription = promisify((topic, callback) => {
+  if (!subscriptions[topic]) {
+    return callback(new Error(`Not subscribed to ${topic}`))
+  }
+
+  subscriptions[topic].stream.emit('end')
+  delete subscriptions[topic]
+
+  if (callback) {
+    callback(null)
+  }
+})
+
+module.exports = function pubsub (self) {
+  return {
+    subscribe: promisify((topic, options, callback) => {
+      if (!self.isOnline()) {
+        throw OFFLINE_ERROR
+      }
+
+      if (typeof options === 'function') {
+        callback = options
+        options = {}
+      }
+
+      if (subscriptions[topic]) {
+        return callback(`Error: Already subscribed to '${topic}'`)
+      }
+
+      const stream = new Readable({ objectMode: true })
+
+      stream._read = () => {}
+
+      // There is no explicit unsubscribe; subscriptions have a cancel event
+      stream.cancel = promisify((cb) => {
+        self._pubsub.unsubscribe(topic)
+        removeSubscription(topic, cb)
+      })
+
+      self._pubsub.on(topic, (data) => {
+        stream.emit('data', {
+          data: data.toString(),
+          topicIDs: [topic]
+        })
+      })
+
+      try {
+        self._pubsub.subscribe(topic)
+      } catch (err) {
+        return callback(err)
+      }
+
+      // Add the request to the active subscriptions and return the stream
+      addSubscription(topic, null, stream)
+      callback(null, stream)
+    }),
+
+    publish: promisify((topic, data, callback) => {
+      if (!self.isOnline()) {
+        throw OFFLINE_ERROR
+      }
+
+      const buf = Buffer.isBuffer(data) ? data : new Buffer(data)
+
+      try {
+        self._pubsub.publish(topic, buf)
+      } catch (err) {
+        return callback(err)
+      }
+
+      callback(null)
+    }),
+
+    ls: promisify((callback) => {
+      if (!self.isOnline()) {
+        throw OFFLINE_ERROR
+      }
+
+      let subscriptions = []
+
+      try {
+        subscriptions = self._pubsub.getSubscriptions()
+      } catch (err) {
+        return callback(err)
+      }
+
+      callback(null, subscriptions)
+    }),
+
+    peers: promisify((topic, callback) => {
+      if (!self.isOnline()) {
+        throw OFFLINE_ERROR
+      }
+
+      if (!subscriptions[topic]) {
+        return callback(`Error: Not subscribed to '${topic}'`)
+      }
+
+      let peers = []
+
+      try {
+        const peerSet = self._pubsub.getPeerSet()
+        _values(peerSet).forEach((peer) => {
+          const idB58Str = peer.peerInfo.id.toB58String()
+          const index = peer.topics.indexOf(topic)
+          if (index > -1) {
+            peers.push(idB58Str)
+          }
+        })
+      } catch (err) {
+        return callback(err)
+      }
+
+      callback(null, peers)
+    }),
+  }
+}
diff --git a/src/core/index.js b/src/core/index.js
index d53394c55b..fa4c2e8ae2 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -23,7 +23,7 @@ const swarm = require('./components/swarm')
 const ping = require('./components/ping')
 const files = require('./components/files')
 const bitswap = require('./components/bitswap')
-const floodsub = require('./components/floodsub')
+const pubsub = require('./components/pubsub')
 
 exports = module.exports = IPFS
 
@@ -45,7 +45,7 @@ function IPFS (repoInstance) {
   this._bitswap = null
   this._blockService = new BlockService(this._repo)
   this._ipldResolver = new IPLDResolver(this._blockService)
-  this._floodsub = null
+  this._pubsub = null
 
   // IPFS Core exposed components
 
@@ -69,5 +69,5 @@ function IPFS (repoInstance) {
   this.files = files(this)
   this.bitswap = bitswap(this)
   this.ping = ping(this)
-  this.floodsub = floodsub(this)
+  this.pubsub = pubsub(this)
 }
diff --git a/src/http-api/resources/index.js b/src/http-api/resources/index.js
index 2f8f273aac..671a349952 100644
--- a/src/http-api/resources/index.js
+++ b/src/http-api/resources/index.js
@@ -10,4 +10,4 @@ exports.block = require('./block')
 exports.swarm = require('./swarm')
 exports.bitswap = require('./bitswap')
 exports.files = require('./files')
-exports.floodsub = require('./floodsub')
+exports.pubsub = require('./pubsub')
diff --git a/src/http-api/resources/floodsub.js b/src/http-api/resources/pubsub.js
similarity index 65%
rename from src/http-api/resources/floodsub.js
rename to src/http-api/resources/pubsub.js
index 9ddcf4fdc9..250ea2a7e8 100644
--- a/src/http-api/resources/floodsub.js
+++ b/src/http-api/resources/pubsub.js
@@ -1,33 +1,18 @@
 'use strict'
 
 const debug = require('debug')
-const log = debug('http-api:floodsub')
-log.error = debug('http-api:floodsub:error')
+const ndjson = require('ndjson')
+const log = debug('http-api:pubsub')
+log.error = debug('http-api:pubsub:error')
 
 exports = module.exports
 
-exports.start = {
-  handler: (request, reply) => {
-    request.server.app.ipfs.floodsub.start((err, floodsub) => {
-      if (err) {
-        log.error(err)
-        return reply({
-          Message: `Failed to start: ${err}`,
-          Code: 0
-        }).code(500)
-      }
-
-      return reply(floodsub)
-    })
-  }
-}
-
 exports.subscribe = {
   handler: (request, reply) => {
     const discover = request.query.discover || null
     const topic = request.params.topic
 
-    request.server.app.ipfs.floodsub.subscribe(topic, { discover }, (err, stream) => {
+    request.server.app.ipfs.pubsub.subscribe(topic, { discover }, (err, stream) => {
       if (err) {
         log.error(err)
         return reply({
@@ -36,7 +21,7 @@ exports.subscribe = {
         }).code(500)
       }
 
-      // hapi is not very clever and throws if no
+      // hapi is not very clever and throws if no:
       // - _read method
       // - _readableState object
       // are there :(
@@ -44,6 +29,8 @@ exports.subscribe = {
         stream._read = () => {}
         stream._readableState = {}
       }
+
+      // ndjson.serialize
       return reply(stream)
     })
   }
@@ -54,7 +41,7 @@ exports.publish = {
     const buf = request.query.buf
     const topic = request.query.topic
 
-    request.server.app.ipfs.floodsub.publish(topic, buf, (err) => {
+    request.server.app.ipfs.pubsub.publish(topic, buf, (err) => {
       if (err) {
         log.error(err)
         return reply({
@@ -68,20 +55,36 @@ exports.publish = {
   }
 }
 
-exports.unsubscribe = {
+exports.ls = {
+  handler: (request, reply) => {
+    request.server.app.ipfs.pubsub.ls((err, subscriptions) => {
+      if (err) {
+        log.error(err)
+        return reply({
+          Message: `Failed to list subscriptions: ${err}`,
+          Code: 0
+        }).code(500)
+      }
+
+      return reply(subscriptions)
+    })
+  }
+}
+
+exports.peers = {
   handler: (request, reply) => {
     const topic = request.params.topic
 
-    request.server.app.ipfs.floodsub.unsubscribe(topic, (err) => {
+    request.server.app.ipfs.pubsub.peers(topic, (err, peers) => {
       if (err) {
         log.error(err)
         return reply({
-          Message: `Failed to unsubscribe from topic ${topic}: ${err}`,
+          Message: `Failed to find peers subscribed to ${topic}: ${err}`,
           Code: 0
         }).code(500)
       }
 
-      return reply()
+      return reply(peers)
     })
   }
 }
diff --git a/src/http-api/routes/index.js b/src/http-api/routes/index.js
index 15dde6116c..7b0afa885d 100644
--- a/src/http-api/routes/index.js
+++ b/src/http-api/routes/index.js
@@ -11,5 +11,5 @@ module.exports = (server) => {
   require('./swarm')(server)
   require('./bitswap')(server)
   require('./files')(server)
-  require('./floodsub')(server)
+  require('./pubsub')(server)
 }
diff --git a/src/http-api/routes/floodsub.js b/src/http-api/routes/pubsub.js
similarity index 67%
rename from src/http-api/routes/floodsub.js
rename to src/http-api/routes/pubsub.js
index 74eedbe725..321cb54476 100644
--- a/src/http-api/routes/floodsub.js
+++ b/src/http-api/routes/pubsub.js
@@ -8,17 +8,9 @@ module.exports = (server) => {
 
   api.route({
     method: '*',
-    path: '/api/v0/pubsub/start',
+    path: '/api/v0/pubsub/sub/{topic}',
     config: {
-      handler: resources.floodsub.start.handler
-    }
-  })
-
-  api.route({
-    method: '*',
-    path: '/api/v0/pubsub/subscribe/{topic}',
-    config: {
-      handler: resources.floodsub.subscribe.handler,
+      handler: resources.pubsub.subscribe.handler,
       validate: {
         params: {
           topic: Joi.string().required()
@@ -32,9 +24,9 @@ module.exports = (server) => {
 
   api.route({
     method: '*',
-    path: '/api/v0/pubsub/publish',
+    path: '/api/v0/pubsub/pub',
     config: {
-      handler: resources.floodsub.publish.handler,
+      handler: resources.pubsub.publish.handler,
       validate: {
         query: {
           topic: Joi.string().required(),
@@ -46,9 +38,17 @@ module.exports = (server) => {
 
   api.route({
     method: '*',
-    path: '/api/v0/pubsub/unsubscribe/{topic}',
+    path: '/api/v0/pubsub/ls',
+    config: {
+      handler: resources.pubsub.ls.handler
+    }
+  })
+
+  api.route({
+    method: '*',
+    path: '/api/v0/pubsub/peers',
     config: {
-      handler: resources.floodsub.unsubscribe.handler,
+      handler: resources.pubsub.peers.handler,
       validate: {
         params: {
           topic: Joi.string().required()
diff --git a/test/cli/test-commands.js b/test/cli/test-commands.js
index fce0681302..765a68e31a 100644
--- a/test/cli/test-commands.js
+++ b/test/cli/test-commands.js
@@ -7,11 +7,10 @@ const ipfsBase = require('../utils/ipfs-exec')
 const ipfs = ipfsBase(repoPath)
 const describeOnlineAndOffline = require('../utils/on-and-off')
 
-// NOTE: Floodsub CLI tests will not be run until
-// https://github.com/ipfs/js-ipfs-api/pull/377
-// is merged. But we have the files ready to go
-// so the command count is bumped from 56 to 61
-const commandCount = 61
+// The command count bump from 56 to 60 depends on:
+// ipfs/interface-ipfs-core.git#5c7df414a8f627f8adb50a52ef8d2b629381285f
+// ipfs/js-ipfs-api.git#01044a1f59fb866e4e08b06aae4e74d968615931
+const commandCount = 60
 
 describe('commands', () => {
   describeOnlineAndOffline(repoPath, () => {
diff --git a/test/cli/test-floodsub.js b/test/cli/test-pubsub.js
similarity index 60%
rename from test/cli/test-floodsub.js
rename to test/cli/test-pubsub.js
index 820ab8a049..1e66a4dc75 100644
--- a/test/cli/test-floodsub.js
+++ b/test/cli/test-pubsub.js
@@ -8,14 +8,15 @@ const createTempNode = require('../utils/temp-node')
 const repoPath = require('./index').repoPath
 const ipfs = require('../utils/ipfs-exec')(repoPath)
 
-// NOTE: Floodsub CLI tests will not be run until
-// https://github.com/ipfs/js-ipfs-api/pull/377
-// is merged
-describe.skip('floodsub', function () {
+// This depends on:
+// ipfs/interface-ipfs-core.git#5c7df414a8f627f8adb50a52ef8d2b629381285f
+// ipfs/js-ipfs-api.git#01044a1f59fb866e4e08b06aae4e74d968615931
+describe.only('pubsub', function () {
   this.timeout(30 * 1000)
   let node
 
-  const topic = 'nonscents'
+  const topicA = 'nonscentsA'
+  const topicB = 'nonscentsB'
   const message = new Buffer('Some non cents.')
 
   before((done) => {
@@ -52,28 +53,50 @@ describe.skip('floodsub', function () {
       })
     })
 
-    it('start', () => {
-      return ipfs('floodsub', 'start').then((out) => {
-        expect(called).to.eql(true)
+    it('subscribe', () => {
+      return ipfs('pubsub', 'subscribe', topicA).then((out) => {
+        expect(out).to.have.length.above(0)
       })
     })
 
-    it('subscribe', () => {
-      return ipfs('floodsub', 'subscribe', topic).then((out) => {
+    it('subscribe alias', () => {
+      return ipfs('pubsub', 'sub', topicB).then((out) => {
         expect(out).to.have.length.above(0)
       })
     })
 
     it('publish', () => {
-      return ipfs('floodsub', 'publish', topic, message).then((out) => {
+      return ipfs('pubsub', 'publish', topicA, message).then((out) => {
         expect(called).to.eql(true)
       })
     })
 
-    it('unsubscribe', () => {
-      return ipfs('floodsub', 'unsubscribe', topic).then((out) => {
-        expect(called).to.eql(true)
+    it('ls', () => {
+      return ipfs('pubsub', 'ls').then((out) => {
+        expect(out).to.have.length.above(0)
+      })
+    })
+
+    it('peers', () => {
+      return ipfs('pubsub', 'peers', topicA).then((out) => {
+        expect(out).to.be.eql('[]')
       })
     })
   })
 })
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/core/both/index.js b/test/core/both/index.js
index a6dc8e5621..5b27dd5e69 100644
--- a/test/core/both/index.js
+++ b/test/core/both/index.js
@@ -10,4 +10,5 @@ describe('--both', () => {
   require('./test-generic')
   require('./test-init')
   require('./test-object')
+  require('./test-pubsub')
 })
diff --git a/test/core/both/test-floodsub.js b/test/core/both/test-floodsub.js
deleted file mode 100644
index 6a53810e6c..0000000000
--- a/test/core/both/test-floodsub.js
+++ /dev/null
@@ -1,140 +0,0 @@
-/* eslint max-nested-callbacks: ["error", 8] */
-/* eslint-env mocha */
-'use strict'
-
-const expect = require('chai').expect
-const Stream = require('stream')
-const IPFSFactory = require('../../utils/factory-core')
-const factory = new IPFSFactory()
-
-describe('floodsub', () => {
-  let nodeOffline
-  let nodeUnstarted
-  let nodeStarted
-
-  let subscription
-  let floodsub
-
-  const topic = 'nonscents'
-  const message = 'Some message'
-
-  before((done) => {
-    factory.spawnNode((err, ipfsOff) => {
-      expect(err).to.not.exist
-      ipfsOff.goOffline((err) => {
-        expect(err).to.not.exist
-        nodeOffline = ipfsOff
-        factory.spawnNode((err, ipfs) => {
-          expect(err).to.not.exist
-          nodeStarted = ipfs
-          factory.spawnNode((err, ipfs) => {
-            expect(err).to.not.exist
-            nodeUnstarted = ipfs
-            done()
-          })
-        })
-      })
-    })
-  })
-
-  after((done) => {
-    factory.dismantle(() => done())
-  })
-
-  describe('Floodsub API', () => {
-    describe('start', () => {
-      it('throws if offline', () => {
-        expect(() => nodeOffline.floodsub.start()).to.throw
-      })
-
-      it('success', () => {
-        nodeStarted.floodsub.start((err, _floodsub) => {
-          expect(err).to.not.exist
-          expect(_floodsub).to.exist
-          floodsub = _floodsub
-        })
-      })
-    })
-
-    describe('subscribe', () => {
-      it('throws if offline', () => {
-        expect(() => nodeOffline.floodsub.subscribe()).to.throw
-      })
-
-      it('throws if not started', () => {
-        expect(() => nodeUnstarted.floodsub.subscribe(topic)).to.throw
-      })
-
-      it('throws without a topic', () => {
-        expect(() => nodeStarted.floodsub.subscribe()).to.throw
-      })
-
-      it('success', (done) => {
-        nodeStarted.floodsub.subscribe(topic, (err, stream) => {
-          expect(err).to.not.exist
-          expect(stream.readable).to.eql(true)
-          expect(typeof stream._read).to.eql('function')
-          expect(typeof stream.cancel).to.eql('function')
-          expect(stream instanceof Stream).to.eql(true)
-
-          subscription = stream
-
-          const nodeSubs = floodsub.getSubscriptions()
-          expect(nodeSubs.length).to.eql(1)
-          done()
-        })
-      })
-    })
-
-    describe('publish', () => {
-      it('throws if offline', () => {
-        expect(() => nodeOffline.floodsub.publish()).to.throw
-      })
-
-      it('throws if not started', () => {
-        expect(() => nodeUnstarted.floodsub.publish(topic, message)).to.throw
-      })
-
-      it('throws without a topic', () => {
-        expect(() => nodeStarted.floodsub.publish()).to.throw
-      })
-
-      it('throws without data', () => {
-        expect(() => nodeStarted.floodsub.publish(topic)).to.throw
-      })
-
-      it('success', (done) => {
-        const published = true
-
-        subscription.on('data', () => done())
-
-        nodeStarted.floodsub.publish(topic, message, () => {
-          expect(published).to.eql(true)
-        })
-      })
-    })
-
-    describe('unsubscribe', () => {
-      it('throws if offline', () => {
-        expect(() => nodeOffline.floodsub.unsubscribe()).to.throw
-      })
-
-      it('throws if not started', () => {
-        expect(() => nodeUnstarted.floodsub.unsubscribe(topic)).to.throw
-      })
-
-      it('throws without a topic', () => {
-        expect(() => nodeStarted.floodsub.unsubscribe()).to.throw
-      })
-
-      it('success', (done) => {
-        nodeStarted.floodsub.unsubscribe(topic, (err) => {
-          expect(err).to.not.exist
-          const nodeSubs = floodsub.getSubscriptions()
-          expect(nodeSubs.length).to.eql(0)
-          done()
-        })
-      })
-    })
-  })
-})
diff --git a/test/core/both/test-pubsub.js b/test/core/both/test-pubsub.js
new file mode 100644
index 0000000000..bdc83ad572
--- /dev/null
+++ b/test/core/both/test-pubsub.js
@@ -0,0 +1,19 @@
+/* eslint-env mocha */
+'use strict'
+
+const test = require('interface-ipfs-core')
+const IPFSFactory = require('../../utils/factory-core')
+
+let factory
+
+const common = {
+  setup: function (cb) {
+    factory = new IPFSFactory()
+    cb(null, factory)
+  },
+  teardown: function (cb) {
+    factory.dismantle(cb)
+  }
+}
+
+test.pubsub(common)
diff --git a/test/http-api/inject/test-floodsub.js b/test/http-api/inject/test-pubsub.js
similarity index 79%
rename from test/http-api/inject/test-floodsub.js
rename to test/http-api/inject/test-pubsub.js
index 159054a133..38299c72f9 100644
--- a/test/http-api/inject/test-floodsub.js
+++ b/test/http-api/inject/test-pubsub.js
@@ -6,7 +6,7 @@ const expect = require('chai').expect
 const createTempNode = require('./../../utils/temp-node')
 
 module.exports = (http) => {
-  describe('/pubsub', () => {
+  describe.only('/pubsub', () => {
     let api
     let tmpNode
 
@@ -32,24 +32,11 @@ module.exports = (http) => {
       }, 1000)
     })
 
-    describe('/pubsub/start', () => {
-      it('returns 200', (done) => {
-        api.inject({
-          method: 'POST',
-          url: `/api/v0/pubsub/start`
-        }, (res) => {
-          expect(res.statusCode).to.equal(200)
-          expect(res.result).to.be.an('object')
-          done()
-        })
-      })
-    })
-
-    describe('/pubsub/subscribe/{topic}', () => {
+    describe('/sub/{topic}', () => {
       it('returns 404 if no topic is provided', (done) => {
         api.inject({
           method: 'GET',
-          url: `/api/v0/pubsub/subscribe`
+          url: `/api/v0/pubsub/sub`
         }, (res) => {
           expect(res.statusCode).to.equal(404)
           done()
@@ -59,7 +46,7 @@ module.exports = (http) => {
       it('returns 200 with topic', (done) => {
         api.inject({
           method: 'GET',
-          url: `/api/v0/pubsub/subscribe/${topic}`
+          url: `/api/v0/pubsub/sub/${topic}`
         }, (res) => {
           expect(res.statusCode).to.equal(200)
           done()
@@ -67,11 +54,11 @@ module.exports = (http) => {
       })
     })
 
-    describe('/pubsub/publish', () => {
+    xdescribe('/pub', () => {
       it('returns 400 if no buffer is provided', (done) => {
         api.inject({
           method: 'POST',
-          url: `/api/v0/pubsub/publish?topic=${topic}`
+          url: `/api/v0/pubsub/pub?topic=${topic}`
         }, (res) => {
           expect(res.statusCode).to.equal(400)
           expect(res.statusMessage).to.equal('Bad Request')
@@ -82,7 +69,7 @@ module.exports = (http) => {
       it('returns 400 if no topic is provided', (done) => {
         api.inject({
           method: 'POST',
-          url: `/api/v0/pubsub/publish?buf=${buf}`
+          url: `/api/v0/pubsub/pub?buf=${buf}`
         }, (res) => {
           expect(res.statusCode).to.equal(400)
           expect(res.statusMessage).to.equal('Bad Request')
@@ -93,7 +80,7 @@ module.exports = (http) => {
       it('returns 200 with topic and buffer', (done) => {
         api.inject({
           method: 'POST',
-          url: `/api/v0/pubsub/publish?buf=${buf}&topic=${topic}`
+          url: `/api/v0/pubsub/pub?buf=${buf}&topic=${topic}`
         }, (res) => {
           expect(res.statusCode).to.equal(200)
           done()
@@ -101,11 +88,24 @@ module.exports = (http) => {
       })
     })
 
-    describe('/pubsub/unsubscribe/{topic}', () => {
+    xdescribe('/ls', () => {
+      it('returns 200', (done) => {
+        api.inject({
+          method: 'GET',
+          url: `/api/v0/pubsub/ls`
+        }, (res) => {
+          expect(res.statusCode).to.equal(200)
+          expect(res.result).to.be.an('object')
+          done()
+        })
+      })
+    })
+
+    xdescribe('/peers/{topic}', () => {
       it('returns 404 if no topic is provided', (done) => {
         api.inject({
           method: 'GET',
-          url: `/api/v0/pubsub/unsubscribe`
+          url: `/api/v0/pubsub/peers`
         }, (res) => {
           expect(res.statusCode).to.equal(404)
           done()
@@ -115,7 +115,7 @@ module.exports = (http) => {
       it('returns 200 with topic', (done) => {
         api.inject({
           method: 'GET',
-          url: `/api/v0/pubsub/unsubscribe/${topic}`
+          url: `/api/v0/pubsub/peers/${topic}`
         }, (res) => {
           expect(res.statusCode).to.equal(200)
           done()

From 8084cb5b9212109b861d81e916b3969d53aa73cd Mon Sep 17 00:00:00 2001
From: Gavin McDermott <gavinmcdermott@gmail.com>
Date: Thu, 8 Dec 2016 12:28:41 -0800
Subject: [PATCH 07/46] fix: fix lint issues

---
 src/cli/commands/pubsub/subscribe.js |  2 +-
 src/core/components/pubsub.js        |  2 +-
 src/http-api/resources/pubsub.js     |  2 +-
 test/cli/test-pubsub.js              | 16 ----------------
 4 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/cli/commands/pubsub/subscribe.js b/src/cli/commands/pubsub/subscribe.js
index 5bab470c17..1f3d108a85 100644
--- a/src/cli/commands/pubsub/subscribe.js
+++ b/src/cli/commands/pubsub/subscribe.js
@@ -8,7 +8,7 @@ log.error = debug('cli:pubsub:error')
 module.exports = {
   command: 'subscribe <topic>',
 
-  alias : 'sub',
+  alias: 'sub',
 
   describe: 'Subscribe to a topic',
 
diff --git a/src/core/components/pubsub.js b/src/core/components/pubsub.js
index 9f85929061..3d33a788e5 100644
--- a/src/core/components/pubsub.js
+++ b/src/core/components/pubsub.js
@@ -126,6 +126,6 @@ module.exports = function pubsub (self) {
       }
 
       callback(null, peers)
-    }),
+    })
   }
 }
diff --git a/src/http-api/resources/pubsub.js b/src/http-api/resources/pubsub.js
index 250ea2a7e8..38c3084b3a 100644
--- a/src/http-api/resources/pubsub.js
+++ b/src/http-api/resources/pubsub.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const debug = require('debug')
-const ndjson = require('ndjson')
+// const ndjson = require('ndjson')
 const log = debug('http-api:pubsub')
 log.error = debug('http-api:pubsub:error')
 
diff --git a/test/cli/test-pubsub.js b/test/cli/test-pubsub.js
index 1e66a4dc75..20b5ffef3e 100644
--- a/test/cli/test-pubsub.js
+++ b/test/cli/test-pubsub.js
@@ -84,19 +84,3 @@ describe.only('pubsub', function () {
     })
   })
 })
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

From 3b365f70a58fd06dca0084050c3e6b9056e7622e Mon Sep 17 00:00:00 2001
From: David Dias <daviddias.p@gmail.com>
Date: Thu, 8 Dec 2016 13:07:53 -0800
Subject: [PATCH 08/46] update dep

---
 package.json                     | 2 +-
 src/core/components/go-online.js | 3 ---
 src/core/components/pubsub.js    | 1 +
 test/core/both/test-bitswap.js   | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 2a535c00c5..f2d1e88131 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
     "ipld-resolver": "^0.4.0",
     "isstream": "^0.1.2",
     "joi": "^10.0.1",
-    "libp2p-floodsub": "0.3.1",
+    "libp2p-floodsub": "0.4.0",
     "libp2p-ipfs-browser": "^0.17.0",
     "libp2p-ipfs-nodejs": "^0.16.1",
     "lodash.flatmap": "^4.5.0",
diff --git a/src/core/components/go-online.js b/src/core/components/go-online.js
index 3e0aa18d4c..b91df2a751 100644
--- a/src/core/components/go-online.js
+++ b/src/core/components/go-online.js
@@ -22,10 +22,7 @@ module.exports = function goOnline (self) {
       )
       self._bitswap.start()
       self._blockService.goOnline(self._bitswap)
-
-      //
       self._pubsub = new FloodSub(self._libp2pNode)
-      //
 
       cb()
     })
diff --git a/src/core/components/pubsub.js b/src/core/components/pubsub.js
index 3d33a788e5..f16ef284e3 100644
--- a/src/core/components/pubsub.js
+++ b/src/core/components/pubsub.js
@@ -114,6 +114,7 @@ module.exports = function pubsub (self) {
 
       try {
         const peerSet = self._pubsub.getPeerSet()
+        console.log(peerSet)
         _values(peerSet).forEach((peer) => {
           const idB58Str = peer.peerInfo.id.toB58String()
           const index = peer.topics.indexOf(topic)
diff --git a/test/core/both/test-bitswap.js b/test/core/both/test-bitswap.js
index 576f93d8a3..a4ea71b3ac 100644
--- a/test/core/both/test-bitswap.js
+++ b/test/core/both/test-bitswap.js
@@ -22,7 +22,7 @@ function makeBlock (cb) {
   return cb(null, new Block(`IPFS is awesome ${Math.random()}`))
 }
 
-describe('bitswap', () => {
+describe.skip('bitswap', () => {
   let inProcNode // Node spawned inside this process
   let swarmAddrsBak
 

From faa6e33fbb96ea9f6b4244cc2c22b35dba06d688 Mon Sep 17 00:00:00 2001
From: haad <haad@headbanggames.com>
Date: Fri, 9 Dec 2016 10:06:18 +0100
Subject: [PATCH 09/46] Fix canceling subscription. Move subscription state to
 be local to the function.

---
 src/core/components/pubsub.js | 37 ++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/core/components/pubsub.js b/src/core/components/pubsub.js
index f16ef284e3..1bce1bf590 100644
--- a/src/core/components/pubsub.js
+++ b/src/core/components/pubsub.js
@@ -6,26 +6,26 @@ const _values = require('lodash.values')
 
 const OFFLINE_ERROR = require('../utils').OFFLINE_ERROR
 
-let subscriptions = {}
-
-const addSubscription = (topic, request, stream) => {
-  subscriptions[topic] = { request: request, stream: stream }
-}
+module.exports = function pubsub (self) {
+  let subscriptions = {}
 
-const removeSubscription = promisify((topic, callback) => {
-  if (!subscriptions[topic]) {
-    return callback(new Error(`Not subscribed to ${topic}`))
+  const addSubscription = (topic, request, stream) => {
+    subscriptions[topic] = { request: request, stream: stream }
   }
 
-  subscriptions[topic].stream.emit('end')
-  delete subscriptions[topic]
+  const removeSubscription = promisify((topic, callback) => {
+    if (!subscriptions[topic]) {
+      return callback(new Error(`Not subscribed to ${topic}`))
+    }
 
-  if (callback) {
-    callback(null)
-  }
-})
+    subscriptions[topic].stream.emit('end')
+    delete subscriptions[topic]
+
+    if (callback) {
+      callback(null)
+    }
+  })
 
-module.exports = function pubsub (self) {
   return {
     subscribe: promisify((topic, options, callback) => {
       if (!self.isOnline()) {
@@ -47,7 +47,11 @@ module.exports = function pubsub (self) {
 
       // There is no explicit unsubscribe; subscriptions have a cancel event
       stream.cancel = promisify((cb) => {
+        // Remove the event listener
+        self._pubsub.removeAllListeners(topic)
+        // Make sure floodsub knows we've unsubscribed
         self._pubsub.unsubscribe(topic)
+        // Remove the subscription from pubsub's internal state
         removeSubscription(topic, cb)
       })
 
@@ -113,8 +117,9 @@ module.exports = function pubsub (self) {
       let peers = []
 
       try {
+        // This part should be moved down to floodsub
+        // Just return the list of peers
         const peerSet = self._pubsub.getPeerSet()
-        console.log(peerSet)
         _values(peerSet).forEach((peer) => {
           const idB58Str = peer.peerInfo.id.toB58String()
           const index = peer.topics.indexOf(topic)

From 6ba150c61564f973e0d6740bae29b314c62fd053 Mon Sep 17 00:00:00 2001
From: Gavin McDermott <gavinmcdermott@gmail.com>
Date: Fri, 9 Dec 2016 21:53:24 -0800
Subject: [PATCH 10/46] fix: typo in bitswap core

---
 src/http-api/resources/bitswap.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/http-api/resources/bitswap.js b/src/http-api/resources/bitswap.js
index b4d941322d..da8fccacec 100644
--- a/src/http-api/resources/bitswap.js
+++ b/src/http-api/resources/bitswap.js
@@ -41,6 +41,6 @@ exports.unwant = {
   parseArgs: parseKey,
 
   handler: (request, reply) => {
-    reply(boom.badRequrest(new Error('Not implemented yet')))
+    reply(boom.badRequest(new Error('Not implemented yet')))
   }
 }

From 7d17a86cc6a602827f719b936354abd8cd5ef8ed Mon Sep 17 00:00:00 2001
From: David Dias <daviddias.p@gmail.com>
Date: Sun, 11 Dec 2016 10:50:11 -0800
Subject: [PATCH 11/46] chore: update deps

---
 package.json | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index f2d1e88131..9ba501fed3 100644
--- a/package.json
+++ b/package.json
@@ -50,22 +50,22 @@
   },
   "homepage": "https://github.com/ipfs/js-ipfs#readme",
   "devDependencies": {
-    "aegir": "^9.1.2",
+    "aegir": "^9.2.1",
     "buffer-loader": "0.0.1",
     "chai": "^3.5.0",
     "detect-node": "^2.0.3",
-    "eslint-plugin-react": "^6.7.1",
+    "eslint-plugin-react": "^6.8.0",
     "execa": "^0.5.0",
     "expose-loader": "^0.7.1",
     "form-data": "^2.1.2",
     "fs-pull-blob-store": "^0.4.1",
     "gulp": "^3.9.1",
-    "interface-ipfs-core": "git+https://github.com/ipfs/interface-ipfs-core.git#5c7df414a8f627f8adb50a52ef8d2b629381285f",
+    "interface-ipfs-core": "ipfs/interface-ipfs-core#501c304",
     "left-pad": "^1.1.3",
     "lodash": "^4.17.2",
     "ncp": "^2.0.0",
     "nexpect": "^0.5.0",
-    "pre-commit": "^1.1.3",
+    "pre-commit": "^1.2.0",
     "rimraf": "^2.5.4",
     "stream-to-promise": "^2.2.0",
     "transform-loader": "^0.2.3"
@@ -77,23 +77,23 @@
     "debug": "^2.3.3",
     "fs-pull-blob-store": "^0.3.0",
     "glob": "^7.1.1",
-    "hapi": "^16.0.0",
+    "hapi": "^16.0.1",
     "hapi-set-header": "^1.0.2",
     "idb-pull-blob-store": "^0.5.1",
-    "ipfs-api": "git+https://github.com/ipfs/js-ipfs-api.git#01044a1f59fb866e4e08b06aae4e74d968615931",
-    "ipfs-bitswap": "^0.8.1",
-    "ipfs-block": "^0.5.0",
-    "ipfs-block-service": "^0.7.0",
+    "ipfs-api": "ipfs/js-ipfs-api#32908ae",
+    "ipfs-bitswap": "^0.8.2",
+    "ipfs-block": "^0.5.3",
+    "ipfs-block-service": "^0.7.1",
     "ipfs-multipart": "^0.1.0",
     "ipfs-repo": "^0.11.1",
     "ipfs-unixfs": "^0.1.8",
-    "ipfs-unixfs-engine": "^0.14.0",
+    "ipfs-unixfs-engine": "^0.14.1",
     "ipld-resolver": "^0.4.0",
     "isstream": "^0.1.2",
-    "joi": "^10.0.1",
-    "libp2p-floodsub": "0.4.0",
-    "libp2p-ipfs-browser": "^0.17.0",
-    "libp2p-ipfs-nodejs": "^0.16.1",
+    "joi": "^10.0.5",
+    "libp2p-floodsub": "0.4.1",
+    "libp2p-ipfs-browser": "^0.17.1",
+    "libp2p-ipfs-nodejs": "^0.16.4",
     "lodash.flatmap": "^4.5.0",
     "lodash.get": "^4.4.2",
     "lodash.has": "^4.5.2",
@@ -121,9 +121,9 @@
     "stream-to-pull-stream": "^1.7.2",
     "tar-stream": "^1.5.2",
     "temp": "^0.8.3",
-    "through2": "^2.0.2",
-    "update-notifier": "^1.0.2",
-    "yargs": "^6.4.0"
+    "through2": "^2.0.3",
+    "update-notifier": "^1.0.3",
+    "yargs": "^6.5.0"
   },
   "contributors": [
     "Andrew de Andrade <andrew@deandrade.com.br>",

From ba12388658d3540782fb12b0fe5f0f0488c20d4f Mon Sep 17 00:00:00 2001
From: David Dias <daviddias.p@gmail.com>
Date: Sun, 11 Dec 2016 10:50:29 -0800
Subject: [PATCH 12/46] fix: no more infinite buffering of messages

---
 src/core/components/pubsub.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/components/pubsub.js b/src/core/components/pubsub.js
index 1bce1bf590..6602e08838 100644
--- a/src/core/components/pubsub.js
+++ b/src/core/components/pubsub.js
@@ -86,7 +86,7 @@ module.exports = function pubsub (self) {
         return callback(err)
       }
 
-      callback(null)
+      setImmediate(() => callback())
     }),
 
     ls: promisify((callback) => {
@@ -102,7 +102,7 @@ module.exports = function pubsub (self) {
         return callback(err)
       }
 
-      callback(null, subscriptions)
+      setImmediate(() => callback(null, subscriptions))
     }),
 
     peers: promisify((topic, callback) => {

From 39db7df2eaa954b8ae537e5895ecceffbf129590 Mon Sep 17 00:00:00 2001
From: Gavin McDermott <gavinmcdermott@gmail.com>
Date: Sun, 11 Dec 2016 16:08:52 -0800
Subject: [PATCH 13/46] fix: wip - cancel relevant subscribe events

---
 src/core/components/pubsub.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/core/components/pubsub.js b/src/core/components/pubsub.js
index 6602e08838..266405c349 100644
--- a/src/core/components/pubsub.js
+++ b/src/core/components/pubsub.js
@@ -9,8 +9,8 @@ const OFFLINE_ERROR = require('../utils').OFFLINE_ERROR
 module.exports = function pubsub (self) {
   let subscriptions = {}
 
-  const addSubscription = (topic, request, stream) => {
-    subscriptions[topic] = { request: request, stream: stream }
+  const addSubscription = (topic, stream, handler) => {
+    subscriptions[topic] = { stream, handler }
   }
 
   const removeSubscription = promisify((topic, callback) => {
@@ -47,20 +47,25 @@ module.exports = function pubsub (self) {
 
       // There is no explicit unsubscribe; subscriptions have a cancel event
       stream.cancel = promisify((cb) => {
-        // Remove the event listener
-        self._pubsub.removeAllListeners(topic)
+        // Remove relevant event listeners
+        if (self._pubsub.listenerCount(topic) > 1) {
+          self._pubsub.removeListener(topic, subscriptions[topic].handler)
+        } else {
+          self._pubsub.removeAllListeners(topic)
+        }
         // Make sure floodsub knows we've unsubscribed
         self._pubsub.unsubscribe(topic)
         // Remove the subscription from pubsub's internal state
         removeSubscription(topic, cb)
       })
 
-      self._pubsub.on(topic, (data) => {
+      const handler = (data) => {
         stream.emit('data', {
           data: data.toString(),
           topicIDs: [topic]
         })
-      })
+      }
+      self._pubsub.on(topic, handler)
 
       try {
         self._pubsub.subscribe(topic)
@@ -69,7 +74,7 @@ module.exports = function pubsub (self) {
       }
 
       // Add the request to the active subscriptions and return the stream
-      addSubscription(topic, null, stream)
+      addSubscription(topic, stream, handler)
       callback(null, stream)
     }),
 

From d2e6f6e5742cc4e372af23b14b58e009f1d9ca4a Mon Sep 17 00:00:00 2001
From: David Dias <daviddias.p@gmail.com>
Date: Sun, 11 Dec 2016 22:48:33 -0800
Subject: [PATCH 14/46] =?UTF-8?q?fix:=20no=20dangling=20listeners,=20multi?=
 =?UTF-8?q?ple=20subscribers.=20pass=20all=20the=20tests=20with=20flying?=
 =?UTF-8?q?=20=F0=9F=8E=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/components/pubsub.js | 83 +++++++++++++----------------------
 1 file changed, 31 insertions(+), 52 deletions(-)

diff --git a/src/core/components/pubsub.js b/src/core/components/pubsub.js
index 266405c349..024c065f79 100644
--- a/src/core/components/pubsub.js
+++ b/src/core/components/pubsub.js
@@ -7,75 +7,53 @@ const _values = require('lodash.values')
 const OFFLINE_ERROR = require('../utils').OFFLINE_ERROR
 
 module.exports = function pubsub (self) {
-  let subscriptions = {}
-
-  const addSubscription = (topic, stream, handler) => {
-    subscriptions[topic] = { stream, handler }
-  }
-
-  const removeSubscription = promisify((topic, callback) => {
-    if (!subscriptions[topic]) {
-      return callback(new Error(`Not subscribed to ${topic}`))
-    }
-
-    subscriptions[topic].stream.emit('end')
-    delete subscriptions[topic]
-
-    if (callback) {
-      callback(null)
-    }
-  })
-
   return {
     subscribe: promisify((topic, options, callback) => {
-      if (!self.isOnline()) {
-        throw OFFLINE_ERROR
-      }
+      if (!self.isOnline()) { throw OFFLINE_ERROR }
 
       if (typeof options === 'function') {
         callback = options
         options = {}
       }
 
-      if (subscriptions[topic]) {
+      if (self._pubsub.getSubscriptions().indexOf(topic) > -1) {
         return callback(`Error: Already subscribed to '${topic}'`)
       }
 
-      const stream = new Readable({ objectMode: true })
+      try {
+        self._pubsub.subscribe(topic)
+      } catch (err) {
+        return callback(err)
+      }
 
-      stream._read = () => {}
+      const subscription = new Readable({ objectMode: true })
+      let canceled = false
+      subscription._read = () => {}
 
-      // There is no explicit unsubscribe; subscriptions have a cancel event
-      stream.cancel = promisify((cb) => {
-        // Remove relevant event listeners
-        if (self._pubsub.listenerCount(topic) > 1) {
-          self._pubsub.removeListener(topic, subscriptions[topic].handler)
-        } else {
-          self._pubsub.removeAllListeners(topic)
-        }
-        // Make sure floodsub knows we've unsubscribed
+      // Attach an extra `cancel` method to the stream
+      subscription.cancel = promisify((cb) => {
+        canceled = true
         self._pubsub.unsubscribe(topic)
-        // Remove the subscription from pubsub's internal state
-        removeSubscription(topic, cb)
+        self._pubsub.removeListener(topic, handler)
+        subscription.on('end', cb)
+        subscription.resume() // make sure it is flowing before cancel
+        subscription.push(null)
       })
 
-      const handler = (data) => {
-        stream.emit('data', {
-          data: data.toString(),
-          topicIDs: [topic]
-        })
-      }
       self._pubsub.on(topic, handler)
 
-      try {
-        self._pubsub.subscribe(topic)
-      } catch (err) {
-        return callback(err)
+      function handler (data) {
+        if (canceled) {
+          return
+        }
+        subscription.push({
+          data: data,
+          topicIDs: [topic]
+        })
       }
 
       // Add the request to the active subscriptions and return the stream
-      addSubscription(topic, stream, handler)
-      callback(null, stream)
+      setImmediate(() => callback(null, subscription))
     }),
 
     publish: promisify((topic, data, callback) => {
@@ -83,10 +61,11 @@ module.exports = function pubsub (self) {
         throw OFFLINE_ERROR
       }
 
-      const buf = Buffer.isBuffer(data) ? data : new Buffer(data)
+      // TODO: Tests don't show that we actually expect this, @haad??
+      // data = Buffer.isBuffer(data) ? data : new Buffer(data)
 
       try {
-        self._pubsub.publish(topic, buf)
+        self._pubsub.publish(topic, data)
       } catch (err) {
         return callback(err)
       }
@@ -115,7 +94,7 @@ module.exports = function pubsub (self) {
         throw OFFLINE_ERROR
       }
 
-      if (!subscriptions[topic]) {
+      if (self._pubsub.getSubscriptions().indexOf(topic) < 0) {
         return callback(`Error: Not subscribed to '${topic}'`)
       }
 
@@ -136,7 +115,7 @@ module.exports = function pubsub (self) {
         return callback(err)
       }
 
-      callback(null, peers)
+      setImmediate(() => callback(null, peers))
     })
   }
 }

From deb5fd64a760eeca4b565248af5b3e23e7e0f7bd Mon Sep 17 00:00:00 2001
From: Gavin McDermott <gavinmcdermott@gmail.com>
Date: Mon, 12 Dec 2016 01:55:28 -0800
Subject: [PATCH 15/46] test: get http tests passing (except subscribe)

---
 src/cli/commands/pubsub.js          |  3 ---
 src/http-api/routes/pubsub.js       |  2 +-
 test/http-api/inject/test-pubsub.js | 29 +++++++++++++++++++++++++----
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/cli/commands/pubsub.js b/src/cli/commands/pubsub.js
index 7102b9af67..dac25c7690 100644
--- a/src/cli/commands/pubsub.js
+++ b/src/cli/commands/pubsub.js
@@ -1,8 +1,5 @@
 'use strict'
 
-// The command count bump from 56 to 60 depends on:
-// ipfs/interface-ipfs-core.git#5c7df414a8f627f8adb50a52ef8d2b629381285f
-// ipfs/js-ipfs-api.git#01044a1f59fb866e4e08b06aae4e74d968615931
 module.exports = {
   command: 'pubsub',
 
diff --git a/src/http-api/routes/pubsub.js b/src/http-api/routes/pubsub.js
index 321cb54476..1651f968ee 100644
--- a/src/http-api/routes/pubsub.js
+++ b/src/http-api/routes/pubsub.js
@@ -46,7 +46,7 @@ module.exports = (server) => {
 
   api.route({
     method: '*',
-    path: '/api/v0/pubsub/peers',
+    path: '/api/v0/pubsub/peers/{topic}',
     config: {
       handler: resources.pubsub.peers.handler,
       validate: {
diff --git a/test/http-api/inject/test-pubsub.js b/test/http-api/inject/test-pubsub.js
index 38299c72f9..28e87ab881 100644
--- a/test/http-api/inject/test-pubsub.js
+++ b/test/http-api/inject/test-pubsub.js
@@ -52,9 +52,19 @@ module.exports = (http) => {
           done()
         })
       })
+
+      it('returns 500 if already subscribed to a topic', (done) => {
+        api.inject({
+          method: 'GET',
+          url: `/api/v0/pubsub/sub/${topic}`
+        }, (res) => {
+          expect(res.statusCode).to.equal(500)
+          done()
+        })
+      })
     })
 
-    xdescribe('/pub', () => {
+    describe('/pub', () => {
       it('returns 400 if no buffer is provided', (done) => {
         api.inject({
           method: 'POST',
@@ -88,20 +98,21 @@ module.exports = (http) => {
       })
     })
 
-    xdescribe('/ls', () => {
+    describe('/ls', () => {
       it('returns 200', (done) => {
         api.inject({
           method: 'GET',
           url: `/api/v0/pubsub/ls`
         }, (res) => {
           expect(res.statusCode).to.equal(200)
-          expect(res.result).to.be.an('object')
+          expect(res.result.length).to.eql(1)
+          expect(res.result[0]).to.eql(topic)
           done()
         })
       })
     })
 
-    xdescribe('/peers/{topic}', () => {
+    describe('/peers/{topic}', () => {
       it('returns 404 if no topic is provided', (done) => {
         api.inject({
           method: 'GET',
@@ -112,6 +123,16 @@ module.exports = (http) => {
         })
       })
 
+      it('returns 500 if not subscribed to a topic', (done) => {
+        api.inject({
+          method: 'GET',
+          url: `/api/v0/pubsub/peers/notsubscribed`
+        }, (res) => {
+          expect(res.statusCode).to.equal(500)
+          done()
+        })
+      })
+
       it('returns 200 with topic', (done) => {
         api.inject({
           method: 'GET',

From a89301ba9d517118d95977654c0fc96d90fd498b Mon Sep 17 00:00:00 2001
From: Gavin McDermott <gavinmcdermott@gmail.com>
Date: Fri, 11 Nov 2016 21:18:20 -0800
Subject: [PATCH 16/46] fix cli test typo

---
 test/utils/ipfs-exec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/utils/ipfs-exec.js b/test/utils/ipfs-exec.js
index 0525d0c7fa..371435850a 100644
--- a/test/utils/ipfs-exec.js
+++ b/test/utils/ipfs-exec.js
@@ -20,7 +20,7 @@ module.exports = (repoPath, opts) => {
   env.IPFS_PATH = repoPath
 
   const config = Object.assign({}, {
-    stipEof: true,
+    stripEof: true,
     env: env,
     timeout: 60 * 1000
   }, opts)

From 9c82402e61bede7ce509f5b36744bbf1db9d09e6 Mon Sep 17 00:00:00 2001
From: Gavin McDermott <gavinmcdermott@gmail.com>
Date: Sat, 12 Nov 2016 00:29:49 -0800
Subject: [PATCH 17/46] wip: floodsub now in api-routes, api-resources, and
 core-components

---
 package.json                       |  6 ++--
 src/core/components/floodsub.js    | 56 ++++++++++++++++++++++++++++++
 src/core/components/go-online.js   |  1 +
 src/core/index.js                  |  2 ++
 src/http-api/resources/floodsub.js | 53 ++++++++++++++++++++++++++++
 src/http-api/resources/index.js    |  1 +
 src/http-api/routes/floodsub.js    | 38 ++++++++++++++++++++
 src/http-api/routes/index.js       |  1 +
 8 files changed, 156 insertions(+), 2 deletions(-)
 create mode 100644 src/core/components/floodsub.js
 create mode 100644 src/http-api/resources/floodsub.js
 create mode 100644 src/http-api/routes/floodsub.js

diff --git a/package.json b/package.json
index bae2a42324..4a1717a654 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
   },
   "homepage": "https://github.com/ipfs/js-ipfs#readme",
   "devDependencies": {
-    "aegir": "^9.2.1",
+    "aegir": "^9.2.2",
     "buffer-loader": "0.0.1",
     "chai": "^3.5.0",
     "detect-node": "^2.0.3",
@@ -85,7 +85,7 @@
     "ipfs-block": "^0.5.3",
     "ipfs-block-service": "^0.7.1",
     "ipfs-multipart": "^0.1.0",
-    "ipfs-repo": "^0.11.1",
+    "ipfs-repo": "^0.11.2",
     "ipfs-unixfs": "^0.1.8",
     "ipfs-unixfs-engine": "^0.14.1",
     "ipld-resolver": "^0.4.0",
@@ -93,6 +93,8 @@
     "joi": "^10.0.5",
     "libp2p-ipfs-nodejs": "^0.17.0",
     "libp2p-ipfs-browser": "^0.17.2",
+    "libp2p-floodsub": "0.4.1",
+    "libp2p-ipfs": "^0.15.0",
     "lodash.flatmap": "^4.5.0",
     "lodash.get": "^4.4.2",
     "lodash.has": "^4.5.2",
diff --git a/src/core/components/floodsub.js b/src/core/components/floodsub.js
new file mode 100644
index 0000000000..c25da15c17
--- /dev/null
+++ b/src/core/components/floodsub.js
@@ -0,0 +1,56 @@
+'use strict'
+
+const FloodSub = require('libp2p-floodsub')
+const promisify = require('promisify-es6')
+const Stream = require('stream')
+
+const OFFLINE_ERROR = require('../utils').OFFLINE_ERROR
+
+module.exports = function floodsub (self) {
+  let fsub
+
+  return {
+    start: promisify((libp2pNode) => {
+      fsub = new FloodSub(libp2pNode)
+    }),
+
+    sub: promisify((topic, options, callback) => {
+      // TODO: Clarify with @diasdavid what to do with the `options.discover` param
+      // Ref: https://github.com/ipfs/js-ipfs-api/pull/377/files#diff-f0c61c06fd5dc36b6f760b7ea97b1862R50
+      if (typeof options === 'function') {
+        callback = options
+        options = {}
+      }
+
+      if (!self.isOnline()) {
+        throw OFFLINE_ERROR
+      }
+
+      let rs = new Stream()
+      rs.readable = true
+      rs._read = () => {}
+      rs.cancel = () => fsub.unsubscribe(topic)
+
+      fsub.on(topic, (data) => {
+        rs.emit('data', {
+          data: data.toString(),
+          topicIDs: [topic]
+        })
+      })
+
+      fsub.subscribe(topic)
+      callback(null, rs)
+    }),
+
+    pub: promisify((topic, data, callback) => {
+      if (!self.isOnline()) {
+        throw OFFLINE_ERROR
+      }
+
+      const buf = Buffer.isBuffer(data) ? data : new Buffer(data)
+
+      fsub.publish(topic, data)
+      callback(null)
+    })
+  }
+}
diff --git a/src/core/components/go-online.js b/src/core/components/go-online.js
index 793a0269a5..693b047ea5 100644
--- a/src/core/components/go-online.js
+++ b/src/core/components/go-online.js
@@ -21,6 +21,7 @@ module.exports = function goOnline (self) {
       )
       self._bitswap.start()
       self._blockService.goOnline(self._bitswap)
+      self.floodsub.start(self._libp2pNode)
       cb()
     })
   }
diff --git a/src/core/index.js b/src/core/index.js
index a58836c10c..3ac9d0ec95 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -23,6 +23,7 @@ const swarm = require('./components/swarm')
 const ping = require('./components/ping')
 const files = require('./components/files')
 const bitswap = require('./components/bitswap')
+const floodsub = require('./components/floodsub')
 
 exports = module.exports = IPFS
 
@@ -67,4 +68,5 @@ function IPFS (repoInstance) {
   this.files = files(this)
   this.bitswap = bitswap(this)
   this.ping = ping(this)
+  this.floodsub = floodsub(this)
 }
diff --git a/src/http-api/resources/floodsub.js b/src/http-api/resources/floodsub.js
new file mode 100644
index 0000000000..bfd4c1e4aa
--- /dev/null
+++ b/src/http-api/resources/floodsub.js
@@ -0,0 +1,53 @@
+'use strict'
+
+const debug = require('debug')
+const log = debug('http-api:floodsub')
+log.error = debug('http-api:floodsub:error')
+
+exports = module.exports
+
+exports.sub = {
+  handler: (request, reply) => {
+    const discover = request.query.discover
+    const topic = request.params.topic
+
+    console.log('API RESC: SUBSCRIBE')
+    console.log('discover',discover)
+    console.log('topic',topic)
+
+    request.server.app.ipfs.floodsub.sub(topic, { discover }, (err, stream) => {
+      if (err) {
+        log.error(err)
+        return reply({
+          Message: `Failed to subscribe to topic ${topic}: ${err}`,
+          Code: 0
+        }).code(500)
+      }
+
+      return reply(stream)
+    })
+  }
+}
+
+exports.pub = {
+  handler: (request, reply) => {
+    const buf = request.query.buf
+    const topic = request.query.topic
+
+    console.log('API RESC: PUBLISH')
+    console.log('buf',buf)
+    console.log('topic',topic)
+
+    request.server.app.ipfs.floodsub.pub(topic, buf, (err) => {
+      if (err) {
+        log.error(err)
+        return reply({
+          Message: `Failed to publish to topic ${topic}: ${err}`,
+          Code: 0
+        }).code(500)
+      }
+
+      return reply(true)
+    })
+  }
+}
diff --git a/src/http-api/resources/index.js b/src/http-api/resources/index.js
index b90a9d912c..2f8f273aac 100644
--- a/src/http-api/resources/index.js
+++ b/src/http-api/resources/index.js
@@ -10,3 +10,4 @@ exports.block = require('./block')
 exports.swarm = require('./swarm')
 exports.bitswap = require('./bitswap')
 exports.files = require('./files')
+exports.floodsub = require('./floodsub')
diff --git a/src/http-api/routes/floodsub.js b/src/http-api/routes/floodsub.js
new file mode 100644
index 0000000000..41a3bd31f1
--- /dev/null
+++ b/src/http-api/routes/floodsub.js
@@ -0,0 +1,38 @@
+'use strict'
+
+const Joi = require('joi')
+const resources = require('./../resources')
+
+module.exports = (server) => {
+  const api = server.select('API')
+
+  api.route({
+    method: '*',
+    path: '/api/v0/pubsub/sub/{topic}',
+    config: {
+      handler: resources.floodsub.sub,
+      validate: {
+        params: {
+          topic: Joi.string().required()
+        },
+        query: {
+          discover: Joi.boolean()
+        },
+      }
+    }
+  })
+
+  api.route({
+    method: '*',
+    path: '/api/v0/floodsub/pub',
+    config: {
+      handler: resources.floodsub.pub,
+      validate: {
+        query: {
+          topic: Joi.string().required(),
+          buf: Joi.binary().required()
+        },
+      }
+    }
+  })
+}
diff --git a/src/http-api/routes/index.js b/src/http-api/routes/index.js
index 587f25de77..15dde6116c 100644
--- a/src/http-api/routes/index.js
+++ b/src/http-api/routes/index.js
@@ -11,4 +11,5 @@ module.exports = (server) => {
   require('./swarm')(server)
   require('./bitswap')(server)
   require('./files')(server)
+  require('./floodsub')(server)
 }

From 7f1eca4e04b6e7855cfd02e381d1f0fa8ef49841 Mon Sep 17 00:00:00 2001
From: Gavin McDermott <gavinmcdermott@gmail.com>
Date: Wed, 16 Nov 2016 00:15:46 -0800
Subject: [PATCH 18/46] Initial core tests pass

---
 src/core/components/floodsub.js    | 26 +++++++--
 src/core/components/go-online.js   |  2 +-
 src/http-api/resources/floodsub.js |  8 ---
 src/http-api/routes/floodsub.js    |  8 +--
 test/core/both/test-floodsub.js    | 93 ++++++++++++++++++++++++++++++
 5 files changed, 119 insertions(+), 18 deletions(-)
 create mode 100644 test/core/both/test-floodsub.js

diff --git a/src/core/components/floodsub.js b/src/core/components/floodsub.js
index c25da15c17..df4ce3635f 100644
--- a/src/core/components/floodsub.js
+++ b/src/core/components/floodsub.js
@@ -1,6 +1,7 @@
 'use strict'
 
-const FloodSub = require('libp2p-floodsub')
+// const FloodSub = require('libp2p-floodsub')
+const FloodSub = require('./../../../node_modules/libp2p-floodsub/src')
 const promisify = require('promisify-es6')
 const Stream = require('stream')
 
@@ -10,8 +11,13 @@ module.exports = function floodsub (self) {
   let fsub
 
   return {
-    start: promisify((libp2pNode) => {
-      fsub = new FloodSub(libp2pNode)
+    start: promisify(() => {
+      if (!self.isOnline()) {
+        throw OFFLINE_ERROR
+      }
+
+      fsub = new FloodSub(self._libp2pNode)
+      return self._libp2pNode
     }),
 
     sub: promisify((topic, options, callback) => {
@@ -38,7 +44,12 @@ module.exports = function floodsub (self) {
         })
       })
 
-      fsub.subscribe(topic)
+      try {
+        fsub.subscribe(topic)
+      } catch (err) {
+        return callback(err)
+      }
+
       callback(null, rs)
     }),
 
@@ -49,7 +60,12 @@ module.exports = function floodsub (self) {
 
       const buf = Buffer.isBuffer(data) ? data : new Buffer(data)
 
-      fsub.publish(topic, data)
+      try {
+        fsub.publish(topic, buf)
+      } catch (err) {
+        return callback(err)
+      }
+
       callback(null)
     })
   }
diff --git a/src/core/components/go-online.js b/src/core/components/go-online.js
index 693b047ea5..fc5a6f1821 100644
--- a/src/core/components/go-online.js
+++ b/src/core/components/go-online.js
@@ -13,6 +13,7 @@ module.exports = function goOnline (self) {
         return cb(err)
       }
 
+      self.floodsub.start()
       self._bitswap = new Bitswap(
         self._libp2pNode.peerInfo,
         self._libp2pNode,
@@ -21,7 +22,6 @@ module.exports = function goOnline (self) {
       )
       self._bitswap.start()
       self._blockService.goOnline(self._bitswap)
-      self.floodsub.start(self._libp2pNode)
       cb()
     })
   }
diff --git a/src/http-api/resources/floodsub.js b/src/http-api/resources/floodsub.js
index bfd4c1e4aa..64fcbb58b0 100644
--- a/src/http-api/resources/floodsub.js
+++ b/src/http-api/resources/floodsub.js
@@ -11,10 +11,6 @@ exports.sub = {
     const discover = request.query.discover
     const topic = request.params.topic
 
-    console.log('API RESC: SUBSCRIBE')
-    console.log('discover',discover)
-    console.log('topic',topic)
-
     request.server.app.ipfs.floodsub.sub(topic, { discover }, (err, stream) => {
       if (err) {
         log.error(err)
@@ -34,10 +30,6 @@ exports.pub = {
     const buf = request.query.buf
     const topic = request.query.topic
 
-    console.log('API RESC: PUBLISH')
-    console.log('buf',buf)
-    console.log('topic',topic)
-
     request.server.app.ipfs.floodsub.pub(topic, buf, (err) => {
       if (err) {
         log.error(err)
diff --git a/src/http-api/routes/floodsub.js b/src/http-api/routes/floodsub.js
index 41a3bd31f1..d7af9a2b78 100644
--- a/src/http-api/routes/floodsub.js
+++ b/src/http-api/routes/floodsub.js
@@ -10,14 +10,14 @@ module.exports = (server) => {
     method: '*',
     path: '/api/v0/pubsub/sub/{topic}',
     config: {
-      handler: resources.floodsub.sub,
+      handler: resources.floodsub.sub.handler,
       validate: {
         params: {
           topic: Joi.string().required()
         },
         query: {
           discover: Joi.boolean()
-        },
+        }
       }
     }
   })
@@ -26,12 +26,12 @@ module.exports = (server) => {
     method: '*',
     path: '/api/v0/floodsub/pub',
     config: {
-      handler: resources.floodsub.pub,
+      handler: resources.floodsub.pub.handler,
       validate: {
         query: {
           topic: Joi.string().required(),
           buf: Joi.binary().required()
-        },
+        }
       }
     }
   })
diff --git a/test/core/both/test-floodsub.js b/test/core/both/test-floodsub.js
new file mode 100644
index 0000000000..33f155c3c0
--- /dev/null
+++ b/test/core/both/test-floodsub.js
@@ -0,0 +1,93 @@
+/* eslint max-nested-callbacks: ["error", 8] */
+/* eslint-env mocha */
+'use strict'
+
+const expect = require('chai').expect
+const Stream = require('stream')
+const IPFSFactory = require('../../utils/factory-core')
+const factory = new IPFSFactory()
+
+describe('floodsub', () => {
+  let nodeOffline
+  let nodeA
+  let subscription
+
+  const topic = 'nonscents'
+
+  before((done) => {
+    factory.spawnNode((err, ipfsOff) => {
+      expect(err).to.not.exist
+      ipfsOff.goOffline((err) => {
+        expect(err).to.not.exist
+        nodeOffline = ipfsOff
+        factory.spawnNode((err, ipfs) => {
+          expect(err).to.not.exist
+          nodeA = ipfs
+          done()
+        })
+      })
+    })
+  })
+
+  after((done) => {
+    factory.dismantle(() => done())
+  })
+
+  describe('Floodsub API', () => {
+    describe('start', () => {
+      it('throws if offline', () => {
+        expect(() => nodeOffline.floodsub.start()).to.throw
+      })
+
+      it('success', () => {
+        expect(nodeA.floodsub.start()).to.exist
+      })
+    })
+
+    describe('sub', () => {
+      it('throws if offline', () => {
+        expect(() => nodeOffline.floodsub.sub()).to.throw
+      })
+
+      it('throws without a topic', () => {
+        expect(() => nodeA.floodsub.sub()).to.throw
+      })
+
+      it('success', (done) => {
+        nodeA.floodsub.sub(topic, (err, stream) => {
+          expect(err).to.not.exist
+          expect(stream.readable).to.eql(true)
+          expect(typeof stream._read).to.eql('function')
+          expect(typeof stream.cancel).to.eql('function')
+          expect(stream instanceof Stream).to.eql(true)
+          subscription = stream
+          done()
+        })
+      })
+    })
+
+    describe('pub', () => {
+      it('throws if offline', () => {
+        expect(() => nodeOffline.floodsub.pub()).to.throw
+      })
+
+      it('throws without a topic', () => {
+        expect(() => nodeA.floodsub.sub()).to.throw
+      })
+
+      it('throws without data', () => {
+        expect(() => nodeA.floodsub.sub(topic)).to.throw
+      })
+
+      it('success', (done) => {
+        const published = true
+
+        subscription.on('data', () => done())
+
+        nodeA.floodsub.pub(topic, 'some data', () => {
+          expect(published).to.eql(true)
+        })
+      })
+    })
+  })
+})

From 4233e53c04a52a778a2d98efa00009a5650b0495 Mon Sep 17 00:00:00 2001
From: Gavin McDermott <gavinmcdermott@gmail.com>
Date: Thu, 17 Nov 2016 12:59:04 -0800
Subject: [PATCH 19/46] feat(api, cli, core): add floodsub

Add initial floodsub implementation
---
 package.json                          |   5 +
 src/cli/commands/floodsub.js          |  17 ++++
 src/cli/commands/floodsub/pub.js      |  28 ++++++
 src/cli/commands/floodsub/start.js    |  27 ++++++
 src/cli/commands/floodsub/sub.js      |  30 ++++++
 src/cli/commands/floodsub/unsub.js    |  28 ++++++
 src/core/components/floodsub.js       |  52 ++++++++---
 src/core/components/go-online.js      |   1 -
 src/core/index.js                     |   1 +
 src/http-api/resources/floodsub.js    |  46 +++++++++-
 src/http-api/routes/floodsub.js       |  23 ++++-
 test/cli/test-commands.js             |  10 +-
 test/cli/test-floodsub.js             |  79 ++++++++++++++++
 test/core/both/test-floodsub.js       |  65 +++++++++++--
 test/http-api/inject/test-floodsub.js | 126 ++++++++++++++++++++++++++
 15 files changed, 508 insertions(+), 30 deletions(-)
 create mode 100644 src/cli/commands/floodsub.js
 create mode 100644 src/cli/commands/floodsub/pub.js
 create mode 100644 src/cli/commands/floodsub/start.js
 create mode 100644 src/cli/commands/floodsub/sub.js
 create mode 100644 src/cli/commands/floodsub/unsub.js
 create mode 100644 test/cli/test-floodsub.js
 create mode 100644 test/http-api/inject/test-floodsub.js

diff --git a/package.json b/package.json
index 4a1717a654..0f74a63fb6 100644
--- a/package.json
+++ b/package.json
@@ -90,10 +90,15 @@
     "ipfs-unixfs-engine": "^0.14.1",
     "ipld-resolver": "^0.4.0",
     "isstream": "^0.1.2",
+<<<<<<< 7f1eca4e04b6e7855cfd02e381d1f0fa8ef49841
     "joi": "^10.0.5",
     "libp2p-ipfs-nodejs": "^0.17.0",
     "libp2p-ipfs-browser": "^0.17.2",
     "libp2p-floodsub": "0.4.1",
+=======
+    "joi": "^9.2.0",
+    "libp2p-floodsub": "0.3.1",
+>>>>>>> feat(api, cli, core): add floodsub
     "libp2p-ipfs": "^0.15.0",
     "lodash.flatmap": "^4.5.0",
     "lodash.get": "^4.4.2",
diff --git a/src/cli/commands/floodsub.js b/src/cli/commands/floodsub.js
new file mode 100644
index 0000000000..63af3fa21a
--- /dev/null
+++ b/src/cli/commands/floodsub.js
@@ -0,0 +1,17 @@
+'use strict'
+
+// NOTE: Floodsub CLI is not tested. Tests will not be run until
+// https://github.com/ipfs/js-ipfs-api/pull/377
+// is merged
+module.exports = {
+  command: 'floodsub',
+
+  description: 'floodsub commands',
+
+  builder (yargs) {
+    return yargs
+      .commandDir('floodsub')
+  },
+
+  handler (argv) {}
+}
diff --git a/src/cli/commands/floodsub/pub.js b/src/cli/commands/floodsub/pub.js
new file mode 100644
index 0000000000..a7d5cc9387
--- /dev/null
+++ b/src/cli/commands/floodsub/pub.js
@@ -0,0 +1,28 @@
+'use strict'
+
+const utils = require('../../utils')
+const debug = require('debug')
+const log = debug('cli:floodsub')
+log.error = debug('cli:floodsub:error')
+
+module.exports = {
+  command: 'pub <topic> <message>',
+
+  describe: 'Publish a message to a topic',
+
+  builder: {},
+
+  handler (argv) {
+    utils.getIPFS((err, ipfs) => {
+      if (err) {
+        throw err
+      }
+
+      ipfs.floodsub.pub(argv.topic, argv.message, (err) => {
+        if (err) {
+          throw err
+        }
+      })
+    })
+  }
+}
diff --git a/src/cli/commands/floodsub/start.js b/src/cli/commands/floodsub/start.js
new file mode 100644
index 0000000000..7d4fe5103e
--- /dev/null
+++ b/src/cli/commands/floodsub/start.js
@@ -0,0 +1,27 @@
+'use strict'
+
+const utils = require('../../utils')
+const debug = require('debug')
+const log = debug('cli:floodsub')
+log.error = debug('cli:floodsub:error')
+
+module.exports = {
+  command: 'start',
+
+  describe: 'Start FloodSub',
+
+  builder: {},
+
+  handler (argv) {
+    utils.getIPFS((err, ipfs) => {
+      if (err) {
+        throw err
+      }
+
+      const fsub = ipfs.floodsub.start()
+      if (fsub) {
+        console.log(fsub.toString())
+      }
+    })
+  }
+}
diff --git a/src/cli/commands/floodsub/sub.js b/src/cli/commands/floodsub/sub.js
new file mode 100644
index 0000000000..703ba90ecf
--- /dev/null
+++ b/src/cli/commands/floodsub/sub.js
@@ -0,0 +1,30 @@
+'use strict'
+
+const utils = require('../../utils')
+const debug = require('debug')
+const log = debug('cli:floodsub')
+log.error = debug('cli:floodsub:error')
+
+module.exports = {
+  command: 'sub <topic>',
+
+  describe: 'Subscribe to a topic',
+
+  builder: {},
+
+  handler (argv) {
+    utils.getIPFS((err, ipfs) => {
+      if (err) {
+        throw err
+      }
+
+      ipfs.floodsub.sub(argv.topic, (err, stream) => {
+        if (err) {
+          throw err
+        }
+
+        console.log(stream.toString())
+      })
+    })
+  }
+}
diff --git a/src/cli/commands/floodsub/unsub.js b/src/cli/commands/floodsub/unsub.js
new file mode 100644
index 0000000000..212ae68e4c
--- /dev/null
+++ b/src/cli/commands/floodsub/unsub.js
@@ -0,0 +1,28 @@
+'use strict'
+
+const utils = require('../../utils')
+const debug = require('debug')
+const log = debug('cli:floodsub')
+log.error = debug('cli:floodsub:error')
+
+module.exports = {
+  command: 'unsub <topic>',
+
+  describe: 'Unsubscribe from a topic',
+
+  builder: {},
+
+  handler (argv) {
+    utils.getIPFS((err, ipfs) => {
+      if (err) {
+        throw err
+      }
+
+      ipfs.floodsub.unsub(argv.topic, (err) => {
+        if (err) {
+          throw err
+        }
+      })
+    })
+  }
+}
diff --git a/src/core/components/floodsub.js b/src/core/components/floodsub.js
index df4ce3635f..1accd305a1 100644
--- a/src/core/components/floodsub.js
+++ b/src/core/components/floodsub.js
@@ -1,23 +1,21 @@
 'use strict'
 
-// const FloodSub = require('libp2p-floodsub')
-const FloodSub = require('./../../../node_modules/libp2p-floodsub/src')
+const FloodSub = require('libp2p-floodsub')
 const promisify = require('promisify-es6')
-const Stream = require('stream')
+const Readable = require('stream').Readable
 
 const OFFLINE_ERROR = require('../utils').OFFLINE_ERROR
+const FSUB_ERROR = new Error(`FloodSub is not started.`)
 
 module.exports = function floodsub (self) {
-  let fsub
-
   return {
-    start: promisify(() => {
+    start: promisify((callback) => {
       if (!self.isOnline()) {
         throw OFFLINE_ERROR
       }
 
-      fsub = new FloodSub(self._libp2pNode)
-      return self._libp2pNode
+      self._floodsub = new FloodSub(self._libp2pNode)
+      return callback(null, self._floodsub)
     }),
 
     sub: promisify((topic, options, callback) => {
@@ -32,12 +30,14 @@ module.exports = function floodsub (self) {
         throw OFFLINE_ERROR
       }
 
-      let rs = new Stream()
-      rs.readable = true
-      rs._read = () => {}
-      rs.cancel = () => fsub.unsubscribe(topic)
+      if (!self._floodsub) {
+        throw FSUB_ERROR
+      }
+
+      let rs = new Readable()
+      rs.cancel = () => self._floodsub.subscribe(topic)
 
-      fsub.on(topic, (data) => {
+      self._floodsub.on(topic, (data) => {
         rs.emit('data', {
           data: data.toString(),
           topicIDs: [topic]
@@ -45,7 +45,7 @@ module.exports = function floodsub (self) {
       })
 
       try {
-        fsub.subscribe(topic)
+        self._floodsub.subscribe(topic)
       } catch (err) {
         return callback(err)
       }
@@ -58,10 +58,32 @@ module.exports = function floodsub (self) {
         throw OFFLINE_ERROR
       }
 
+      if (!self._floodsub) {
+        throw FSUB_ERROR
+      }
+
       const buf = Buffer.isBuffer(data) ? data : new Buffer(data)
 
       try {
-        fsub.publish(topic, buf)
+        self._floodsub.publish(topic, buf)
+      } catch (err) {
+        return callback(err)
+      }
+
+      callback(null)
+    }),
+
+    unsub: promisify((topic, callback) => {
+      if (!self.isOnline()) {
+        throw OFFLINE_ERROR
+      }
+
+      if (!self._floodsub) {
+        throw FSUB_ERROR
+      }
+
+      try {
+        self._floodsub.unsubscribe(topic)
       } catch (err) {
         return callback(err)
       }
diff --git a/src/core/components/go-online.js b/src/core/components/go-online.js
index fc5a6f1821..793a0269a5 100644
--- a/src/core/components/go-online.js
+++ b/src/core/components/go-online.js
@@ -13,7 +13,6 @@ module.exports = function goOnline (self) {
         return cb(err)
       }
 
-      self.floodsub.start()
       self._bitswap = new Bitswap(
         self._libp2pNode.peerInfo,
         self._libp2pNode,
diff --git a/src/core/index.js b/src/core/index.js
index 3ac9d0ec95..d53394c55b 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -45,6 +45,7 @@ function IPFS (repoInstance) {
   this._bitswap = null
   this._blockService = new BlockService(this._repo)
   this._ipldResolver = new IPLDResolver(this._blockService)
+  this._floodsub = null
 
   // IPFS Core exposed components
 
diff --git a/src/http-api/resources/floodsub.js b/src/http-api/resources/floodsub.js
index 64fcbb58b0..30a1cfc9bf 100644
--- a/src/http-api/resources/floodsub.js
+++ b/src/http-api/resources/floodsub.js
@@ -6,9 +6,25 @@ log.error = debug('http-api:floodsub:error')
 
 exports = module.exports
 
+exports.start = {
+  handler: (request, reply) => {
+    request.server.app.ipfs.floodsub.start((err, floodsub) => {
+      if (err) {
+        log.error(err)
+        return reply({
+          Message: `Failed to start: ${err}`,
+          Code: 0
+        }).code(500)
+      }
+
+      return reply(floodsub)
+    })
+  }
+}
+
 exports.sub = {
   handler: (request, reply) => {
-    const discover = request.query.discover
+    const discover = request.query.discover || null
     const topic = request.params.topic
 
     request.server.app.ipfs.floodsub.sub(topic, { discover }, (err, stream) => {
@@ -20,6 +36,14 @@ exports.sub = {
         }).code(500)
       }
 
+      // hapi is not very clever and throws if no
+      // - _read method
+      // - _readableState object
+      // are there :(
+      if (!stream._read) {
+        stream._read = () => {}
+        stream._readableState = {}
+      }
       return reply(stream)
     })
   }
@@ -39,7 +63,25 @@ exports.pub = {
         }).code(500)
       }
 
-      return reply(true)
+      return reply()
+    })
+  }
+}
+
+exports.unsub = {
+  handler: (request, reply) => {
+    const topic = request.params.topic
+
+    request.server.app.ipfs.floodsub.unsub(topic, (err) => {
+      if (err) {
+        log.error(err)
+        return reply({
+          Message: `Failed to subscribe to topic ${topic}: ${err}`,
+          Code: 0
+        }).code(500)
+      }
+
+      return reply()
     })
   }
 }
diff --git a/src/http-api/routes/floodsub.js b/src/http-api/routes/floodsub.js
index d7af9a2b78..6af23791a8 100644
--- a/src/http-api/routes/floodsub.js
+++ b/src/http-api/routes/floodsub.js
@@ -6,6 +6,14 @@ const resources = require('./../resources')
 module.exports = (server) => {
   const api = server.select('API')
 
+  api.route({
+    method: '*',
+    path: '/api/v0/pubsub/start',
+    config: {
+      handler: resources.floodsub.start.handler
+    }
+  })
+
   api.route({
     method: '*',
     path: '/api/v0/pubsub/sub/{topic}',
@@ -24,7 +32,7 @@ module.exports = (server) => {
 
   api.route({
     method: '*',
-    path: '/api/v0/floodsub/pub',
+    path: '/api/v0/pubsub/pub',
     config: {
       handler: resources.floodsub.pub.handler,
       validate: {
@@ -35,4 +43,17 @@ module.exports = (server) => {
       }
     }
   })
+
+  api.route({
+    method: '*',
+    path: '/api/v0/pubsub/unsub/{topic}',
+    config: {
+      handler: resources.floodsub.unsub.handler,
+      validate: {
+        params: {
+          topic: Joi.string().required()
+        }
+      }
+    }
+  })
 }
diff --git a/test/cli/test-commands.js b/test/cli/test-commands.js
index da484580d1..fce0681302 100644
--- a/test/cli/test-commands.js
+++ b/test/cli/test-commands.js
@@ -7,11 +7,17 @@ const ipfsBase = require('../utils/ipfs-exec')
 const ipfs = ipfsBase(repoPath)
 const describeOnlineAndOffline = require('../utils/on-and-off')
 
+// NOTE: Floodsub CLI tests will not be run until
+// https://github.com/ipfs/js-ipfs-api/pull/377
+// is merged. But we have the files ready to go
+// so the command count is bumped from 56 to 61
+const commandCount = 61
+
 describe('commands', () => {
   describeOnlineAndOffline(repoPath, () => {
     it('list the commands', () => {
       return ipfs('commands').then((out) => {
-        expect(out.split('\n')).to.have.length(56)
+        expect(out.split('\n')).to.have.length(commandCount)
       })
     })
   })
@@ -20,7 +26,7 @@ describe('commands', () => {
     return ipfsBase(repoPath, {
       cwd: '/tmp'
     })('commands').then((out) => {
-      expect(out.split('\n').length).to.equal(56)
+      expect(out.split('\n').length).to.equal(commandCount)
     })
   })
 })
diff --git a/test/cli/test-floodsub.js b/test/cli/test-floodsub.js
new file mode 100644
index 0000000000..9311bd6a9d
--- /dev/null
+++ b/test/cli/test-floodsub.js
@@ -0,0 +1,79 @@
+/* eslint max-nested-callbacks: ["error", 8] */
+/* eslint-env mocha */
+'use strict'
+
+const expect = require('chai').expect
+const HttpAPI = require('../../src/http-api')
+const createTempNode = require('../utils/temp-node')
+const repoPath = require('./index').repoPath
+const ipfs = require('../utils/ipfs-exec')(repoPath)
+
+// NOTE: Floodsub CLI tests will not be run until
+// https://github.com/ipfs/js-ipfs-api/pull/377
+// is merged
+describe.skip('floodsub', function () {
+  this.timeout(30 * 1000)
+  let node
+
+  const topic = 'nonscents'
+  const message = new Buffer('Some non cents.')
+
+  before((done) => {
+    createTempNode(1, (err, _node) => {
+      expect(err).to.not.exist
+      node = _node
+      node.goOnline((err) => {
+        expect(err).to.not.exist
+        done()
+      })
+    })
+  })
+
+  after((done) => {
+    node.goOffline(done)
+  })
+
+  describe('api running', () => {
+    let httpAPI
+    const called = true
+
+    before((done) => {
+      httpAPI = new HttpAPI(repoPath)
+      httpAPI.start((err) => {
+        expect(err).to.not.exist
+        done()
+      })
+    })
+
+    after((done) => {
+      httpAPI.stop((err) => {
+        expect(err).to.not.exist
+        done()
+      })
+    })
+
+    it('start', () => {
+      return ipfs('floodsub', 'start').then((out) => {
+        expect(called).to.eql(true)
+      })
+    })
+
+    it('sub', () => {
+      return ipfs('floodsub', 'sub', topic).then((out) => {
+        expect(out).to.have.length.above(0)
+      })
+    })
+
+    it('pub', () => {
+      return ipfs('floodsub', 'pub', topic, message).then((out) => {
+        expect(called).to.eql(true)
+      })
+    })
+
+    it('unsub', () => {
+      return ipfs('floodsub', 'unsub', topic).then((out) => {
+        expect(called).to.eql(true)
+      })
+    })
+  })
+})
diff --git a/test/core/both/test-floodsub.js b/test/core/both/test-floodsub.js
index 33f155c3c0..903c1c53eb 100644
--- a/test/core/both/test-floodsub.js
+++ b/test/core/both/test-floodsub.js
@@ -9,10 +9,14 @@ const factory = new IPFSFactory()
 
 describe('floodsub', () => {
   let nodeOffline
-  let nodeA
+  let nodeUnstarted
+  let nodeStarted
+
   let subscription
+  let floodsub
 
   const topic = 'nonscents'
+  const message = 'Some message'
 
   before((done) => {
     factory.spawnNode((err, ipfsOff) => {
@@ -22,8 +26,12 @@ describe('floodsub', () => {
         nodeOffline = ipfsOff
         factory.spawnNode((err, ipfs) => {
           expect(err).to.not.exist
-          nodeA = ipfs
-          done()
+          nodeStarted = ipfs
+          factory.spawnNode((err, ipfs) => {
+            expect(err).to.not.exist
+            nodeUnstarted = ipfs
+            done()
+          })
         })
       })
     })
@@ -40,7 +48,11 @@ describe('floodsub', () => {
       })
 
       it('success', () => {
-        expect(nodeA.floodsub.start()).to.exist
+        nodeStarted.floodsub.start((err, _floodsub) => {
+          expect(err).to.not.exist
+          expect(_floodsub).to.exist
+          floodsub = _floodsub
+        })
       })
     })
 
@@ -49,18 +61,26 @@ describe('floodsub', () => {
         expect(() => nodeOffline.floodsub.sub()).to.throw
       })
 
+      it('throws if not started', () => {
+        expect(() => nodeUnstarted.floodsub.sub(topic)).to.throw
+      })
+
       it('throws without a topic', () => {
-        expect(() => nodeA.floodsub.sub()).to.throw
+        expect(() => nodeStarted.floodsub.sub()).to.throw
       })
 
       it('success', (done) => {
-        nodeA.floodsub.sub(topic, (err, stream) => {
+        nodeStarted.floodsub.sub(topic, (err, stream) => {
           expect(err).to.not.exist
           expect(stream.readable).to.eql(true)
           expect(typeof stream._read).to.eql('function')
           expect(typeof stream.cancel).to.eql('function')
           expect(stream instanceof Stream).to.eql(true)
+
           subscription = stream
+
+          const nodeSubs = floodsub.getSubscriptions()
+          expect(nodeSubs.length).to.eql(1)
           done()
         })
       })
@@ -71,12 +91,16 @@ describe('floodsub', () => {
         expect(() => nodeOffline.floodsub.pub()).to.throw
       })
 
+      it('throws if not started', () => {
+        expect(() => nodeUnstarted.floodsub.pub(topic, message)).to.throw
+      })
+
       it('throws without a topic', () => {
-        expect(() => nodeA.floodsub.sub()).to.throw
+        expect(() => nodeStarted.floodsub.sub()).to.throw
       })
 
       it('throws without data', () => {
-        expect(() => nodeA.floodsub.sub(topic)).to.throw
+        expect(() => nodeStarted.floodsub.sub(topic)).to.throw
       })
 
       it('success', (done) => {
@@ -84,10 +108,33 @@ describe('floodsub', () => {
 
         subscription.on('data', () => done())
 
-        nodeA.floodsub.pub(topic, 'some data', () => {
+        nodeStarted.floodsub.pub(topic, message, () => {
           expect(published).to.eql(true)
         })
       })
     })
+
+    describe('unsub', () => {
+      it('throws if offline', () => {
+        expect(() => nodeOffline.floodsub.unsub()).to.throw
+      })
+
+      it('throws if not started', () => {
+        expect(() => nodeUnstarted.floodsub.unsub(topic)).to.throw
+      })
+
+      it('throws without a topic', () => {
+        expect(() => nodeStarted.floodsub.unsub()).to.throw
+      })
+
+      it('success', (done) => {
+        nodeStarted.floodsub.unsub(topic, (err) => {
+          expect(err).to.not.exist
+          const nodeSubs = floodsub.getSubscriptions()
+          expect(nodeSubs.length).to.eql(0)
+          done()
+        })
+      })
+    })
   })
 })
diff --git a/test/http-api/inject/test-floodsub.js b/test/http-api/inject/test-floodsub.js
new file mode 100644
index 0000000000..a300a814d5
--- /dev/null
+++ b/test/http-api/inject/test-floodsub.js
@@ -0,0 +1,126 @@
+/* eslint max-nested-callbacks: ["error", 8] */
+/* eslint-env mocha */
+'use strict'
+
+const expect = require('chai').expect
+const createTempNode = require('./../../utils/temp-node')
+
+module.exports = (http) => {
+  describe('/pubsub', () => {
+    let api
+    let tmpNode
+
+    const buf = new Buffer('some message')
+    const topic = 'nonScents'
+
+    before((done) => {
+      api = http.api.server.select('API')
+
+      createTempNode(47, (err, _ipfs) => {
+        expect(err).to.not.exist
+        tmpNode = _ipfs
+        tmpNode.goOnline((err) => {
+          expect(err).to.not.exist
+          done()
+        })
+      })
+    })
+
+    after((done) => {
+      setTimeout(() => {
+        tmpNode.goOffline(done)
+      }, 1000)
+    })
+
+    describe('/pubsub/start', () => {
+      it('returns 200', (done) => {
+        api.inject({
+          method: 'POST',
+          url: `/api/v0/pubsub/start`
+        }, (res) => {
+          expect(res.statusCode).to.equal(200)
+          expect(res.result).to.be.an('object')
+          done()
+        })
+      })
+    })
+
+    describe('/pubsub/sub/{topic}', () => {
+      it('returns 404 if no topic is provided', (done) => {
+        api.inject({
+          method: 'GET',
+          url: `/api/v0/pubsub/sub`
+        }, (res) => {
+          expect(res.statusCode).to.equal(404)
+          done()
+        })
+      })
+
+      it('returns 200 with topic', (done) => {
+        api.inject({
+          method: 'GET',
+          url: `/api/v0/pubsub/sub/${topic}`
+        }, (res) => {
+          expect(res.statusCode).to.equal(200)
+          done()
+        })
+      })
+    })
+
+    describe('/pubsub/pub', () => {
+      it('returns 400 if no buffer is provided', (done) => {
+        api.inject({
+          method: 'POST',
+          url: `/api/v0/pubsub/pub?topic=${topic}`
+        }, (res) => {
+          expect(res.statusCode).to.equal(400)
+          expect(res.statusMessage).to.equal('Bad Request')
+          done()
+        })
+      })
+
+      it('returns 400 if no topic is provided', (done) => {
+        api.inject({
+          method: 'POST',
+          url: `/api/v0/pubsub/pub?buf=${buf}`
+        }, (res) => {
+          expect(res.statusCode).to.equal(400)
+          expect(res.statusMessage).to.equal('Bad Request')
+          done()
+        })
+      })
+
+      it('returns 200 with topic and buffer', (done) => {
+        api.inject({
+          method: 'POST',
+          url: `/api/v0/pubsub/pub?buf=${buf}&topic=${topic}`
+        }, (res) => {
+          expect(res.statusCode).to.equal(200)
+          done()
+        })
+      })
+    })
+
+    describe('/pubsub/unsub/{topic}', () => {
+      it('returns 404 if no topic is provided', (done) => {
+        api.inject({
+          method: 'GET',
+          url: `/api/v0/pubsub/unsub`
+        }, (res) => {
+          expect(res.statusCode).to.equal(404)
+          done()
+        })
+      })
+
+      it('returns 200 with topic', (done) => {
+        api.inject({
+          method: 'GET',
+          url: `/api/v0/pubsub/unsub/${topic}`
+        }, (res) => {
+          expect(res.statusCode).to.equal(200)
+          done()
+        })
+      })
+    })
+  })
+}

From 186c5d21434e1a198d467cb1396c4d83c3219311 Mon Sep 17 00:00:00 2001
From: Gavin McDermott <gavinmcdermott@gmail.com>
Date: Sat, 19 Nov 2016 23:14:18 -0800
Subject: [PATCH 20/46] refactor(api, cli, core): update floodsub to a full
 name API

---
 .../commands/floodsub/{pub.js => publish.js}  |  6 ++--
 .../floodsub/{sub.js => subscribe.js}         |  4 +--
 .../floodsub/{unsub.js => unsubscribe.js}     |  4 +--
 src/core/components/floodsub.js               |  8 ++---
 src/http-api/resources/floodsub.js            | 14 ++++----
 src/http-api/routes/floodsub.js               | 12 +++----
 test/cli/test-floodsub.js                     | 12 +++----
 test/core/both/test-floodsub.js               | 32 +++++++++----------
 test/http-api/inject/test-floodsub.js         | 20 ++++++------
 9 files changed, 56 insertions(+), 56 deletions(-)
 rename src/cli/commands/floodsub/{pub.js => publish.js} (72%)
 rename src/cli/commands/floodsub/{sub.js => subscribe.js} (82%)
 rename src/cli/commands/floodsub/{unsub.js => unsubscribe.js} (81%)

diff --git a/src/cli/commands/floodsub/pub.js b/src/cli/commands/floodsub/publish.js
similarity index 72%
rename from src/cli/commands/floodsub/pub.js
rename to src/cli/commands/floodsub/publish.js
index a7d5cc9387..6ef45dcd6e 100644
--- a/src/cli/commands/floodsub/pub.js
+++ b/src/cli/commands/floodsub/publish.js
@@ -6,9 +6,9 @@ const log = debug('cli:floodsub')
 log.error = debug('cli:floodsub:error')
 
 module.exports = {
-  command: 'pub <topic> <message>',
+  command: 'publish <topic> <data>',
 
-  describe: 'Publish a message to a topic',
+  describe: 'Publish data to a topic',
 
   builder: {},
 
@@ -18,7 +18,7 @@ module.exports = {
         throw err
       }
 
-      ipfs.floodsub.pub(argv.topic, argv.message, (err) => {
+      ipfs.floodsub.publish(argv.topic, argv.data, (err) => {
         if (err) {
           throw err
         }
diff --git a/src/cli/commands/floodsub/sub.js b/src/cli/commands/floodsub/subscribe.js
similarity index 82%
rename from src/cli/commands/floodsub/sub.js
rename to src/cli/commands/floodsub/subscribe.js
index 703ba90ecf..16e3eeda4b 100644
--- a/src/cli/commands/floodsub/sub.js
+++ b/src/cli/commands/floodsub/subscribe.js
@@ -6,7 +6,7 @@ const log = debug('cli:floodsub')
 log.error = debug('cli:floodsub:error')
 
 module.exports = {
-  command: 'sub <topic>',
+  command: 'subscribe <topic>',
 
   describe: 'Subscribe to a topic',
 
@@ -18,7 +18,7 @@ module.exports = {
         throw err
       }
 
-      ipfs.floodsub.sub(argv.topic, (err, stream) => {
+      ipfs.floodsub.subscribe(argv.topic, (err, stream) => {
         if (err) {
           throw err
         }
diff --git a/src/cli/commands/floodsub/unsub.js b/src/cli/commands/floodsub/unsubscribe.js
similarity index 81%
rename from src/cli/commands/floodsub/unsub.js
rename to src/cli/commands/floodsub/unsubscribe.js
index 212ae68e4c..27d52d4a59 100644
--- a/src/cli/commands/floodsub/unsub.js
+++ b/src/cli/commands/floodsub/unsubscribe.js
@@ -6,7 +6,7 @@ const log = debug('cli:floodsub')
 log.error = debug('cli:floodsub:error')
 
 module.exports = {
-  command: 'unsub <topic>',
+  command: 'unsubscribe <topic>',
 
   describe: 'Unsubscribe from a topic',
 
@@ -18,7 +18,7 @@ module.exports = {
         throw err
       }
 
-      ipfs.floodsub.unsub(argv.topic, (err) => {
+      ipfs.floodsub.unsubscribe(argv.topic, (err) => {
         if (err) {
           throw err
         }
diff --git a/src/core/components/floodsub.js b/src/core/components/floodsub.js
index 1accd305a1..8ec4132665 100644
--- a/src/core/components/floodsub.js
+++ b/src/core/components/floodsub.js
@@ -18,7 +18,7 @@ module.exports = function floodsub (self) {
       return callback(null, self._floodsub)
     }),
 
-    sub: promisify((topic, options, callback) => {
+    subscribe: promisify((topic, options, callback) => {
       // TODO: Clarify with @diasdavid what to do with the `options.discover` param
       // Ref: https://github.com/ipfs/js-ipfs-api/pull/377/files#diff-f0c61c06fd5dc36b6f760b7ea97b1862R50
       if (typeof options === 'function') {
@@ -35,7 +35,7 @@ module.exports = function floodsub (self) {
       }
 
       let rs = new Readable()
-      rs.cancel = () => self._floodsub.subscribe(topic)
+      rs.cancel = () => self._floodsub.unsubscribe(topic)
 
       self._floodsub.on(topic, (data) => {
         rs.emit('data', {
@@ -53,7 +53,7 @@ module.exports = function floodsub (self) {
       callback(null, rs)
     }),
 
-    pub: promisify((topic, data, callback) => {
+    publish: promisify((topic, data, callback) => {
       if (!self.isOnline()) {
         throw OFFLINE_ERROR
       }
@@ -73,7 +73,7 @@ module.exports = function floodsub (self) {
       callback(null)
     }),
 
-    unsub: promisify((topic, callback) => {
+    unsubscribe: promisify((topic, callback) => {
       if (!self.isOnline()) {
         throw OFFLINE_ERROR
       }
diff --git a/src/http-api/resources/floodsub.js b/src/http-api/resources/floodsub.js
index 30a1cfc9bf..9ddcf4fdc9 100644
--- a/src/http-api/resources/floodsub.js
+++ b/src/http-api/resources/floodsub.js
@@ -22,12 +22,12 @@ exports.start = {
   }
 }
 
-exports.sub = {
+exports.subscribe = {
   handler: (request, reply) => {
     const discover = request.query.discover || null
     const topic = request.params.topic
 
-    request.server.app.ipfs.floodsub.sub(topic, { discover }, (err, stream) => {
+    request.server.app.ipfs.floodsub.subscribe(topic, { discover }, (err, stream) => {
       if (err) {
         log.error(err)
         return reply({
@@ -49,12 +49,12 @@ exports.sub = {
   }
 }
 
-exports.pub = {
+exports.publish = {
   handler: (request, reply) => {
     const buf = request.query.buf
     const topic = request.query.topic
 
-    request.server.app.ipfs.floodsub.pub(topic, buf, (err) => {
+    request.server.app.ipfs.floodsub.publish(topic, buf, (err) => {
       if (err) {
         log.error(err)
         return reply({
@@ -68,15 +68,15 @@ exports.pub = {
   }
 }
 
-exports.unsub = {
+exports.unsubscribe = {
   handler: (request, reply) => {
     const topic = request.params.topic
 
-    request.server.app.ipfs.floodsub.unsub(topic, (err) => {
+    request.server.app.ipfs.floodsub.unsubscribe(topic, (err) => {
       if (err) {
         log.error(err)
         return reply({
-          Message: `Failed to subscribe to topic ${topic}: ${err}`,
+          Message: `Failed to unsubscribe from topic ${topic}: ${err}`,
           Code: 0
         }).code(500)
       }
diff --git a/src/http-api/routes/floodsub.js b/src/http-api/routes/floodsub.js
index 6af23791a8..74eedbe725 100644
--- a/src/http-api/routes/floodsub.js
+++ b/src/http-api/routes/floodsub.js
@@ -16,9 +16,9 @@ module.exports = (server) => {
 
   api.route({
     method: '*',
-    path: '/api/v0/pubsub/sub/{topic}',
+    path: '/api/v0/pubsub/subscribe/{topic}',
     config: {
-      handler: resources.floodsub.sub.handler,
+      handler: resources.floodsub.subscribe.handler,
       validate: {
         params: {
           topic: Joi.string().required()
@@ -32,9 +32,9 @@ module.exports = (server) => {
 
   api.route({
     method: '*',
-    path: '/api/v0/pubsub/pub',
+    path: '/api/v0/pubsub/publish',
     config: {
-      handler: resources.floodsub.pub.handler,
+      handler: resources.floodsub.publish.handler,
       validate: {
         query: {
           topic: Joi.string().required(),
@@ -46,9 +46,9 @@ module.exports = (server) => {
 
   api.route({
     method: '*',
-    path: '/api/v0/pubsub/unsub/{topic}',
+    path: '/api/v0/pubsub/unsubscribe/{topic}',
     config: {
-      handler: resources.floodsub.unsub.handler,
+      handler: resources.floodsub.unsubscribe.handler,
       validate: {
         params: {
           topic: Joi.string().required()
diff --git a/test/cli/test-floodsub.js b/test/cli/test-floodsub.js
index 9311bd6a9d..820ab8a049 100644
--- a/test/cli/test-floodsub.js
+++ b/test/cli/test-floodsub.js
@@ -58,20 +58,20 @@ describe.skip('floodsub', function () {
       })
     })
 
-    it('sub', () => {
-      return ipfs('floodsub', 'sub', topic).then((out) => {
+    it('subscribe', () => {
+      return ipfs('floodsub', 'subscribe', topic).then((out) => {
         expect(out).to.have.length.above(0)
       })
     })
 
-    it('pub', () => {
-      return ipfs('floodsub', 'pub', topic, message).then((out) => {
+    it('publish', () => {
+      return ipfs('floodsub', 'publish', topic, message).then((out) => {
         expect(called).to.eql(true)
       })
     })
 
-    it('unsub', () => {
-      return ipfs('floodsub', 'unsub', topic).then((out) => {
+    it('unsubscribe', () => {
+      return ipfs('floodsub', 'unsubscribe', topic).then((out) => {
         expect(called).to.eql(true)
       })
     })
diff --git a/test/core/both/test-floodsub.js b/test/core/both/test-floodsub.js
index 903c1c53eb..6a53810e6c 100644
--- a/test/core/both/test-floodsub.js
+++ b/test/core/both/test-floodsub.js
@@ -56,21 +56,21 @@ describe('floodsub', () => {
       })
     })
 
-    describe('sub', () => {
+    describe('subscribe', () => {
       it('throws if offline', () => {
-        expect(() => nodeOffline.floodsub.sub()).to.throw
+        expect(() => nodeOffline.floodsub.subscribe()).to.throw
       })
 
       it('throws if not started', () => {
-        expect(() => nodeUnstarted.floodsub.sub(topic)).to.throw
+        expect(() => nodeUnstarted.floodsub.subscribe(topic)).to.throw
       })
 
       it('throws without a topic', () => {
-        expect(() => nodeStarted.floodsub.sub()).to.throw
+        expect(() => nodeStarted.floodsub.subscribe()).to.throw
       })
 
       it('success', (done) => {
-        nodeStarted.floodsub.sub(topic, (err, stream) => {
+        nodeStarted.floodsub.subscribe(topic, (err, stream) => {
           expect(err).to.not.exist
           expect(stream.readable).to.eql(true)
           expect(typeof stream._read).to.eql('function')
@@ -86,21 +86,21 @@ describe('floodsub', () => {
       })
     })
 
-    describe('pub', () => {
+    describe('publish', () => {
       it('throws if offline', () => {
-        expect(() => nodeOffline.floodsub.pub()).to.throw
+        expect(() => nodeOffline.floodsub.publish()).to.throw
       })
 
       it('throws if not started', () => {
-        expect(() => nodeUnstarted.floodsub.pub(topic, message)).to.throw
+        expect(() => nodeUnstarted.floodsub.publish(topic, message)).to.throw
       })
 
       it('throws without a topic', () => {
-        expect(() => nodeStarted.floodsub.sub()).to.throw
+        expect(() => nodeStarted.floodsub.publish()).to.throw
       })
 
       it('throws without data', () => {
-        expect(() => nodeStarted.floodsub.sub(topic)).to.throw
+        expect(() => nodeStarted.floodsub.publish(topic)).to.throw
       })
 
       it('success', (done) => {
@@ -108,27 +108,27 @@ describe('floodsub', () => {
 
         subscription.on('data', () => done())
 
-        nodeStarted.floodsub.pub(topic, message, () => {
+        nodeStarted.floodsub.publish(topic, message, () => {
           expect(published).to.eql(true)
         })
       })
     })
 
-    describe('unsub', () => {
+    describe('unsubscribe', () => {
       it('throws if offline', () => {
-        expect(() => nodeOffline.floodsub.unsub()).to.throw
+        expect(() => nodeOffline.floodsub.unsubscribe()).to.throw
       })
 
       it('throws if not started', () => {
-        expect(() => nodeUnstarted.floodsub.unsub(topic)).to.throw
+        expect(() => nodeUnstarted.floodsub.unsubscribe(topic)).to.throw
       })
 
       it('throws without a topic', () => {
-        expect(() => nodeStarted.floodsub.unsub()).to.throw
+        expect(() => nodeStarted.floodsub.unsubscribe()).to.throw
       })
 
       it('success', (done) => {
-        nodeStarted.floodsub.unsub(topic, (err) => {
+        nodeStarted.floodsub.unsubscribe(topic, (err) => {
           expect(err).to.not.exist
           const nodeSubs = floodsub.getSubscriptions()
           expect(nodeSubs.length).to.eql(0)
diff --git a/test/http-api/inject/test-floodsub.js b/test/http-api/inject/test-floodsub.js
index a300a814d5..159054a133 100644
--- a/test/http-api/inject/test-floodsub.js
+++ b/test/http-api/inject/test-floodsub.js
@@ -45,11 +45,11 @@ module.exports = (http) => {
       })
     })
 
-    describe('/pubsub/sub/{topic}', () => {
+    describe('/pubsub/subscribe/{topic}', () => {
       it('returns 404 if no topic is provided', (done) => {
         api.inject({
           method: 'GET',
-          url: `/api/v0/pubsub/sub`
+          url: `/api/v0/pubsub/subscribe`
         }, (res) => {
           expect(res.statusCode).to.equal(404)
           done()
@@ -59,7 +59,7 @@ module.exports = (http) => {
       it('returns 200 with topic', (done) => {
         api.inject({
           method: 'GET',
-          url: `/api/v0/pubsub/sub/${topic}`
+          url: `/api/v0/pubsub/subscribe/${topic}`
         }, (res) => {
           expect(res.statusCode).to.equal(200)
           done()
@@ -67,11 +67,11 @@ module.exports = (http) => {
       })
     })
 
-    describe('/pubsub/pub', () => {
+    describe('/pubsub/publish', () => {
       it('returns 400 if no buffer is provided', (done) => {
         api.inject({
           method: 'POST',
-          url: `/api/v0/pubsub/pub?topic=${topic}`
+          url: `/api/v0/pubsub/publish?topic=${topic}`
         }, (res) => {
           expect(res.statusCode).to.equal(400)
           expect(res.statusMessage).to.equal('Bad Request')
@@ -82,7 +82,7 @@ module.exports = (http) => {
       it('returns 400 if no topic is provided', (done) => {
         api.inject({
           method: 'POST',
-          url: `/api/v0/pubsub/pub?buf=${buf}`
+          url: `/api/v0/pubsub/publish?buf=${buf}`
         }, (res) => {
           expect(res.statusCode).to.equal(400)
           expect(res.statusMessage).to.equal('Bad Request')
@@ -93,7 +93,7 @@ module.exports = (http) => {
       it('returns 200 with topic and buffer', (done) => {
         api.inject({
           method: 'POST',
-          url: `/api/v0/pubsub/pub?buf=${buf}&topic=${topic}`
+          url: `/api/v0/pubsub/publish?buf=${buf}&topic=${topic}`
         }, (res) => {
           expect(res.statusCode).to.equal(200)
           done()
@@ -101,11 +101,11 @@ module.exports = (http) => {
       })
     })
 
-    describe('/pubsub/unsub/{topic}', () => {
+    describe('/pubsub/unsubscribe/{topic}', () => {
       it('returns 404 if no topic is provided', (done) => {
         api.inject({
           method: 'GET',
-          url: `/api/v0/pubsub/unsub`
+          url: `/api/v0/pubsub/unsubscribe`
         }, (res) => {
           expect(res.statusCode).to.equal(404)
           done()
@@ -115,7 +115,7 @@ module.exports = (http) => {
       it('returns 200 with topic', (done) => {
         api.inject({
           method: 'GET',
-          url: `/api/v0/pubsub/unsub/${topic}`
+          url: `/api/v0/pubsub/unsubscribe/${topic}`
         }, (res) => {
           expect(res.statusCode).to.equal(200)
           done()

From 093897b622843c49f96f91d7cc937b7c5a9ddf98 Mon Sep 17 00:00:00 2001
From: Gavin McDermott <gavinmcdermott@gmail.com>
Date: Thu, 8 Dec 2016 12:28:05 -0800
Subject: [PATCH 21/46] chore: address CR comments

---
 package.json                                  |  15 ++
 src/cli/commands/floodsub.js                  |  17 ---
 src/cli/commands/floodsub/start.js            |  27 ----
 src/cli/commands/pubsub.js                    |  17 +++
 .../{floodsub/unsubscribe.js => pubsub/ls.js} |  12 +-
 src/cli/commands/pubsub/peers.js              |  30 ++++
 .../commands/{floodsub => pubsub}/publish.js  |   6 +-
 .../{floodsub => pubsub}/subscribe.js         |   8 +-
 src/core/components/floodsub.js               |  94 ------------
 src/core/components/go-online.js              |   6 +
 src/core/components/pubsub.js                 | 131 ++++++++++++++++
 src/core/index.js                             |   6 +-
 src/http-api/resources/index.js               |   2 +-
 .../resources/{floodsub.js => pubsub.js}      |  53 +++----
 src/http-api/routes/index.js                  |   2 +-
 .../routes/{floodsub.js => pubsub.js}         |  28 ++--
 test/cli/test-commands.js                     |   9 +-
 test/cli/{test-floodsub.js => test-pubsub.js} |  51 +++++--
 test/core/both/index.js                       |   1 +
 test/core/both/test-floodsub.js               | 140 ------------------
 test/core/both/test-pubsub.js                 |  19 +++
 .../{test-floodsub.js => test-pubsub.js}      |  48 +++---
 22 files changed, 346 insertions(+), 376 deletions(-)
 delete mode 100644 src/cli/commands/floodsub.js
 delete mode 100644 src/cli/commands/floodsub/start.js
 create mode 100644 src/cli/commands/pubsub.js
 rename src/cli/commands/{floodsub/unsubscribe.js => pubsub/ls.js} (54%)
 create mode 100644 src/cli/commands/pubsub/peers.js
 rename src/cli/commands/{floodsub => pubsub}/publish.js (72%)
 rename src/cli/commands/{floodsub => pubsub}/subscribe.js (72%)
 delete mode 100644 src/core/components/floodsub.js
 create mode 100644 src/core/components/pubsub.js
 rename src/http-api/resources/{floodsub.js => pubsub.js} (65%)
 rename src/http-api/routes/{floodsub.js => pubsub.js} (67%)
 rename test/cli/{test-floodsub.js => test-pubsub.js} (60%)
 delete mode 100644 test/core/both/test-floodsub.js
 create mode 100644 test/core/both/test-pubsub.js
 rename test/http-api/inject/{test-floodsub.js => test-pubsub.js} (79%)

diff --git a/package.json b/package.json
index 0f74a63fb6..a7e89d9930 100644
--- a/package.json
+++ b/package.json
@@ -80,16 +80,24 @@
     "hapi": "^16.0.1",
     "hapi-set-header": "^1.0.2",
     "idb-pull-blob-store": "^0.5.1",
+<<<<<<< 186c5d21434e1a198d467cb1396c4d83c3219311
     "ipfs-api": "^12.1.0",
     "ipfs-bitswap": "^0.8.2",
     "ipfs-block": "^0.5.3",
     "ipfs-block-service": "^0.7.1",
+=======
+    "ipfs-api": "git+https://github.com/ipfs/js-ipfs-api.git#01044a1f59fb866e4e08b06aae4e74d968615931",
+    "ipfs-bitswap": "^0.8.1",
+    "ipfs-block": "^0.5.0",
+    "ipfs-block-service": "^0.7.0",
+>>>>>>> chore: address CR comments
     "ipfs-multipart": "^0.1.0",
     "ipfs-repo": "^0.11.2",
     "ipfs-unixfs": "^0.1.8",
     "ipfs-unixfs-engine": "^0.14.1",
     "ipld-resolver": "^0.4.0",
     "isstream": "^0.1.2",
+<<<<<<< 186c5d21434e1a198d467cb1396c4d83c3219311
 <<<<<<< 7f1eca4e04b6e7855cfd02e381d1f0fa8ef49841
     "joi": "^10.0.5",
     "libp2p-ipfs-nodejs": "^0.17.0",
@@ -100,6 +108,12 @@
     "libp2p-floodsub": "0.3.1",
 >>>>>>> feat(api, cli, core): add floodsub
     "libp2p-ipfs": "^0.15.0",
+=======
+    "joi": "^10.0.1",
+    "libp2p-floodsub": "0.3.1",
+    "libp2p-ipfs-browser": "^0.17.0",
+    "libp2p-ipfs-nodejs": "^0.16.1",
+>>>>>>> chore: address CR comments
     "lodash.flatmap": "^4.5.0",
     "lodash.get": "^4.4.2",
     "lodash.has": "^4.5.2",
@@ -109,6 +123,7 @@
     "mafmt": "^2.1.2",
     "multiaddr": "^2.1.1",
     "multihashes": "^0.3.0",
+    "ndjson": "1.5.0",
     "path-exists": "^3.0.0",
     "peer-book": "^0.3.0",
     "peer-id": "^0.8.0",
diff --git a/src/cli/commands/floodsub.js b/src/cli/commands/floodsub.js
deleted file mode 100644
index 63af3fa21a..0000000000
--- a/src/cli/commands/floodsub.js
+++ /dev/null
@@ -1,17 +0,0 @@
-'use strict'
-
-// NOTE: Floodsub CLI is not tested. Tests will not be run until
-// https://github.com/ipfs/js-ipfs-api/pull/377
-// is merged
-module.exports = {
-  command: 'floodsub',
-
-  description: 'floodsub commands',
-
-  builder (yargs) {
-    return yargs
-      .commandDir('floodsub')
-  },
-
-  handler (argv) {}
-}
diff --git a/src/cli/commands/floodsub/start.js b/src/cli/commands/floodsub/start.js
deleted file mode 100644
index 7d4fe5103e..0000000000
--- a/src/cli/commands/floodsub/start.js
+++ /dev/null
@@ -1,27 +0,0 @@
-'use strict'
-
-const utils = require('../../utils')
-const debug = require('debug')
-const log = debug('cli:floodsub')
-log.error = debug('cli:floodsub:error')
-
-module.exports = {
-  command: 'start',
-
-  describe: 'Start FloodSub',
-
-  builder: {},
-
-  handler (argv) {
-    utils.getIPFS((err, ipfs) => {
-      if (err) {
-        throw err
-      }
-
-      const fsub = ipfs.floodsub.start()
-      if (fsub) {
-        console.log(fsub.toString())
-      }
-    })
-  }
-}
diff --git a/src/cli/commands/pubsub.js b/src/cli/commands/pubsub.js
new file mode 100644
index 0000000000..7102b9af67
--- /dev/null
+++ b/src/cli/commands/pubsub.js
@@ -0,0 +1,17 @@
+'use strict'
+
+// The command count bump from 56 to 60 depends on:
+// ipfs/interface-ipfs-core.git#5c7df414a8f627f8adb50a52ef8d2b629381285f
+// ipfs/js-ipfs-api.git#01044a1f59fb866e4e08b06aae4e74d968615931
+module.exports = {
+  command: 'pubsub',
+
+  description: 'pubsub commands',
+
+  builder (yargs) {
+    return yargs
+      .commandDir('pubsub')
+  },
+
+  handler (argv) {}
+}
diff --git a/src/cli/commands/floodsub/unsubscribe.js b/src/cli/commands/pubsub/ls.js
similarity index 54%
rename from src/cli/commands/floodsub/unsubscribe.js
rename to src/cli/commands/pubsub/ls.js
index 27d52d4a59..0a53b01ce3 100644
--- a/src/cli/commands/floodsub/unsubscribe.js
+++ b/src/cli/commands/pubsub/ls.js
@@ -2,13 +2,13 @@
 
 const utils = require('../../utils')
 const debug = require('debug')
-const log = debug('cli:floodsub')
-log.error = debug('cli:floodsub:error')
+const log = debug('cli:pubsub')
+log.error = debug('cli:pubsub:error')
 
 module.exports = {
-  command: 'unsubscribe <topic>',
+  command: 'ls',
 
-  describe: 'Unsubscribe from a topic',
+  describe: 'Get your list of subscriptions',
 
   builder: {},
 
@@ -18,10 +18,12 @@ module.exports = {
         throw err
       }
 
-      ipfs.floodsub.unsubscribe(argv.topic, (err) => {
+      ipfs.pubsub.ls((err, subscriptions) => {
         if (err) {
           throw err
         }
+
+        console.log(JSON.stringify(subscriptions, null, 2))
       })
     })
   }
diff --git a/src/cli/commands/pubsub/peers.js b/src/cli/commands/pubsub/peers.js
new file mode 100644
index 0000000000..0f4052b27e
--- /dev/null
+++ b/src/cli/commands/pubsub/peers.js
@@ -0,0 +1,30 @@
+'use strict'
+
+const utils = require('../../utils')
+const debug = require('debug')
+const log = debug('cli:pubsub')
+log.error = debug('cli:pubsub:error')
+
+module.exports = {
+  command: 'peers <topic>',
+
+  describe: 'Get all peers subscribed to a topic',
+
+  builder: {},
+
+  handler (argv) {
+    utils.getIPFS((err, ipfs) => {
+      if (err) {
+        throw err
+      }
+
+      ipfs.pubsub.peers(argv.topic, (err, peers) => {
+        if (err) {
+          throw err
+        }
+
+        console.log(JSON.stringify(peers, null, 2))
+      })
+    })
+  }
+}
diff --git a/src/cli/commands/floodsub/publish.js b/src/cli/commands/pubsub/publish.js
similarity index 72%
rename from src/cli/commands/floodsub/publish.js
rename to src/cli/commands/pubsub/publish.js
index 6ef45dcd6e..4f0e141270 100644
--- a/src/cli/commands/floodsub/publish.js
+++ b/src/cli/commands/pubsub/publish.js
@@ -2,8 +2,8 @@
 
 const utils = require('../../utils')
 const debug = require('debug')
-const log = debug('cli:floodsub')
-log.error = debug('cli:floodsub:error')
+const log = debug('cli:pubsub')
+log.error = debug('cli:pubsub:error')
 
 module.exports = {
   command: 'publish <topic> <data>',
@@ -18,7 +18,7 @@ module.exports = {
         throw err
       }
 
-      ipfs.floodsub.publish(argv.topic, argv.data, (err) => {
+      ipfs.pubsub.publish(argv.topic, argv.data, (err) => {
         if (err) {
           throw err
         }
diff --git a/src/cli/commands/floodsub/subscribe.js b/src/cli/commands/pubsub/subscribe.js
similarity index 72%
rename from src/cli/commands/floodsub/subscribe.js
rename to src/cli/commands/pubsub/subscribe.js
index 16e3eeda4b..5bab470c17 100644
--- a/src/cli/commands/floodsub/subscribe.js
+++ b/src/cli/commands/pubsub/subscribe.js
@@ -2,12 +2,14 @@
 
 const utils = require('../../utils')
 const debug = require('debug')
-const log = debug('cli:floodsub')
-log.error = debug('cli:floodsub:error')
+const log = debug('cli:pubsub')
+log.error = debug('cli:pubsub:error')
 
 module.exports = {
   command: 'subscribe <topic>',
 
+  alias : 'sub',
+
   describe: 'Subscribe to a topic',
 
   builder: {},
@@ -18,7 +20,7 @@ module.exports = {
         throw err
       }
 
-      ipfs.floodsub.subscribe(argv.topic, (err, stream) => {
+      ipfs.pubsub.subscribe(argv.topic, (err, stream) => {
         if (err) {
           throw err
         }
diff --git a/src/core/components/floodsub.js b/src/core/components/floodsub.js
deleted file mode 100644
index 8ec4132665..0000000000
--- a/src/core/components/floodsub.js
+++ /dev/null
@@ -1,94 +0,0 @@
-'use strict'
-
-const FloodSub = require('libp2p-floodsub')
-const promisify = require('promisify-es6')
-const Readable = require('stream').Readable
-
-const OFFLINE_ERROR = require('../utils').OFFLINE_ERROR
-const FSUB_ERROR = new Error(`FloodSub is not started.`)
-
-module.exports = function floodsub (self) {
-  return {
-    start: promisify((callback) => {
-      if (!self.isOnline()) {
-        throw OFFLINE_ERROR
-      }
-
-      self._floodsub = new FloodSub(self._libp2pNode)
-      return callback(null, self._floodsub)
-    }),
-
-    subscribe: promisify((topic, options, callback) => {
-      // TODO: Clarify with @diasdavid what to do with the `options.discover` param
-      // Ref: https://github.com/ipfs/js-ipfs-api/pull/377/files#diff-f0c61c06fd5dc36b6f760b7ea97b1862R50
-      if (typeof options === 'function') {
-        callback = options
-        options = {}
-      }
-
-      if (!self.isOnline()) {
-        throw OFFLINE_ERROR
-      }
-
-      if (!self._floodsub) {
-        throw FSUB_ERROR
-      }
-
-      let rs = new Readable()
-      rs.cancel = () => self._floodsub.unsubscribe(topic)
-
-      self._floodsub.on(topic, (data) => {
-        rs.emit('data', {
-          data: data.toString(),
-          topicIDs: [topic]
-        })
-      })
-
-      try {
-        self._floodsub.subscribe(topic)
-      } catch (err) {
-        return callback(err)
-      }
-
-      callback(null, rs)
-    }),
-
-    publish: promisify((topic, data, callback) => {
-      if (!self.isOnline()) {
-        throw OFFLINE_ERROR
-      }
-
-      if (!self._floodsub) {
-        throw FSUB_ERROR
-      }
-
-      const buf = Buffer.isBuffer(data) ? data : new Buffer(data)
-
-      try {
-        self._floodsub.publish(topic, buf)
-      } catch (err) {
-        return callback(err)
-      }
-
-      callback(null)
-    }),
-
-    unsubscribe: promisify((topic, callback) => {
-      if (!self.isOnline()) {
-        throw OFFLINE_ERROR
-      }
-
-      if (!self._floodsub) {
-        throw FSUB_ERROR
-      }
-
-      try {
-        self._floodsub.unsubscribe(topic)
-      } catch (err) {
-        return callback(err)
-      }
-
-      callback(null)
-    })
-  }
-}
diff --git a/src/core/components/go-online.js b/src/core/components/go-online.js
index 793a0269a5..3e0aa18d4c 100644
--- a/src/core/components/go-online.js
+++ b/src/core/components/go-online.js
@@ -2,6 +2,7 @@
 
 const series = require('async/series')
 const Bitswap = require('ipfs-bitswap')
+const FloodSub = require('libp2p-floodsub')
 
 module.exports = function goOnline (self) {
   return (cb) => {
@@ -21,6 +22,11 @@ module.exports = function goOnline (self) {
       )
       self._bitswap.start()
       self._blockService.goOnline(self._bitswap)
+
+      //
+      self._pubsub = new FloodSub(self._libp2pNode)
+      //
+
       cb()
     })
   }
diff --git a/src/core/components/pubsub.js b/src/core/components/pubsub.js
new file mode 100644
index 0000000000..9f85929061
--- /dev/null
+++ b/src/core/components/pubsub.js
@@ -0,0 +1,131 @@
+'use strict'
+
+const promisify = require('promisify-es6')
+const Readable = require('stream').Readable
+const _values = require('lodash.values')
+
+const OFFLINE_ERROR = require('../utils').OFFLINE_ERROR
+
+let subscriptions = {}
+
+const addSubscription = (topic, request, stream) => {
+  subscriptions[topic] = { request: request, stream: stream }
+}
+
+const removeSubscription = promisify((topic, callback) => {
+  if (!subscriptions[topic]) {
+    return callback(new Error(`Not subscribed to ${topic}`))
+  }
+
+  subscriptions[topic].stream.emit('end')
+  delete subscriptions[topic]
+
+  if (callback) {
+    callback(null)
+  }
+})
+
+module.exports = function pubsub (self) {
+  return {
+    subscribe: promisify((topic, options, callback) => {
+      if (!self.isOnline()) {
+        throw OFFLINE_ERROR
+      }
+
+      if (typeof options === 'function') {
+        callback = options
+        options = {}
+      }
+
+      if (subscriptions[topic]) {
+        return callback(`Error: Already subscribed to '${topic}'`)
+      }
+
+      const stream = new Readable({ objectMode: true })
+
+      stream._read = () => {}
+
+      // There is no explicit unsubscribe; subscriptions have a cancel event
+      stream.cancel = promisify((cb) => {
+        self._pubsub.unsubscribe(topic)
+        removeSubscription(topic, cb)
+      })
+
+      self._pubsub.on(topic, (data) => {
+        stream.emit('data', {
+          data: data.toString(),
+          topicIDs: [topic]
+        })
+      })
+
+      try {
+        self._pubsub.subscribe(topic)
+      } catch (err) {
+        return callback(err)
+      }
+
+      // Add the request to the active subscriptions and return the stream
+      addSubscription(topic, null, stream)
+      callback(null, stream)
+    }),
+
+    publish: promisify((topic, data, callback) => {
+      if (!self.isOnline()) {
+        throw OFFLINE_ERROR
+      }
+
+      const buf = Buffer.isBuffer(data) ? data : new Buffer(data)
+
+      try {
+        self._pubsub.publish(topic, buf)
+      } catch (err) {
+        return callback(err)
+      }
+
+      callback(null)
+    }),
+
+    ls: promisify((callback) => {
+      if (!self.isOnline()) {
+        throw OFFLINE_ERROR
+      }
+
+      let subscriptions = []
+
+      try {
+        subscriptions = self._pubsub.getSubscriptions()
+      } catch (err) {
+        return callback(err)
+      }
+
+      callback(null, subscriptions)
+    }),
+
+    peers: promisify((topic, callback) => {
+      if (!self.isOnline()) {
+        throw OFFLINE_ERROR
+      }
+
+      if (!subscriptions[topic]) {
+        return callback(`Error: Not subscribed to '${topic}'`)
+      }
+
+      let peers = []
+
+      try {
+        const peerSet = self._pubsub.getPeerSet()
+        _values(peerSet).forEach((peer) => {
+          const idB58Str = peer.peerInfo.id.toB58String()
+          const index = peer.topics.indexOf(topic)
+          if (index > -1) {
+            peers.push(idB58Str)
+          }
+        })
+      } catch (err) {
+        return callback(err)
+      }
+
+      callback(null, peers)
+    }),
+  }
+}
diff --git a/src/core/index.js b/src/core/index.js
index d53394c55b..fa4c2e8ae2 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -23,7 +23,7 @@ const swarm = require('./components/swarm')
 const ping = require('./components/ping')
 const files = require('./components/files')
 const bitswap = require('./components/bitswap')
-const floodsub = require('./components/floodsub')
+const pubsub = require('./components/pubsub')
 
 exports = module.exports = IPFS
 
@@ -45,7 +45,7 @@ function IPFS (repoInstance) {
   this._bitswap = null
   this._blockService = new BlockService(this._repo)
   this._ipldResolver = new IPLDResolver(this._blockService)
-  this._floodsub = null
+  this._pubsub = null
 
   // IPFS Core exposed components
 
@@ -69,5 +69,5 @@ function IPFS (repoInstance) {
   this.files = files(this)
   this.bitswap = bitswap(this)
   this.ping = ping(this)
-  this.floodsub = floodsub(this)
+  this.pubsub = pubsub(this)
 }
diff --git a/src/http-api/resources/index.js b/src/http-api/resources/index.js
index 2f8f273aac..671a349952 100644
--- a/src/http-api/resources/index.js
+++ b/src/http-api/resources/index.js
@@ -10,4 +10,4 @@ exports.block = require('./block')
 exports.swarm = require('./swarm')
 exports.bitswap = require('./bitswap')
 exports.files = require('./files')
-exports.floodsub = require('./floodsub')
+exports.pubsub = require('./pubsub')
diff --git a/src/http-api/resources/floodsub.js b/src/http-api/resources/pubsub.js
similarity index 65%
rename from src/http-api/resources/floodsub.js
rename to src/http-api/resources/pubsub.js
index 9ddcf4fdc9..250ea2a7e8 100644
--- a/src/http-api/resources/floodsub.js
+++ b/src/http-api/resources/pubsub.js
@@ -1,33 +1,18 @@
 'use strict'
 
 const debug = require('debug')
-const log = debug('http-api:floodsub')
-log.error = debug('http-api:floodsub:error')
+const ndjson = require('ndjson')
+const log = debug('http-api:pubsub')
+log.error = debug('http-api:pubsub:error')
 
 exports = module.exports
 
-exports.start = {
-  handler: (request, reply) => {
-    request.server.app.ipfs.floodsub.start((err, floodsub) => {
-      if (err) {
-        log.error(err)
-        return reply({
-          Message: `Failed to start: ${err}`,
-          Code: 0
-        }).code(500)
-      }
-
-      return reply(floodsub)
-    })
-  }
-}
-
 exports.subscribe = {
   handler: (request, reply) => {
     const discover = request.query.discover || null
     const topic = request.params.topic
 
-    request.server.app.ipfs.floodsub.subscribe(topic, { discover }, (err, stream) => {
+    request.server.app.ipfs.pubsub.subscribe(topic, { discover }, (err, stream) => {
       if (err) {
         log.error(err)
         return reply({
@@ -36,7 +21,7 @@ exports.subscribe = {
         }).code(500)
       }
 
-      // hapi is not very clever and throws if no
+      // hapi is not very clever and throws if no:
       // - _read method
       // - _readableState object
       // are there :(
@@ -44,6 +29,8 @@ exports.subscribe = {
         stream._read = () => {}
         stream._readableState = {}
       }
+
+      // ndjson.serialize
       return reply(stream)
     })
   }
@@ -54,7 +41,7 @@ exports.publish = {
     const buf = request.query.buf
     const topic = request.query.topic
 
-    request.server.app.ipfs.floodsub.publish(topic, buf, (err) => {
+    request.server.app.ipfs.pubsub.publish(topic, buf, (err) => {
       if (err) {
         log.error(err)
         return reply({
@@ -68,20 +55,36 @@ exports.publish = {
   }
 }
 
-exports.unsubscribe = {
+exports.ls = {
+  handler: (request, reply) => {
+    request.server.app.ipfs.pubsub.ls((err, subscriptions) => {
+      if (err) {
+        log.error(err)
+        return reply({
+          Message: `Failed to list subscriptions: ${err}`,
+          Code: 0
+        }).code(500)
+      }
+
+      return reply(subscriptions)
+    })
+  }
+}
+
+exports.peers = {
   handler: (request, reply) => {
     const topic = request.params.topic
 
-    request.server.app.ipfs.floodsub.unsubscribe(topic, (err) => {
+    request.server.app.ipfs.pubsub.peers(topic, (err, peers) => {
       if (err) {
         log.error(err)
         return reply({
-          Message: `Failed to unsubscribe from topic ${topic}: ${err}`,
+          Message: `Failed to find peers subscribed to ${topic}: ${err}`,
           Code: 0
         }).code(500)
       }
 
-      return reply()
+      return reply(peers)
     })
   }
 }
diff --git a/src/http-api/routes/index.js b/src/http-api/routes/index.js
index 15dde6116c..7b0afa885d 100644
--- a/src/http-api/routes/index.js
+++ b/src/http-api/routes/index.js
@@ -11,5 +11,5 @@ module.exports = (server) => {
   require('./swarm')(server)
   require('./bitswap')(server)
   require('./files')(server)
-  require('./floodsub')(server)
+  require('./pubsub')(server)
 }
diff --git a/src/http-api/routes/floodsub.js b/src/http-api/routes/pubsub.js
similarity index 67%
rename from src/http-api/routes/floodsub.js
rename to src/http-api/routes/pubsub.js
index 74eedbe725..321cb54476 100644
--- a/src/http-api/routes/floodsub.js
+++ b/src/http-api/routes/pubsub.js
@@ -8,17 +8,9 @@ module.exports = (server) => {
 
   api.route({
     method: '*',
-    path: '/api/v0/pubsub/start',
+    path: '/api/v0/pubsub/sub/{topic}',
     config: {
-      handler: resources.floodsub.start.handler
-    }
-  })
-
-  api.route({
-    method: '*',
-    path: '/api/v0/pubsub/subscribe/{topic}',
-    config: {
-      handler: resources.floodsub.subscribe.handler,
+      handler: resources.pubsub.subscribe.handler,
       validate: {
         params: {
           topic: Joi.string().required()
@@ -32,9 +24,9 @@ module.exports = (server) => {
 
   api.route({
     method: '*',
-    path: '/api/v0/pubsub/publish',
+    path: '/api/v0/pubsub/pub',
     config: {
-      handler: resources.floodsub.publish.handler,
+      handler: resources.pubsub.publish.handler,
       validate: {
         query: {
           topic: Joi.string().required(),
@@ -46,9 +38,17 @@ module.exports = (server) => {
 
   api.route({
     method: '*',
-    path: '/api/v0/pubsub/unsubscribe/{topic}',
+    path: '/api/v0/pubsub/ls',
+    config: {
+      handler: resources.pubsub.ls.handler
+    }
+  })
+
+  api.route({
+    method: '*',
+    path: '/api/v0/pubsub/peers',
     config: {
-      handler: resources.floodsub.unsubscribe.handler,
+      handler: resources.pubsub.peers.handler,
       validate: {
         params: {
           topic: Joi.string().required()
diff --git a/test/cli/test-commands.js b/test/cli/test-commands.js
index fce0681302..765a68e31a 100644
--- a/test/cli/test-commands.js
+++ b/test/cli/test-commands.js
@@ -7,11 +7,10 @@ const ipfsBase = require('../utils/ipfs-exec')
 const ipfs = ipfsBase(repoPath)
 const describeOnlineAndOffline = require('../utils/on-and-off')
 
-// NOTE: Floodsub CLI tests will not be run until
-// https://github.com/ipfs/js-ipfs-api/pull/377
-// is merged. But we have the files ready to go
-// so the command count is bumped from 56 to 61
-const commandCount = 61
+// The command count bump from 56 to 60 depends on:
+// ipfs/interface-ipfs-core.git#5c7df414a8f627f8adb50a52ef8d2b629381285f
+// ipfs/js-ipfs-api.git#01044a1f59fb866e4e08b06aae4e74d968615931
+const commandCount = 60
 
 describe('commands', () => {
   describeOnlineAndOffline(repoPath, () => {
diff --git a/test/cli/test-floodsub.js b/test/cli/test-pubsub.js
similarity index 60%
rename from test/cli/test-floodsub.js
rename to test/cli/test-pubsub.js
index 820ab8a049..1e66a4dc75 100644
--- a/test/cli/test-floodsub.js
+++ b/test/cli/test-pubsub.js
@@ -8,14 +8,15 @@ const createTempNode = require('../utils/temp-node')
 const repoPath = require('./index').repoPath
 const ipfs = require('../utils/ipfs-exec')(repoPath)
 
-// NOTE: Floodsub CLI tests will not be run until
-// https://github.com/ipfs/js-ipfs-api/pull/377
-// is merged
-describe.skip('floodsub', function () {
+// This depends on:
+// ipfs/interface-ipfs-core.git#5c7df414a8f627f8adb50a52ef8d2b629381285f
+// ipfs/js-ipfs-api.git#01044a1f59fb866e4e08b06aae4e74d968615931
+describe.only('pubsub', function () {
   this.timeout(30 * 1000)
   let node
 
-  const topic = 'nonscents'
+  const topicA = 'nonscentsA'
+  const topicB = 'nonscentsB'
   const message = new Buffer('Some non cents.')
 
   before((done) => {
@@ -52,28 +53,50 @@ describe.skip('floodsub', function () {
       })
     })
 
-    it('start', () => {
-      return ipfs('floodsub', 'start').then((out) => {
-        expect(called).to.eql(true)
+    it('subscribe', () => {
+      return ipfs('pubsub', 'subscribe', topicA).then((out) => {
+        expect(out).to.have.length.above(0)
       })
     })
 
-    it('subscribe', () => {
-      return ipfs('floodsub', 'subscribe', topic).then((out) => {
+    it('subscribe alias', () => {
+      return ipfs('pubsub', 'sub', topicB).then((out) => {
         expect(out).to.have.length.above(0)
       })
     })
 
     it('publish', () => {
-      return ipfs('floodsub', 'publish', topic, message).then((out) => {
+      return ipfs('pubsub', 'publish', topicA, message).then((out) => {
         expect(called).to.eql(true)
       })
     })
 
-    it('unsubscribe', () => {
-      return ipfs('floodsub', 'unsubscribe', topic).then((out) => {
-        expect(called).to.eql(true)
+    it('ls', () => {
+      return ipfs('pubsub', 'ls').then((out) => {
+        expect(out).to.have.length.above(0)
+      })
+    })
+
+    it('peers', () => {
+      return ipfs('pubsub', 'peers', topicA).then((out) => {
+        expect(out).to.be.eql('[]')
       })
     })
   })
 })
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/core/both/index.js b/test/core/both/index.js
index a6dc8e5621..5b27dd5e69 100644
--- a/test/core/both/index.js
+++ b/test/core/both/index.js
@@ -10,4 +10,5 @@ describe('--both', () => {
   require('./test-generic')
   require('./test-init')
   require('./test-object')
+  require('./test-pubsub')
 })
diff --git a/test/core/both/test-floodsub.js b/test/core/both/test-floodsub.js
deleted file mode 100644
index 6a53810e6c..0000000000
--- a/test/core/both/test-floodsub.js
+++ /dev/null
@@ -1,140 +0,0 @@
-/* eslint max-nested-callbacks: ["error", 8] */
-/* eslint-env mocha */
-'use strict'
-
-const expect = require('chai').expect
-const Stream = require('stream')
-const IPFSFactory = require('../../utils/factory-core')
-const factory = new IPFSFactory()
-
-describe('floodsub', () => {
-  let nodeOffline
-  let nodeUnstarted
-  let nodeStarted
-
-  let subscription
-  let floodsub
-
-  const topic = 'nonscents'
-  const message = 'Some message'
-
-  before((done) => {
-    factory.spawnNode((err, ipfsOff) => {
-      expect(err).to.not.exist
-      ipfsOff.goOffline((err) => {
-        expect(err).to.not.exist
-        nodeOffline = ipfsOff
-        factory.spawnNode((err, ipfs) => {
-          expect(err).to.not.exist
-          nodeStarted = ipfs
-          factory.spawnNode((err, ipfs) => {
-            expect(err).to.not.exist
-            nodeUnstarted = ipfs
-            done()
-          })
-        })
-      })
-    })
-  })
-
-  after((done) => {
-    factory.dismantle(() => done())
-  })
-
-  describe('Floodsub API', () => {
-    describe('start', () => {
-      it('throws if offline', () => {
-        expect(() => nodeOffline.floodsub.start()).to.throw
-      })
-
-      it('success', () => {
-        nodeStarted.floodsub.start((err, _floodsub) => {
-          expect(err).to.not.exist
-          expect(_floodsub).to.exist
-          floodsub = _floodsub
-        })
-      })
-    })
-
-    describe('subscribe', () => {
-      it('throws if offline', () => {
-        expect(() => nodeOffline.floodsub.subscribe()).to.throw
-      })
-
-      it('throws if not started', () => {
-        expect(() => nodeUnstarted.floodsub.subscribe(topic)).to.throw
-      })
-
-      it('throws without a topic', () => {
-        expect(() => nodeStarted.floodsub.subscribe()).to.throw
-      })
-
-      it('success', (done) => {
-        nodeStarted.floodsub.subscribe(topic, (err, stream) => {
-          expect(err).to.not.exist
-          expect(stream.readable).to.eql(true)
-          expect(typeof stream._read).to.eql('function')
-          expect(typeof stream.cancel).to.eql('function')
-          expect(stream instanceof Stream).to.eql(true)
-
-          subscription = stream
-
-          const nodeSubs = floodsub.getSubscriptions()
-          expect(nodeSubs.length).to.eql(1)
-          done()
-        })
-      })
-    })
-
-    describe('publish', () => {
-      it('throws if offline', () => {
-        expect(() => nodeOffline.floodsub.publish()).to.throw
-      })
-
-      it('throws if not started', () => {
-        expect(() => nodeUnstarted.floodsub.publish(topic, message)).to.throw
-      })
-
-      it('throws without a topic', () => {
-        expect(() => nodeStarted.floodsub.publish()).to.throw
-      })
-
-      it('throws without data', () => {
-        expect(() => nodeStarted.floodsub.publish(topic)).to.throw
-      })
-
-      it('success', (done) => {
-        const published = true
-
-        subscription.on('data', () => done())
-
-        nodeStarted.floodsub.publish(topic, message, () => {
-          expect(published).to.eql(true)
-        })
-      })
-    })
-
-    describe('unsubscribe', () => {
-      it('throws if offline', () => {
-        expect(() => nodeOffline.floodsub.unsubscribe()).to.throw
-      })
-
-      it('throws if not started', () => {
-        expect(() => nodeUnstarted.floodsub.unsubscribe(topic)).to.throw
-      })
-
-      it('throws without a topic', () => {
-        expect(() => nodeStarted.floodsub.unsubscribe()).to.throw
-      })
-
-      it('success', (done) => {
-        nodeStarted.floodsub.unsubscribe(topic, (err) => {
-          expect(err).to.not.exist
-          const nodeSubs = floodsub.getSubscriptions()
-          expect(nodeSubs.length).to.eql(0)
-          done()
-        })
-      })
-    })
-  })
-})
diff --git a/test/core/both/test-pubsub.js b/test/core/both/test-pubsub.js
new file mode 100644
index 0000000000..bdc83ad572
--- /dev/null
+++ b/test/core/both/test-pubsub.js
@@ -0,0 +1,19 @@
+/* eslint-env mocha */
+'use strict'
+
+const test = require('interface-ipfs-core')
+const IPFSFactory = require('../../utils/factory-core')
+
+let factory
+
+const common = {
+  setup: function (cb) {
+    factory = new IPFSFactory()
+    cb(null, factory)
+  },
+  teardown: function (cb) {
+    factory.dismantle(cb)
+  }
+}
+
+test.pubsub(common)
diff --git a/test/http-api/inject/test-floodsub.js b/test/http-api/inject/test-pubsub.js
similarity index 79%
rename from test/http-api/inject/test-floodsub.js
rename to test/http-api/inject/test-pubsub.js
index 159054a133..38299c72f9 100644
--- a/test/http-api/inject/test-floodsub.js
+++ b/test/http-api/inject/test-pubsub.js
@@ -6,7 +6,7 @@ const expect = require('chai').expect
 const createTempNode = require('./../../utils/temp-node')
 
 module.exports = (http) => {
-  describe('/pubsub', () => {
+  describe.only('/pubsub', () => {
     let api
     let tmpNode
 
@@ -32,24 +32,11 @@ module.exports = (http) => {
       }, 1000)
     })
 
-    describe('/pubsub/start', () => {
-      it('returns 200', (done) => {
-        api.inject({
-          method: 'POST',
-          url: `/api/v0/pubsub/start`
-        }, (res) => {
-          expect(res.statusCode).to.equal(200)
-          expect(res.result).to.be.an('object')
-          done()
-        })
-      })
-    })
-
-    describe('/pubsub/subscribe/{topic}', () => {
+    describe('/sub/{topic}', () => {
       it('returns 404 if no topic is provided', (done) => {
         api.inject({
           method: 'GET',
-          url: `/api/v0/pubsub/subscribe`
+          url: `/api/v0/pubsub/sub`
         }, (res) => {
           expect(res.statusCode).to.equal(404)
           done()
@@ -59,7 +46,7 @@ module.exports = (http) => {
       it('returns 200 with topic', (done) => {
         api.inject({
           method: 'GET',
-          url: `/api/v0/pubsub/subscribe/${topic}`
+          url: `/api/v0/pubsub/sub/${topic}`
         }, (res) => {
           expect(res.statusCode).to.equal(200)
           done()
@@ -67,11 +54,11 @@ module.exports = (http) => {
       })
     })
 
-    describe('/pubsub/publish', () => {
+    xdescribe('/pub', () => {
       it('returns 400 if no buffer is provided', (done) => {
         api.inject({
           method: 'POST',
-          url: `/api/v0/pubsub/publish?topic=${topic}`
+          url: `/api/v0/pubsub/pub?topic=${topic}`
         }, (res) => {
           expect(res.statusCode).to.equal(400)
           expect(res.statusMessage).to.equal('Bad Request')
@@ -82,7 +69,7 @@ module.exports = (http) => {
       it('returns 400 if no topic is provided', (done) => {
         api.inject({
           method: 'POST',
-          url: `/api/v0/pubsub/publish?buf=${buf}`
+          url: `/api/v0/pubsub/pub?buf=${buf}`
         }, (res) => {
           expect(res.statusCode).to.equal(400)
           expect(res.statusMessage).to.equal('Bad Request')
@@ -93,7 +80,7 @@ module.exports = (http) => {
       it('returns 200 with topic and buffer', (done) => {
         api.inject({
           method: 'POST',
-          url: `/api/v0/pubsub/publish?buf=${buf}&topic=${topic}`
+          url: `/api/v0/pubsub/pub?buf=${buf}&topic=${topic}`
         }, (res) => {
           expect(res.statusCode).to.equal(200)
           done()
@@ -101,11 +88,24 @@ module.exports = (http) => {
       })
     })
 
-    describe('/pubsub/unsubscribe/{topic}', () => {
+    xdescribe('/ls', () => {
+      it('returns 200', (done) => {
+        api.inject({
+          method: 'GET',
+          url: `/api/v0/pubsub/ls`
+        }, (res) => {
+          expect(res.statusCode).to.equal(200)
+          expect(res.result).to.be.an('object')
+          done()
+        })
+      })
+    })
+
+    xdescribe('/peers/{topic}', () => {
       it('returns 404 if no topic is provided', (done) => {
         api.inject({
           method: 'GET',
-          url: `/api/v0/pubsub/unsubscribe`
+          url: `/api/v0/pubsub/peers`
         }, (res) => {
           expect(res.statusCode).to.equal(404)
           done()
@@ -115,7 +115,7 @@ module.exports = (http) => {
       it('returns 200 with topic', (done) => {
         api.inject({
           method: 'GET',
-          url: `/api/v0/pubsub/unsubscribe/${topic}`
+          url: `/api/v0/pubsub/peers/${topic}`
         }, (res) => {
           expect(res.statusCode).to.equal(200)
           done()

From d4e9efa4c5bdccbf9c6c196b68dde4fef97bf122 Mon Sep 17 00:00:00 2001
From: Gavin McDermott <gavinmcdermott@gmail.com>
Date: Thu, 8 Dec 2016 12:28:41 -0800
Subject: [PATCH 22/46] fix: fix lint issues

---
 src/cli/commands/pubsub/subscribe.js |  2 +-
 src/core/components/pubsub.js        |  2 +-
 src/http-api/resources/pubsub.js     |  2 +-
 test/cli/test-pubsub.js              | 16 ----------------
 4 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/cli/commands/pubsub/subscribe.js b/src/cli/commands/pubsub/subscribe.js
index 5bab470c17..1f3d108a85 100644
--- a/src/cli/commands/pubsub/subscribe.js
+++ b/src/cli/commands/pubsub/subscribe.js
@@ -8,7 +8,7 @@ log.error = debug('cli:pubsub:error')
 module.exports = {
   command: 'subscribe <topic>',
 
-  alias : 'sub',
+  alias: 'sub',
 
   describe: 'Subscribe to a topic',
 
diff --git a/src/core/components/pubsub.js b/src/core/components/pubsub.js
index 9f85929061..3d33a788e5 100644
--- a/src/core/components/pubsub.js
+++ b/src/core/components/pubsub.js
@@ -126,6 +126,6 @@ module.exports = function pubsub (self) {
       }
 
       callback(null, peers)
-    }),
+    })
   }
 }
diff --git a/src/http-api/resources/pubsub.js b/src/http-api/resources/pubsub.js
index 250ea2a7e8..38c3084b3a 100644
--- a/src/http-api/resources/pubsub.js
+++ b/src/http-api/resources/pubsub.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const debug = require('debug')
-const ndjson = require('ndjson')
+// const ndjson = require('ndjson')
 const log = debug('http-api:pubsub')
 log.error = debug('http-api:pubsub:error')
 
diff --git a/test/cli/test-pubsub.js b/test/cli/test-pubsub.js
index 1e66a4dc75..20b5ffef3e 100644
--- a/test/cli/test-pubsub.js
+++ b/test/cli/test-pubsub.js
@@ -84,19 +84,3 @@ describe.only('pubsub', function () {
     })
   })
 })
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

From 580313a793464b989bf78feafab9964dfaa958f9 Mon Sep 17 00:00:00 2001
From: David Dias <daviddias.p@gmail.com>
Date: Thu, 8 Dec 2016 13:07:53 -0800
Subject: [PATCH 23/46] update dep

---
 package.json                     | 2 +-
 src/core/components/go-online.js | 3 ---
 src/core/components/pubsub.js    | 1 +
 test/core/both/test-bitswap.js   | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index a7e89d9930..c99f7c9f7e 100644
--- a/package.json
+++ b/package.json
@@ -110,7 +110,7 @@
     "libp2p-ipfs": "^0.15.0",
 =======
     "joi": "^10.0.1",
-    "libp2p-floodsub": "0.3.1",
+    "libp2p-floodsub": "0.4.0",
     "libp2p-ipfs-browser": "^0.17.0",
     "libp2p-ipfs-nodejs": "^0.16.1",
 >>>>>>> chore: address CR comments
diff --git a/src/core/components/go-online.js b/src/core/components/go-online.js
index 3e0aa18d4c..b91df2a751 100644
--- a/src/core/components/go-online.js
+++ b/src/core/components/go-online.js
@@ -22,10 +22,7 @@ module.exports = function goOnline (self) {
       )
       self._bitswap.start()
       self._blockService.goOnline(self._bitswap)
-
-      //
       self._pubsub = new FloodSub(self._libp2pNode)
-      //
 
       cb()
     })
diff --git a/src/core/components/pubsub.js b/src/core/components/pubsub.js
index 3d33a788e5..f16ef284e3 100644
--- a/src/core/components/pubsub.js
+++ b/src/core/components/pubsub.js
@@ -114,6 +114,7 @@ module.exports = function pubsub (self) {
 
       try {
         const peerSet = self._pubsub.getPeerSet()
+        console.log(peerSet)
         _values(peerSet).forEach((peer) => {
           const idB58Str = peer.peerInfo.id.toB58String()
           const index = peer.topics.indexOf(topic)
diff --git a/test/core/both/test-bitswap.js b/test/core/both/test-bitswap.js
index 576f93d8a3..a4ea71b3ac 100644
--- a/test/core/both/test-bitswap.js
+++ b/test/core/both/test-bitswap.js
@@ -22,7 +22,7 @@ function makeBlock (cb) {
   return cb(null, new Block(`IPFS is awesome ${Math.random()}`))
 }
 
-describe('bitswap', () => {
+describe.skip('bitswap', () => {
   let inProcNode // Node spawned inside this process
   let swarmAddrsBak
 

From ca9c0ea5dc85190af612abb68eb69fcdf2389b22 Mon Sep 17 00:00:00 2001
From: haad <haad@headbanggames.com>
Date: Fri, 9 Dec 2016 10:06:18 +0100
Subject: [PATCH 24/46] Fix canceling subscription. Move subscription state to
 be local to the function.

---
 src/core/components/pubsub.js | 37 ++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/core/components/pubsub.js b/src/core/components/pubsub.js
index f16ef284e3..1bce1bf590 100644
--- a/src/core/components/pubsub.js
+++ b/src/core/components/pubsub.js
@@ -6,26 +6,26 @@ const _values = require('lodash.values')
 
 const OFFLINE_ERROR = require('../utils').OFFLINE_ERROR
 
-let subscriptions = {}
-
-const addSubscription = (topic, request, stream) => {
-  subscriptions[topic] = { request: request, stream: stream }
-}
+module.exports = function pubsub (self) {
+  let subscriptions = {}
 
-const removeSubscription = promisify((topic, callback) => {
-  if (!subscriptions[topic]) {
-    return callback(new Error(`Not subscribed to ${topic}`))
+  const addSubscription = (topic, request, stream) => {
+    subscriptions[topic] = { request: request, stream: stream }
   }
 
-  subscriptions[topic].stream.emit('end')
-  delete subscriptions[topic]
+  const removeSubscription = promisify((topic, callback) => {
+    if (!subscriptions[topic]) {
+      return callback(new Error(`Not subscribed to ${topic}`))
+    }
 
-  if (callback) {
-    callback(null)
-  }
-})
+    subscriptions[topic].stream.emit('end')
+    delete subscriptions[topic]
+
+    if (callback) {
+      callback(null)
+    }
+  })
 
-module.exports = function pubsub (self) {
   return {
     subscribe: promisify((topic, options, callback) => {
       if (!self.isOnline()) {
@@ -47,7 +47,11 @@ module.exports = function pubsub (self) {
 
       // There is no explicit unsubscribe; subscriptions have a cancel event
       stream.cancel = promisify((cb) => {
+        // Remove the event listener
+        self._pubsub.removeAllListeners(topic)
+        // Make sure floodsub knows we've unsubscribed
         self._pubsub.unsubscribe(topic)
+        // Remove the subscription from pubsub's internal state
         removeSubscription(topic, cb)
       })
 
@@ -113,8 +117,9 @@ module.exports = function pubsub (self) {
       let peers = []
 
       try {
+        // This part should be moved down to floodsub
+        // Just return the list of peers
         const peerSet = self._pubsub.getPeerSet()
-        console.log(peerSet)
         _values(peerSet).forEach((peer) => {
           const idB58Str = peer.peerInfo.id.toB58String()
           const index = peer.topics.indexOf(topic)

From 43045f58fbb59f727a40e62307ca01304c82554f Mon Sep 17 00:00:00 2001
From: Gavin McDermott <gavinmcdermott@gmail.com>
Date: Fri, 9 Dec 2016 21:53:24 -0800
Subject: [PATCH 25/46] fix: typo in bitswap core

---
 src/http-api/resources/bitswap.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/http-api/resources/bitswap.js b/src/http-api/resources/bitswap.js
index b4d941322d..da8fccacec 100644
--- a/src/http-api/resources/bitswap.js
+++ b/src/http-api/resources/bitswap.js
@@ -41,6 +41,6 @@ exports.unwant = {
   parseArgs: parseKey,
 
   handler: (request, reply) => {
-    reply(boom.badRequrest(new Error('Not implemented yet')))
+    reply(boom.badRequest(new Error('Not implemented yet')))
   }
 }

From 467a9a9331654259fb366bda8386c7f6a694cc82 Mon Sep 17 00:00:00 2001
From: David Dias <daviddias.p@gmail.com>
Date: Sun, 11 Dec 2016 10:50:11 -0800
Subject: [PATCH 26/46] chore: update deps

---
 package.json | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index c99f7c9f7e..7a8ce8a2c2 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "form-data": "^2.1.2",
     "fs-pull-blob-store": "^0.4.1",
     "gulp": "^3.9.1",
-    "interface-ipfs-core": "^0.22.1",
+    "interface-ipfs-core": "ipfs/interface-ipfs-core#501c304",
     "left-pad": "^1.1.3",
     "lodash": "^4.17.2",
     "ncp": "^2.0.0",
@@ -80,40 +80,22 @@
     "hapi": "^16.0.1",
     "hapi-set-header": "^1.0.2",
     "idb-pull-blob-store": "^0.5.1",
-<<<<<<< 186c5d21434e1a198d467cb1396c4d83c3219311
     "ipfs-api": "^12.1.0",
     "ipfs-bitswap": "^0.8.2",
     "ipfs-block": "^0.5.3",
     "ipfs-block-service": "^0.7.1",
-=======
-    "ipfs-api": "git+https://github.com/ipfs/js-ipfs-api.git#01044a1f59fb866e4e08b06aae4e74d968615931",
-    "ipfs-bitswap": "^0.8.1",
-    "ipfs-block": "^0.5.0",
-    "ipfs-block-service": "^0.7.0",
->>>>>>> chore: address CR comments
+    "ipfs-api": "ipfs/js-ipfs-api#32908ae",
+    "ipfs-bitswap": "^0.8.2",
     "ipfs-multipart": "^0.1.0",
     "ipfs-repo": "^0.11.2",
     "ipfs-unixfs": "^0.1.8",
     "ipfs-unixfs-engine": "^0.14.1",
     "ipld-resolver": "^0.4.0",
     "isstream": "^0.1.2",
-<<<<<<< 186c5d21434e1a198d467cb1396c4d83c3219311
-<<<<<<< 7f1eca4e04b6e7855cfd02e381d1f0fa8ef49841
     "joi": "^10.0.5",
     "libp2p-ipfs-nodejs": "^0.17.0",
     "libp2p-ipfs-browser": "^0.17.2",
     "libp2p-floodsub": "0.4.1",
-=======
-    "joi": "^9.2.0",
-    "libp2p-floodsub": "0.3.1",
->>>>>>> feat(api, cli, core): add floodsub
-    "libp2p-ipfs": "^0.15.0",
-=======
-    "joi": "^10.0.1",
-    "libp2p-floodsub": "0.4.0",
-    "libp2p-ipfs-browser": "^0.17.0",
-    "libp2p-ipfs-nodejs": "^0.16.1",
->>>>>>> chore: address CR comments
     "lodash.flatmap": "^4.5.0",
     "lodash.get": "^4.4.2",
     "lodash.has": "^4.5.2",

From a302b251d6f4a14bb0716f2be84d860c794c8632 Mon Sep 17 00:00:00 2001
From: David Dias <daviddias.p@gmail.com>
Date: Sun, 11 Dec 2016 10:50:29 -0800
Subject: [PATCH 27/46] fix: no more infinite buffering of messages

---
 src/core/components/pubsub.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/components/pubsub.js b/src/core/components/pubsub.js
index 1bce1bf590..6602e08838 100644
--- a/src/core/components/pubsub.js
+++ b/src/core/components/pubsub.js
@@ -86,7 +86,7 @@ module.exports = function pubsub (self) {
         return callback(err)
       }
 
-      callback(null)
+      setImmediate(() => callback())
     }),
 
     ls: promisify((callback) => {
@@ -102,7 +102,7 @@ module.exports = function pubsub (self) {
         return callback(err)
       }
 
-      callback(null, subscriptions)
+      setImmediate(() => callback(null, subscriptions))
     }),
 
     peers: promisify((topic, callback) => {

From 2d829f8abf51c62368c71e00e99b7146c7f011e8 Mon Sep 17 00:00:00 2001
From: Gavin McDermott <gavinmcdermott@gmail.com>
Date: Sun, 11 Dec 2016 16:08:52 -0800
Subject: [PATCH 28/46] fix: wip - cancel relevant subscribe events

---
 src/core/components/pubsub.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/core/components/pubsub.js b/src/core/components/pubsub.js
index 6602e08838..266405c349 100644
--- a/src/core/components/pubsub.js
+++ b/src/core/components/pubsub.js
@@ -9,8 +9,8 @@ const OFFLINE_ERROR = require('../utils').OFFLINE_ERROR
 module.exports = function pubsub (self) {
   let subscriptions = {}
 
-  const addSubscription = (topic, request, stream) => {
-    subscriptions[topic] = { request: request, stream: stream }
+  const addSubscription = (topic, stream, handler) => {
+    subscriptions[topic] = { stream, handler }
   }
 
   const removeSubscription = promisify((topic, callback) => {
@@ -47,20 +47,25 @@ module.exports = function pubsub (self) {
 
       // There is no explicit unsubscribe; subscriptions have a cancel event
       stream.cancel = promisify((cb) => {
-        // Remove the event listener
-        self._pubsub.removeAllListeners(topic)
+        // Remove relevant event listeners
+        if (self._pubsub.listenerCount(topic) > 1) {
+          self._pubsub.removeListener(topic, subscriptions[topic].handler)
+        } else {
+          self._pubsub.removeAllListeners(topic)
+        }
         // Make sure floodsub knows we've unsubscribed
         self._pubsub.unsubscribe(topic)
         // Remove the subscription from pubsub's internal state
         removeSubscription(topic, cb)
       })
 
-      self._pubsub.on(topic, (data) => {
+      const handler = (data) => {
         stream.emit('data', {
           data: data.toString(),
           topicIDs: [topic]
         })
-      })
+      }
+      self._pubsub.on(topic, handler)
 
       try {
         self._pubsub.subscribe(topic)
@@ -69,7 +74,7 @@ module.exports = function pubsub (self) {
       }
 
       // Add the request to the active subscriptions and return the stream
-      addSubscription(topic, null, stream)
+      addSubscription(topic, stream, handler)
       callback(null, stream)
     }),
 

From 5a5a8103906df8356d106af89ed1a628f85fb3fc Mon Sep 17 00:00:00 2001
From: David Dias <daviddias.p@gmail.com>
Date: Sun, 11 Dec 2016 22:48:33 -0800
Subject: [PATCH 29/46] =?UTF-8?q?fix:=20no=20dangling=20listeners,=20multi?=
 =?UTF-8?q?ple=20subscribers.=20pass=20all=20the=20tests=20with=20flying?=
 =?UTF-8?q?=20=F0=9F=8E=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/components/pubsub.js | 83 +++++++++++++----------------------
 1 file changed, 31 insertions(+), 52 deletions(-)

diff --git a/src/core/components/pubsub.js b/src/core/components/pubsub.js
index 266405c349..024c065f79 100644
--- a/src/core/components/pubsub.js
+++ b/src/core/components/pubsub.js
@@ -7,75 +7,53 @@ const _values = require('lodash.values')
 const OFFLINE_ERROR = require('../utils').OFFLINE_ERROR
 
 module.exports = function pubsub (self) {
-  let subscriptions = {}
-
-  const addSubscription = (topic, stream, handler) => {
-    subscriptions[topic] = { stream, handler }
-  }
-
-  const removeSubscription = promisify((topic, callback) => {
-    if (!subscriptions[topic]) {
-      return callback(new Error(`Not subscribed to ${topic}`))
-    }
-
-    subscriptions[topic].stream.emit('end')
-    delete subscriptions[topic]
-
-    if (callback) {
-      callback(null)
-    }
-  })
-
   return {
     subscribe: promisify((topic, options, callback) => {
-      if (!self.isOnline()) {
-        throw OFFLINE_ERROR
-      }
+      if (!self.isOnline()) { throw OFFLINE_ERROR }
 
       if (typeof options === 'function') {
         callback = options
         options = {}
       }
 
-      if (subscriptions[topic]) {
+      if (self._pubsub.getSubscriptions().indexOf(topic) > -1) {
         return callback(`Error: Already subscribed to '${topic}'`)
       }
 
-      const stream = new Readable({ objectMode: true })
+      try {
+        self._pubsub.subscribe(topic)
+      } catch (err) {
+        return callback(err)
+      }
 
-      stream._read = () => {}
+      const subscription = new Readable({ objectMode: true })
+      let canceled = false
+      subscription._read = () => {}
 
-      // There is no explicit unsubscribe; subscriptions have a cancel event
-      stream.cancel = promisify((cb) => {
-        // Remove relevant event listeners
-        if (self._pubsub.listenerCount(topic) > 1) {
-          self._pubsub.removeListener(topic, subscriptions[topic].handler)
-        } else {
-          self._pubsub.removeAllListeners(topic)
-        }
-        // Make sure floodsub knows we've unsubscribed
+      // Attach an extra `cancel` method to the stream
+      subscription.cancel = promisify((cb) => {
+        canceled = true
         self._pubsub.unsubscribe(topic)
-        // Remove the subscription from pubsub's internal state
-        removeSubscription(topic, cb)
+        self._pubsub.removeListener(topic, handler)
+        subscription.on('end', cb)
+        subscription.resume() // make sure it is flowing before cancel
+        subscription.push(null)
       })
 
-      const handler = (data) => {
-        stream.emit('data', {
-          data: data.toString(),
-          topicIDs: [topic]
-        })
-      }
       self._pubsub.on(topic, handler)
 
-      try {
-        self._pubsub.subscribe(topic)
-      } catch (err) {
-        return callback(err)
+      function handler (data) {
+        if (canceled) {
+          return
+        }
+        subscription.push({
+          data: data,
+          topicIDs: [topic]
+        })
       }
 
       // Add the request to the active subscriptions and return the stream
-      addSubscription(topic, stream, handler)
-      callback(null, stream)
+      setImmediate(() => callback(null, subscription))
     }),
 
     publish: promisify((topic, data, callback) => {
@@ -83,10 +61,11 @@ module.exports = function pubsub (self) {
         throw OFFLINE_ERROR
       }
 
-      const buf = Buffer.isBuffer(data) ? data : new Buffer(data)
+      // TODO: Tests don't show that we actually expect this, @haad??
+      // data = Buffer.isBuffer(data) ? data : new Buffer(data)
 
       try {
-        self._pubsub.publish(topic, buf)
+        self._pubsub.publish(topic, data)
       } catch (err) {
         return callback(err)
       }
@@ -115,7 +94,7 @@ module.exports = function pubsub (self) {
         throw OFFLINE_ERROR
       }
 
-      if (!subscriptions[topic]) {
+      if (self._pubsub.getSubscriptions().indexOf(topic) < 0) {
         return callback(`Error: Not subscribed to '${topic}'`)
       }
 
@@ -136,7 +115,7 @@ module.exports = function pubsub (self) {
         return callback(err)
       }
 
-      callback(null, peers)
+      setImmediate(() => callback(null, peers))
     })
   }
 }

From 82aba1e745d8613fbe00c517d22a963ce677e0ef Mon Sep 17 00:00:00 2001
From: David Dias <daviddias.p@gmail.com>
Date: Mon, 12 Dec 2016 20:11:53 -0800
Subject: [PATCH 30/46] chore: update deps

---
 package.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 7a8ce8a2c2..267174b1eb 100644
--- a/package.json
+++ b/package.json
@@ -81,16 +81,16 @@
     "hapi-set-header": "^1.0.2",
     "idb-pull-blob-store": "^0.5.1",
     "ipfs-api": "^12.1.0",
-    "ipfs-bitswap": "^0.8.2",
+    "ipfs-bitswap": "^0.8.3",
     "ipfs-block": "^0.5.3",
-    "ipfs-block-service": "^0.7.1",
+    "ipfs-block-service": "^0.7.2",
     "ipfs-api": "ipfs/js-ipfs-api#32908ae",
-    "ipfs-bitswap": "^0.8.2",
+    "ipfs-bitswap": "^0.8.3",
     "ipfs-multipart": "^0.1.0",
     "ipfs-repo": "^0.11.2",
-    "ipfs-unixfs": "^0.1.8",
-    "ipfs-unixfs-engine": "^0.14.1",
-    "ipld-resolver": "^0.4.0",
+    "ipfs-unixfs": "^0.1.9",
+    "ipfs-unixfs-engine": "^0.14.2",
+    "ipld-resolver": "^0.4.1",
     "isstream": "^0.1.2",
     "joi": "^10.0.5",
     "libp2p-ipfs-nodejs": "^0.17.0",

From 8d855c2fe3bef8d200aec8a82c34f55055981f96 Mon Sep 17 00:00:00 2001
From: Gavin McDermott <gavinmcdermott@gmail.com>
Date: Fri, 16 Dec 2016 15:32:47 -0800
Subject: [PATCH 31/46] fix: subscribe returns a valid stream

---
 package.json                        |  1 -
 src/http-api/resources/pubsub.js    | 21 +++++++++++++++------
 test/http-api/inject/test-pubsub.js | 28 +++++++++++++++++++---------
 3 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 9ba501fed3..1bf6435309 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,6 @@
     "mafmt": "^2.1.2",
     "multiaddr": "^2.1.1",
     "multihashes": "^0.3.0",
-    "ndjson": "1.5.0",
     "path-exists": "^3.0.0",
     "peer-book": "^0.3.0",
     "peer-id": "^0.8.0",
diff --git a/src/http-api/resources/pubsub.js b/src/http-api/resources/pubsub.js
index 38c3084b3a..3317077654 100644
--- a/src/http-api/resources/pubsub.js
+++ b/src/http-api/resources/pubsub.js
@@ -1,7 +1,9 @@
 'use strict'
 
 const debug = require('debug')
-// const ndjson = require('ndjson')
+const pull = require('pull-stream')
+const toStream = require('pull-stream-to-stream')
+const toPull = require('stream-to-pull-stream')
 const log = debug('http-api:pubsub')
 log.error = debug('http-api:pubsub:error')
 
@@ -21,17 +23,24 @@ exports.subscribe = {
         }).code(500)
       }
 
+      // TODO: expose pull-streams on floodsub and use them here
+      const res = toStream.source(pull(
+        toPull(stream),
+        pull.map((obj) => JSON.stringify(obj) + '\n')
+      ))
+
       // hapi is not very clever and throws if no:
       // - _read method
       // - _readableState object
       // are there :(
-      if (!stream._read) {
-        stream._read = () => {}
-        stream._readableState = {}
+      if (!res._read) {
+        res._read = () => {}
+        res._readableState = {}
       }
 
-      // ndjson.serialize
-      return reply(stream)
+      res.destroy = () => stream.cancel()
+
+      reply(res).header('X-Stream-Output', '1')
     })
   }
 }
diff --git a/test/http-api/inject/test-pubsub.js b/test/http-api/inject/test-pubsub.js
index 28e87ab881..6fc264d9b8 100644
--- a/test/http-api/inject/test-pubsub.js
+++ b/test/http-api/inject/test-pubsub.js
@@ -6,12 +6,13 @@ const expect = require('chai').expect
 const createTempNode = require('./../../utils/temp-node')
 
 module.exports = (http) => {
-  describe.only('/pubsub', () => {
+  describe('/pubsub', () => {
     let api
     let tmpNode
 
     const buf = new Buffer('some message')
     const topic = 'nonScents'
+    const topicNotSubscribed = 'somethingRandom'
 
     before((done) => {
       api = http.api.server.select('API')
@@ -44,13 +45,22 @@ module.exports = (http) => {
       })
 
       it('returns 200 with topic', (done) => {
-        api.inject({
-          method: 'GET',
-          url: `/api/v0/pubsub/sub/${topic}`
-        }, (res) => {
-          expect(res.statusCode).to.equal(200)
-          done()
-        })
+        // TODO: Agree on a better way to test this (currently this hangs)
+        // Regarding: https://github.com/ipfs/js-ipfs/pull/644#issuecomment-267687194
+        // Current Patch: Subscribe to a topic so the other tests run as expected
+        api.app.ipfs.pubsub.subscribe(topic)
+          .then((stream) => {
+              stream.on('end', done)
+              setTimeout(() => stream.emit('end'), 100)
+            })
+        // api.inject({
+        //   method: 'GET',
+        //   url: `/api/v0/pubsub/sub/${topic}`
+        // }, (res) => {
+        //   console.log(res.result)
+        //   expect(res.statusCode).to.equal(200)
+        //   done()
+        // })
       })
 
       it('returns 500 if already subscribed to a topic', (done) => {
@@ -126,7 +136,7 @@ module.exports = (http) => {
       it('returns 500 if not subscribed to a topic', (done) => {
         api.inject({
           method: 'GET',
-          url: `/api/v0/pubsub/peers/notsubscribed`
+          url: `/api/v0/pubsub/peers/${topicNotSubscribed}`
         }, (res) => {
           expect(res.statusCode).to.equal(500)
           done()

From c457bf7e61a8cda3735b19f394fedd599d608ace Mon Sep 17 00:00:00 2001
From: Friedel Ziegelmayer <dignifiedquire@gmail.com>
Date: Sun, 18 Dec 2016 11:33:56 +0100
Subject: [PATCH 32/46] update to the latest floodsub

---
 package.json                     |  4 ++--
 src/core/components/pubsub.js    | 34 +++++++++++---------------------
 src/http-api/resources/pubsub.js | 15 ++++++++++----
 3 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index f4293736c7..6925bad569 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
     "ipld-resolver": "^0.4.1",
     "isstream": "^0.1.2",
     "joi": "^10.0.5",
-    "libp2p-floodsub": "0.4.1",
+    "libp2p-floodsub": "0.5.0",
     "libp2p-ipfs-browser": "^0.17.2",
     "libp2p-ipfs-nodejs": "^0.17.0",
     "lodash.flatmap": "^4.5.0",
@@ -105,7 +105,7 @@
     "multihashes": "^0.3.0",
     "path-exists": "^3.0.0",
     "peer-book": "^0.3.0",
-    "peer-id": "^0.8.0",
+    "peer-id": "^0.8.1",
     "peer-info": "^0.8.1",
     "promisify-es6": "^1.0.2",
     "pull-file": "^1.0.0",
diff --git a/src/core/components/pubsub.js b/src/core/components/pubsub.js
index 024c065f79..e5e0a11f6f 100644
--- a/src/core/components/pubsub.js
+++ b/src/core/components/pubsub.js
@@ -2,21 +2,22 @@
 
 const promisify = require('promisify-es6')
 const Readable = require('stream').Readable
-const _values = require('lodash.values')
 
 const OFFLINE_ERROR = require('../utils').OFFLINE_ERROR
 
 module.exports = function pubsub (self) {
   return {
     subscribe: promisify((topic, options, callback) => {
-      if (!self.isOnline()) { throw OFFLINE_ERROR }
+      if (!self.isOnline()) {
+        throw OFFLINE_ERROR
+      }
 
       if (typeof options === 'function') {
         callback = options
         options = {}
       }
 
-      if (self._pubsub.getSubscriptions().indexOf(topic) > -1) {
+      if (self._pubsub.subscriptions.has(topic)) {
         return callback(`Error: Already subscribed to '${topic}'`)
       }
 
@@ -78,13 +79,9 @@ module.exports = function pubsub (self) {
         throw OFFLINE_ERROR
       }
 
-      let subscriptions = []
-
-      try {
-        subscriptions = self._pubsub.getSubscriptions()
-      } catch (err) {
-        return callback(err)
-      }
+      const subscriptions = Array.from(
+        self._pubsub.subscriptions
+      )
 
       setImmediate(() => callback(null, subscriptions))
     }),
@@ -94,23 +91,16 @@ module.exports = function pubsub (self) {
         throw OFFLINE_ERROR
       }
 
-      if (self._pubsub.getSubscriptions().indexOf(topic) < 0) {
+      if (!self._pubsub.subscriptions.has(topic)) {
         return callback(`Error: Not subscribed to '${topic}'`)
       }
 
-      let peers = []
+      let peers
 
       try {
-        // This part should be moved down to floodsub
-        // Just return the list of peers
-        const peerSet = self._pubsub.getPeerSet()
-        _values(peerSet).forEach((peer) => {
-          const idB58Str = peer.peerInfo.id.toB58String()
-          const index = peer.topics.indexOf(topic)
-          if (index > -1) {
-            peers.push(idB58Str)
-          }
-        })
+        peers = Array.from(self._pubsub.peers.values())
+          .filter((peer) => peer.topics.has(topic))
+          .map((peer) => peer.info.id.toB58String())
       } catch (err) {
         return callback(err)
       }
diff --git a/src/http-api/resources/pubsub.js b/src/http-api/resources/pubsub.js
index 3317077654..a8e663696b 100644
--- a/src/http-api/resources/pubsub.js
+++ b/src/http-api/resources/pubsub.js
@@ -13,8 +13,11 @@ exports.subscribe = {
   handler: (request, reply) => {
     const discover = request.query.discover || null
     const topic = request.params.topic
+    const ipfs = request.server.app.ipfs
 
-    request.server.app.ipfs.pubsub.subscribe(topic, { discover }, (err, stream) => {
+    ipfs.pubsub.subscribe(topic, {
+      discover: discover
+    }, (err, stream) => {
       if (err) {
         log.error(err)
         return reply({
@@ -49,8 +52,9 @@ exports.publish = {
   handler: (request, reply) => {
     const buf = request.query.buf
     const topic = request.query.topic
+    const ipfs = request.server.app.ipfs
 
-    request.server.app.ipfs.pubsub.publish(topic, buf, (err) => {
+    ipfs.pubsub.publish(topic, buf, (err) => {
       if (err) {
         log.error(err)
         return reply({
@@ -66,7 +70,9 @@ exports.publish = {
 
 exports.ls = {
   handler: (request, reply) => {
-    request.server.app.ipfs.pubsub.ls((err, subscriptions) => {
+    const ipfs = request.server.app.ipfs
+
+    ipfs.pubsub.ls((err, subscriptions) => {
       if (err) {
         log.error(err)
         return reply({
@@ -83,8 +89,9 @@ exports.ls = {
 exports.peers = {
   handler: (request, reply) => {
     const topic = request.params.topic
+    const ipfs = request.server.app.ipfs
 
-    request.server.app.ipfs.pubsub.peers(topic, (err, peers) => {
+    ipfs.pubsub.peers(topic, (err, peers) => {
       if (err) {
         log.error(err)
         return reply({

From ea458eed74c0459ec28ef79e1c4960604f7eff44 Mon Sep 17 00:00:00 2001
From: Friedel Ziegelmayer <dignifiedquire@gmail.com>
Date: Sun, 18 Dec 2016 22:26:51 +0100
Subject: [PATCH 33/46] simple cli and http tests passing

---
 package.json                                  |  2 +
 src/cli/commands/pubsub/ls.js                 |  4 +-
 src/cli/commands/pubsub/peers.js              |  4 +-
 .../commands/pubsub/{publish.js => pub.js}    |  2 +-
 .../commands/pubsub/{subscribe.js => sub.js}  | 16 +++-
 src/core/components/pubsub.js                 | 36 +++-----
 src/http-api/error-handler.js                 | 54 ++++++++++++
 src/http-api/index.js                         |  4 +
 src/http-api/resources/pubsub.js              | 78 ++++++++++-------
 src/http-api/routes/pubsub.js                 | 30 ++-----
 test/cli/test-pubsub.js                       | 85 ++++++++++++-------
 test/http-api/inject/test-pubsub.js           | 41 +++------
 test/utils/ipfs-exec.js                       | 10 ++-
 13 files changed, 222 insertions(+), 144 deletions(-)
 rename src/cli/commands/pubsub/{publish.js => pub.js} (92%)
 rename src/cli/commands/pubsub/{subscribe.js => sub.js} (64%)
 create mode 100644 src/http-api/error-handler.js

diff --git a/package.json b/package.json
index 64071f9f04..8ef19b3415 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,7 @@
     "aegir": "^9.2.2",
     "buffer-loader": "0.0.1",
     "chai": "^3.5.0",
+    "delay": "^1.3.1",
     "detect-node": "^2.0.3",
     "eslint-plugin-react": "^6.8.0",
     "execa": "^0.5.0",
@@ -80,6 +81,7 @@
     "glob": "^7.1.1",
     "hapi": "^16.0.1",
     "hapi-set-header": "^1.0.2",
+    "hoek": "^4.1.0",
     "idb-pull-blob-store": "^0.5.1",
     "ipfs-api": "ipfs/js-ipfs-api#32908ae",
     "ipfs-bitswap": "^0.8.3",
diff --git a/src/cli/commands/pubsub/ls.js b/src/cli/commands/pubsub/ls.js
index 0a53b01ce3..82ca7cbb54 100644
--- a/src/cli/commands/pubsub/ls.js
+++ b/src/cli/commands/pubsub/ls.js
@@ -23,7 +23,9 @@ module.exports = {
           throw err
         }
 
-        console.log(JSON.stringify(subscriptions, null, 2))
+        subscriptions.forEach((sub) => {
+          console.log(sub)
+        })
       })
     })
   }
diff --git a/src/cli/commands/pubsub/peers.js b/src/cli/commands/pubsub/peers.js
index 0f4052b27e..4519677b64 100644
--- a/src/cli/commands/pubsub/peers.js
+++ b/src/cli/commands/pubsub/peers.js
@@ -23,7 +23,9 @@ module.exports = {
           throw err
         }
 
-        console.log(JSON.stringify(peers, null, 2))
+        peers.forEach((peer) => {
+          console.log(peer)
+        })
       })
     })
   }
diff --git a/src/cli/commands/pubsub/publish.js b/src/cli/commands/pubsub/pub.js
similarity index 92%
rename from src/cli/commands/pubsub/publish.js
rename to src/cli/commands/pubsub/pub.js
index 4f0e141270..85e14fdf33 100644
--- a/src/cli/commands/pubsub/publish.js
+++ b/src/cli/commands/pubsub/pub.js
@@ -6,7 +6,7 @@ const log = debug('cli:pubsub')
 log.error = debug('cli:pubsub:error')
 
 module.exports = {
-  command: 'publish <topic> <data>',
+  command: 'pub <topic> <data>',
 
   describe: 'Publish data to a topic',
 
diff --git a/src/cli/commands/pubsub/subscribe.js b/src/cli/commands/pubsub/sub.js
similarity index 64%
rename from src/cli/commands/pubsub/subscribe.js
rename to src/cli/commands/pubsub/sub.js
index 1f3d108a85..57c6effffa 100644
--- a/src/cli/commands/pubsub/subscribe.js
+++ b/src/cli/commands/pubsub/sub.js
@@ -6,9 +6,7 @@ const log = debug('cli:pubsub')
 log.error = debug('cli:pubsub:error')
 
 module.exports = {
-  command: 'subscribe <topic>',
-
-  alias: 'sub',
+  command: 'sub <topic>',
 
   describe: 'Subscribe to a topic',
 
@@ -25,7 +23,17 @@ module.exports = {
           throw err
         }
 
-        console.log(stream.toString())
+        stream.on('data', (obj) => {
+          console.log(obj.data.toString())
+        })
+
+        stream.on('error', (err) => {
+          throw err
+        })
+
+        stream.on('end', () => {
+          process.exit()
+        })
       })
     })
   }
diff --git a/src/core/components/pubsub.js b/src/core/components/pubsub.js
index e5e0a11f6f..624380c0b1 100644
--- a/src/core/components/pubsub.js
+++ b/src/core/components/pubsub.js
@@ -18,15 +18,8 @@ module.exports = function pubsub (self) {
       }
 
       if (self._pubsub.subscriptions.has(topic)) {
-        return callback(`Error: Already subscribed to '${topic}'`)
+        return callback(new Error(`Already subscribed to '${topic}'`))
       }
-
-      try {
-        self._pubsub.subscribe(topic)
-      } catch (err) {
-        return callback(err)
-      }
-
       const subscription = new Readable({ objectMode: true })
       let canceled = false
       subscription._read = () => {}
@@ -47,10 +40,14 @@ module.exports = function pubsub (self) {
         if (canceled) {
           return
         }
-        subscription.push({
-          data: data,
-          topicIDs: [topic]
-        })
+
+        subscription.push(data)
+      }
+
+      try {
+        self._pubsub.subscribe(topic)
+      } catch (err) {
+        return callback(err)
       }
 
       // Add the request to the active subscriptions and return the stream
@@ -62,8 +59,9 @@ module.exports = function pubsub (self) {
         throw OFFLINE_ERROR
       }
 
-      // TODO: Tests don't show that we actually expect this, @haad??
-      // data = Buffer.isBuffer(data) ? data : new Buffer(data)
+      if (typeof data === 'string') {
+        data = new Buffer(data)
+      }
 
       try {
         self._pubsub.publish(topic, data)
@@ -92,18 +90,12 @@ module.exports = function pubsub (self) {
       }
 
       if (!self._pubsub.subscriptions.has(topic)) {
-        return callback(`Error: Not subscribed to '${topic}'`)
+        return callback(new Error(`Not subscribed to '${topic}'`))
       }
 
-      let peers
-
-      try {
-        peers = Array.from(self._pubsub.peers.values())
+      const peers = Array.from(self._pubsub.peers.values())
           .filter((peer) => peer.topics.has(topic))
           .map((peer) => peer.info.id.toB58String())
-      } catch (err) {
-        return callback(err)
-      }
 
       setImmediate(() => callback(null, peers))
     })
diff --git a/src/http-api/error-handler.js b/src/http-api/error-handler.js
new file mode 100644
index 0000000000..6d0627cccb
--- /dev/null
+++ b/src/http-api/error-handler.js
@@ -0,0 +1,54 @@
+'use strict'
+
+const Hoek = require('hoek')
+
+module.exports = (server) => {
+  server.ext('onRequest', (request, reply) => {
+    request.handleError = handleError
+    reply.continue()
+  })
+
+  server.ext('onPreResponse', (request, reply) => {
+    const res = request.response
+    const req = request.raw.req
+
+    let statusCode = 200
+    let msg = 'Sorry, something went wrong, please retrace your steps.'
+
+    if (res.isBoom) {
+      statusCode = res.output.payload.statusCode
+
+      if (res.message && res.isDeveloperError) {
+        // we caught it!
+        msg = res.message.replace('Uncaught error: ', '')
+      }
+
+      const debug = {
+        method: req.method,
+        url: request.url.path,
+        headers: request.raw.req.headers,
+        info: request.info,
+        payload: request.payload,
+        response: res.output.payload
+      }
+      // ALWAYS Log the error
+      server.log('error', debug)
+
+      reply({
+        Message: msg,
+        Code: 0
+      }).code(statusCode)
+      return
+    }
+
+    reply.continue()
+  })
+}
+
+function handleError (error, errorMessage) {
+  if (errorMessage) {
+    return Hoek.assert(!error, errorMessage)
+  }
+
+  return Hoek.assert(!error, error)
+}
diff --git a/src/http-api/index.js b/src/http-api/index.js
index 9cd866a5cb..21a6bc5e44 100644
--- a/src/http-api/index.js
+++ b/src/http-api/index.js
@@ -14,6 +14,7 @@ const log = debug('api')
 log.error = debug('api:error')
 
 const IPFS = require('../core')
+const errorHandler = require('./error-handler')
 
 exports = module.exports = function HttpApi (repo) {
   this.ipfs = null
@@ -80,6 +81,9 @@ exports = module.exports = function HttpApi (repo) {
           labels: 'Gateway'
         })
 
+        // Nicer errors
+        errorHandler(this.server)
+
         // load routes
         require('./routes')(this.server)
 
diff --git a/src/http-api/resources/pubsub.js b/src/http-api/resources/pubsub.js
index a8e663696b..ba51521bbc 100644
--- a/src/http-api/resources/pubsub.js
+++ b/src/http-api/resources/pubsub.js
@@ -9,27 +9,41 @@ log.error = debug('http-api:pubsub:error')
 
 exports = module.exports
 
+function handleError (reply, msg) {
+  reply({
+    Message: msg,
+    Code: 0
+  }).code(500)
+}
+
 exports.subscribe = {
   handler: (request, reply) => {
-    const discover = request.query.discover || null
-    const topic = request.params.topic
+    const query = request.query
+    const discover = query.discover === 'true'
+    const topic = query.arg
+
+    if (!topic) {
+      return handleError(reply, 'Missing topic')
+    }
+
     const ipfs = request.server.app.ipfs
 
     ipfs.pubsub.subscribe(topic, {
       discover: discover
     }, (err, stream) => {
       if (err) {
-        log.error(err)
-        return reply({
-          Message: `Failed to subscribe to topic ${topic}: ${err}`,
-          Code: 0
-        }).code(500)
+        return handleError(reply, `Failed to subscribe to topic ${topic}: ${err}`)
       }
 
       // TODO: expose pull-streams on floodsub and use them here
       const res = toStream.source(pull(
         toPull(stream),
-        pull.map((obj) => JSON.stringify(obj) + '\n')
+        pull.map((obj) => JSON.stringify({
+          from: obj.from,
+          data: obj.data.toString('base64'),
+          seqno: obj.seqno.toString('base64'),
+          topicCIDs: obj.topicCIDs
+        }) + '\n')
       ))
 
       // hapi is not very clever and throws if no:
@@ -43,27 +57,35 @@ exports.subscribe = {
 
       res.destroy = () => stream.cancel()
 
-      reply(res).header('X-Stream-Output', '1')
+      reply(res)
+        .header('X-Chunked-Output', '1')
+        .header('content-type', 'application/json')
     })
   }
 }
 
 exports.publish = {
   handler: (request, reply) => {
-    const buf = request.query.buf
-    const topic = request.query.topic
+    const arg = request.query.arg
+    const topic = arg[0]
+    const buf = arg[1]
+
     const ipfs = request.server.app.ipfs
 
+    if (!topic) {
+      return handleError(reply, 'Missing topic')
+    }
+
+    if (!buf) {
+      return handleError(reply, 'Missing buf')
+    }
+
     ipfs.pubsub.publish(topic, buf, (err) => {
       if (err) {
-        log.error(err)
-        return reply({
-          Message: `Failed to publish to topic ${topic}: ${err}`,
-          Code: 0
-        }).code(500)
+        return handleError(reply, `Failed to publish to topic ${topic}: ${err}`)
       }
 
-      return reply()
+      reply()
     })
   }
 }
@@ -74,33 +96,29 @@ exports.ls = {
 
     ipfs.pubsub.ls((err, subscriptions) => {
       if (err) {
-        log.error(err)
-        return reply({
-          Message: `Failed to list subscriptions: ${err}`,
-          Code: 0
-        }).code(500)
+        return handleError(reply, `Failed to list subscriptions: ${err}`)
       }
 
-      return reply(subscriptions)
+      reply({Strings: subscriptions})
     })
   }
 }
 
 exports.peers = {
   handler: (request, reply) => {
-    const topic = request.params.topic
+    const topic = request.query.arg
     const ipfs = request.server.app.ipfs
 
+    if (!topic) {
+      return handleError(reply, 'Missing topic')
+    }
+
     ipfs.pubsub.peers(topic, (err, peers) => {
       if (err) {
-        log.error(err)
-        return reply({
-          Message: `Failed to find peers subscribed to ${topic}: ${err}`,
-          Code: 0
-        }).code(500)
+        return handleError(reply, `Failed to find peers subscribed to ${topic}: ${err}`)
       }
 
-      return reply(peers)
+      reply({Strings: peers})
     })
   }
 }
diff --git a/src/http-api/routes/pubsub.js b/src/http-api/routes/pubsub.js
index 1651f968ee..6f55b52b65 100644
--- a/src/http-api/routes/pubsub.js
+++ b/src/http-api/routes/pubsub.js
@@ -1,6 +1,5 @@
 'use strict'
 
-const Joi = require('joi')
 const resources = require('./../resources')
 
 module.exports = (server) => {
@@ -8,17 +7,9 @@ module.exports = (server) => {
 
   api.route({
     method: '*',
-    path: '/api/v0/pubsub/sub/{topic}',
+    path: '/api/v0/pubsub/sub',
     config: {
-      handler: resources.pubsub.subscribe.handler,
-      validate: {
-        params: {
-          topic: Joi.string().required()
-        },
-        query: {
-          discover: Joi.boolean()
-        }
-      }
+      handler: resources.pubsub.subscribe.handler
     }
   })
 
@@ -26,13 +17,7 @@ module.exports = (server) => {
     method: '*',
     path: '/api/v0/pubsub/pub',
     config: {
-      handler: resources.pubsub.publish.handler,
-      validate: {
-        query: {
-          topic: Joi.string().required(),
-          buf: Joi.binary().required()
-        }
-      }
+      handler: resources.pubsub.publish.handler
     }
   })
 
@@ -46,14 +31,9 @@ module.exports = (server) => {
 
   api.route({
     method: '*',
-    path: '/api/v0/pubsub/peers/{topic}',
+    path: '/api/v0/pubsub/peers',
     config: {
-      handler: resources.pubsub.peers.handler,
-      validate: {
-        params: {
-          topic: Joi.string().required()
-        }
-      }
+      handler: resources.pubsub.peers.handler
     }
   })
 }
diff --git a/test/cli/test-pubsub.js b/test/cli/test-pubsub.js
index eb37998a2a..9e4531e148 100644
--- a/test/cli/test-pubsub.js
+++ b/test/cli/test-pubsub.js
@@ -3,21 +3,19 @@
 'use strict'
 
 const expect = require('chai').expect
+const delay = require('delay')
 const HttpAPI = require('../../src/http-api')
 const createTempNode = require('../utils/temp-node')
 const repoPath = require('./index').repoPath
 const ipfs = require('../utils/ipfs-exec')(repoPath)
 
-// This depends on:
-// ipfs/interface-ipfs-core.git#5c7df414a8f627f8adb50a52ef8d2b629381285f
-// ipfs/js-ipfs-api.git#01044a1f59fb866e4e08b06aae4e74d968615931
-describe.skip('pubsub', function () {
+describe('pubsub', function () {
   this.timeout(30 * 1000)
   let node
 
   const topicA = 'nonscentsA'
   const topicB = 'nonscentsB'
-  const message = new Buffer('Some non cents.')
+  const topicC = 'nonscentsC'
 
   before((done) => {
     createTempNode(1, (err, _node) => {
@@ -36,51 +34,76 @@ describe.skip('pubsub', function () {
 
   describe('api running', () => {
     let httpAPI
-    const called = true
 
     before((done) => {
       httpAPI = new HttpAPI(repoPath)
-      httpAPI.start((err) => {
-        expect(err).to.not.exist
-        done()
-      })
+      httpAPI.start(done)
     })
 
     after((done) => {
-      httpAPI.stop((err) => {
-        expect(err).to.not.exist
-        done()
-      })
+      httpAPI.stop(done)
     })
 
-    it('subscribe', () => {
-      return ipfs('pubsub', 'subscribe', topicA).then((out) => {
-        expect(out).to.have.length.above(0)
-      })
-    })
+    it('subscribe and publish', () => {
+      const sub = ipfs(`pubsub sub ${topicA}`)
 
-    it('subscribe alias', () => {
-      return ipfs('pubsub', 'sub', topicB).then((out) => {
-        expect(out).to.have.length.above(0)
+      sub.stdout.on('data', (c) => {
+        expect(c.toString()).to.be.eql('world\n')
+        sub.kill()
       })
-    })
 
-    it('publish', () => {
-      return ipfs('pubsub', 'publish', topicA, message).then((out) => {
-        expect(called).to.eql(true)
-      })
+      return Promise.all([
+        sub.catch(ignoreKill),
+        delay(200)
+          .then(() => ipfs(`pubsub pub ${topicA} world`))
+          .then((out) => {
+            expect(out).to.be.eql('')
+          })
+      ])
     })
 
     it('ls', () => {
-      return ipfs('pubsub', 'ls').then((out) => {
-        expect(out).to.have.length.above(0)
+      const sub = ipfs(`pubsub sub ${topicB}`)
+
+      sub.stdout.once('data', (data) => {
+        expect(data.toString()).to.be.eql('world\n')
+        ipfs('pubsub ls')
+          .then((out) => {
+            expect(out).to.be.eql(topicB)
+            sub.kill()
+          })
       })
+
+      return Promise.all([
+        sub.catch(ignoreKill),
+        delay(200)
+          .then(() => ipfs(`pubsub pub ${topicB} world`))
+      ])
     })
 
     it('peers', () => {
-      return ipfs('pubsub', 'peers', topicA).then((out) => {
-        expect(out).to.be.eql('[]')
+      const sub = ipfs(`pubsub sub ${topicC}`)
+
+      sub.stdout.once('data', (data) => {
+        expect(data.toString()).to.be.eql('world\n')
+        ipfs(`pubsub peers ${topicC}`)
+          .then((out) => {
+            expect(out).to.be.eql('')
+            sub.kill()
+          })
       })
+
+      return Promise.all([
+        sub.catch(ignoreKill),
+        delay(200)
+          .then(() => ipfs(`pubsub pub ${topicC} world`))
+      ])
     })
   })
 })
+
+function ignoreKill (err) {
+  if (!err.killed) {
+    throw err
+  }
+}
diff --git a/test/http-api/inject/test-pubsub.js b/test/http-api/inject/test-pubsub.js
index 9edb90be54..06cd7d3e59 100644
--- a/test/http-api/inject/test-pubsub.js
+++ b/test/http-api/inject/test-pubsub.js
@@ -33,13 +33,13 @@ module.exports = (http) => {
       }, 1000)
     })
 
-    describe('/sub/{topic}', () => {
-      it('returns 404 if no topic is provided', (done) => {
+    describe('/sub', () => {
+      it('returns 500 if no topic is provided', (done) => {
         api.inject({
           method: 'GET',
           url: `/api/v0/pubsub/sub`
         }, (res) => {
-          expect(res.statusCode).to.equal(404)
+          expect(res.statusCode).to.equal(500)
           done()
         })
       })
@@ -66,7 +66,7 @@ module.exports = (http) => {
       it('returns 500 if already subscribed to a topic', (done) => {
         api.inject({
           method: 'GET',
-          url: `/api/v0/pubsub/sub/${topic}`
+          url: `/api/v0/pubsub/sub?arg=${topic}`
         }, (res) => {
           expect(res.statusCode).to.equal(500)
           done()
@@ -75,24 +75,12 @@ module.exports = (http) => {
     })
 
     describe('/pub', () => {
-      it('returns 400 if no buffer is provided', (done) => {
-        api.inject({
-          method: 'POST',
-          url: `/api/v0/pubsub/pub?topic=${topic}`
-        }, (res) => {
-          expect(res.statusCode).to.equal(400)
-          expect(res.statusMessage).to.equal('Bad Request')
-          done()
-        })
-      })
-
-      it('returns 400 if no topic is provided', (done) => {
+      it('returns 500 if no buffer is provided', (done) => {
         api.inject({
           method: 'POST',
-          url: `/api/v0/pubsub/pub?buf=${buf}`
+          url: `/api/v0/pubsub/pub?arg=${topic}&arg=`
         }, (res) => {
-          expect(res.statusCode).to.equal(400)
-          expect(res.statusMessage).to.equal('Bad Request')
+          expect(res.statusCode).to.equal(500)
           done()
         })
       })
@@ -100,7 +88,7 @@ module.exports = (http) => {
       it('returns 200 with topic and buffer', (done) => {
         api.inject({
           method: 'POST',
-          url: `/api/v0/pubsub/pub?buf=${buf}&topic=${topic}`
+          url: `/api/v0/pubsub/pub?arg=${topic}&arg=${buf}`
         }, (res) => {
           expect(res.statusCode).to.equal(200)
           done()
@@ -115,20 +103,19 @@ module.exports = (http) => {
           url: `/api/v0/pubsub/ls`
         }, (res) => {
           expect(res.statusCode).to.equal(200)
-          expect(res.result.length).to.eql(1)
-          expect(res.result[0]).to.eql(topic)
+          expect(res.result.Strings).to.be.eql([topic])
           done()
         })
       })
     })
 
-    describe('/peers/{topic}', () => {
-      it('returns 404 if no topic is provided', (done) => {
+    describe('/peers', () => {
+      it('returns 500 if no topic is provided', (done) => {
         api.inject({
           method: 'GET',
           url: `/api/v0/pubsub/peers`
         }, (res) => {
-          expect(res.statusCode).to.equal(404)
+          expect(res.statusCode).to.equal(500)
           done()
         })
       })
@@ -136,7 +123,7 @@ module.exports = (http) => {
       it('returns 500 if not subscribed to a topic', (done) => {
         api.inject({
           method: 'GET',
-          url: `/api/v0/pubsub/peers/${topicNotSubscribed}`
+          url: `/api/v0/pubsub/peers?arg=${topicNotSubscribed}`
         }, (res) => {
           expect(res.statusCode).to.equal(500)
           done()
@@ -146,7 +133,7 @@ module.exports = (http) => {
       it('returns 200 with topic', (done) => {
         api.inject({
           method: 'GET',
-          url: `/api/v0/pubsub/peers/${topic}`
+          url: `/api/v0/pubsub/peers?arg=${topic}`
         }, (res) => {
           expect(res.statusCode).to.equal(200)
           done()
diff --git a/test/utils/ipfs-exec.js b/test/utils/ipfs-exec.js
index 371435850a..d761502e61 100644
--- a/test/utils/ipfs-exec.js
+++ b/test/utils/ipfs-exec.js
@@ -33,13 +33,19 @@ module.exports = (repoPath, opts) => {
       args = args[0].split(' ')
     }
 
-    return exec(args).then((res) => {
+    const cp = exec(args)
+    const res = cp.then((res) => {
       // We can't escape the os.tmpDir warning due to:
       // https://github.com/shelljs/shelljs/blob/master/src/tempdir.js#L43
       // expect(res.stderr).to.be.eql('')
-
       return res.stdout
     })
+
+    res.kill = cp.kill.bind(cp)
+    res.stdout = cp.stdout
+    res.stderr = cp.stderr
+
+    return res
   }
 
   ipfs.fail = function ipfsFail () {

From 3e29f954a5db50522e1e1635522ae7a2e17caadd Mon Sep 17 00:00:00 2001
From: Friedel Ziegelmayer <dignifiedquire@gmail.com>
Date: Mon, 19 Dec 2016 20:31:01 +0100
Subject: [PATCH 34/46] new events based api done and http-api with
 ipfs-interface-core testing

---
 src/cli/commands/pubsub/sub.js                | 18 +---
 src/core/components/pubsub.js                 | 85 +++++++++----------
 src/http-api/resources/pubsub.js              | 52 ++++++------
 test/http-api/inject/test-pubsub.js           | 25 ++----
 .../test-pubsub.js                            | 20 +++++
 5 files changed, 98 insertions(+), 102 deletions(-)
 create mode 100644 test/http-api/interface-ipfs-core-over-ipfs-api/test-pubsub.js

diff --git a/src/cli/commands/pubsub/sub.js b/src/cli/commands/pubsub/sub.js
index 57c6effffa..87f9322e4a 100644
--- a/src/cli/commands/pubsub/sub.js
+++ b/src/cli/commands/pubsub/sub.js
@@ -18,22 +18,8 @@ module.exports = {
         throw err
       }
 
-      ipfs.pubsub.subscribe(argv.topic, (err, stream) => {
-        if (err) {
-          throw err
-        }
-
-        stream.on('data', (obj) => {
-          console.log(obj.data.toString())
-        })
-
-        stream.on('error', (err) => {
-          throw err
-        })
-
-        stream.on('end', () => {
-          process.exit()
-        })
+      ipfs.pubsub.subscribe(argv.topic, (msg) => {
+        console.log(msg.data.toString())
       })
     })
   }
diff --git a/src/core/components/pubsub.js b/src/core/components/pubsub.js
index 624380c0b1..75f79df954 100644
--- a/src/core/components/pubsub.js
+++ b/src/core/components/pubsub.js
@@ -1,58 +1,46 @@
 'use strict'
 
 const promisify = require('promisify-es6')
-const Readable = require('stream').Readable
+const setImmediate = require('async/setImmediate')
 
 const OFFLINE_ERROR = require('../utils').OFFLINE_ERROR
 
 module.exports = function pubsub (self) {
   return {
-    subscribe: promisify((topic, options, callback) => {
+    subscribe: (topic, options, handler, callback) => {
       if (!self.isOnline()) {
         throw OFFLINE_ERROR
       }
 
       if (typeof options === 'function') {
-        callback = options
+        callback = handler
+        handler = options
         options = {}
       }
 
-      if (self._pubsub.subscriptions.has(topic)) {
-        return callback(new Error(`Already subscribed to '${topic}'`))
-      }
-      const subscription = new Readable({ objectMode: true })
-      let canceled = false
-      subscription._read = () => {}
-
-      // Attach an extra `cancel` method to the stream
-      subscription.cancel = promisify((cb) => {
-        canceled = true
-        self._pubsub.unsubscribe(topic)
-        self._pubsub.removeListener(topic, handler)
-        subscription.on('end', cb)
-        subscription.resume() // make sure it is flowing before cancel
-        subscription.push(null)
-      })
-
-      self._pubsub.on(topic, handler)
-
-      function handler (data) {
-        if (canceled) {
-          return
-        }
-
-        subscription.push(data)
+      if (!callback) {
+        return new Promise((resolve, reject) => {
+          subscribe(topic, options, handler, (err) => {
+            if (err) {
+              return reject(err)
+            }
+            resolve()
+          })
+        })
       }
 
-      try {
-        self._pubsub.subscribe(topic)
-      } catch (err) {
-        return callback(err)
-      }
+      subscribe(topic, options, handler, callback)
+    },
 
-      // Add the request to the active subscriptions and return the stream
-      setImmediate(() => callback(null, subscription))
-    }),
+    unsubscribe: (topic, handler) => {
+      const ps = self._pubsub
+
+      ps.removeListener(topic, handler)
+
+      if (ps.listenerCount(topic) === 0) {
+        ps.unsubscribe(topic)
+      }
+    },
 
     publish: promisify((topic, data, callback) => {
       if (!self.isOnline()) {
@@ -63,13 +51,9 @@ module.exports = function pubsub (self) {
         data = new Buffer(data)
       }
 
-      try {
-        self._pubsub.publish(topic, data)
-      } catch (err) {
-        return callback(err)
-      }
+      self._pubsub.publish(topic, data)
 
-      setImmediate(() => callback())
+      setImmediate(callback)
     }),
 
     ls: promisify((callback) => {
@@ -98,6 +82,21 @@ module.exports = function pubsub (self) {
           .map((peer) => peer.info.id.toB58String())
 
       setImmediate(() => callback(null, peers))
-    })
+    }),
+
+    setMaxListeners (n) {
+      return self._pubsub.setMaxListeners(n)
+    }
+  }
+
+  function subscribe (topic, options, handler, callback) {
+    const ps = self._pubsub
+
+    if (ps.listenerCount(topic) === 0) {
+      ps.subscribe(topic)
+    }
+
+    ps.on(topic, handler)
+    setImmediate(callback)
   }
 }
diff --git a/src/http-api/resources/pubsub.js b/src/http-api/resources/pubsub.js
index ba51521bbc..62759f0965 100644
--- a/src/http-api/resources/pubsub.js
+++ b/src/http-api/resources/pubsub.js
@@ -1,9 +1,7 @@
 'use strict'
 
 const debug = require('debug')
-const pull = require('pull-stream')
-const toStream = require('pull-stream-to-stream')
-const toPull = require('stream-to-pull-stream')
+const PassThrough = require('stream').PassThrough
 const log = debug('http-api:pubsub')
 log.error = debug('http-api:pubsub:error')
 
@@ -28,35 +26,35 @@ exports.subscribe = {
 
     const ipfs = request.server.app.ipfs
 
+    const res = new PassThrough({highWaterMark: 1})
+
+    const handler = (msg) => {
+      res.write(JSON.stringify({
+        from: msg.from,
+        data: msg.data.toString('base64'),
+        seqno: msg.seqno.toString('base64'),
+        topicCIDs: msg.topicCIDs
+      }) + '\n', 'utf8')
+    }
+
+    // js-ipfs-api needs a reply, and go-ipfs does the same thing
+    res.write('{}\n')
+
+    const unsubscribe = () => {
+      ipfs.pubsub.unsubscribe(topic, handler)
+      res.end()
+    }
+
+    request.once('disconnect', unsubscribe)
+    request.once('finish', unsubscribe)
+
     ipfs.pubsub.subscribe(topic, {
       discover: discover
-    }, (err, stream) => {
+    }, handler, (err) => {
       if (err) {
-        return handleError(reply, `Failed to subscribe to topic ${topic}: ${err}`)
+        return handleError(reply, err.message)
       }
 
-      // TODO: expose pull-streams on floodsub and use them here
-      const res = toStream.source(pull(
-        toPull(stream),
-        pull.map((obj) => JSON.stringify({
-          from: obj.from,
-          data: obj.data.toString('base64'),
-          seqno: obj.seqno.toString('base64'),
-          topicCIDs: obj.topicCIDs
-        }) + '\n')
-      ))
-
-      // hapi is not very clever and throws if no:
-      // - _read method
-      // - _readableState object
-      // are there :(
-      if (!res._read) {
-        res._read = () => {}
-        res._readableState = {}
-      }
-
-      res.destroy = () => stream.cancel()
-
       reply(res)
         .header('X-Chunked-Output', '1')
         .header('content-type', 'application/json')
diff --git a/test/http-api/inject/test-pubsub.js b/test/http-api/inject/test-pubsub.js
index 06cd7d3e59..6ce90d4d89 100644
--- a/test/http-api/inject/test-pubsub.js
+++ b/test/http-api/inject/test-pubsub.js
@@ -48,10 +48,13 @@ module.exports = (http) => {
         // TODO: Agree on a better way to test this (currently this hangs)
         // Regarding: https://github.com/ipfs/js-ipfs/pull/644#issuecomment-267687194
         // Current Patch: Subscribe to a topic so the other tests run as expected
-        api.app.ipfs.pubsub.subscribe(topic)
-        .then((stream) => {
-          stream.on('end', done)
-          setTimeout(() => stream.emit('end'), 100)
+        const ipfs = api.app.ipfs
+        const handler = (msg) => {}
+        ipfs.pubsub.subscribe(topic, handler, () => {
+          setTimeout(() => {
+            ipfs.pubsub.unsubscribe(topic, handler)
+            done()
+          }, 100)
         })
         // api.inject({
         //   method: 'GET',
@@ -62,16 +65,6 @@ module.exports = (http) => {
         //   done()
         // })
       })
-
-      it('returns 500 if already subscribed to a topic', (done) => {
-        api.inject({
-          method: 'GET',
-          url: `/api/v0/pubsub/sub?arg=${topic}`
-        }, (res) => {
-          expect(res.statusCode).to.equal(500)
-          done()
-        })
-      })
     })
 
     describe('/pub', () => {
@@ -96,7 +89,7 @@ module.exports = (http) => {
       })
     })
 
-    describe('/ls', () => {
+    describe.skip('/ls', () => {
       it('returns 200', (done) => {
         api.inject({
           method: 'GET',
@@ -109,7 +102,7 @@ module.exports = (http) => {
       })
     })
 
-    describe('/peers', () => {
+    describe.skip('/peers', () => {
       it('returns 500 if no topic is provided', (done) => {
         api.inject({
           method: 'GET',
diff --git a/test/http-api/interface-ipfs-core-over-ipfs-api/test-pubsub.js b/test/http-api/interface-ipfs-core-over-ipfs-api/test-pubsub.js
new file mode 100644
index 0000000000..17ca258a1e
--- /dev/null
+++ b/test/http-api/interface-ipfs-core-over-ipfs-api/test-pubsub.js
@@ -0,0 +1,20 @@
+/* eslint-env mocha */
+
+'use strict'
+
+const test = require('interface-ipfs-core')
+const FactoryClient = require('./../../utils/factory-http')
+
+let fc
+
+const common = {
+  setup: function (callback) {
+    fc = new FactoryClient()
+    callback(null, fc)
+  },
+  teardown: function (callback) {
+    fc.dismantle(callback)
+  }
+}
+
+test.pubsub(common)

From 350a85472c21604b753f6ff8da0effa3c65d1072 Mon Sep 17 00:00:00 2001
From: Friedel Ziegelmayer <dignifiedquire@gmail.com>
Date: Tue, 20 Dec 2016 14:59:08 +0100
Subject: [PATCH 35/46] pubsub: fix peers implementation and test

---
 src/cli/commands/pubsub/sub.js      |  8 +++++-
 src/core/components/pubsub.js       |  4 ---
 test/cli/test-pubsub.js             | 41 ++++++++++++++++++-----------
 test/http-api/inject/test-pubsub.js |  8 +++---
 4 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/src/cli/commands/pubsub/sub.js b/src/cli/commands/pubsub/sub.js
index 87f9322e4a..f88aeed727 100644
--- a/src/cli/commands/pubsub/sub.js
+++ b/src/cli/commands/pubsub/sub.js
@@ -18,8 +18,14 @@ module.exports = {
         throw err
       }
 
-      ipfs.pubsub.subscribe(argv.topic, (msg) => {
+      const handler = (msg) => {
         console.log(msg.data.toString())
+      }
+
+      ipfs.pubsub.subscribe(argv.topic, handler, (err) => {
+        if (err) {
+          throw err
+        }
       })
     })
   }
diff --git a/src/core/components/pubsub.js b/src/core/components/pubsub.js
index 75f79df954..69426f4fe1 100644
--- a/src/core/components/pubsub.js
+++ b/src/core/components/pubsub.js
@@ -73,10 +73,6 @@ module.exports = function pubsub (self) {
         throw OFFLINE_ERROR
       }
 
-      if (!self._pubsub.subscriptions.has(topic)) {
-        return callback(new Error(`Not subscribed to '${topic}'`))
-      }
-
       const peers = Array.from(self._pubsub.peers.values())
           .filter((peer) => peer.topics.has(topic))
           .map((peer) => peer.info.id.toB58String())
diff --git a/test/cli/test-pubsub.js b/test/cli/test-pubsub.js
index 9e4531e148..7baa8601f1 100644
--- a/test/cli/test-pubsub.js
+++ b/test/cli/test-pubsub.js
@@ -4,6 +4,7 @@
 
 const expect = require('chai').expect
 const delay = require('delay')
+const waterfall = require('async/waterfall')
 const HttpAPI = require('../../src/http-api')
 const createTempNode = require('../utils/temp-node')
 const repoPath = require('./index').repoPath
@@ -11,20 +12,17 @@ const ipfs = require('../utils/ipfs-exec')(repoPath)
 
 describe('pubsub', function () {
   this.timeout(30 * 1000)
-  let node
-
   const topicA = 'nonscentsA'
   const topicB = 'nonscentsB'
   const topicC = 'nonscentsC'
+  let node
+  let id
 
   before((done) => {
     createTempNode(1, (err, _node) => {
       expect(err).to.not.exist
       node = _node
-      node.goOnline((err) => {
-        expect(err).to.not.exist
-        done()
-      })
+      node.goOnline(done)
     })
   })
 
@@ -37,7 +35,17 @@ describe('pubsub', function () {
 
     before((done) => {
       httpAPI = new HttpAPI(repoPath)
-      httpAPI.start(done)
+
+      waterfall([
+        (cb) => httpAPI.start(cb),
+        (cb) => node.id(cb),
+        (_id, cb) => {
+          id = _id
+          ipfs(`swarm connect ${id.addresses[0]}`)
+            .then(() => cb())
+            .catch(cb)
+        }
+      ], done)
     })
 
     after((done) => {
@@ -82,19 +90,22 @@ describe('pubsub', function () {
     })
 
     it('peers', () => {
-      const sub = ipfs(`pubsub sub ${topicC}`)
-
-      sub.stdout.once('data', (data) => {
-        expect(data.toString()).to.be.eql('world\n')
+      const handler = (msg) => {
+        expect(msg.data.toString()).to.be.eql('world')
         ipfs(`pubsub peers ${topicC}`)
           .then((out) => {
-            expect(out).to.be.eql('')
-            sub.kill()
+            expect(out).to.be.eql(id.id)
+            sub2.kill()
+            node.pubsub.unsubscribe(topicC, handler)
           })
-      })
+      }
+
+      const sub1 = node.pubsub.subscribe(topicC, handler)
+      const sub2 = ipfs(`pubsub sub ${topicC}`)
 
       return Promise.all([
-        sub.catch(ignoreKill),
+        sub1,
+        sub2.catch(ignoreKill),
         delay(200)
           .then(() => ipfs(`pubsub pub ${topicC} world`))
       ])
diff --git a/test/http-api/inject/test-pubsub.js b/test/http-api/inject/test-pubsub.js
index 6ce90d4d89..9000ce43e0 100644
--- a/test/http-api/inject/test-pubsub.js
+++ b/test/http-api/inject/test-pubsub.js
@@ -102,7 +102,7 @@ module.exports = (http) => {
       })
     })
 
-    describe.skip('/peers', () => {
+    describe('/peers', () => {
       it('returns 500 if no topic is provided', (done) => {
         api.inject({
           method: 'GET',
@@ -113,12 +113,13 @@ module.exports = (http) => {
         })
       })
 
-      it('returns 500 if not subscribed to a topic', (done) => {
+      it('returns 200 if not subscribed to a topic', (done) => {
         api.inject({
           method: 'GET',
           url: `/api/v0/pubsub/peers?arg=${topicNotSubscribed}`
         }, (res) => {
-          expect(res.statusCode).to.equal(500)
+          expect(res.statusCode).to.equal(200)
+          expect(res.result.Strings).to.be.eql([])
           done()
         })
       })
@@ -129,6 +130,7 @@ module.exports = (http) => {
           url: `/api/v0/pubsub/peers?arg=${topic}`
         }, (res) => {
           expect(res.statusCode).to.equal(200)
+          expect(res.result.Strings).to.be.eql([])
           done()
         })
       })

From b5b4739df50dfa795a6df7faf1d09a4642766d95 Mon Sep 17 00:00:00 2001
From: Friedel Ziegelmayer <dignifiedquire@gmail.com>
Date: Wed, 21 Dec 2016 14:53:58 +0100
Subject: [PATCH 36/46] apply some cr

---
 src/cli/commands/pubsub/pub.js   | 4 +++-
 src/core/components/pubsub.js    | 4 ++--
 src/http-api/resources/pubsub.js | 2 +-
 test/core/both/test-bitswap.js   | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/cli/commands/pubsub/pub.js b/src/cli/commands/pubsub/pub.js
index 85e14fdf33..ef303d1c04 100644
--- a/src/cli/commands/pubsub/pub.js
+++ b/src/cli/commands/pubsub/pub.js
@@ -18,7 +18,9 @@ module.exports = {
         throw err
       }
 
-      ipfs.pubsub.publish(argv.topic, argv.data, (err) => {
+      const data = new Buffer(String(argv.data))
+
+      ipfs.pubsub.publish(argv.topic, data, (err) => {
         if (err) {
           throw err
         }
diff --git a/src/core/components/pubsub.js b/src/core/components/pubsub.js
index 69426f4fe1..997559928e 100644
--- a/src/core/components/pubsub.js
+++ b/src/core/components/pubsub.js
@@ -47,8 +47,8 @@ module.exports = function pubsub (self) {
         throw OFFLINE_ERROR
       }
 
-      if (typeof data === 'string') {
-        data = new Buffer(data)
+      if (!Buffer.isBuffer(data)) {
+        return callback(new Error('data must be a Buffer'))
       }
 
       self._pubsub.publish(topic, data)
diff --git a/src/http-api/resources/pubsub.js b/src/http-api/resources/pubsub.js
index 62759f0965..ae9a11a679 100644
--- a/src/http-api/resources/pubsub.js
+++ b/src/http-api/resources/pubsub.js
@@ -78,7 +78,7 @@ exports.publish = {
       return handleError(reply, 'Missing buf')
     }
 
-    ipfs.pubsub.publish(topic, buf, (err) => {
+    ipfs.pubsub.publish(topic, new Buffer(String(buf)), (err) => {
       if (err) {
         return handleError(reply, `Failed to publish to topic ${topic}: ${err}`)
       }
diff --git a/test/core/both/test-bitswap.js b/test/core/both/test-bitswap.js
index a4ea71b3ac..576f93d8a3 100644
--- a/test/core/both/test-bitswap.js
+++ b/test/core/both/test-bitswap.js
@@ -22,7 +22,7 @@ function makeBlock (cb) {
   return cb(null, new Block(`IPFS is awesome ${Math.random()}`))
 }
 
-describe.skip('bitswap', () => {
+describe('bitswap', () => {
   let inProcNode // Node spawned inside this process
   let swarmAddrsBak
 

From 6465bb5db1507a4109d98a3bbe326f970e80a2a6 Mon Sep 17 00:00:00 2001
From: Friedel Ziegelmayer <dignifiedquire@gmail.com>
Date: Wed, 21 Dec 2016 15:11:15 +0100
Subject: [PATCH 37/46] better error handling

---
 src/http-api/error-handler.js       |  5 ++---
 src/http-api/resources/pubsub.js    | 26 ++++++++------------------
 test/http-api/inject/test-pubsub.js |  3 +++
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/http-api/error-handler.js b/src/http-api/error-handler.js
index 6d0627cccb..82062a492b 100644
--- a/src/http-api/error-handler.js
+++ b/src/http-api/error-handler.js
@@ -19,7 +19,6 @@ module.exports = (server) => {
       statusCode = res.output.payload.statusCode
 
       if (res.message && res.isDeveloperError) {
-        // we caught it!
         msg = res.message.replace('Uncaught error: ', '')
       }
 
@@ -31,12 +30,12 @@ module.exports = (server) => {
         payload: request.payload,
         response: res.output.payload
       }
-      // ALWAYS Log the error
+
       server.log('error', debug)
 
       reply({
         Message: msg,
-        Code: 0
+        Code: 1
       }).code(statusCode)
       return
     }
diff --git a/src/http-api/resources/pubsub.js b/src/http-api/resources/pubsub.js
index ae9a11a679..39ece9935c 100644
--- a/src/http-api/resources/pubsub.js
+++ b/src/http-api/resources/pubsub.js
@@ -1,19 +1,9 @@
 'use strict'
 
-const debug = require('debug')
 const PassThrough = require('stream').PassThrough
-const log = debug('http-api:pubsub')
-log.error = debug('http-api:pubsub:error')
 
 exports = module.exports
 
-function handleError (reply, msg) {
-  reply({
-    Message: msg,
-    Code: 0
-  }).code(500)
-}
-
 exports.subscribe = {
   handler: (request, reply) => {
     const query = request.query
@@ -21,7 +11,7 @@ exports.subscribe = {
     const topic = query.arg
 
     if (!topic) {
-      return handleError(reply, 'Missing topic')
+      return reply(new Error('Missing topic'))
     }
 
     const ipfs = request.server.app.ipfs
@@ -52,7 +42,7 @@ exports.subscribe = {
       discover: discover
     }, handler, (err) => {
       if (err) {
-        return handleError(reply, err.message)
+        return reply(err)
       }
 
       reply(res)
@@ -71,16 +61,16 @@ exports.publish = {
     const ipfs = request.server.app.ipfs
 
     if (!topic) {
-      return handleError(reply, 'Missing topic')
+      return reply(new Error('Missing topic'))
     }
 
     if (!buf) {
-      return handleError(reply, 'Missing buf')
+      return reply(new Error('Missing buf'))
     }
 
     ipfs.pubsub.publish(topic, new Buffer(String(buf)), (err) => {
       if (err) {
-        return handleError(reply, `Failed to publish to topic ${topic}: ${err}`)
+        return reply(new Error(`Failed to publish to topic ${topic}: ${err}`))
       }
 
       reply()
@@ -94,7 +84,7 @@ exports.ls = {
 
     ipfs.pubsub.ls((err, subscriptions) => {
       if (err) {
-        return handleError(reply, `Failed to list subscriptions: ${err}`)
+        return reply(new Error(`Failed to list subscriptions: ${err}`))
       }
 
       reply({Strings: subscriptions})
@@ -108,12 +98,12 @@ exports.peers = {
     const ipfs = request.server.app.ipfs
 
     if (!topic) {
-      return handleError(reply, 'Missing topic')
+      return reply(new Error('Missing topic'))
     }
 
     ipfs.pubsub.peers(topic, (err, peers) => {
       if (err) {
-        return handleError(reply, `Failed to find peers subscribed to ${topic}: ${err}`)
+        return reply(new Error(`Failed to find peers subscribed to ${topic}: ${err}`))
       }
 
       reply({Strings: peers})
diff --git a/test/http-api/inject/test-pubsub.js b/test/http-api/inject/test-pubsub.js
index 9000ce43e0..29976046ad 100644
--- a/test/http-api/inject/test-pubsub.js
+++ b/test/http-api/inject/test-pubsub.js
@@ -40,6 +40,7 @@ module.exports = (http) => {
           url: `/api/v0/pubsub/sub`
         }, (res) => {
           expect(res.statusCode).to.equal(500)
+          expect(res.result.Code).to.be.eql(1)
           done()
         })
       })
@@ -74,6 +75,7 @@ module.exports = (http) => {
           url: `/api/v0/pubsub/pub?arg=${topic}&arg=`
         }, (res) => {
           expect(res.statusCode).to.equal(500)
+          expect(res.result.Code).to.be.eql(1)
           done()
         })
       })
@@ -109,6 +111,7 @@ module.exports = (http) => {
           url: `/api/v0/pubsub/peers`
         }, (res) => {
           expect(res.statusCode).to.equal(500)
+          expect(res.result.Code).to.be.eql(1)
           done()
         })
       })

From 966b59747f72f2121336f517357eb9a60534f170 Mon Sep 17 00:00:00 2001
From: Friedel Ziegelmayer <dignifiedquire@gmail.com>
Date: Wed, 21 Dec 2016 18:27:16 +0100
Subject: [PATCH 38/46] chore(deps): use interface-ipfs-core release

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 21e188acd6..664621a0b5 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "form-data": "^2.1.2",
     "fs-pull-blob-store": "^0.4.1",
     "gulp": "^3.9.1",
-    "interface-ipfs-core": "ipfs/interface-ipfs-core#501c304",
+    "interface-ipfs-core": "^0.23.0",
     "left-pad": "^1.1.3",
     "lodash": "^4.17.2",
     "ncp": "^2.0.0",

From c2068000f168dde426debd38f60e2ba7fbd5a2b4 Mon Sep 17 00:00:00 2001
From: David Dias <daviddias.p@gmail.com>
Date: Fri, 23 Dec 2016 07:22:48 +0000
Subject: [PATCH 39/46] chore: update deps

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 664621a0b5..2ed2462b15 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
     "ipfs-unixfs-engine": "^0.14.2",
     "ipld-resolver": "^0.4.1",
     "isstream": "^0.1.2",
-    "libp2p-floodsub": "0.5.0",
+    "libp2p-floodsub": "0.6.0",
     "joi": "^10.0.6",
     "libp2p-ipfs-nodejs": "^0.17.1",
     "libp2p-ipfs-browser": "^0.17.3",

From 9371b67d2c1880947fccaf264ef19e5e0a7b2575 Mon Sep 17 00:00:00 2001
From: David Dias <daviddias.p@gmail.com>
Date: Fri, 30 Dec 2016 11:22:49 +0000
Subject: [PATCH 40/46] (wip) fix: pubsub closes its conns

---
 src/core/components/go-offline.js             |  3 ++-
 src/core/components/go-online.js              |  4 ++--
 test/cli/test-pubsub.js                       |  3 +--
 test/core/node-only/test-swarm.js             | 20 +++++++++----------
 .../test-pubsub.js                            |  6 +++++-
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/core/components/go-offline.js b/src/core/components/go-offline.js
index 0c5d084c0e..8161ca6dc9 100644
--- a/src/core/components/go-offline.js
+++ b/src/core/components/go-offline.js
@@ -1,9 +1,10 @@
 'use strict'
 
-module.exports = function goOffline (self) {
+module.exports = (self) => {
   return (cb) => {
     self._blockService.goOffline()
     self._bitswap.stop()
+    // TODO self._pubsub.stop()
     self.libp2p.stop(cb)
   }
 }
diff --git a/src/core/components/go-online.js b/src/core/components/go-online.js
index 43494aad93..96dc0fe4ac 100644
--- a/src/core/components/go-online.js
+++ b/src/core/components/go-online.js
@@ -4,7 +4,7 @@ const series = require('async/series')
 const Bitswap = require('ipfs-bitswap')
 const FloodSub = require('libp2p-floodsub')
 
-module.exports = function goOnline (self) {
+module.exports = (self) => {
   return (cb) => {
     series([
       self.load,
@@ -22,7 +22,7 @@ module.exports = function goOnline (self) {
       self._bitswap.start()
       self._blockService.goOnline(self._bitswap)
       self._pubsub = new FloodSub(self._libp2pNode)
-
+      // TODO self.pubsub.start()
       cb()
     })
   }
diff --git a/test/cli/test-pubsub.js b/test/cli/test-pubsub.js
index 7baa8601f1..3fc60968a1 100644
--- a/test/cli/test-pubsub.js
+++ b/test/cli/test-pubsub.js
@@ -10,8 +10,7 @@ const createTempNode = require('../utils/temp-node')
 const repoPath = require('./index').repoPath
 const ipfs = require('../utils/ipfs-exec')(repoPath)
 
-describe('pubsub', function () {
-  this.timeout(30 * 1000)
+describe.skip('pubsub', () => {
   const topicA = 'nonscentsA'
   const topicB = 'nonscentsB'
   const topicC = 'nonscentsC'
diff --git a/test/core/node-only/test-swarm.js b/test/core/node-only/test-swarm.js
index 5c0224187e..dd0a4e21fc 100644
--- a/test/core/node-only/test-swarm.js
+++ b/test/core/node-only/test-swarm.js
@@ -6,9 +6,7 @@ const parallel = require('async/parallel')
 
 const createTempNode = require('../../utils/temp-node')
 
-describe('swarm', function () {
-  this.timeout(40 * 1000)
-
+describe('swarm', () => {
   let nodeA
   let nodeB
 
@@ -71,16 +69,16 @@ describe('swarm', function () {
   it('libp2p.swarm.peers on nodeA and nodeB match each other', (done) => {
     parallel([
       (cb) => {
-        nodeA.swarm.peers((err, res) => {
+        nodeA.swarm.peers((err, peers) => {
           expect(err).to.not.exist
-          expect(Object.keys(res)).to.have.length.above(0)
+          expect(peers).to.have.length.above(0)
           cb()
         })
       },
       (cb) => {
-        nodeB.swarm.peers((err, res) => {
+        nodeB.swarm.peers((err, peers) => {
           expect(err).to.not.exist
-          expect(Object.keys(res)).to.have.length.above(0)
+          expect(peers).to.have.length.above(0)
           cb()
         })
       }
@@ -104,16 +102,16 @@ describe('swarm', function () {
       function check () {
         parallel([
           (cb) => {
-            nodeA.swarm.peers((err, res) => {
+            nodeA.swarm.peers((err, peers) => {
               expect(err).to.not.exist
-              expect(Object.keys(res)).to.have.length(0)
+              expect(peers).to.have.length(0)
               cb()
             })
           },
           (cb) => {
-            nodeB.swarm.peers((err, res) => {
+            nodeB.swarm.peers((err, peers) => {
               expect(err).to.not.exist
-              expect(Object.keys(res)).to.have.length(0)
+              expect(peers).to.have.length(0)
               cb()
             })
           }
diff --git a/test/http-api/interface-ipfs-core-over-ipfs-api/test-pubsub.js b/test/http-api/interface-ipfs-core-over-ipfs-api/test-pubsub.js
index 17ca258a1e..721c09607f 100644
--- a/test/http-api/interface-ipfs-core-over-ipfs-api/test-pubsub.js
+++ b/test/http-api/interface-ipfs-core-over-ipfs-api/test-pubsub.js
@@ -2,6 +2,7 @@
 
 'use strict'
 
+/*
 const test = require('interface-ipfs-core')
 const FactoryClient = require('./../../utils/factory-http')
 
@@ -16,5 +17,8 @@ const common = {
     fc.dismantle(callback)
   }
 }
+*/
 
-test.pubsub(common)
+// TODO
+// needs: https://github.com/ipfs/js-ipfs-api/pull/493
+// test.pubsub(common)

From 50ae06d5b7ced4586fd3e01f0eac45690291229c Mon Sep 17 00:00:00 2001
From: David Dias <daviddias.p@gmail.com>
Date: Mon, 9 Jan 2017 13:00:27 +0000
Subject: [PATCH 41/46] feat(pubsub): update to new floodsub

---
 package.json                        |   2 +-
 src/core/components/go-offline.js   |  10 +-
 src/core/components/go-online.js    |   9 +-
 test/core/node-only/test-swarm-2.js |  20 ----
 test/core/node-only/test-swarm.js   | 137 +++-------------------------
 5 files changed, 27 insertions(+), 151 deletions(-)
 delete mode 100644 test/core/node-only/test-swarm-2.js

diff --git a/package.json b/package.json
index c15afb7933..320447d0b7 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "ipfs-unixfs-engine": "^0.14.2",
     "ipld-resolver": "^0.4.1",
     "isstream": "^0.1.2",
-    "libp2p-floodsub": "0.6.0",
+    "libp2p-floodsub": "0.7.0",
     "joi": "^10.0.6",
     "libp2p-ipfs-nodejs": "^0.17.1",
     "libp2p-ipfs-browser": "^0.17.3",
diff --git a/src/core/components/go-offline.js b/src/core/components/go-offline.js
index 8161ca6dc9..f0786702da 100644
--- a/src/core/components/go-offline.js
+++ b/src/core/components/go-offline.js
@@ -1,10 +1,14 @@
 'use strict'
 
 module.exports = (self) => {
-  return (cb) => {
+  return (callback) => {
     self._blockService.goOffline()
     self._bitswap.stop()
-    // TODO self._pubsub.stop()
-    self.libp2p.stop(cb)
+    self._pubsub.stop((err) => {
+      if (err) {
+        return callback(err)
+      }
+      self.libp2p.stop(callback)
+    })
   }
 }
diff --git a/src/core/components/go-online.js b/src/core/components/go-online.js
index 96dc0fe4ac..f03adbbf85 100644
--- a/src/core/components/go-online.js
+++ b/src/core/components/go-online.js
@@ -5,13 +5,13 @@ const Bitswap = require('ipfs-bitswap')
 const FloodSub = require('libp2p-floodsub')
 
 module.exports = (self) => {
-  return (cb) => {
+  return (callback) => {
     series([
       self.load,
       self.libp2p.start
     ], (err) => {
       if (err) {
-        return cb(err)
+        return callback(err)
       }
 
       self._bitswap = new Bitswap(
@@ -20,10 +20,11 @@ module.exports = (self) => {
         self._libp2pNode.peerBook
       )
       self._bitswap.start()
+
       self._blockService.goOnline(self._bitswap)
+
       self._pubsub = new FloodSub(self._libp2pNode)
-      // TODO self.pubsub.start()
-      cb()
+      self._pubsub.start(callback)
     })
   }
 }
diff --git a/test/core/node-only/test-swarm-2.js b/test/core/node-only/test-swarm-2.js
deleted file mode 100644
index bf81c71e60..0000000000
--- a/test/core/node-only/test-swarm-2.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/* eslint-env mocha */
-
-'use strict'
-
-const test = require('interface-ipfs-core')
-const IPFSFactory = require('../../utils/factory-core')
-
-let factory
-
-const common = {
-  setup: function (cb) {
-    factory = new IPFSFactory()
-    cb(null, factory)
-  },
-  teardown: function (cb) {
-    factory.dismantle(cb)
-  }
-}
-
-test.swarm(common)
diff --git a/test/core/node-only/test-swarm.js b/test/core/node-only/test-swarm.js
index dd0a4e21fc..bf81c71e60 100644
--- a/test/core/node-only/test-swarm.js
+++ b/test/core/node-only/test-swarm.js
@@ -1,129 +1,20 @@
 /* eslint-env mocha */
-'use strict'
-
-const expect = require('chai').expect
-const parallel = require('async/parallel')
-
-const createTempNode = require('../../utils/temp-node')
-
-describe('swarm', () => {
-  let nodeA
-  let nodeB
-
-  // let nodeAMultiaddr
-  let nodeBMultiaddr
 
-  it('create 2 temporary nodes', (done) => {
-    parallel([
-      (cb) => {
-        createTempNode(2, (err, tmpNode) => {
-          expect(err).to.not.exist
-          nodeA = tmpNode
-          cb()
-        })
-      },
-      (cb) => {
-        createTempNode(3, (err, tmpNode) => {
-          expect(err).to.not.exist
-          nodeB = tmpNode
-          cb()
-        })
-      }
-    ], done)
-  })
-
-  it('get each peer addr', (done) => {
-    parallel([
-      (cb) => {
-        nodeA.id((err, res) => {
-          expect(err).to.not.exist
-          // nodeAMultiaddr = `${res.addresses[0]}/ipfs/${res.id}`
-          cb()
-        })
-      },
-      (cb) => {
-        nodeB.id((err, res) => {
-          expect(err).to.not.exist
-          nodeBMultiaddr = res.addresses[0]
-          cb()
-        })
-      }
-    ], done)
-  })
-
-  it('start 2 nodes', (done) => {
-    parallel([
-      nodeA.goOnline,
-      nodeB.goOnline
-    ], done)
-  })
-
-  it('libp2p.swarm.connect nodeA to nodeB', (done) => {
-    nodeA.swarm.connect(nodeBMultiaddr, (err) => {
-      expect(err).to.not.exist
-      // So that identify has time to execute
-      setTimeout(done, 500)
-    })
-  })
-
-  it('libp2p.swarm.peers on nodeA and nodeB match each other', (done) => {
-    parallel([
-      (cb) => {
-        nodeA.swarm.peers((err, peers) => {
-          expect(err).to.not.exist
-          expect(peers).to.have.length.above(0)
-          cb()
-        })
-      },
-      (cb) => {
-        nodeB.swarm.peers((err, peers) => {
-          expect(err).to.not.exist
-          expect(peers).to.have.length.above(0)
-          cb()
-        })
-      }
-    ], done)
-  })
+'use strict'
 
-  it('libp2p.swarm.localAddrs', (done) => {
-    nodeB.swarm.localAddrs((err, res) => {
-      expect(err).to.not.exist
-      expect(res.length > 1).to.equal(true)
-      done()
-    })
-  })
+const test = require('interface-ipfs-core')
+const IPFSFactory = require('../../utils/factory-core')
 
-  it('libp2p.swarm.disconnect nodeB from nodeA', (done) => {
-    nodeA.swarm.disconnect(nodeBMultiaddr, (err) => {
-      expect(err).to.not.exist
-      // So that identify has time to execute
-      setTimeout(check, 500)
+let factory
 
-      function check () {
-        parallel([
-          (cb) => {
-            nodeA.swarm.peers((err, peers) => {
-              expect(err).to.not.exist
-              expect(peers).to.have.length(0)
-              cb()
-            })
-          },
-          (cb) => {
-            nodeB.swarm.peers((err, peers) => {
-              expect(err).to.not.exist
-              expect(peers).to.have.length(0)
-              cb()
-            })
-          }
-        ], done)
-      }
-    })
-  })
+const common = {
+  setup: function (cb) {
+    factory = new IPFSFactory()
+    cb(null, factory)
+  },
+  teardown: function (cb) {
+    factory.dismantle(cb)
+  }
+}
 
-  it('stop', (done) => {
-    parallel([
-      nodeA.goOffline,
-      nodeB.goOffline
-    ], done)
-  })
-})
+test.swarm(common)

From 9b1aea731053e8d2cb4819fb10878ca5d62c5fed Mon Sep 17 00:00:00 2001
From: David Dias <daviddias.p@gmail.com>
Date: Tue, 10 Jan 2017 12:27:43 +0000
Subject: [PATCH 42/46] fix: let protocols initiate properly

---
 src/core/components/go-online.js | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/core/components/go-online.js b/src/core/components/go-online.js
index f03adbbf85..0c7cef6ef4 100644
--- a/src/core/components/go-online.js
+++ b/src/core/components/go-online.js
@@ -7,8 +7,8 @@ const FloodSub = require('libp2p-floodsub')
 module.exports = (self) => {
   return (callback) => {
     series([
-      self.load,
-      self.libp2p.start
+      (cb) => self.load(cb),
+      (cb) => self.libp2p.start(cb)
     ], (err) => {
       if (err) {
         return callback(err)
@@ -19,12 +19,22 @@ module.exports = (self) => {
         self._repo.blockstore,
         self._libp2pNode.peerBook
       )
-      self._bitswap.start()
-
-      self._blockService.goOnline(self._bitswap)
 
       self._pubsub = new FloodSub(self._libp2pNode)
-      self._pubsub.start(callback)
+
+      series([
+        (cb) => {
+          self._bitswap.start()
+          cb()
+        },
+        (cb) => {
+          self._blockService.goOnline(self._bitswap)
+          cb()
+        },
+        (cb) => self._pubsub.start(cb),
+        // For all of the protocols to handshake with each other
+        (cb) => setTimeout(cb, 1000)
+      ], callback)
     })
   }
 }

From aa29598c3ea4b42f4751939e4e637e21e82f2b9b Mon Sep 17 00:00:00 2001
From: David Dias <daviddias.p@gmail.com>
Date: Tue, 10 Jan 2017 15:05:57 +0000
Subject: [PATCH 43/46] chore: update deps

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 320447d0b7..1b510df3d3 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "delay": "^1.3.1",
     "detect-node": "^2.0.3",
     "eslint-plugin-react": "^6.8.0",
-    "execa": "^0.5.0",
+    "execa": "^0.6.0",
     "expose-loader": "^0.7.1",
     "form-data": "^2.1.2",
     "fs-pull-blob-store": "^0.4.1",

From 4495b3acea1cd2ab4ab9c5ebb8b0373bdc155cae Mon Sep 17 00:00:00 2001
From: David Dias <daviddias.p@gmail.com>
Date: Tue, 10 Jan 2017 15:15:19 +0000
Subject: [PATCH 44/46] fix: remove delay

---
 src/core/components/go-online.js             | 4 ++--
 test/core/both/index.js                      | 1 -
 test/core/{both => node-only}/test-pubsub.js | 0
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename test/core/{both => node-only}/test-pubsub.js (100%)

diff --git a/src/core/components/go-online.js b/src/core/components/go-online.js
index 0c7cef6ef4..d710478899 100644
--- a/src/core/components/go-online.js
+++ b/src/core/components/go-online.js
@@ -31,9 +31,9 @@ module.exports = (self) => {
           self._blockService.goOnline(self._bitswap)
           cb()
         },
-        (cb) => self._pubsub.start(cb),
+        (cb) => self._pubsub.start(cb) // ,
         // For all of the protocols to handshake with each other
-        (cb) => setTimeout(cb, 1000)
+        // (cb) => setTimeout(cb, 1000) // Still not decided if we want this
       ], callback)
     })
   }
diff --git a/test/core/both/index.js b/test/core/both/index.js
index 5b27dd5e69..a6dc8e5621 100644
--- a/test/core/both/index.js
+++ b/test/core/both/index.js
@@ -10,5 +10,4 @@ describe('--both', () => {
   require('./test-generic')
   require('./test-init')
   require('./test-object')
-  require('./test-pubsub')
 })
diff --git a/test/core/both/test-pubsub.js b/test/core/node-only/test-pubsub.js
similarity index 100%
rename from test/core/both/test-pubsub.js
rename to test/core/node-only/test-pubsub.js

From 3082c2fd96d4dc9ee24634c5959cebc8509188f2 Mon Sep 17 00:00:00 2001
From: David Dias <daviddias.p@gmail.com>
Date: Wed, 11 Jan 2017 10:29:11 +0000
Subject: [PATCH 45/46] chore: update deps

---
 package.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 1b510df3d3..31e5a7ef59 100644
--- a/package.json
+++ b/package.json
@@ -63,16 +63,16 @@
     "chai": "^3.5.0",
     "delay": "^1.3.1",
     "detect-node": "^2.0.3",
-    "eslint-plugin-react": "^6.8.0",
+    "eslint-plugin-react": "^6.9.0",
     "execa": "^0.6.0",
     "expose-loader": "^0.7.1",
     "form-data": "^2.1.2",
     "fs-pull-blob-store": "^0.4.1",
     "gulp": "^3.9.1",
-    "interface-ipfs-core": "^0.23.0",
-    "ipfsd-ctl": "^0.18.0",
+    "interface-ipfs-core": "^0.23.2",
+    "ipfsd-ctl": "^0.18.1",
     "left-pad": "^1.1.3",
-    "lodash": "^4.17.2",
+    "lodash": "^4.17.4",
     "mocha": "^3.2.0",
     "ncp": "^2.0.0",
     "nexpect": "^0.5.0",
@@ -86,14 +86,14 @@
     "async": "^2.1.4",
     "bl": "^1.2.0",
     "boom": "^4.2.0",
-    "debug": "^2.5.1",
+    "debug": "^2.6.0",
     "fs-pull-blob-store": "^0.3.0",
     "glob": "^7.1.1",
-    "hapi": "^16.0.2",
+    "hapi": "^16.1.0",
     "hapi-set-header": "^1.0.2",
     "hoek": "^4.1.0",
     "idb-pull-blob-store": "^0.5.1",
-    "ipfs-api": "^12.1.2",
+    "ipfs-api": "^12.1.3",
     "ipfs-bitswap": "^0.9.0",
     "ipfs-block": "^0.5.4",
     "ipfs-block-service": "^0.8.0",
@@ -103,10 +103,10 @@
     "ipfs-unixfs-engine": "^0.14.2",
     "ipld-resolver": "^0.4.1",
     "isstream": "^0.1.2",
-    "libp2p-floodsub": "0.7.0",
-    "joi": "^10.0.6",
-    "libp2p-ipfs-nodejs": "^0.17.1",
-    "libp2p-ipfs-browser": "^0.17.3",
+    "libp2p-floodsub": "0.7.1",
+    "joi": "^10.1.0",
+    "libp2p-ipfs-nodejs": "^0.17.3",
+    "libp2p-ipfs-browser": "^0.17.4",
     "lodash.flatmap": "^4.5.0",
     "lodash.get": "^4.4.2",
     "lodash.has": "^4.5.2",
@@ -119,7 +119,7 @@
     "path-exists": "^3.0.0",
     "peer-book": "^0.3.0",
     "peer-id": "^0.8.1",
-    "peer-info": "^0.8.1",
+    "peer-info": "^0.8.2",
     "promisify-es6": "^1.0.2",
     "pull-file": "^1.0.0",
     "pull-paramap": "^1.2.1",
@@ -135,7 +135,7 @@
     "temp": "^0.8.3",
     "through2": "^2.0.3",
     "update-notifier": "^1.0.3",
-    "yargs": "^6.5.0"
+    "yargs": "^6.6.0"
   },
   "contributors": [
     "Andrew de Andrade <andrew@deandrade.com.br>",

From 02085040b83476962962369d56884e3ca170a90f Mon Sep 17 00:00:00 2001
From: David Dias <daviddias.p@gmail.com>
Date: Thu, 12 Jan 2017 14:19:18 +0000
Subject: [PATCH 46/46] fix: setImmediate erros as well, update
 interface-ipfs-core

---
 package.json                  |  2 +-
 src/core/components/pubsub.js | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 31e5a7ef59..a3589b518e 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "form-data": "^2.1.2",
     "fs-pull-blob-store": "^0.4.1",
     "gulp": "^3.9.1",
-    "interface-ipfs-core": "^0.23.2",
+    "interface-ipfs-core": "^0.23.3",
     "ipfsd-ctl": "^0.18.1",
     "left-pad": "^1.1.3",
     "lodash": "^4.17.4",
diff --git a/src/core/components/pubsub.js b/src/core/components/pubsub.js
index 997559928e..b0a1eb283d 100644
--- a/src/core/components/pubsub.js
+++ b/src/core/components/pubsub.js
@@ -44,21 +44,20 @@ module.exports = function pubsub (self) {
 
     publish: promisify((topic, data, callback) => {
       if (!self.isOnline()) {
-        throw OFFLINE_ERROR
+        return setImmediate(() => callback(OFFLINE_ERROR))
       }
 
       if (!Buffer.isBuffer(data)) {
-        return callback(new Error('data must be a Buffer'))
+        return setImmediate(() => callback(new Error('data must be a Buffer')))
       }
 
       self._pubsub.publish(topic, data)
-
-      setImmediate(callback)
+      setImmediate(() => callback())
     }),
 
     ls: promisify((callback) => {
       if (!self.isOnline()) {
-        throw OFFLINE_ERROR
+        return setImmediate(() => callback(OFFLINE_ERROR))
       }
 
       const subscriptions = Array.from(
@@ -70,7 +69,7 @@ module.exports = function pubsub (self) {
 
     peers: promisify((topic, callback) => {
       if (!self.isOnline()) {
-        throw OFFLINE_ERROR
+        return setImmediate(() => callback(OFFLINE_ERROR))
       }
 
       const peers = Array.from(self._pubsub.peers.values())
@@ -93,6 +92,6 @@ module.exports = function pubsub (self) {
     }
 
     ps.on(topic, handler)
-    setImmediate(callback)
+    setImmediate(() => callback())
   }
 }