Merge pull request #420 from ipfs/feat/generic-spec-compliant

level-up

Author: daviddias

package.json

@@ -40,14 +40,14 @@
   },
   "homepage": "https://github.com/ipfs/js-ipfs#readme",
   "devDependencies": {
-    "aegir": "^5.0.1",
+    "aegir": "^7.0.0",
     "buffer-loader": "0.0.1",
     "chai": "^3.5.0",
     "expose-loader": "^0.7.1",
     "form-data": "^1.0.0-rc4",
     "gulp": "^3.9.1",
     "idb-plus-blob-store": "^1.1.2",
-    "interface-ipfs-core": "^0.8.0",
+    "interface-ipfs-core": "^0.13.0",
     "left-pad": "^1.1.1",
     "lodash": "^4.14.1",
     "ncp": "^2.0.0",
@@ -67,8 +67,8 @@
     "fs-blob-store": "^5.2.1",
     "glob": "^7.0.5",
     "hapi": "^14.0.0",
+    "ipfs-api": "^7.0.0",
     "ipfs-bitswap": "^0.6.0",
-    "ipfs-api": "^6.0.3",
     "ipfs-block": "^0.3.0",
     "ipfs-block-service": "^0.4.0",
     "ipfs-merkle-dag": "^0.6.2",
@@ -80,8 +80,9 @@
     "joi": "^9.0.4",
     "libp2p-ipfs": "^0.12.1",
     "libp2p-ipfs-browser": "^0.12.1",
-    "lodash.get": "^4.4.0",
-    "lodash.set": "^4.3.0",
+    "lodash.get": "^4.4.1",
+    "lodash.has": "^4.5.2",
+    "lodash.set": "^4.3.1",
     "lodash.sortby": "^4.6.1",
     "mafmt": "^2.1.1",
     "map-limit": "0.0.1",

src/cli/commands/config.js

@@ -55,7 +55,7 @@ module.exports = {
           })
         }
 
