Merge branch 'master' into netstandard

Author: richardschneider

src/CoreApi/SwarmApi.cs

@@ -56,22 +56,47 @@ public async Task<IEnumerable<ConnectedPeer>> PeersAsync()
         {
             var json = await ipfs.DoCommandAsync("swarm/peers", null, "verbose=true");
             var result = JObject.Parse(json);
-            return ((JArray)JObject.Parse(json)["Strings"])
-                .Select(s =>
+
+            // Older servers return an array of strings
+            var strings = (JArray)result["Strings"];
+            if (strings != null)
+            {
+                return strings
+                   .Select(s =>
+                   {
+                       var parts = ((string)s).Split(' ');
+                       var address = new MultiAddress(parts[0]);
+                       return new ConnectedPeer
+                       {
+                           Id = address.Protocols.First(p => p.Name == "ipfs").Value,
+                           ConnectedAddress = parts[0],
+                           Latency = ParseLatency(parts[1])
+                       };
+                   });
+            }
+
+            // Current servers return JSON
+            var peers = (JArray)result["Peers"];
+            if (peers != null)
+            {
+                return peers.Select(p => new ConnectedPeer
                 {
-                    var parts = ((string)s).Split(' ');
-                    var address = new MultiAddress(parts[0]);
-                    return new ConnectedPeer
-                    {
-                        Id = address.Protocols.First(p => p.Name == "ipfs").Value,
-                        ConnectedAddress = parts[0],
-                        Latency = ParseLatency(parts[1])
-                    };
+                    Id = (string)p["Peer"],
+                    ConnectedAddress = new MultiAddress((string)p["Addr"] + "/ipfs/" + (string)p["Peer"]),
+                    Latency = ParseLatency((string)p["Latency"])
                 });
+            }
+            
+            // Hmmm. Another change we can handle
+            throw new FormatException("Unknown response from 'swarm/peers");
         }
 
         TimeSpan ParseLatency(string latency)
         {
+            if (latency == "n/a")
+            {
+                return TimeSpan.Zero;
+            }
             if (latency.EndsWith("ms"))
             {
                 var ms = Double.Parse(latency.Substring(0, latency.Length - 2));

test/TrustedPeersTest.cs

@@ -36,7 +36,7 @@ public void Trusted_Peers_Add_Missing_Peer_ID()
         {
             var missingPeerId = new MultiAddress("/ip4/25.196.147.100/tcp/4001");
             var ipfs = TestFixture.Ipfs;
-            ExceptionAssert.Throws<Exception>(() => ipfs.TrustedPeers.Add(missingPeerId), "invalid ipfs address");
+            ExceptionAssert.Throws<Exception>(() => ipfs.TrustedPeers.Add(missingPeerId), "invalid IPFS address");
         }
 
         [TestMethod]