Make cli connect to the daemon if it's running

Author: fbaiodias

package.json

@@ -76,7 +76,7 @@
     "ipfs-api": "^2.13.1",
     "ipfs-blocks": "^0.1.0",
     "ipfs-merkle-dag": "^0.2.1",
-    "ipfs-multipart": "0.0.1",
+    "ipfs-multipart": "^0.1.0",
     "ipfs-repo": "^0.5.0",
     "joi": "^8.0.2",
     "lodash.get": "^4.0.0",

src/cli/commands/object/data.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const Command = require('ronin').Command
-const IPFS = require('../../../ipfs-core')
+const utils = require('../../utils')
 const bs58 = require('bs58')
 const debug = require('debug')
 const log = debug('cli:object')
@@ -13,20 +13,29 @@ module.exports = Command.extend({
   options: {},
 
   run: (key) => {
-    var node = new IPFS()
+    var ipfs = utils.getIPFS()
 
     if (!key) {
       throw new Error("Argument 'key' is required")
     }
 
-    const mh = new Buffer(bs58.decode(key))
-    node.object.data(mh, (err, data) => {
+    const mh = utils.isDaemonOn()
+      ? key
+      : new Buffer(bs58.decode(key))
+
+    ipfs.object.data(mh, (err, data) => {
       if (err) {
         log.error(err)
         throw err
       }
 
-      console.log(data.toString())
+      if (data instanceof Buffer) {
+        console.log(data.toString())
+        return
+      }
+
+      // js-ipfs-api output (http stream)
+      data.pipe(process.stdout)
     })
   }
 })

src/cli/commands/object/get.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const Command = require('ronin').Command
-const IPFS = require('../../../ipfs-core')
+const utils = require('../../utils')
 const bs58 = require('bs58')
 const debug = require('debug')
 const log = debug('cli:object')
@@ -13,14 +13,25 @@ module.exports = Command.extend({
   options: {},
 
   run: (key) => {
-    var node = new IPFS()
+    var ipfs = utils.getIPFS()
 
     if (!key) {
       throw new Error("Argument 'key' is required")
     }
 
+    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))
-    node.object.get(mh, (err, obj) => {
+    ipfs.object.get(mh, (err, obj) => {
       if (err) {
         log.error(err)
         throw err

src/cli/commands/object/links.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const Command = require('ronin').Command
-const IPFS = require('../../../ipfs-core')
+const utils = require('../../utils')
 const bs58 = require('bs58')
 const debug = require('debug')
 const log = debug('cli:object')
@@ -13,19 +13,29 @@ module.exports = Command.extend({
   options: {},
 
   run: (key) => {
-    var node = new IPFS()
+    var ipfs = utils.getIPFS()
 
     if (!key) {
       throw new Error("Argument 'key' is required")
     }
 
-    const mh = new Buffer(bs58.decode(key))
-    node.object.links(mh, (err, links) => {
+    const mh = utils.isDaemonOn()
+      ? key
+      : new Buffer(bs58.decode(key))
+
+    ipfs.object.links(mh, (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)
       })

src/cli/commands/object/new.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const Command = require('ronin').Command
-const IPFS = require('../../../ipfs-core')
+const utils = require('../../utils')
 const bs58 = require('bs58')
 const debug = require('debug')
 const log = debug('cli:object')
@@ -13,14 +13,19 @@ module.exports = Command.extend({
   options: {},
 
   run: (template) => {
-    var node = new IPFS()
+    var ipfs = utils.getIPFS()
 
-    node.object.new(template, (err, obj) => {
+    ipfs.object.new(template, (err, obj) => {
       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())
     })
   }

src/cli/commands/object/put.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const Command = require('ronin').Command
-const IPFS = require('../../../ipfs-core')
+const utils = require('../../utils')
 const bs58 = require('bs58')
 const bl = require('bl')
 const fs = require('fs')
@@ -17,9 +17,20 @@ module.exports = Command.extend({
   options: {},
 
   run: (filePath) => {
-    var node = new IPFS()
+    var ipfs = utils.getIPFS()
 
     function parseAndAddNode (buf) {
+      if (utils.isDaemonOn()) {
+        return ipfs.object.put(buf, 'json', (err, obj) => {
+          if (err) {
+            log.error(err)
+            throw err
+          }
+
+          console.log('added', obj.Hash)
+        })
+      }
+
       let parsed
       try {
         parsed = JSON.parse(buf.toString())
@@ -38,7 +49,7 @@ module.exports = Command.extend({
 
       const dagNode = new DAGNode(data, links)
 
-      node.object.put(dagNode, (err, obj) => {
+      ipfs.object.put(dagNode, (err, obj) => {
         if (err) {
           log.error(err)
           throw err

src/cli/commands/object/stat.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const Command = require('ronin').Command
-const IPFS = require('../../../ipfs-core')
+const utils = require('../../utils')
 const bs58 = require('bs58')
 const debug = require('debug')
 const log = debug('cli:object')
@@ -13,19 +13,24 @@ module.exports = Command.extend({
   options: {},
 
   run: (key) => {
-    var node = new IPFS()
+    var ipfs = utils.getIPFS()
 
     if (!key) {
       throw new Error("Argument 'key' is required")
     }
 
-    const mh = new Buffer(bs58.decode(key))
-    node.object.stat(mh, (err, stats) => {
+    const mh = utils.isDaemonOn()
+      ? key
+      : new Buffer(bs58.decode(key))
+
+    ipfs.object.stat(mh, (err, stats) => {
       if (err) {
         log.error(err)
         throw err
       }
 
+      delete stats.Hash // only for js-ipfs-api output
+
       Object.keys(stats).forEach((key) => {
         console.log(`${key}: ${stats[key]}`)
       })