feat: migrate cli to use new async DAGNode interface

ipfs · Oct 29, 2016 · 1b0b22d · 1b0b22d
1 parent 01e56ec
commit 1b0b22d
Show file tree

Hide file tree

Showing 9 changed files with 76 additions and 23 deletions.
diff --git a/src/cli/commands/object/get.js b/src/cli/commands/object/get.js
@@ -23,9 +23,13 @@ module.exports = {
           throw err
         }
 
-        const res = node.toJSON()
-        res.Data = res.Data ? res.Data.toString() : ''
-        console.log(JSON.stringify(res))
+        node.toJSON((err, nodeJSON) => {
+          if (err) {
+            throw err
+          }
+          nodeJSON.Data = nodeJSON.Data ? nodeJSON.Data.toString() : ''
+          console.log(JSON.stringify(nodeJSON))
+        })
       })
     })
   }

diff --git a/src/cli/commands/object/new.js b/src/cli/commands/object/new.js
@@ -23,7 +23,12 @@ module.exports = {
           throw err
         }
 
-        console.log(node.toJSON().Hash)
+        node.toJSON((err, nodeJSON) => {
+          if (err) {
+            throw err
+          }
+          console.log(nodeJSON.Hash)
+        })
       })
     })
   }

diff --git a/src/cli/commands/object/patch/add-link.js b/src/cli/commands/object/patch/add-link.js
@@ -3,8 +3,8 @@
 const utils = require('../../../utils')
 const debug = require('debug')
 const log = debug('cli:object')
-const mDAG = require('ipfs-merkle-dag')
-const DAGLink = mDAG.DAGLink
+const dagPB = require('ipld-dag-pb')
+const DAGLink = dagPB.DAGLink
 log.error = debug('cli:object:error')
 
 module.exports = {
@@ -15,23 +15,41 @@ module.exports = {
   builder: {},
 
   handler (argv) {
-    utils.getIPFS((err, ipfs) => {
+    utils.getIPFS(gotIPFS)
+
+    function gotIPFS (err, ipfs) {
       if (err) {
         throw err
       }
 
       ipfs.object.get(argv.ref, {enc: 'base58'}).then((linkedObj) => {
-        const link = new DAGLink(
-          argv.name,
-          linkedObj.size(),
-          linkedObj.multihash()
-        )
-        return ipfs.object.patch.addLink(argv.root, link, {enc: 'base58'})
-      }).then((node) => {
-        console.log(node.toJSON().Hash)
+        linkedObj.size((err, size) => {
+          if (err) {
+            throw err
+          }
+          linkedObj.multihash((err, multihash) => {
+            if (err) {
+              throw err
+            }
+
+            const link = new DAGLink(argv.name, size, multihash)
+
+            ipfs.object.patch.addLink(argv.root, link, {enc: 'base58'})
+            .then((node) => {
+              node.toJSON(gotJSON)
+
+              function gotJSON (err, nodeJSON) {
+                if (err) {
+                  throw err
+                }
+                console.log(nodeJSON.Hash)
+              }
+            })
+          })
+        })
       }).catch((err) => {
         throw err
       })
-    })
+    }
   }
 }
diff --git a/src/cli/commands/object/patch/append-data.js b/src/cli/commands/object/patch/append-data.js
@@ -18,7 +18,13 @@ function appendData (key, data) {
         throw err
       }
 
-      console.log(node.toJSON().Hash)
+      node.toJSON((err, nodeJSON) => {
+        if (err) {
+          throw err
+        }
+
+        console.log(nodeJSON.Hash)
+      })
     })
   })
 }

diff --git a/src/cli/commands/object/patch/rm-link.js b/src/cli/commands/object/patch/rm-link.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const DAGLink = require('ipfs-merkle-dag').DAGLink
+const DAGLink = require('ipld-dag-pb').DAGLink
 const utils = require('../../../utils')
 const debug = require('debug')
 const log = debug('cli:object')
@@ -26,7 +26,12 @@ module.exports = {
           throw err
         }
 
-        console.log(node.toJSON().Hash)
+        node.toJSON((err, nodeJSON) => {
+          if (err) {
+            throw err
+          }
+          console.log(nodeJSON.Hash)
+        })
       })
     })
   }

diff --git a/src/cli/commands/object/patch/set-data.js b/src/cli/commands/object/patch/set-data.js
@@ -18,7 +18,13 @@ function parseAndAddNode (key, data) {
         throw err
       }
 
-      console.log(node.toJSON().Hash)
+      node.toJSON((err, nodeJSON) => {
+        if (err) {
+          throw err
+        }
+
+        console.log(nodeJSON.Hash)
+      })
     })
   })
 }

diff --git a/src/cli/commands/object/put.js b/src/cli/commands/object/put.js
@@ -18,7 +18,13 @@ function putNode (buf, enc) {
         throw err
       }
 
-      console.log('added', node.toJSON().Hash)
+      node.toJSON((err, nodeJSON) => {
+        if (err) {
+          throw err
+        }
+
+        console.log('added', nodeJSON.Hash)
+      })
     })
   })
 }

diff --git a/src/http-api/resources/object.js b/src/http-api/resources/object.js
@@ -443,15 +443,17 @@ exports.patchAddLink = {
               }).code(500)
             }
 
-            node.toJSON((err, nodeJSON) => {
+            node.toJSON(gotJSON)
+
+            function gotJSON (err, nodeJSON) {
               if (err) {
                 return reply({
                   Message: 'Failed to get object: ' + err,
                   Code: 0
                 }).code(500)
               }
               return reply(nodeJSON)
-            })
+            }
           })
         })
       })

diff --git a/test/http-api/ipfs-api/test-object.js b/test/http-api/ipfs-api/test-object.js
@@ -1,4 +1,5 @@
 /* eslint-env mocha */
+/* eslint max-nested-callbacks: ["error", 8] */
 'use strict'
 
 const expect = require('chai').expect