Break: decode the players packet

src/models/data/entity_method.rs

@@ -1,16 +1,23 @@
-use std::io::Read;
-
 use byteorder::{LittleEndian, ReadBytesExt};
+use prost::encoding::decode_varint;
+use prost::Message;
 use serde::Serialize;
 use serde_with::serde_as;
 
+use crate::models::data::read_quirky_length;
+use crate::models::data::subtype_2f::Subtype2F;
 use crate::result::Result;
 
 #[serde_as]
 #[derive(Debug, Serialize)]
 pub enum EntityMethod {
     Subtype2F {
-        // prefix: [u8; 9],
+        field_number: u64,
+        sub_type_2f: Subtype2F,
+
+        /// Original payload for investigation.
+        #[serde_as(as = "serde_with::hex::Hex")]
+        payload: Vec<u8>,
     },
 
     /// Default variant when subtype is not known by the parser.
@@ -32,9 +39,15 @@ impl EntityMethod {
 
         let this = match sub_type {
             0x2F => {
-                // let mut prefix = [0; 9];
-                // reader.read_exact(&mut prefix)?;
-                Self::Subtype2F {}
+                let _inner_length = reader.read_u32::<LittleEndian>()?;
+
+                let field_number = decode_varint(&mut reader)?;
+                let message_length = read_quirky_length(&mut reader)?;
+                Self::Subtype2F {
+                    field_number,
+                    sub_type_2f: Subtype2F::decode(&reader[..message_length])?,
+                    payload,
+                }
             }
 
             _ => Self::Unknown { sub_type, payload },

src/models/data/payload.rs

@@ -6,7 +6,7 @@ use serde_with::serde_as;
 
 use crate::models::data::entity_method::EntityMethod;
 use crate::models::data::type_0::Type0;
-use crate::models::data::{assert_magic, read_pickled, read_string};
+use crate::models::data::{read_pickled, read_quirky_length, read_string};
 use crate::result::Result;
 
 #[serde_as]
@@ -43,10 +43,8 @@ impl Payload {
                 let arena_unique_id = reader.read_u64::<LittleEndian>()?;
                 let arena_type_id = reader.read_u32::<LittleEndian>()?;
                 let type_0 = {
-                    assert_magic(reader.read_u8()?, 0xFF)?;
-                    let pickled_length = reader.read_u16::<LittleEndian>()?;
-                    assert_magic(reader.read_u8()?, 0x00)?;
-                    read_pickled(&mut reader, pickled_length as usize)?
+                    let pickled_length = read_quirky_length(&mut reader)?;
+                    read_pickled(&mut reader, pickled_length)?
                 };
                 Self::Type0 {
                     type_0,

src/models/data/subtype_2f.rs

@@ -1 +1,32 @@
-pub struct Subtype2f {}
+use prost::Message;
+use serde::Serialize;
+
+#[derive(Message, Serialize)]
+pub struct Subtype2F {
+    #[prost(message, tag = "1")]
+    pub players: Option<Players>,
+}
+
+#[derive(Message, Serialize)]
+pub struct Players {
+    #[prost(message, repeated, tag = "1")]
+    pub players: Vec<Player>,
+}
+
+#[derive(Message, Serialize)]
+pub struct Player {
+    #[prost(string, required, tag = "3")]
+    pub nickname: String,
+
+    #[prost(uint32, required, tag = "4")]
+    pub team_number: u32,
+
+    #[prost(uint32, required, tag = "7")]
+    pub account_id: u32,
+
+    #[prost(string, optional, tag = "8")]
+    pub clan_tag: Option<String>,
+
+    #[prost(uint32, optional, tag = "11")]
+    pub platoon_number: Option<u32>,
+}