feat: update packets to support for F1 25 (#11)

Author: volodymyr-fed

F1Game.UDP.Benchmarks/Helpers/PacketGenerator.cs

@@ -121,6 +121,7 @@ static int GetPacketSize(PacketType packetType)
 			PacketType.TyreSets => GetSize<TyreSetsDataPacket>(),
 			PacketType.MotionEx => GetSize<MotionExDataPacket>(),
 			PacketType.TimeTrial => GetSize<TimeTrialDataPacket>(),
+			PacketType.LapPositions => GetSize<LapPositionsDataPacket>(),
 			_ => throw new ArgumentOutOfRangeException(nameof(packetType), packetType, null)
 		};
 	}

F1Game.UDP.Benchmarks/InternalBenchmark.cs

@@ -24,7 +24,8 @@ public class InternalBenchmark
 		PacketType.Session,
 		PacketType.SessionHistory,
 		PacketType.TyreSets,
-		PacketType.TimeTrial
+		PacketType.TimeTrial,
+		PacketType.LapPositions
 	])]
 	public PacketType Type { get; set; }
 

F1Game.UDP.Benchmarks/ThirdPartyComparisonBenchmark.cs

@@ -26,7 +26,8 @@ public class ThirdPartyComparisonBenchmark
 		PacketType.SessionHistory,
 		PacketType.TyreSets,
 		PacketType.Event,
-		PacketType.TimeTrial
+		PacketType.TimeTrial,
+		PacketType.LapPositions
 	])]
 	public PacketType Type { get; set; }
 

F1Game.UDP.Benchmarks/ToPacketBenchmark.cs

@@ -0,0 +1,45 @@
+using BenchmarkDotNet.Attributes;
+
+using F1Game.UDP.Benchmarks.Helpers;
+using F1Game.UDP.Enums;
+using F1Game.UDP.Packets;
+
+namespace F1Game.UDP.Benchmarks;
+
+[MemoryDiagnoser(true)]
+public class ToPacketBenchmark
+{
+	[Params([
+		PacketType.CarDamage,
+		PacketType.CarSetups,
+		PacketType.CarStatus,
+		PacketType.CarTelemetry,
+		PacketType.Event,
+		PacketType.FinalClassification,
+		PacketType.LapData,
+		PacketType.LobbyInfo,
+		PacketType.Motion,
+		PacketType.MotionEx,
+		PacketType.Participants,
+		PacketType.Session,
+		PacketType.SessionHistory,
+		PacketType.TyreSets,
+		PacketType.TimeTrial,
+		PacketType.LapPositions
+	])]
+	public PacketType Type { get; set; }
+
+	byte[] data = [];
+
+	[GlobalSetup]
+	public void GlobalSetup()
+	{
+		data = PacketGenerator.GeneratePacket(Type);
+	}
+
+	[Benchmark(Baseline = true)]
+	public UnionPacket ReadPacket()
+	{
+		return data.ToPacket();
+	}
+}

F1Game.UDP.Tests/PacketReaderFixture.cs

@@ -165,6 +165,7 @@ public void ReadEventDataPacket(EventType eventType)
 			EventType.Overtake => fixture.Create<OvertakeEvent>(),
 			EventType.SafetyCar => fixture.Create<SafetyCarEvent>(),
 			EventType.Collision => fixture.Create<CollisionEvent>(),
+			EventType.DRSDisabled => fixture.Create<DrsDisabledEvent>(),
 			_ => new EventDetails { EventType = eventType },
 		};
 
