Merge pull request #219 from ipfs/core/object

interface-ipfs-core for object/core

package.json

@@ -37,13 +37,14 @@
   },
   "homepage": "https://github.com/ipfs/js-ipfs#readme",
   "devDependencies": {
-    "aegir": "^3.0.1",
+    "aegir": "^3.0.2",
     "buffer-loader": "0.0.1",
     "chai": "^3.5.0",
     "expose-loader": "^0.7.1",
     "form-data": "^1.0.0-rc3",
     "gulp": "^3.9.1",
     "idb-plus-blob-store": "^1.1.2",
+    "interface-ipfs-core": "^0.1.5",
     "libp2p-ipfs-browser": "^0.2.0",
     "lodash": "^4.11.2",
     "mocha": "^2.4.5",
@@ -63,24 +64,25 @@
     "fs-blob-store": "^5.2.1",
     "glob": "^7.0.3",
     "hapi": "^13.3.0",
-    "ipfs-api": "^3.0.2",
+    "ipfs-api": "^4.0.2",
     "ipfs-bitswap": "^0.2.0",
     "ipfs-block": "^0.3.0",
     "ipfs-block-service": "^0.4.0",
-    "ipfs-merkle-dag": "^0.5.1",
+    "ipfs-merkle-dag": "^0.6.0",
     "ipfs-multipart": "^0.1.0",
     "ipfs-repo": "^0.8.0",
     "ipfs-unixfs-engine": "^0.6.1",
     "joi": "^8.0.5",
-    "libp2p-ipfs": "^0.3.3",
+    "libp2p-ipfs": "^0.3.8",
     "libp2p-swarm": "^0.12.11",
-    "lodash.get": "^4.2.1",
-    "lodash.set": "^4.1.0",
+    "lodash.get": "^4.3.0",
+    "lodash.set": "^4.2.0",
     "multiaddr": "^1.4.1",
     "path-exists": "^3.0.0",
     "peer-book": "^0.1.1",
     "peer-id": "^0.6.6",
     "peer-info": "^0.6.2",
+    "promisify-es6": "^1.0.1",
     "readable-stream": "1.1.13",
     "ronin": "^0.3.11",
     "run-parallel": "^1.1.6",

src/cli/commands/block/get.js

@@ -28,7 +28,6 @@ module.exports = Command.extend({
 
       ipfs.block.get(mh, (err, block) => {
         if (err) {
-          log.error(err)
           throw err
         }
 

src/cli/commands/block/put.js

@@ -19,7 +19,6 @@ function addBlock (buf) {
     if (utils.isDaemonOn()) {
       return ipfs.block.put(buf, (err, block) => {
         if (err) {
-          log.error(err)
           throw err
         }
 
@@ -31,7 +30,6 @@ function addBlock (buf) {
 
     ipfs.block.put(block, (err, obj) => {
       if (err) {
-        log.error(err)
         throw err
       }
 
@@ -52,7 +50,6 @@ module.exports = Command.extend({
 
     process.stdin.pipe(bl((err, input) => {
       if (err) {
-        log.error(err)
         throw err
       }
 

src/cli/commands/block/rm.js

@@ -31,7 +31,6 @@ module.exports = Command.extend({
 
       ipfs.block.del(mh, (err) => {
         if (err) {
-          log.error(err)
           throw err
         }
 

src/cli/commands/block/stat.js

@@ -28,7 +28,6 @@ module.exports = Command.extend({
 
       ipfs.block.stat(mh, (err, block) => {
         if (err) {
-          log.error(err)
           throw err
         }
 

src/cli/commands/bootstrap/add.js

@@ -18,7 +18,7 @@ module.exports = Command.extend({
       }
       ipfs.bootstrap.add(multiaddr, (err, list) => {
         if (err) {
-          return log.error(err)
+          throw err
         }
       })
     })

src/cli/commands/bootstrap/rm.js

@@ -18,7 +18,7 @@ module.exports = Command.extend({
       }
       ipfs.bootstrap.rm(multiaddr, (err, list) => {
         if (err) {
-          return log.error(err)
+          throw err
         }
       })
     })

src/cli/commands/config/edit.js

@@ -61,7 +61,6 @@ module.exports = Command.extend({
 
         child.on('exit', (err, code) => {
           if (err) {
-            log.error(err)
             throw new Error('error on the editor')
           }
 

src/cli/commands/daemon.js

@@ -16,7 +16,7 @@ module.exports = Command.extend({
     httpAPI = new HttpAPI()
     httpAPI.start((err) => {
       if (err) {
-        return log.error(err)
+        throw err
       }
       console.log('Daemon is ready')
     })
@@ -25,7 +25,7 @@ module.exports = Command.extend({
       console.log('Received interrupt signal, shutting down..')
       httpAPI.stop((err) => {
         if (err) {
-          return log.error(err)
+          throw err
         }
         process.exit(0)
       })

src/cli/commands/id.js

@@ -24,7 +24,7 @@ module.exports = Command.extend({
 
       ipfs.id((err, id) => {
         if (err) {
-          return log.error(err)
+          throw err
         }
         console.log(id)
       })

src/cli/commands/object/data.js

@@ -2,7 +2,6 @@
 
 const Command = require('ronin').Command
 const utils = require('../../utils')
-const bs58 = require('bs58')
 const debug = require('debug')
 const log = debug('cli:object')
 log.error = debug('cli:object:error')
@@ -21,23 +20,13 @@ module.exports = Command.extend({
       if (err) {
         throw err
       }
-      const mh = utils.isDaemonOn()
-        ? key
-        : new Buffer(bs58.decode(key))
 
-      ipfs.object.data(mh, (err, data) => {
+      ipfs.object.data(key, {enc: 'base58'}, (err, data) => {
         if (err) {
-          log.error(err)
           throw err
         }
 
-        if (data instanceof Buffer) {
-          console.log(data.toString())
-          return
-        }
-
-        // js-ipfs-api output (http stream)
-        data.pipe(process.stdout)
+        console.log(data.toString())
       })
     })
   }

src/cli/commands/object/get.js

@@ -2,7 +2,6 @@
 
 const Command = require('ronin').Command
 const utils = require('../../utils')
-const bs58 = require('bs58')
 const debug = require('debug')
 const log = debug('cli:object')
 log.error = debug('cli:object:error')
@@ -21,32 +20,15 @@ module.exports = Command.extend({
       if (err) {
         throw err
       }
-      if (utils.isDaemonOn()) {
-        return ipfs.object.get(key, (err, obj) => {
-          if (err) {
-            log.error(err)
-            throw err
-          }
 
-          console.log(JSON.stringify(obj))
-        })
-      }
-
-      const mh = new Buffer(bs58.decode(key))
-      ipfs.object.get(mh, (err, obj) => {
+      ipfs.object.get(key, {enc: 'base58'}, (err, node) => {
         if (err) {
-          log.error(err)
           throw err
         }
 
-        console.log(JSON.stringify({
-          Links: obj.links.map((link) => ({
-            Name: link.name,
-            Hash: bs58.encode(link.hash).toString(),
-            Size: link.size
-          })),
-          Data: obj.data.toString()
-        }))
+        const res = node.toJSON()
+        res.Data = res.Data ? res.Data.toString() : ''
+        console.log(JSON.stringify(res))
       })
     })
   }

src/cli/commands/object/links.js

@@ -2,7 +2,6 @@
 
 const Command = require('ronin').Command
 const utils = require('../../utils')
-const bs58 = require('bs58')
 const debug = require('debug')
 const log = debug('cli:object')
 log.error = debug('cli:object:error')
@@ -21,25 +20,15 @@ module.exports = Command.extend({
       if (err) {
         throw err
       }
-      const mh = utils.isDaemonOn()
-        ? key
-        : new Buffer(bs58.decode(key))
 
-      ipfs.object.links(mh, (err, links) => {
+      ipfs.object.links(key, {enc: 'base58'}, (err, links) => {
         if (err) {
-          log.error(err)
           throw err
         }
 
-        if (links.Links) { // js-ipfs-api output
-          links.Links.forEach((link) => {
-            console.log(link.Hash, link.Size, link.Name)
-          })
-          return
-        }
-
         links.forEach((link) => {
-          console.log(bs58.encode(link.hash).toString(), link.size, link.name)
+          link = link.toJSON()
+          console.log(link.Hash, link.Size, link.Name)
         })
       })
     })

src/cli/commands/object/new.js

@@ -2,7 +2,6 @@
 
 const Command = require('ronin').Command
 const utils = require('../../utils')
-const bs58 = require('bs58')
 const debug = require('debug')
 const log = debug('cli:object')
 log.error = debug('cli:object:error')
@@ -12,23 +11,18 @@ module.exports = Command.extend({
 
   options: {},
 
-  run: (template) => {
+  run: () => {
     utils.getIPFS((err, ipfs) => {
       if (err) {
         throw err
       }
-      ipfs.object.new(template, (err, obj) => {
+
+      ipfs.object.new((err, node) => {
         if (err) {
-          log.error(err)
           throw err
         }
 
-        if (typeof obj.Hash === 'string') { // js-ipfs-api output
-          console.log(obj.Hash)
-          return
-        }
-
-        console.log(bs58.encode(obj.Hash).toString())
+        console.log(node.toJSON().Hash)
       })
     })
   }

src/cli/commands/object/patch/add-link.js

@@ -2,7 +2,6 @@
 
 const Command = require('ronin').Command
 const utils = require('../../../utils')
-const bs58 = require('bs58')
 const debug = require('debug')
 const log = debug('cli:object')
 const mDAG = require('ipfs-merkle-dag')
@@ -30,36 +29,17 @@ module.exports = Command.extend({
         throw err
       }
 
-      if (utils.isDaemonOn()) {
-        return ipfs.object.patch.addLink(root, name, ref, (err, obj) => {
-          if (err) {
-            log.error(err)
-            throw err
-          }
-
-          console.log(obj.Hash)
-        })
-      }
-
-      // when running locally we first need to get the ref object,
-      // so we can create the link with the correct size
-      const refMh = new Buffer(bs58.decode(ref))
-      ipfs.object.get(refMh, (err, linkedObj) => {
-        if (err) {
-          log.error(err)
-          throw err
-        }
-
-        const rootMh = new Buffer(bs58.decode(root))
-        const link = new DAGLink(name, linkedObj.size(), linkedObj.multihash())
-        ipfs.object.patch.addLink(rootMh, link, (err, obj) => {
-          if (err) {
-            log.error(err)
-            throw err
-          }
-
-          console.log(bs58.encode(obj.multihash()).toString())
-        })
+      ipfs.object.get(ref, {enc: 'base58'}).then((linkedObj) => {
+        const link = new DAGLink(
+          name,
+          linkedObj.size(),
+          linkedObj.multihash()
+        )
+        return ipfs.object.patch.addLink(root, link, {enc: 'base58'})
+      }).then((node) => {
+        console.log(node.toJSON().Hash)
+      }).catch((err) => {
+        throw err
       })
     })
   }