🚑️ 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"] }

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 {
@@ -21,6 +22,15 @@ 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_secs: i64,
@@ -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,
@@ -80,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,
@@ -185,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

@@ -63,8 +63,7 @@ fn assert_magic<T: Into<u32> + PartialEq>(actual: T, expected: T) -> Result {
 #[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)
 }
@@ -76,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())?)
 }

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,
@@ -34,10 +34,10 @@ pub struct BasePlayerCreate {
     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>,

src/models/data/packet.rs

@@ -35,7 +35,9 @@ impl Packet {
     ///
     /// 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_secs = reader.read_f32::<LittleEndian>()?;
         let raw_payload = Self::read_raw_payload(reader, length as usize)?;
@@ -57,8 +59,7 @@ impl Packet {
     }
 
     fn read_raw_payload(reader: &mut impl Read, length: usize) -> Result<Vec<u8>> {
-        let mut buffer = Vec::new();
-        buffer.resize(length, 0);
+        let mut buffer = vec![0; length];
         reader.read_exact(&mut buffer)?;
         Ok(buffer)
     }

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,
+}

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

@@ -55,10 +55,10 @@ fn base_player_create_ok() -> Result<()> {
     );
     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(())
 }