@@ -221,7 +222,7 @@ public void ReadLapDataPacket()
 	public void ReadLobbyInfoDataPacket()
 	{
 		var lobbyPlayers = fixture.Build<LobbyInfoData>()
-			.With(x => x.NameBytes, fixture.Create<string>().AsArray48Bytes())
+			.With(x => x.NameBytes, fixture.Create<string>().AsArray32Bytes())
 			.CreateMany(22)
 			.ToArray();
 
@@ -270,7 +271,8 @@ public void ReadMotionExDataPacket()
 	public void ReadParticipantsDataPacket()
 	{
 		var participants = fixture.Build<ParticipantData>()
-			.With(x => x.NameBytes, fixture.Create<string>().AsArray48Bytes())
+			.With(x => x.NameBytes, fixture.Create<string>().AsArray32Bytes())
+			.With(x => x.LiveryColors, fixture.CreateMany<LiveryColor>(4).ToArray())
 			.CreateMany(22)
 			.ToArray();
 
@@ -347,6 +349,25 @@ public void ReadTimeTrialDataPacket()
 		bytes.ToPacketWithReader().Should().BeEquivalentTo(packet, Configure);
 	}
 
+	[Test]
+	public void ReadLapPositionsDataPacket()
+	{
+		var positionsPerLapForVehicle = Enumerable.Range(0, 50)
+			.Select(_ => Array22<byte>.Create(fixture.CreateMany<byte>(22).ToArray()))
+			.ToArray();
+
+		UnionPacket packet = BuildPacket<LapPositionsDataPacket>()
+			.With(x => x.PositionsPerLapForVehicle, positionsPerLapForVehicle)
+			.Create();
+
+		var bytes = new byte[GetSize<LapPositionsDataPacket>()];
+		var writer = new BytesWriter(bytes);
+		writer.Write(packet);
+
+		bytes.ToPacket().Should().BeEquivalentTo(packet, Configure);
+		bytes.ToPacketWithReader().Should().BeEquivalentTo(packet, Configure);
+	}
+
 	IPostprocessComposer<T> BuildPacket<T>() where T : IHaveHeader, new()
 	{
 		var packetType = new T() switch
@@ -366,6 +387,7 @@ public void ReadTimeTrialDataPacket()
 			SessionHistoryDataPacket => PacketType.SessionHistory,
 			TyreSetsDataPacket => PacketType.TyreSets,
 			TimeTrialDataPacket => PacketType.TimeTrial,
+			LapPositionsDataPacket => PacketType.LapPositions,
 			_ => throw new NotImplementedException()
 		};
 

F1Game.UDP/Data/Arrays.cs

@@ -2,6 +2,9 @@
 
 namespace F1Game.UDP.Data;
 
+[AutoInlineArray(4)]
+public partial struct Array4<T>;
+
 [AutoInlineArray(8)]
 public partial struct Array8<T>;
 
@@ -17,8 +20,11 @@ public partial struct Array21<T>;
 [AutoInlineArray(22)]
 public partial struct Array22<T>;
 
-[AutoInlineArray(48)]
-public partial struct Array48<T>;
+[AutoInlineArray(32)]
+public partial struct Array32<T>;
+
+[AutoInlineArray(50)]
+public partial struct Array50<T>;
 
 [AutoInlineArray(64)]
 public partial struct Array64<T>;

F1Game.UDP/Data/CarDamageData.cs

@@ -3,7 +3,7 @@
 [StructLayout(LayoutKind.Sequential, Pack = 1)]
 public readonly record struct CarDamageData() : IByteParsable<CarDamageData>, IByteWritable, ISizeable
 {
-	static int ISizeable.Size => 42;
+	static int ISizeable.Size => 46;
 
 	/// <summary>
 	/// Tyre wear (percentage).
@@ -18,6 +18,10 @@ public readonly record struct CarDamageData() : IByteParsable<CarDamageData>, IB
 	/// </summary>
 	public Tyres<byte> BrakesDamage { get; init; }
 	/// <summary>
+	/// Tyre blisters value (percentage)
+	/// </summary>
+	public Tyres<byte> TyresBlisters { get; init; }
+	/// <summary>
 	/// Front left wing damage (percentage).
 	/// </summary>
 	public byte FrontLeftWingDamage { get; init; }
@@ -97,6 +101,7 @@ static CarDamageData IByteParsable<CarDamageData>.Parse(ref BytesReader reader)
 			TyresWear = reader.GetNextTyresFloat(),
 			TyresDamage = reader.GetNextTyresByte(),
 			BrakesDamage = reader.GetNextTyresByte(),
+			TyresBlisters = reader.GetNextTyresByte(),
 			FrontLeftWingDamage = reader.GetNextByte(),
 			FrontRightWingDamage = reader.GetNextByte(),
 			RearWingDamage = reader.GetNextByte(),
@@ -123,6 +128,7 @@ void IByteWritable.WriteBytes(ref BytesWriter writer)
 		writer.WriteTyresFloat(TyresWear);
 		writer.WriteTyresByte(TyresDamage);
 		writer.WriteTyresByte(BrakesDamage);
+		writer.WriteTyresByte(TyresBlisters);
 		writer.Write(FrontLeftWingDamage);
 		writer.Write(FrontRightWingDamage);
 		writer.Write(RearWingDamage);

F1Game.UDP/Data/FinalClassificationData.cs

@@ -5,7 +5,7 @@ namespace F1Game.UDP.Data;
 [StructLayout(LayoutKind.Sequential, Pack = 1)]
 public readonly record struct FinalClassificationData() : IByteParsable<FinalClassificationData>, IByteWritable, ISizeable
 {
-	static int ISizeable.Size => 45;
+	static int ISizeable.Size => 46;
 
 	/// <summary>
 	/// The finishing position.
@@ -32,6 +32,10 @@ public readonly record struct FinalClassificationData() : IByteParsable<FinalCla
 	/// </summary>
 	public ResultStatus ResultStatus { get; init; }
 	/// <summary>
+	/// The reason for the result, such as DNF or DSQ.
+	/// </summary>
+	public ResultReason ResultReason { get; init; }
+	/// <summary>
 	/// The best lap time of the session in milliseconds.
 	/// </summary>
 	public uint BestLapTimeInMS { get; init; }
@@ -74,6 +78,7 @@ static FinalClassificationData IByteParsable<FinalClassificationData>.Parse(ref
 			Points = reader.GetNextByte(),
 			NumPitStops = reader.GetNextByte(),
 			ResultStatus = reader.GetNextEnum<ResultStatus>(),
+			ResultReason = reader.GetNextEnum<ResultReason>(),
 			BestLapTimeInMS = reader.GetNextUInt(),
 			TotalRaceTime = reader.GetNextDouble(),
 			PenaltiesTime = reader.GetNextByte(),
@@ -93,6 +98,7 @@ void IByteWritable.WriteBytes(ref BytesWriter writer)
 		writer.Write(Points);
 		writer.Write(NumPitStops);
 		writer.WriteEnum(ResultStatus);
+		writer.WriteEnum(ResultReason);
 		writer.Write(BestLapTimeInMS);
 		writer.Write(TotalRaceTime);
 		writer.Write(PenaltiesTime);

F1Game.UDP/Data/LiveryColor.cs

@@ -0,0 +1,37 @@
+namespace F1Game.UDP.Data;
+
+[StructLayout(LayoutKind.Sequential, Pack = 1)]
+public readonly record struct LiveryColor() : IByteParsable<LiveryColor>, IByteWritable, ISizeable
+{
+	static int ISizeable.Size => 3;
+
+	/// <summary>
+	/// The red component of the livery color.
+	/// </summary>
+	public byte Red { get; init; }
+	/// <summary>
+	/// The green component of the livery color.
+	/// </summary>
+	public byte Green { get; init; }
+	/// <summary>
+	/// The blue component of the livery color.
+	/// </summary>
+	public byte Blue { get; init; }
+
+	static LiveryColor IByteParsable<LiveryColor>.Parse(ref BytesReader reader)
+	{
+		return new()
+		{
+			Red = reader.GetNextByte(),
+			Green = reader.GetNextByte(),
+			Blue = reader.GetNextByte()
+		};
+	}
+
+	void IByteWritable.WriteBytes(ref BytesWriter writer)
+	{
+		writer.Write(Red);
+		writer.Write(Green);
+		writer.Write(Blue);
+	}
+}

F1Game.UDP/Data/LobbyInfoData.cs

@@ -5,7 +5,7 @@ namespace F1Game.UDP.Data;
 [StructLayout(LayoutKind.Sequential, Pack = 1)]
 public readonly record struct LobbyInfoData() : IByteParsable<LobbyInfoData>, IByteWritable, ISizeable
 {
-	static int ISizeable.Size => 58;
+	static int ISizeable.Size => 42;
 
 	/// <summary>
 	/// Gets whether the vehicle is AI or Human.
@@ -24,13 +24,13 @@ public readonly record struct LobbyInfoData() : IByteParsable<LobbyInfoData>, IB
 	/// </summary>
 	public Platform Platform { get; init; }
 	/// <summary>
-	/// The name of participant in UTF-8 bytes – null terminated. Will be truncated with ... (U+2026) if too long; 48 chars.
+	/// The name of participant in UTF-8 bytes – null terminated. Will be truncated with ... (U+2026) if too long; 32 bytes maximum.
 	/// </summary>
-	public Array48<byte> NameBytes { get; init; }
+	public Array32<byte> NameBytes { get; init; }
 	/// <summary>
-	/// The name of participant in UTF-8 format – null terminated. Will be truncated with ... (U+2026) if too long; 48 chars.
+	/// The name of participant in UTF-8 format – null terminated. Will be truncated with ... (U+2026) if too long; 32 bytes maximum.
 	/// </summary>
-	public string Name { get => NameBytes.AsString(); init => NameBytes = value.AsArray48Bytes(); }
+	public string Name { get => NameBytes.AsString(); init => NameBytes = value.AsArray32Bytes(); }
 	/// <summary>
 	/// Car number of the player.
 	/// </summary>
@@ -60,7 +60,7 @@ static LobbyInfoData IByteParsable<LobbyInfoData>.Parse(ref BytesReader reader)
 			Team = reader.GetNextEnum<Team>(),
 			Nationality = reader.GetNextEnum<Nationality>(),
 			Platform = reader.GetNextEnum<Platform>(),
-			NameBytes = reader.GetNextBytes(48),
+			NameBytes = reader.GetNextBytes(32),
 			CarNumber = reader.GetNextByte(),
 			IsTelemetryPublic = reader.GetNextBoolean(),
 			ShowOnlineNames = reader.GetNextBoolean(),