Merge pull request #4 from Dignifiedquire/no-ip

Small fixes
ipfs-shipyard · Dec 1, 2015 · 68c90a3 · 68c90a3
2 parents c7a1d86 + 9d8e9ea
commit 68c90a3
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 22 deletions.
diff --git a/lib/lookup.js b/lib/lookup.js
@@ -12,28 +12,32 @@ var memoized_lookup
 function _lookup (ipfs, hash, lookfor, cb) {
   ipfs.object.get(hash, function (err, res) {
     if (err) {
-      cb(err, null)
-    } else {
+      return cb(err, null)
+    }
+
+    try {
       var obj = JSON.parse(res.Data)
+    } catch (err) {
+      return cb(err, null)
+    }
+
+    var child = 0
+    if (obj.type === 'Node') {
+      while (obj.mins[child] &&
+             obj.mins[child] <= lookfor) {
+        child++
+      }
+      return memoized_lookup(ipfs, res.Links[child - 1].Hash, lookfor, cb)
+    } else if (obj.type === 'Leaf') {
+      while (obj.data[child] &&
+             obj.data[child].min <= lookfor) {
+        child++
+      }
 
-      var child = 0
-      if (obj.type === 'Node') {
-        while (obj.mins[child] &&
-               obj.mins[child] <= lookfor) {
-          child++
-        }
-        return memoized_lookup(ipfs, res.Links[child - 1].Hash, lookfor, cb)
-      } else if (obj.type === 'Leaf') {
-        while (obj.data[child] &&
-               obj.data[child].min <= lookfor) {
-          child++
-        }
-
-        if (obj.data[child - 1].data) {
-          cb(null, formatData(obj.data[child - 1].data))
-        } else {
-          cb('Unmapped range', null)
-        }
+      if (obj.data[child - 1].data) {
+        cb(null, formatData(obj.data[child - 1].data))
+      } else {
+        cb('Unmapped range', null)
       }
     }
   })

diff --git a/lib/pretty.js b/lib/pretty.js
@@ -15,8 +15,11 @@ module.exports = function lookupPretty (ipfs, multiaddrs, cb) {
   if (multiaddrs.length === 0) return cb(null, null)
   if (typeof multiaddrs === 'string') multiaddrs = [multiaddrs]
 
-  var address = multiaddrs[0].split('/')[2]
-  if (isLocal(address)) return lookupPretty(ipfs, multiaddrs.slice(1), cb)
+  var current = multiaddrs[0].split('/')
+  var address = current[2]
+
+  // No ip6 support at the moment
+  if (isLocal(address) || current[1] === 'ip6') return lookupPretty(ipfs, multiaddrs.slice(1), cb)
 
   lookup(ipfs, address, function (err, res) {
     if (err) return cb(err)