Skip to content

Request Datapackage as individual responses #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Berserker66 wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −12
Open

Request Datapackage as individual responses #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Archipelago.MultiClient.Net.Tests/ArchipelagoSessionFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public void Should_send_connect_after_retrieving_data_package()

Received.InOrder(() =>
{
socket.Received().SendPacket(Arg.Any<GetDataPackagePacket>());
socket.Received().SendMultiplePackets(Arg.Any<GetDataPackagePacket[]>());
socket.Received().SendPacket(Arg.Any<ConnectPacket>());
});

Expand Down
16 changes: 9 additions & 7 deletions Archipelago.MultiClient.Net.Tests/DataPackageFileSystemCacheFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ public void Should_request_data_package_when_no_local_cache_is_available()
Games = new []{ "One" }
});

socket.Received().SendPacket(Arg.Is<GetDataPackagePacket>(p =>
p.Games.Length == 1 && p.Games[0] == "One"
socket.Received().SendMultiplePackets(Arg.Is<GetDataPackagePacket[]>(p =>
p.Length == 1 && p[0].Games.Length == 1 && p[0].Games[0] == "One"
));
}

Expand Down Expand Up @@ -87,7 +87,7 @@ public void Should_not_request_data_when_local_contains_a_file_with_same_checksu

socket.PacketReceived += Raise.Event<ArchipelagoSocketHelperDelagates.PacketReceivedHandler>(roomInfo);

socket.DidNotReceive().SendPacket(Arg.Any<GetDataPackagePacket>());
socket.DidNotReceive().SendMultiplePackets(Arg.Any<GetDataPackagePacket[]>());
}

[Test]
Expand Down Expand Up @@ -127,8 +127,10 @@ public void Should_only_request_data_for_games_that_a_have_different_checksum_th

socket.PacketReceived += Raise.Event<ArchipelagoSocketHelperDelagates.PacketReceivedHandler>(roomInfo);

socket.Received().SendPacket(Arg.Is<GetDataPackagePacket>(p =>
p.Games.Length == 2 && p.Games[0] == "Two" && p.Games[1] == "Three"
socket.Received().SendMultiplePackets(Arg.Is<GetDataPackagePacket[]>(p =>
p.Length == 2
&& p[0].Games.Length == 1 && p[0].Games[0] == "Two"
&& p[1].Games.Length == 1 && p[1].Games[0] == "Three"
));
}

Expand Down Expand Up @@ -257,8 +259,8 @@ public void Should_request_data_package_for_games_the_server_fails_to_send_the_v

socket.PacketReceived += Raise.Event<ArchipelagoSocketHelperDelagates.PacketReceivedHandler>(roomInfo);

socket.Received().SendPacket(Arg.Is<GetDataPackagePacket>(p =>
p.Games.Length == 1 && p.Games[0] == "Two"
socket.Received().SendMultiplePackets(Arg.Is<GetDataPackagePacket[]>(p =>
p.Length == 1 && p[0].Games.Length == 1 && p[0].Games[0] == "Two"
));
}

Expand Down
7 changes: 3 additions & 4 deletions Archipelago.MultiClient.Net/DataPackage/DataPackageCache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,9 @@ void Socket_PacketReceived(ArchipelagoPacketBase packet)
var invalidated = GetCacheInvalidatedGamesByChecksum(roomInfoPacket);
if (invalidated.Any())
{
socket.SendPacket(new GetDataPackagePacket
{
Games = invalidated.ToArray()
});
socket.SendMultiplePackets(
invalidated.Select(game => new GetDataPackagePacket { Games = new[] { game } }).ToArray()
);
}
break;
case DataPackagePacket packagePacket:
Expand Down
Loading