🚑️ Fix for 64-bit player IDs

Cargo.toml

@@ -23,6 +23,7 @@ serde = { version = "1.0.148", features = ["derive"] }
 serde_bytes = "0.11.7"
 serde-pickle = "1.1.1"
 serde_json = { version = "1.0.96", optional = true }
+serde_repr = "0.1.12"
 serde_with = { version = "2.3.3", features = ["hex"] }
 thiserror = "1.0.37"
 zip = { version = "0.6.3", default-features = false, features = ["deflate"] }

README.md

@@ -20,7 +20,7 @@ use wotbreplay_parser::replay::Replay;
 fn main() -> Result<()> {
     let battle_results = Replay::open(File::open("replays/20221203_player_results.wotbreplay")?)?.read_battle_results()?;
 
-    assert_eq!(battle_results.timestamp, 1670083956);
+    assert_eq!(battle_results.timestamp_secs, 1670083956);
     assert_eq!(battle_results.players.len(), 14);
 
     assert_eq!(battle_results.players[0].account_id, 595693744);

src/error.rs

@@ -21,9 +21,13 @@ pub enum Error {
     #[error("JSON error")]
     JsonError(#[from] serde_json::Error),
 
-    #[error("invalid magic: {0:#X}, expected: {1:#X}")]
-    InvalidMagic(u32, u32),
+    #[error("invalid magic: {actual:#X}, expected: {expected:#X}")]
+    InvalidMagic { expected: u32, actual: u32 },
 
-    #[error("failed to read a packet length, got {0} bytes")]
-    PacketLengthError(usize),
+    #[error("failed to parse type {type_} packet's payload at replay time {clock_secs}s")]
+    PacketPayloadParsingError {
+        source: Box<Error>,
+        type_: u32,
+        clock_secs: f32,
+    },
 }

src/models.rs

@@ -1,4 +1,6 @@
 pub mod battle_results;
 pub mod battle_results_dat;
 pub mod data;
+pub mod map_id;
 pub mod meta;
+pub mod room_type;

src/models/battle_results.rs

@@ -2,6 +2,7 @@ use prost::bytes::Buf;
 use prost::{Enumeration, Message};
 use serde::Serialize;
 
+use crate::models::room_type::RoomType;
 use crate::result::Result;
 
 impl BattleResults {
@@ -9,7 +10,7 @@ impl BattleResults {
     ///
     /// # Note
     ///
-    /// This does **not** parse `battle_results.dat` itself, but the un-pickled tuple element.
+    /// This can **not** parse `battle_results.dat` itself, but the un-pickled tuple element.
     /// To parse `battle_results.dat`, use [`crate::models::battle_results_dat::BattleResultsDat`].
     pub fn from_buffer(buffer: impl Buf) -> Result<Self> {
         Ok(Self::decode(buffer)?)
@@ -21,9 +22,18 @@ impl BattleResults {
 /// TODO: 150[0].21[0].8[0].801[0].unsigned is arena end time.
 #[derive(Message, Serialize)]
 pub struct BattleResults {
+    /// The two least-significant bytes is map ID.
+    ///
+    /// The 3rd byte is probably a game mode:
+    ///
+    /// - `0x0xxxx` is «encounter»
+    /// - `0x1xxxx` flag is «supremacy»
+    #[prost(uint32, tag = "1")]
+    pub mode_map_id: u32,
+
     /// Battle timestamp.
     #[prost(int64, tag = "2")]
-    pub timestamp: i64,
+    pub timestamp_secs: i64,
 
     #[prost(enumeration = "TeamNumber", optional, tag = "3")]
     pub winner_team_number: Option<i32>,
@@ -32,6 +42,9 @@ pub struct BattleResults {
     #[prost(message, required, tag = "8")]
     pub author: Author,
 
+    #[prost(enumeration = "RoomType", tag = "9")]
+    pub room_type: i32,
+
     /// Author's free XP, including premium.
     #[prost(uint32, tag = "137")]
     pub free_xp: u32,
@@ -40,7 +53,7 @@ pub struct BattleResults {
     #[prost(message, repeated, tag = "201")]
     pub players: Vec<Player>,
 
-    /// Player's results.
+    /// Individual player's results.
     #[prost(message, repeated, tag = "301")]
     pub player_results: Vec<PlayerResults>,
 }
@@ -65,8 +78,9 @@ pub struct PlayerInfo {
     pub nickname: String,
 
     /// Some sort of platoon ID:
-    /// - contains same ID for a platoon members, or
-    /// - `None` for non-platoon players
+    ///
+    /// - contains same ID for the platoon members, or
+    /// - [`None`] for non-platoon players
     #[prost(uint32, optional, tag = "2")]
     pub platoon_id: Option<u32>,
 
@@ -79,10 +93,12 @@ pub struct PlayerInfo {
 
     #[prost(message, required, tag = "7")]
     pub avatar: Avatar,
+
+    #[prost(uint32, optional, tag = "9")]
+    pub rank: Option<u32>,
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Enumeration, Serialize)]
-#[repr(i32)]
 pub enum TeamNumber {
     One = 1,
     Two = 2,
@@ -165,6 +181,8 @@ pub struct PlayerResultsInfo {
     ///
     /// Note, that this is **not** the game client's displayed rating.
     /// This field matches the `mm_rating` as returned by the Wargaming.net API.
+    ///
+    /// The display rating is calculated as: `3000.0 + mm_rating * 10.0`.
     #[prost(float, optional, tag = "107")]
     pub mm_rating: Option<f32>,
 
@@ -173,7 +191,7 @@ pub struct PlayerResultsInfo {
 }
 
 impl PlayerResultsInfo {
-    /// Returns displayed rating as per the game client.
+    /// Calculate displayed rating according to the game client.
     pub fn display_rating(&self) -> Option<u32> {
         self.mm_rating
             .map(|mm_rating| (mm_rating * 10.0 + 3000.0) as u32)
@@ -182,13 +200,31 @@ impl PlayerResultsInfo {
 
 #[derive(Message, Serialize)]
 pub struct Author {
+    /// # Note
+    ///
+    /// The field is `-2` if the player is auto-destroyed by inactivity.
+    #[prost(int32, tag = "1")]
+    pub hitpoints_left: i32,
+
     /// Earned credits, including premium and special awards and medals.
     #[prost(uint32, tag = "2")]
-    pub credits_earned: u32,
+    pub total_credits: u32,
 
     /// Combat XP, including premium.
     #[prost(uint32, tag = "3")]
-    pub combat_xp: u32,
+    pub total_xp: u32,
+
+    #[prost(uint32, tag = "4")]
+    pub n_shots: u32,
+
+    #[prost(uint32, tag = "5")]
+    pub n_hits: u32,
+
+    #[prost(uint32, tag = "6")]
+    pub n_splashes: u32,
+
+    #[prost(uint32, tag = "7")]
+    pub n_penetrations: u32,
 
     #[prost(uint32, tag = "8")]
     pub damage_dealt: u32,

src/models/data.rs

@@ -53,15 +53,17 @@ fn assert_magic<T: Into<u32> + PartialEq>(actual: T, expected: T) -> Result {
     if actual == expected {
         Ok(())
     } else {
-        Err(Error::InvalidMagic(actual.into(), expected.into()))
+        Err(Error::InvalidMagic {
+            actual: actual.into(),
+            expected: expected.into(),
+        })
     }
 }
 
 #[inline]
 fn read_length_delimited(reader: &mut impl Read) -> Result<Vec<u8>> {
     let length = reader.read_u8()? as usize;
-    let mut buffer = Vec::new();
-    buffer.resize(length, 0);
+    let mut buffer = vec![0; length];
     reader.read_exact(&mut buffer)?;
     Ok(buffer)
 }
@@ -73,8 +75,7 @@ fn read_string(reader: &mut impl Read) -> Result<String> {
 
 #[inline]
 fn read_pickled<T: DeserializeOwned>(reader: &mut impl Read, length: usize) -> Result<T> {
-    let mut buffer = Vec::new();
-    buffer.resize(length, 0);
+    let mut buffer = vec![0; length];
     reader.read_exact(&mut buffer)?;
     Ok(serde_pickle::from_slice(&buffer, Default::default())?)
 }
@@ -82,7 +83,11 @@ fn read_pickled<T: DeserializeOwned>(reader: &mut impl Read, length: usize) -> R
 /// Read 2-byte length surrounded by the magical `0xFF` and `0x00`,
 /// unless it's a simple 1-byte length.
 ///
-/// P.S. Okay, Wargaming, I've no idea what you smoke, but I want some!
+/// # Context
+///
+/// It seems that for payloads larger than 254 bytes, Wargaming writes `00 <XX XX> FF`,
+/// where the word in the middle is the actual length of a payload, and the `00` and `FF`
+/// are magic values.
 #[inline]
 fn read_quirky_length(reader: &mut impl Read) -> Result<usize> {
     match reader.read_u8()? {

src/models/data/base_player_create.rs

@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
 #[derive(Debug, Serialize, Deserialize)]
 pub struct BasePlayerCreate {
     #[serde(default, rename(deserialize = "playersBattleCategoriesIds"))]
-    pub players_battle_categories_ids: Option<HashMap<u32, (u8, u32)>>,
+    pub players_battle_categories_ids: Option<HashMap<u64, (u8, u32)>>,
 
     #[serde(rename(deserialize = "battleLevel"))]
     pub battle_level: u8,
@@ -22,19 +22,31 @@ pub struct BasePlayerCreate {
     #[serde(rename(deserialize = "camouflageSlot"))]
     pub camouflage_slot: u8,
 
+    /// Average team ratings for rating battles.
+    ///
+    /// # Contains
+    ///
+    /// - [`Some`] 2-vector, if the attribute is present in the replay. Each element represents one team:
+    ///     - [`Some`] rating, if known
+    ///     - [`None`], if the average rating is unknown (all the players are calibrating)
+    /// - [`None`], if the attribute is missing in the replay
     #[serde(default, rename(deserialize = "avgMmr"))]
-    pub average_mmr: Option<Vec<Option<f64>>>,
+    pub average_mm_ratings: Option<Vec<Option<f64>>>,
 
     #[serde(default, rename(deserialize = "playerWaitTimes"))]
-    pub player_wait_times: Option<HashMap<u32, f64>>,
+    pub player_wait_times: Option<HashMap<u64, f64>>,
 
     #[serde(rename(deserialize = "accountDatabaseIds"))]
-    pub account_database_ids: Vec<u32>,
+    pub account_database_ids: Option<Vec<u64>>,
 
     #[serde(default, rename(deserialize = "turboBattlesStats"))]
     pub turbo_battles_statistics: Option<TurboBattlesStatistics>,
 }
 
+/// I don't know what that is:
+///
+/// - On EU, Asia, and NA the values are just constants
+/// - On Russia, the `alpha` and `beta` are different constants, and the chances actually differ for different replays
 #[derive(Debug, Serialize, Deserialize)]
 pub struct TurboBattlesStatistics {
     #[serde(rename(deserialize = "turboBattleChance"))]

src/models/data/entity_method.rs

@@ -26,22 +26,22 @@ pub enum EntityMethod {
 }
 
 impl EntityMethod {
-    /// Parse the entity method payload.
-    pub fn new(payload: &[u8]) -> Result<Self> {
-        let mut payload = payload;
+    /// Parse the entity method raw payload.
+    pub fn new(raw_payload: &[u8]) -> Result<Self> {
+        let mut raw_payload = raw_payload;
 
-        payload.read_u32::<LittleEndian>()?;
-        let sub_type = payload.read_u32::<LittleEndian>()?;
+        raw_payload.read_u32::<LittleEndian>()?;
+        let sub_type = raw_payload.read_u32::<LittleEndian>()?;
 
         let this = match sub_type {
             47 => {
-                let _inner_length = payload.read_u32::<LittleEndian>()?;
+                let _inner_length = raw_payload.read_u32::<LittleEndian>()?;
 
-                let field_number = decode_varint(&mut payload)?;
-                let message_length = read_quirky_length(&mut payload)?;
+                let field_number = decode_varint(&mut raw_payload)?;
+                let message_length = read_quirky_length(&mut raw_payload)?;
                 Self::UpdateArena {
                     field_number,
-                    arguments: UpdateArena::decode(&payload[..message_length])?,
+                    arguments: UpdateArena::decode(&raw_payload[..message_length])?,
                 }
             }
 

src/models/data/packet.rs

@@ -6,37 +6,60 @@ use serde_with::serde_as;
 
 use crate::models::data::payload::Payload;
 use crate::result::Result;
+use crate::Error;
 
+/// «Packet» is a single traffic message in a replay,
+/// packets tell us what is going on during the battle.
 #[serde_as]
 #[derive(Debug, Serialize)]
 pub struct Packet {
-    pub clock: f32,
+    /// Replay time, starting from zero.
+    #[serde(rename = "clock")]
+    pub clock_secs: f32,
+
+    /// Parsed packet payload.
     pub payload: Payload,
 
+    /// Raw packet payload, excluding the clock and packet type, and including optional subtype.
+    ///
+    /// This attribute requires the `raw-payload` feature.
     #[cfg(feature = "raw-payload")]
     #[serde_as(as = "serde_with::hex::Hex")]
     pub raw_payload: Vec<u8>,
 }
 
 impl Packet {
+    /// Parse next packet from the reader.
+    ///
+    /// # Returns
+    ///
+    /// Parsed packet, or [`None`], when no packets are left.
     pub fn from_reader(reader: &mut impl Read) -> Result<Option<Self>> {
-        let Ok(length) = reader.read_u32::<LittleEndian>() else { return Ok(None) };
+        let Ok(length) = reader.read_u32::<LittleEndian>() else {
+            return Ok(None);
+        };
         let type_ = reader.read_u32::<LittleEndian>()?;
-        let clock = reader.read_f32::<LittleEndian>()?;
-        let payload = Self::read_payload(reader, length as usize)?;
+        let clock_secs = reader.read_f32::<LittleEndian>()?;
+        let raw_payload = Self::read_raw_payload(reader, length as usize)?;
+        let payload = Payload::new(type_, &raw_payload).map_err(|source| {
+            Error::PacketPayloadParsingError {
+                source: Box::new(source),
+                type_,
+                clock_secs,
+            }
+        })?;
         let this = Self {
-            clock,
-            payload: Payload::new(type_, &payload)?,
+            clock_secs,
+            payload,
 
             #[cfg(feature = "raw-payload")]
-            raw_payload: payload,
+            raw_payload,
         };
         Ok(Some(this))
     }
 
-    fn read_payload(reader: &mut impl Read, length: usize) -> Result<Vec<u8>> {
-        let mut buffer = Vec::new();
-        buffer.resize(length, 0);
+    fn read_raw_payload(reader: &mut impl Read, length: usize) -> Result<Vec<u8>> {
+        let mut buffer = vec![0; length];
         reader.read_exact(&mut buffer)?;
         Ok(buffer)
     }

src/models/data/payload.rs

@@ -29,20 +29,20 @@ pub enum Payload {
 }
 
 impl Payload {
-    /// Parse the packet payload.
-    pub fn new(packet_type: u32, payload: &[u8]) -> Result<Self> {
-        let mut payload = payload;
+    /// Parse the raw packet payload.
+    pub fn new(packet_type: u32, raw_payload: &[u8]) -> Result<Self> {
+        let mut raw_payload = raw_payload;
 
         let this = match packet_type {
             0 => {
-                payload.read_exact(&mut [0; 10])?;
+                raw_payload.read_exact(&mut [0; 10])?;
 
-                let author_nickname = read_string(&mut payload)?;
-                let arena_unique_id = payload.read_u64::<LittleEndian>()?;
-                let arena_type_id = payload.read_u32::<LittleEndian>()?;
+                let author_nickname = read_string(&mut raw_payload)?;
+                let arena_unique_id = raw_payload.read_u64::<LittleEndian>()?;
+                let arena_type_id = raw_payload.read_u32::<LittleEndian>()?;
                 let arguments = {
-                    let pickled_length = read_quirky_length(&mut payload)?;
-                    read_pickled(&mut payload, pickled_length)?
+                    let pickled_length = read_quirky_length(&mut raw_payload)?;
+                    read_pickled(&mut raw_payload, pickled_length)?
                 };
                 Self::BasePlayerCreate {
                     arguments,
@@ -52,7 +52,7 @@ impl Payload {
                 }
             }
 
-            8 => Self::EntityMethod(EntityMethod::new(payload)?),
+            8 => Self::EntityMethod(EntityMethod::new(raw_payload)?),
 
             _ => Self::Unknown { packet_type },
         };

src/models/map_id.rs

@@ -0,0 +1,38 @@
+use prost::Enumeration;
+use serde_repr::{Deserialize_repr, Serialize_repr};
+
+#[derive(Debug, Serialize_repr, Deserialize_repr, Enumeration, Ord, PartialOrd, Eq, PartialEq)]
+#[serde(untagged)]
+#[repr(u16)]
+pub enum MapId {
+    DesertSands = 2,
+    Middleburg = 3,
+    Copperfield = 4,
+    Alpenstadt = 5,
+    Mines = 6,
+    DeadRail = 7,
+    FortDespair = 8,
+    Himmelsdorf = 9,
+    BlackGoldville = 10,
+    OasisPalms = 11,
+    GhostFactory = 12,
+    Molendijk = 14,
+    PortBay = 15,
+    WinterMalinovka = 19,
+    Castilla = 20,
+    Canal = 21,
+    Vineyards = 23,
+    YamatoHarbor = 25,
+    Canyon = 27,
+    MayanRuins = 30,
+    DynastyPearl = 31,
+    NavalFrontier = 35,
+    FallsCreek = 38,
+    NewBay = 40,
+    Normandy = 42,
+    Wasteland = 71,
+
+    /// Default value for Protocol Buffers and fallback value for Serde.
+    #[serde(deserialize_with = "serde_with::rust::deserialize_ignore_any")]
+    Undefined = 0,
+}

src/models/meta.rs

@@ -5,6 +5,7 @@ use std::io::Read;
 
 use serde::Deserialize;
 
+use crate::models::map_id::MapId;
 use crate::result::Result;
 
 /// The model for `meta.json`.
@@ -21,6 +22,9 @@ pub struct Meta {
 
     #[serde(rename = "vehicleCompDescriptor")]
     pub tank_id: u16,
+
+    #[serde(rename = "mapId")]
+    pub map_id: MapId,
 }
 
 impl Meta {

src/models/room_type.rs

@@ -0,0 +1,18 @@
+use prost::Enumeration;
+use serde::Serialize;
+
+#[derive(Debug, Enumeration, Serialize, Ord, PartialOrd, Eq, PartialEq)]
+pub enum RoomType {
+    Any = 0,
+    Regular = 1,
+    TrainingRoom = 2,
+    Tournament = 4,
+    QuickTournament = 5,
+    Rating = 7,
+    MadGames = 8,
+    RealisticBattles = 22,
+    Uprising = 23,
+    GravityMode = 24,
+    Skirmish = 25,
+    BurningGames = 26,
+}

src/replay.rs

@@ -21,7 +21,7 @@ use crate::result::Result;
 pub struct Replay<R>(pub(crate) ZipArchive<R>);
 
 impl<R: Read + Seek> Replay<R> {
-    /// Opens a replay from the reader which contains a `*.wotbreplay`.
+    /// Open a replay from the reader which contains a `*.wotbreplay`.
     pub fn open(reader: R) -> Result<Self> {
         Ok(Self(ZipArchive::new(reader)?))
     }

tests/battle_results.rs

@@ -2,6 +2,7 @@ use std::fs::File;
 
 use anyhow::Result;
 use wotbreplay_parser::models::battle_results::BattleResults;
+use wotbreplay_parser::models::room_type::RoomType;
 use wotbreplay_parser::replay::Replay;
 
 #[test]
@@ -13,10 +14,11 @@ fn player_results_ok() -> Result<()> {
     let battle_results: BattleResults = battle_results_dat.try_into()?;
 
     assert_eq!(battle_results.winner_team_number, Some(2));
+    assert_eq!(battle_results.room_type(), RoomType::Regular);
 
     assert_eq!(battle_results.author.team_number, 2);
-    assert_eq!(battle_results.author.credits_earned, 59518);
-    assert_eq!(battle_results.author.combat_xp, 5255);
+    assert_eq!(battle_results.author.total_credits, 59518);
+    assert_eq!(battle_results.author.total_xp, 5255);
     assert_eq!(battle_results.author.damage_dealt, 1438);
     assert_eq!(battle_results.author.account_id, 594778041);
     assert_eq!(battle_results.free_xp, 260);
@@ -127,3 +129,35 @@ fn draw_ok() -> Result<()> {
     assert_eq!(battle_results.winner_team_number, None);
     Ok(())
 }
+
+#[test]
+fn room_type_ok() -> Result<()> {
+    let battle_results = Replay::open(File::open(
+        "replays/20230512_2150__helaas_pindakaas_R159_SU_130PM_15146680594634860.wotbreplay",
+    )?)?
+    .read_battle_results()?;
+    assert_eq!(battle_results.room_type(), RoomType::MadGames);
+    Ok(())
+}
+
+/// Training room on Strv K with a rank.
+#[test]
+fn rank_ok() -> Result<()> {
+    let battle_results = Replay::open(File::open(
+        "replays/20230802_2133__helaas_pindakaas_S31_Strv_K_15193856522497923.wotbreplay",
+    )?)?
+    .read_battle_results()?;
+    assert_eq!(battle_results.players[0].info.rank, Some(12));
+    Ok(())
+}
+
+/// Training room on Regressor with no rank.
+#[test]
+fn no_rank_ok() -> Result<()> {
+    let battle_results = Replay::open(File::open(
+        "replays/20230802_2136__helaas_pindakaas_Oth38_50TP_Tyszkiewicza_S1_15188303129784363.wotbreplay",
+    )?)?
+    .read_battle_results()?;
+    assert_eq!(battle_results.players[0].info.rank, None);
+    Ok(())
+}

tests/data.rs

@@ -50,15 +50,15 @@ fn base_player_create_ok() -> Result<()> {
     assert_eq!(arguments.matchmaker_type, 2);
     assert_eq!(arguments.camouflage_slot, 1);
     assert_eq!(
-        arguments.average_mmr,
+        arguments.average_mm_ratings,
         Some(vec![Some(59.29457753400008), Some(99.34182121604681)])
     );
     assert_eq!(
         arguments.account_database_ids,
-        [
+        Some(vec![
             517033644, 537867068, 597583401, 601893865, 576810156, 531053956, 599580824, 558025185,
             526927603, 594778041, 505587490, 597422303, 531923111, 587617355
-        ]
+        ])
     );
 
     Ok(())

tests/meta.rs

@@ -3,6 +3,7 @@
 use std::fs::File;
 
 use anyhow::Result;
+use wotbreplay_parser::models::map_id::MapId;
 use wotbreplay_parser::replay::Replay;
 
 #[test]
@@ -14,6 +15,7 @@ fn meta_ok() -> Result<()> {
     assert_eq!(meta.arena_unique_id, "1661909200500084");
     assert_eq!(meta.battle_duration_secs, 164.08485);
     assert_eq!(meta.tank_id, 26657);
+    assert_eq!(meta.map_id, MapId::DynastyPearl);
 
     Ok(())
 }