Merge pull request #53 from richardschneider/core-api-52

feat(BitswapApi): add LedgerAsync

.nuget/packages.config

@@ -2,5 +2,4 @@
 <packages>
   <package id="coveralls.net" version="0.6.0" />
   <package id="OpenCover" version="4.6.519" />
-  <package id="msdn.4.5.2" version="0.1.0-alpha-1611021200" />
 </packages>

appveyor.yml

@@ -32,8 +32,6 @@ environment:
 install:
   - dotnet --version
   - choco install gitversion.portable -y
-  - nuget update -self
-  - choco install docfx -y
   - npm install gh-pages -g
 
 #  - nuget install secure-file -ExcludeVersion
@@ -56,8 +54,11 @@ build_script:
 
 after_build:
   - cmd: appveyor PushArtifact "src\bin\%CONFIGURATION%\Ipfs.Http.Client.%GitVersion_MajorMinorPatch%.nupkg"
+
 # Build documentation in doc\_site
-  - docfx doc\docfx.json --logLevel Warning
+# v2.43 is requiring VS 2019!!!
+  - cmd: choco install docfx -y --version 2.42 --force
+  - docfx doc\docfx.json --logLevel Warning --warningsAsErrors
   - 7z a -tzip docs.zip doc\_site
   - appveyor PushArtifact docs.zip
   - if defined git_token gh-pages -d doc\_site -m "new docs %GitVersion_FullSemVer%"

doc/api/.manifest

@@ -26,6 +26,7 @@
   "Ipfs.Http.IpfsClient.ApiUri": "Ipfs.Http.IpfsClient.yml",
   "Ipfs.Http.IpfsClient.Bitswap": "Ipfs.Http.IpfsClient.yml",
   "Ipfs.Http.IpfsClient.Block": "Ipfs.Http.IpfsClient.yml",
+  "Ipfs.Http.IpfsClient.BlockRepository": "Ipfs.Http.IpfsClient.yml",
   "Ipfs.Http.IpfsClient.Bootstrap": "Ipfs.Http.IpfsClient.yml",
   "Ipfs.Http.IpfsClient.Config": "Ipfs.Http.IpfsClient.yml",
   "Ipfs.Http.IpfsClient.Dag": "Ipfs.Http.IpfsClient.yml",
@@ -47,8 +48,10 @@
   "Ipfs.Http.IpfsClient.PubSub": "Ipfs.Http.IpfsClient.yml",
   "Ipfs.Http.IpfsClient.ResolveAsync(System.String,System.Boolean,System.Threading.CancellationToken)": "Ipfs.Http.IpfsClient.yml",
   "Ipfs.Http.IpfsClient.ShutdownAsync": "Ipfs.Http.IpfsClient.yml",
+  "Ipfs.Http.IpfsClient.Stats": "Ipfs.Http.IpfsClient.yml",
   "Ipfs.Http.IpfsClient.Swarm": "Ipfs.Http.IpfsClient.yml",
   "Ipfs.Http.IpfsClient.TrustedPeers": "Ipfs.Http.IpfsClient.yml",
+  "Ipfs.Http.IpfsClient.Upload2Async(System.String,System.Threading.CancellationToken,System.IO.Stream,System.String,System.String[])": "Ipfs.Http.IpfsClient.yml",
   "Ipfs.Http.IpfsClient.UploadAsync(System.String,System.Threading.CancellationToken,System.Byte[],System.String[])": "Ipfs.Http.IpfsClient.yml",
   "Ipfs.Http.IpfsClient.UploadAsync(System.String,System.Threading.CancellationToken,System.IO.Stream,System.String,System.String[])": "Ipfs.Http.IpfsClient.yml",
   "Ipfs.Http.IpfsClient.UserAgent": "Ipfs.Http.IpfsClient.yml",

doc/docfx.json

@@ -64,16 +64,18 @@
         ]
       }
     ],
