Borrow peerId decode

Author: cstamas

src/main/java/io/ipfs/api/Peer.java

@@ -2,19 +2,20 @@
 
 import io.ipfs.cid.*;
 import io.ipfs.multiaddr.*;
+import io.ipfs.multibase.Base58;
 import io.ipfs.multihash.*;
 
 import java.util.*;
 import java.util.function.*;
 
 public class Peer {
     public final MultiAddress address;
-    public final Multihash id;
+    public final Cid id;
     public final long latency;
     public final String muxer;
     public final Object streams;
 
-    public Peer(MultiAddress address, Multihash id, long latency, String muxer, Object streams) {
+    public Peer(MultiAddress address, Cid id, long latency, String muxer, Object streams) {
         this.address = address;
         this.id = id;
         this.latency = latency;
@@ -27,17 +28,20 @@ public static Peer fromJSON(Object json) {
             throw new IllegalStateException("Incorrect json for Peer: " + JSONParser.toString(json));
         Map m = (Map) json;
         Function<String, String> val = key -> (String) m.get(key);
-        String peerId = val.apply("Peer");
-        Multihash peer; // Multihash bug? Throws IAEx Base1 not supported
-        try {
-            peer = Multihash.fromBase58(peerId);
-        } catch (Exception e) {
-            peer = Multihash.decode(peerId);
-        }
+        Cid peer = decodePeerId(val.apply("Peer"));
         long latency = m.containsKey("Latency") ? Long.parseLong(val.apply("Latency")) : -1;
         return new Peer(new MultiAddress(val.apply("Addr")), peer, latency, val.apply("Muxer"), val.apply("Streams"));
     }
 
+    // See https://github.com/Peergos/Peergos/blob/81064fdb2cdf6b6fe126cf6a20d4d40ecd148938/src/peergos/shared/io/ipfs/Cid.java#L148
+    public static Cid decodePeerId(String peerId) {
+        if (peerId.startsWith("1")) {
+            // convert base58 encoded identity multihash to cidV1
+            Multihash hash = Multihash.deserialize(Base58.decode(peerId));
+            return new Cid(1, Cid.Codec.Libp2pKey, hash.getType(), hash.getHash());
+        }
+        return Cid.decode(peerId);
+    }
     @Override
     public String toString() {
         return id + "@" + address;