refactor: use promise-nodeify

License: MIT
Signed-off-by: Alan Shaw <[email protected]>

package.json

@@ -73,6 +73,7 @@
     "once": "^1.4.0",
     "peer-id": "~0.12.2",
     "peer-info": "~0.15.1",
+    "promise-nodeify": "^3.0.1",
     "promisify-es6": "^1.0.3",
     "pull-defer": "~0.2.3",
     "pull-stream": "^3.6.9",

src/pubsub/index.js

@@ -1,18 +1,50 @@
 'use strict'
 
-const callbackify = require('../lib/callbackify')
+const nodeify = require('promise-nodeify')
 
 // This file is temporary and for compatibility with legacy usage
 module.exports = (send, options) => {
   if (typeof send !== 'function') {
     options = send
   }
 
+  const ls = require('./ls')(options)
+  const peers = require('./peers')(options)
+  const publish = require('./publish')(options)
+  const subscribe = require('./subscribe')(options)
+  const unsubscribe = require('./unsubscribe')(options)
+
   return {
-    ls: callbackify(require('./ls')(options)),
-    peers: callbackify(require('./peers')(options)),
-    publish: callbackify(require('./publish')(options)),
-    subscribe: callbackify(require('./subscribe')(options), { minArgs: 2 }),
-    unsubscribe: callbackify(require('./unsubscribe')(options), { minArgs: 2 })
+    ls: (options, callback) => {
+      if (typeof options === 'function') {
+        callback = options
+        options = {}
+      }
+      return nodeify(ls(options), callback)
+    },
+    peers: (topic, options, callback) => {
+      if (typeof options === 'function') {
+        callback = options
+        options = {}
+      }
+      return nodeify(peers(topic, options), callback)
+    },
+    publish: (topic, data, options, callback) => {
+      if (typeof options === 'function') {
+        callback = options
+        options = {}
+      }
+      return nodeify(publish(topic, data, options), callback)
+    },
+    subscribe: (topic, handler, options, callback) => {
+      if (typeof options === 'function') {
+        callback = options
+        options = {}
+      }
+      return nodeify(subscribe(topic, handler, options), callback)
+    },
+    unsubscribe: (topic, handler, callback) => {
+      return nodeify(unsubscribe(topic, handler), callback)
+    }
   }
 }