+    "xrefService": [
+      "https://xref.docs.microsoft.com/query?uid={uid}"
+    ],
     "xref": [
-      "../packages/msdn.4.5.2.0.1.0-alpha-1611021200/content/msdn.4.5.2.zip",
-	    "https://richardschneider.github.io/net-ipfs-core/xrefmap.yml"
+      "https://richardschneider.github.io/net-ipfs-core/xrefmap.yml"
     ],
-    "globalMetadata" : {
+    "globalMetadata": {
       "_appTitle": "IPFS HTP Client documentation",
       "_appFooter": "Generated by DocFX",
-	    "_appFaviconPath": "images/ipfs-favicon.ico",
-      "_appLogoPath":  "images/ipfs-logo.svg"
-	  },
+      "_appFaviconPath": "images/ipfs-favicon.ico",
+      "_appLogoPath": "images/ipfs-cs-logo-48x48.png"
+    },
     "dest": "_site",
     "globalMetadataFiles": [],
     "fileMetadataFiles": [],

src/CoreApi/BitswapApi.cs

@@ -46,6 +46,19 @@ internal BitswapApi(IpfsClient ipfs)
         {
             await ipfs.DoCommandAsync("bitswap/unwant", cancel, id);
         }
+
+        public async Task<BitswapLedger> LedgerAsync(Peer peer, CancellationToken cancel = default(CancellationToken))
+        {
+            var json = await ipfs.DoCommandAsync("bitswap/ledger", cancel, peer.Id.ToString());
+            var o = JObject.Parse(json);
+            return new BitswapLedger
+            {
+                Peer = (string)o["Peer"],
+                DataReceived = (ulong)o["Sent"],
+                DataSent = (ulong)o["Recv"],
+                BlocksExchanged = (ulong)o["Exchanged"]
+            };
+        }
     }
 
 }

src/IpfsHttpClient.csproj

@@ -6,7 +6,8 @@
     <RootNamespace>Ipfs.Http</RootNamespace>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
     <DebugType>full</DebugType>
-
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+
     <!-- developer build is always 0.42 -->
     <AssemblyVersion>0.42</AssemblyVersion>
     <Version>0.42</Version>
@@ -18,17 +19,16 @@
     <Description> Provides .Net client access to the InterPlanetary File System.</Description>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageReleaseNotes>https://github.com/richardschneider/net-ipfs-http-client/releases</PackageReleaseNotes>
-    <Copyright>© 2015-2018 Richard Schneider</Copyright>
+    <Copyright>© 2015-2019 Richard Schneider</Copyright>
     <PackageTags>ipfs peer-to-peer distributed file-system</PackageTags>
     <IncludeSymbols>True</IncludeSymbols>
-    <PackageLicenseUrl>https://github.com/richardschneider/net-ipfs-http-client/blob/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/richardschneider/net-ipfs-http-client</PackageProjectUrl>
-    <PackageIconUrl>https://github.com/ipfs/logo/blob/master/platform-icons/osx-menu-bar.png</PackageIconUrl>
+    <PackageIconUrl>https://raw.githubusercontent.com/richardschneider/net-ipfs-core/master/doc/images/ipfs-cs-logo-64x64.png</PackageIconUrl>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Ipfs.Core" Version="0.51.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="Ipfs.Core" Version="0.52.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
 	  <PackageReference Include="System.Net.Http" Version="4.3.3" Condition="'$(TargetFramework)' == 'netstandard14'" />
     <PackageReference Include="System.Net.Http" Version="4.3.3" Condition="'$(TargetFramework)' == 'net45'" />
   </ItemGroup>

test/CoreApi/BitswapApiTest.cs

@@ -63,5 +63,14 @@ public async Task Unwant()
                     break;
             }
         }
+
+        [TestMethod]
+        public async Task Ledger()
+        {
+            var peer = new Peer { Id = "QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3" };
+            var ledger = await ipfs.Bitswap.LedgerAsync(peer);
+            Assert.IsNotNull(ledger);
+            Assert.AreEqual(peer.Id, ledger.Peer.Id);
+        }
     }
 }