feat(internals): use promisify for every exposed interface and apply CR

Author: daviddias

README.md

@@ -138,7 +138,6 @@ This is very similar to `ipfs.files.add({path:'', content: stream})`. It is like
 
 ```JavaScript
 ```
->>>>>> refactor(module+tests): Enable running the tests
 
 ### Callbacks and promises
 

src/api/add-files.js

@@ -2,10 +2,11 @@
 
 const isNode = require('detect-node')
 const addToDagNodesTransform = require('../add-to-dagnode-transform')
+const promisify = require('promisify-es6')
 
 module.exports = (send) => {
-  return function add (path, opts, callback) {
-    if (typeof (opts) === 'function' &&
+  return promisify((path, opts, callback) => {
+    if (typeof opts === 'function' &&
         callback === undefined) {
       callback = opts
       opts = {}
@@ -21,10 +22,10 @@ module.exports = (send) => {
 
     const sendWithTransform = send.withTransform(addToDagNodesTransform)
 
-    return sendWithTransform({
+    sendWithTransform({
       path: 'add',
       qs: opts,
       files: path
     }, callback)
-  }
+  })
 }

src/api/add-stream.js

@@ -7,7 +7,7 @@ const promisify = require('promisify-es6')
 module.exports = (send) => {
   const add = addCmd(send)
 
-  return promisify(function createAddStream (callback) {
+  return promisify((callback) => {
     const tuples = []
 
     const ds = new Duplex({ objectMode: true })

src/api/add-url.js

@@ -3,8 +3,10 @@
 const Wreck = require('wreck')
 const addToDagNodesTransform = require('../add-to-dagnode-transform')
 
+const promisify = require('promisify-es6')
+
 module.exports = (send) => {
-  return function add (url, opts, callback) {
+  return promisify((url, opts, callback) => {
     if (typeof (opts) === 'function' &&
         callback === undefined) {
       callback = opts
@@ -29,5 +31,5 @@ module.exports = (send) => {
         files: res
       }, callback)
     })
-  }
+  })
 }

src/api/bitswap.js

@@ -1,27 +1,29 @@
 'use strict'
 
+const promisify = require('promisify-es6')
+
 module.exports = (send) => {
   return {
-    wantlist (callback) {
-      return send({
+    wantlist: promisify((callback) => {
+      send({
         path: 'bitswap/wantlist'
       }, callback)
-    },
-    stat (callback) {
-      return send({
+    }),
+    stat: promisify((callback) => {
+      send({
         path: 'bitswap/stat'
       }, callback)
-    },
-    unwant (args, opts, callback) {
+    }),
+    unwant: promisify((args, opts, callback) => {
       if (typeof (opts) === 'function') {
         callback = opts
         opts = {}
       }
-      return send({
+      send({
         path: 'bitswap/unwant',
         args: args,
         qs: opts
       }, callback)
-    }
+    })
   }
 }

src/api/block.js

@@ -1,8 +1,10 @@
 'use strict'
 
+const promisify = require('promisify-es6')
+
 module.exports = (send) => {
   return {
-    get (args, opts, callback) {
+    get: promisify((args, opts, callback) => {
       if (typeof (opts) === 'function') {
         callback = opts
         opts = {}
@@ -12,8 +14,8 @@ module.exports = (send) => {
         args: args,
         qs: opts
       }, callback)
-    },
-    stat (args, opts, callback) {
+    }),
+    stat: promisify((args, opts, callback) => {
       if (typeof (opts) === 'function') {
         callback = opts
         opts = {}
@@ -23,21 +25,17 @@ module.exports = (send) => {
         args: args,
         qs: opts
       }, callback)
-    },
-    put (file, callback) {
+    }),
+    put: promisify((file, callback) => {
       if (Array.isArray(file)) {
         const err = new Error('block.put() only accepts 1 file')
-        if (typeof callback !== 'function' &&
-            typeof Promise !== 'undefined') {
-          return new Promise((resolve, reject) => reject(err))
-        }
         return callback(err)
       }
 
       return send({
         path: 'block/put',
         files: file
       }, callback)
-    }
+    })
   }
 }

src/api/bootstrap.js

@@ -1,40 +1,70 @@
 'use strict'
 
+const promisify = require('promisify-es6')
+
 module.exports = (send) => {
   return {
-    add (args, opts, callback) {
+    add: promisify((args, opts, callback) => {
       if (typeof opts === 'function' &&
-          callback === undefined) {
+          !callback) {
         callback = opts
         opts = {}
       }
-      return send({
+
+      // opts is the real callback --
+      // 'callback' is being injected by promisify
+      if (typeof opts === 'function' &&
+          typeof callback === 'function') {
+        callback = opts
+        opts = {}
+      }
+
+      if (args && typeof args === 'object') {
+        opts = args
+        args = undefined
+      }
+
+      send({
         path: 'bootstrap/add',
         args: args,
         qs: opts
       }, callback)
-    },
-    rm (args, opts, callback) {
+    }),
+    rm: promisify((args, opts, callback) => {
       if (typeof opts === 'function' &&
-          callback === undefined) {
+          !callback) {
         callback = opts
         opts = {}
       }
-      return send({
+
+      // opts is the real callback --
+      // 'callback' is being injected by promisify
+      if (typeof opts === 'function' &&
+          typeof callback === 'function') {
+        callback = opts
+        opts = {}
+      }
+
+      if (args && typeof args === 'object') {
+        opts = args
+        args = undefined
+      }
+
+      send({
         path: 'bootstrap/rm',
         args: args,
         qs: opts
       }, callback)
-    },
-    list (opts, callback) {
+    }),
+    list: promisify((opts, callback) => {
       if (typeof (opts) === 'function') {
         callback = opts
         opts = {}
       }
-      return send({
+      send({
         path: 'bootstrap/list',
         qs: opts
       }, callback)
-    }
+    })
   }
 }

src/api/cat.js

@@ -11,7 +11,7 @@ module.exports = (send) => {
       return callback(err)
     }
 
-    return send({
+    send({
       path: 'cat',
       args: hash
     }, callback)

src/api/commands.js

@@ -1,9 +1,11 @@
 'use strict'
 
+const promisify = require('promisify-es6')
+
 module.exports = (send) => {
-  return (callback) => {
-    return send({
+  return promisify((callback) => {
+    send({
       path: 'commands'
     }, callback)
-  }
+  })
 }

src/api/config.js

@@ -1,23 +1,25 @@
 'use strict'
 
 const streamifier = require('streamifier')
+const promisify = require('promisify-es6')
 
 module.exports = (send) => {
   return {
-    get (key, callback) {
+    get: promisify((key, callback) => {
       if (typeof key === 'function') {
         callback = key
         key = undefined
       }
 
       if (!key) {
-        return send({
+        send({
           path: 'config/show',
           buffer: true
         }, callback)
+        return
       }
 
-      return send({
+      send({
         path: 'config',
         args: key,
         buffer: true
@@ -27,8 +29,8 @@ module.exports = (send) => {
         }
         callback(null, response.Value)
       })
-    },
-    set (key, value, opts, callback) {
+    }),
+    set: promisify((key, value, opts, callback) => {
       if (typeof opts === 'function') {
         callback = opts
         opts = {}
@@ -53,24 +55,24 @@ module.exports = (send) => {
         opts = { bool: true }
       }
 
-      return send({
+      send({
         path: 'config',
         args: [key, value],
         qs: opts,
         files: undefined,
         buffer: true
       }, callback)
-    },
-    replace (config, callback) {
+    }),
+    replace: promisify((config, callback) => {
       if (typeof config === 'object') {
         config = streamifier.createReadStream(new Buffer(JSON.stringify(config)))
       }
 
-      return send({
+      send({
         path: 'config/replace',
         files: config,
         buffer: true
       }, callback)
-    }
+    })
   }
 }