0.0.1

Netorrent.Example/Program.cs

@@ -236,6 +236,7 @@ await AnsiConsole
                 RemainingStyle = new Style(Color.Grey),
             },
             new PercentageColumn(),
+            new TransferSpeedColumn(),
             new RemainingTimeColumn(),
             new SpinnerColumn()
         )

Netorrent.Tests.Integration/Torrents/TorrentTests.cs

@@ -454,7 +454,7 @@ CancellationToken cancellationToken
             var seederTorrent = await seeder.CreateTorrentAsync(
                 path,
                 _fixture.AnnounceUrl,
-                [.. _fixture.AnnounceUrls]
+                [_fixture.AnnounceUrls]
             );
 
             yield return (seederTorrent, seeder);

Netorrent.Tests/Fakes/FakePeerConnection.cs

@@ -59,7 +59,7 @@ public ulong DecrementRequestedBlock()
 
     public ulong DecrementUploadRequested() => _uploadRequestedCount--;
 
-    public ValueTask DisposeAsync() => ValueTask.CompletedTask;
+    public async ValueTask DisposeAsync() => SentBlocks.OnCompleted();
 
     public ulong IncrementRequestedBlock()
     {

Netorrent.Tests/Fakes/FakePiecePicker.cs

@@ -9,20 +9,15 @@ internal class FakePiecePicker : IPiecePicker
 {
     public int BlockSize => 16 * 1024;
 
-    public void CompletePiece(int index)
-    {
-        throw new NotImplementedException();
-    }
+    public bool IsEndGame => throw new NotImplementedException();
 
-    public void CompleteRequestBlock(RequestBlock requestBlock)
+    public void CompletePiece(int index)
     {
         throw new NotImplementedException();
     }
 
     public void DecreaseRarity(int index) { }
 
-    public ValueTask DisposeAsync() => ValueTask.CompletedTask;
-
     public long GetBitfieldSize()
     {
         throw new NotImplementedException();
@@ -55,12 +50,10 @@ public IEnumerable<RequestBlock> GetTimeoutRequestBlocks()
 
     public void IncreaseRarity(int index) { }
 
-    public void SetBlockToPending(RequestBlock requestBlock)
-    {
-        throw new NotImplementedException();
-    }
-
-    public void SetBlockToRequested(RequestBlock requestBlock, IPeerConnection peerConnection)
+    public bool TryGetRequestBlock(
+        IPeerConnection peerConnection,
+        [NotNullWhen(true)] out RequestBlock? requestBlock
+    )
     {
         throw new NotImplementedException();
     }

Netorrent.Tests/Netorrent.Tests.csproj

@@ -16,7 +16,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Shouldly" Version="4.3.0" />
-    <PackageReference Include="TUnit" Version="1.11.45" />
+    <PackageReference Include="TUnit" Version="1.12.15" />
     <PackageReference Include="PublicApiGenerator" Version="11.5.4" />
   </ItemGroup>
   <ItemGroup>

Netorrent.Tests/P2P/UploadSchedulerTests.cs

@@ -13,7 +13,7 @@ public class UploadSchedulerTests
 {
     //TODO use matrix to create multiple peers
     [Test]
-    public async Task Should_Upload_To_Peer(CancellationToken cancellationToken)
+    public async Task Should_Upload_Block_To_Peer(CancellationToken cancellationToken)
     {
         var logger = NullLogger.Instance;
         var bitfield = new Bitfield(5, true);
@@ -42,4 +42,35 @@ public async Task Should_Upload_To_Peer(CancellationToken cancellationToken)
         block.Payload.Length.ShouldBe(0);
         chokeState.ShouldBe(false);
     }
+
+    [Test]
+    public async Task Should_Cancel_Block_To_Peer(CancellationToken cancellationToken)
+    {
+        var logger = NullLogger.Instance;
+        var bitfield = new Bitfield(5, true);
+        var peerConnection = new FakePeerConnection(bitfield);
+        await using var uploadScheduler = new UploadScheduler(
+            new Dictionary<PeerEndpoint, IPeerConnection>()
+            {
+                [peerConnection.PeerEndpoint] = peerConnection,
+            },
+            new FakePieceStorage(),
+            bitfield,
+            new DataStatistics(10),
+            logger
+        );
+        var requestBlock = new RequestBlock(0, 0, 0);
+        var amChokingTask = peerConnection.AmChoking.FirstAsync(i => i == false, cancellationToken);
+        var isEmptyTask = peerConnection.SentBlocks.IsEmptyAsync(cancellationToken);
+        peerConnection.PeerInterested.Value = true;
+        requestBlock.RequestedFrom.Add(peerConnection);
+        var uploadTask = uploadScheduler.StartAsync(cancellationToken);
+        var chokeState = await amChokingTask;
+        await uploadScheduler.AddRequestAsync(requestBlock, cancellationToken);
+        uploadScheduler.CancelRequest(requestBlock);
+        await Task.Delay(1000, cancellationToken);
+        await peerConnection.DisposeAsync();
+        (await isEmptyTask).ShouldBe(true);
+        chokeState.ShouldBe(false);
+    }
 }

Netorrent.Tests/PublicApi/ApiTest.My_API_Has_No_Changes.approved.txt

@@ -207,16 +207,16 @@ namespace Netorrent.TorrentFile.FileStructure
     }
     public class MetaInfo : System.IEquatable<Netorrent.TorrentFile.FileStructure.MetaInfo>
     {
-        public MetaInfo(Netorrent.TorrentFile.FileStructure.Info Info, string Announce, System.Collections.Generic.List<string>? AnnounceList = null, long? CreationDate = default, string? Comment = null, string? CreatedBy = null, string? Encoding = null, string? Title = null, System.Collections.Generic.List<string>? UrlList = null) { }
+        public MetaInfo(Netorrent.TorrentFile.FileStructure.Info Info, string Announce, System.Collections.Generic.IReadOnlyList<string[]>? AnnounceList = null, long? CreationDate = default, string? Comment = null, string? CreatedBy = null, string? Encoding = null, string? Title = null, System.Collections.Generic.IReadOnlyList<string>? UrlList = null) { }
         public string Announce { get; init; }
-        public System.Collections.Generic.List<string>? AnnounceList { get; init; }
+        public System.Collections.Generic.IReadOnlyList<string[]>? AnnounceList { get; init; }
         public string? Comment { get; init; }
         public string? CreatedBy { get; init; }
         public long? CreationDate { get; init; }
         public string? Encoding { get; init; }
         public Netorrent.TorrentFile.FileStructure.Info Info { get; init; }
         public string? Title { get; init; }
-        public System.Collections.Generic.List<string>? UrlList { get; init; }
+        public System.Collections.Generic.IReadOnlyList<string>? UrlList { get; init; }
         public Netorrent.Bencoding.Structs.BDictionary ToBDictionary() { }
     }
 }
@@ -265,7 +265,7 @@ namespace Netorrent.TorrentFile
     public sealed class TorrentClient : System.IAsyncDisposable
     {
         public TorrentClient(System.Func<Netorrent.TorrentFile.Options.TorrentClientOptions, Netorrent.TorrentFile.Options.TorrentClientOptions>? action = null) { }
-        public System.Threading.Tasks.ValueTask<Netorrent.TorrentFile.Torrent> CreateTorrentAsync(string path, string announceUrl, System.Collections.Generic.List<string>? announceUrls = null, System.Collections.Generic.List<string>? webUrls = null, int pieceLength = 262144, System.Threading.CancellationToken cancellationToken = default) { }
+        public System.Threading.Tasks.ValueTask<Netorrent.TorrentFile.Torrent> CreateTorrentAsync(string path, string announceUrl, System.Collections.Generic.List<string[]>? announceUrls = null, System.Collections.Generic.List<string>? webUrls = null, int pieceLength = 262144, System.Threading.CancellationToken cancellationToken = default) { }
         public System.Threading.Tasks.ValueTask DisposeAsync() { }
         public Netorrent.TorrentFile.Torrent LoadTorrent(Netorrent.TorrentFile.FileStructure.MetaInfo metaInfo, string outputDirectory, int[]? downloadedPieces = null) { }
         public System.Threading.Tasks.ValueTask<Netorrent.TorrentFile.Torrent> LoadTorrentAsync(string path, string outputDirectory, int[]? downloadedPieces = null, System.Threading.CancellationToken cancellationToken = default) { }

Netorrent.Tests/Torrents/TorrentFileTests.cs

@@ -64,7 +64,9 @@ public async Task Should_Create_Torrent_File_From_Directory(CancellationToken ca
         await using var torrent = await torrentClient.CreateTorrentAsync(
             "Data/MultifileTest",
             "http://test.com",
-            ["http://test.com"],
+            [
+                ["http://test.com"],
+            ],
             ["http://test.com"],
             cancellationToken: cancellationToken
         );
@@ -90,7 +92,9 @@ public async Task Should_Create_Torrent_File_From_File(CancellationToken cancell
         await using var torrent = await torrentClient.CreateTorrentAsync(
             "Data/MultifileTest/test.txt",
             "http://test.com",
-            ["http://test.com"],
+            [
+                ["http://test.com"],
+            ],
             ["http://test.com"],
             cancellationToken: cancellationToken
         );
@@ -112,7 +116,9 @@ await torrentClient
             .CreateTorrentAsync(
                 "Data/ASdasd",
                 "http://test.com",
-                ["http://test.com"],
+                [
+                    ["http://test.com"],
+                ],
                 ["http://test.com"],
                 cancellationToken: cancellationToken
             )
@@ -128,7 +134,9 @@ await torrentClient
             .CreateTorrentAsync(
                 "Data/MultifileTest/adasdasd.txt",
                 "http://test.com",
-                ["http://test.com"],
+                [
+                    ["http://test.com"],
+                ],
                 ["http://test.com"],
                 cancellationToken: cancellationToken
             )
@@ -146,7 +154,9 @@ public async Task Should_Verify_File(string path, CancellationToken cancellation
         await using var torrent = await torrentClient.CreateTorrentAsync(
             path,
             "http://test.com",
-            ["http://test.com"],
+            [
+                ["http://test.com"],
+            ],
             ["http://test.com"],
             pieceLength: pieceLength,
             cancellationToken: cancellationToken
@@ -177,7 +187,9 @@ CancellationToken cancellationToken
         await using var torrent = await torrentClient.CreateTorrentAsync(
             path,
             "http://test.com",
-            ["http://test.com"],
+            [
+                ["http://test.com"],
+            ],
             ["http://test.com"],
             pieceLength: pieceLength,
             cancellationToken: cancellationToken