-        ipfs.config.show((err, config) => {
+        ipfs.config.get((err, config) => {
           if (err) {
             log.error(err)
             throw new Error('failed to read the config')
@@ -87,7 +87,7 @@ module.exports = {
           })
         }
 
-        ipfs.config.show((err, originalConfig) => {
+        ipfs.config.get((err, originalConfig) => {
           if (err) {
             log.error(err)
             throw new Error('failed to read the config')

src/cli/commands/config/edit.js

@@ -31,7 +31,7 @@ module.exports = {
       }
 
       function getConfig (next) {
-        ipfs.config.show((err, config) => {
+        ipfs.config.get((err, config) => {
           if (err) {
             log.error(err)
             next(new Error('failed to get the config'))

src/cli/commands/config/show.js

@@ -20,7 +20,7 @@ module.exports = {
       if (err) {
         throw err
       }
-      ipfs.config.show((err, config) => {
+      ipfs.config.get((err, config) => {
         if (err) {
           throw err
         }

src/core/index.js

@@ -56,6 +56,7 @@ function IPFS (repoInstance) {
   this.block = block(this)
   this.object = object(this)
   this.libp2p = libp2p(this)
+  this.swarm = this.libp2p.swarm // for interface-ipfs-core sake
   this.files = files(this)
   this.cat = files(this).cat // Alias for js-ipfs-api cat
   this.bitswap = bitswap(this)

src/core/ipfs/config.js

@@ -1,14 +1,57 @@
 'use strict'
 
+const promisify = require('promisify-es6')
+const _get = require('lodash.get')
+const _has = require('lodash.has')
+const _set = require('lodash.set')
+
 module.exports = function config (self) {
   return {
-    // cli only feature built with show and replace
-    // edit: (callback) => {},
-    replace: (config, callback) => {
+    get: promisify((key, callback) => {
+      if (typeof key === 'function') {
+        callback = key
+        key = undefined
+      }
+
+      if (!key) {
+        return self._repo.config.get(callback)
+      }
+
+      if (typeof key !== 'string') {
+        return callback(new Error('Invalid key type'))
+      }
+
+      self._repo.config.get((err, config) => {
+        if (err) {
+          return callback(err)
+        }
+        if (_has(config, key)) {
+          const value = _get(config, key, undefined)
+          callback(null, value)
+        } else {
+          callback(new Error('Key does not exist in config'))
+        }
+      })
+    }),
+    set: promisify((key, value, callback) => {
+      if (!key || typeof key !== 'string') {
+        return callback(new Error('Invalid key type'))
+      }
+
+      if (value === undefined || Buffer.isBuffer(value)) {
+        return callback(new Error('Invalid value type'))
+      }
+
+      self._repo.config.get((err, config) => {
+        if (err) {
+          return callback(err)
+        }
+        _set(config, key, value)
+        self.config.replace(config, callback)
+      })
+    }),
+    replace: promisify((config, callback) => {
       self._repo.config.set(config, callback)
-    },
-    show: (callback) => {
-      self._repo.config.get(callback)
-    }
+    })
   }
 }

src/core/ipfs/id.js

@@ -1,7 +1,9 @@
 'use strict'
 
+const promisify = require('promisify-es6')
+
 module.exports = function id (self) {
-  return (opts, callback) => {
+  return promisify((opts, callback) => {
     if (typeof opts === 'function') {
       callback = opts
       opts = {}
@@ -14,12 +16,12 @@ module.exports = function id (self) {
 
     function ready () {
       callback(null, {
-        ID: self._peerInfo.id.toB58String(),
-        PublicKey: self._peerInfo.id.pubKey.bytes.toString('base64'),
-        Addresses: self._peerInfo.multiaddrs.map((ma) => { return ma.toString() }).sort(),
-        AgentVersion: 'js-ipfs',
-        ProtocolVersion: '9000'
+        id: self._peerInfo.id.toB58String(),
+        publicKey: self._peerInfo.id.pubKey.bytes.toString('base64'),
+        addresses: self._peerInfo.multiaddrs.map((ma) => { return ma.toString() }).sort(),
+        agentVersion: 'js-ipfs',
+        protocolVersion: '9000'
       })
     }
-  }
+  })
 }

src/core/ipfs/version.js

@@ -1,14 +1,19 @@
 'use strict'
 
 const pkg = require('../../../package.json')
+const promisify = require('promisify-es6')
 
 module.exports = function version (self) {
-  return (opts, callback) => {
+  return promisify((opts, callback) => {
     if (typeof opts === 'function') {
       callback = opts
       opts = {}
     }
 
-    callback(null, pkg.version)
-  }
+    callback(null, {
+      version: pkg.version,
+      repo: '',
+      commit: ''
+    })
+  })
 }

src/http-api/index.js

@@ -38,7 +38,7 @@ exports = module.exports = function HttpApi (repo) {
         fs.writeFileSync(apiPath, 'api is on by js-ipfs', {flag: 'w+'})
       }
 
-      this.ipfs.config.show((err, config) => {
+      this.ipfs.config.get((err, config) => {
         if (err) {
           return callback(err)
         }

src/http-api/resources/config.js

@@ -60,7 +60,7 @@ exports.getOrSet = {
 
     if (value === undefined) {
       // Get the value of a given key
-      return request.server.app.ipfs.config.show((err, config) => {
+      return request.server.app.ipfs.config.get((err, config) => {
         if (err) {
           log.error(err)
           return reply({
@@ -84,7 +84,7 @@ exports.getOrSet = {
       })
     } else {
       // Set the new value of a given key
-      request.server.app.ipfs.config.show((err, originalConfig) => {
+      request.server.app.ipfs.config.get((err, originalConfig) => {
         if (err) {
           log.error(err)
           return reply({
@@ -113,8 +113,8 @@ exports.getOrSet = {
   }
 }
 
-exports.show = (request, reply) => {
-  return request.server.app.ipfs.config.show((err, config) => {
+exports.get = (request, reply) => {
+  return request.server.app.ipfs.config.get((err, config) => {
     if (err) {
       log.error(err)
       return reply({