Allow object get/data to accept CID

tableflip · Sep 7, 2017 · bfc0c3d · bfc0c3d
1 parent b4c0785
commit bfc0c3d
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 13 deletions.
diff --git a/src/object/data.js b/src/object/data.js
@@ -2,7 +2,7 @@
 
 const promisify = require('promisify-es6')
 const streamToValue = require('../utils/stream-to-value')
-const cleanMultihash = require('../utils/clean-multihash')
+const CID = require('cids')
 const LRU = require('lru-cache')
 const lruOptions = {
   max: 128
@@ -11,7 +11,7 @@ const lruOptions = {
 const cache = LRU(lruOptions)
 
 module.exports = (send) => {
-  return promisify((multihash, options, callback) => {
+  return promisify((hash, options, callback) => {
     if (typeof options === 'function') {
       callback = options
       options = {}
@@ -20,21 +20,24 @@ module.exports = (send) => {
       options = {}
     }
 
+    let cid, b58Hash
+
     try {
-      multihash = cleanMultihash(multihash, options)
+      cid = new CID(hash)
+      b58Hash = cid.toBaseEncodedString()
     } catch (err) {
       return callback(err)
     }
 
-    const node = cache.get(multihash)
+    const node = cache.get(b58Hash)
 
     if (node) {
       return callback(null, node.data)
     }
 
     send({
       path: 'object/data',
-      args: multihash
+      args: b58Hash
     }, (err, result) => {
       if (err) {
         return callback(err)

diff --git a/src/object/get.js b/src/object/get.js
@@ -5,7 +5,7 @@ const dagPB = require('ipld-dag-pb')
 const DAGNode = dagPB.DAGNode
 const DAGLink = dagPB.DAGLink
 const bs58 = require('bs58')
-const cleanMultihash = require('../utils/clean-multihash')
+const CID = require('cids')
 const LRU = require('lru-cache')
 const lruOptions = {
   max: 128
@@ -14,7 +14,7 @@ const lruOptions = {
 const cache = LRU(lruOptions)
 
 module.exports = (send) => {
-  return promisify((multihash, options, callback) => {
+  return promisify((hash, options, callback) => {
     if (typeof options === 'function') {
       callback = options
       options = {}
@@ -24,21 +24,24 @@ module.exports = (send) => {
       options = {}
     }
 
+    let cid, b58Hash
+
     try {
-      multihash = cleanMultihash(multihash, options)
+      cid = new CID(hash)
+      b58Hash = cid.toBaseEncodedString()
     } catch (err) {
       return callback(err)
     }
 
-    const node = cache.get(multihash)
+    const node = cache.get(b58Hash)
 
     if (node) {
       return callback(null, node)
     }
 
     send({
       path: 'object/get',
-      args: multihash
+      args: b58Hash
     }, (err, result) => {
       if (err) {
         return callback(err)
@@ -52,7 +55,7 @@ module.exports = (send) => {
         if (err) {
           return callback(err)
         }
-        cache.set(multihash, node)
+        cache.set(b58Hash, node)
         callback(null, node)
       })
     })

diff --git a/src/utils/get-dagnode.js b/src/utils/get-dagnode.js
@@ -2,16 +2,25 @@
 
 const DAGNode = require('ipld-dag-pb').DAGNode
 const parallel = require('async/parallel')
+const CID = require('cids')
 const streamToValue = require('./stream-to-value')
 
 module.exports = function (send, hash, callback) {
+  let cid
+
+  try {
+    cid = new CID(hash)
+  } catch (err) {
+    return callback(err)
+  }
+
   // Retrieve the object and its data in parallel, then produce a DAGNode
   // instance using this information.
   parallel([
     function get (done) {
       send({
         path: 'object/get',
-        args: hash
+        args: cid.toBaseEncodedString()
       }, done)
     },
 
@@ -21,7 +30,7 @@ module.exports = function (send, hash, callback) {
       // See https://github.com/ipfs/go-ipfs/issues/1582 for more details.
       send({
         path: 'object/data',
-        args: hash
+        args: cid.toBaseEncodedString()
       }, done)
     }],