supports async pubsub.unsubscribe() and ipfsv0.29. Fixes #43

Author: pgte

README.md

@@ -11,7 +11,7 @@
 
 ## js-ipfs
 
-This package has been tested with js-ipfs version __0.28.0__.
+This package has been tested with js-ipfs version __0.29.1__.
 
 ## Install
 
@@ -77,7 +77,7 @@ Broacasts message (string or buffer).
 
 Sends message (string or buffer) to peer.
 
-## room.leave()
+## async room.leave()
 
 Leaves room, stopping everything.
 

package.json

@@ -38,7 +38,7 @@
     "chai": "^4.1.1",
     "dirty-chai": "^2.0.1",
     "aegir": "^12.1.3",
-    "ipfs": "~0.28.0"
+    "ipfs": "~0.29.1"
   },
   "browser": {
     "./test/utils/create-repo-node.js": "./test/utils/create-repo-browser.js"

src/index.js

@@ -52,12 +52,15 @@ class PubSubRoom extends EventEmitter {
   }
 
   leave () {
-    timers.clearInterval(this._interval)
-    Object.keys(this._connections).forEach((peer) => {
-      this._connections[peer].stop()
+    return new Promise((resolve, reject) => {
+      timers.clearInterval(this._interval)
+      Object.keys(this._connections).forEach((peer) => {
+        this._connections[peer].stop()
+      })
+      directConnection.emitter.removeListener(this._topic, this._handleDirectMessage)
+      this.once('stopped', () => resolve())
+      this.emit('stopping')
     })
-    directConnection.emitter.removeListener(this._topic, this._handleDirectMessage)
-    this.emit('stop')
   }
 
   broadcast (_message) {
@@ -117,8 +120,14 @@ class PubSubRoom extends EventEmitter {
       }
     })
 
-    this.once('stop', () => {
-      this._ipfs.pubsub.unsubscribe(this._topic, listener)
+    this.once('stopping', () => {
+      this._ipfs.pubsub.unsubscribe(this._topic, listener, (err) => {
+        if (err) {
+          this.emit('error', err)
+        } else {
+          this.emit('stopped')
+        }
+      })
     })
 
     this._ipfs._libp2pNode.handle(PROTOCOL, directConnection.handler)