fix playerinfoblock parsing

Author: Kiiyya

.vscode/launch.json

@@ -7,15 +7,15 @@
         {
             "type": "lldb",
             "request": "launch",
-            "name": "Debug executable 'battlefield_rcon'",
+            "name": "Debug executable 'battle_fox'",
             "cargo": {
                 "args": [
                     "build",
-                    "--bin=battlefield_rcon",
-                    "--package=battlefield_rcon"
+                    "--bin=battle_fox",
+                    "--package=battle_fox"
                 ],
                 "filter": {
-                    "name": "battlefield_rcon",
+                    "name": "battle_fox",
                     "kind": "bin"
                 }
             },
@@ -25,16 +25,16 @@
         {
             "type": "lldb",
             "request": "launch",
-            "name": "Debug unit tests in executable 'battlefield_rcon'",
+            "name": "Debug unit tests in executable 'battle_fox'",
             "cargo": {
                 "args": [
                     "test",
                     "--no-run",
-                    "--bin=battlefield_rcon",
-                    "--package=battlefield_rcon"
+                    "--bin=battle_fox",
+                    "--package=battle_fox"
                 ],
                 "filter": {
-                    "name": "battlefield_rcon",
+                    "name": "battle_fox",
                     "kind": "bin"
                 }
             },

battlefield_rcon/src/bf4.rs

@@ -166,20 +166,22 @@ impl Bf4Client {
         } else {
             // welp, gotta ask rcon and update cache...
             // println!("[Bf4Client::resolve_player] Cache miss for {}, resolving...", name);
-            let pib = match self.list_players(Visibility::Player(name.clone())).await { // hm, sucks that you need clone for this :/
-                Ok(pib) => Ok(pib),
-                Err(ListPlayersError::Rcon(RconError::InvalidArguments)) => {
-                    Err(Bf4Error::Rcon(RconError::other(format!("Failed to resolve player {}", name))))
+
+            // let pib = match self.list_players(Visibility::Player(name.clone())).await { // hm, sucks that you need clone for this :/
+            // let pib = match self.list_players(Visibility::Squad(Team::One, Squad::Alpha)).await { // hm, sucks that you need clone for this :/
+            let pib = match self.list_players(Visibility::All).await { // hm, sucks that you need clone for this :/
+                Ok(pib) => pib,
+                Err(ListPlayersError::Rcon(rcon)) => {
+                    return Err(Bf4Error::PlayerGuidResolveFailed { player_name: name.clone(), rcon: Some(rcon) } );
                 },
-                Err(ListPlayersError::Rcon(rcon)) => Err(rcon.into()),
-            }?;
+            };
             if pib.len() != 1 {
                 // we expect exactly one
-                return Err(Bf4Error::PlayerGuidResolveFailed);
+                return Err(Bf4Error::PlayerGuidResolveFailed { player_name: name.clone(), rcon: None } );
             }
             if &pib[0].player_name != name {
                 // wrong player returned? Wtf xD.
-                return Err(Bf4Error::PlayerGuidResolveFailed);
+                return Err(Bf4Error::PlayerGuidResolveFailed { player_name: name.clone(), rcon: None } );
             }
 
             let player = Player {
@@ -319,7 +321,7 @@ impl Bf4Client {
 
     pub async fn list_players(&self, vis: Visibility) -> Result<Vec<PlayerInfo>, ListPlayersError> {
         self.rcon.command(&veca!["admin.listPlayers", vis.to_rcon_format()],
-            |ok| player_info_block::parse_pib(ok).map_err(|rconerr| rconerr.into()),
+            |ok| player_info_block::parse_pib(&ok[1..]).map_err(|rconerr| rconerr.into()),
             err_none
         ).await
     }

battlefield_rcon/src/bf4/ea_guid.rs

@@ -21,6 +21,8 @@ impl Eaid {
                 let guid_only = &ascii.as_slice()[3..]; // skip "EA_"
                 Ok(Eaid(guid_only.try_into().unwrap())) // we can use unwrap here because we tested the length
             }
+        } else if str.len() == 0 {
+            Ok(Eaid([AsciiChar::X; 32]))
         } else {
             Err(EaidParseError)
         }

battlefield_rcon/src/bf4/error.rs

@@ -1,8 +1,10 @@
+use ascii::AsciiString;
+
 use crate::rcon::RconError;
 
 #[derive(Debug, Clone)]
 pub enum Bf4Error {
-    PlayerGuidResolveFailed,
+    PlayerGuidResolveFailed{ player_name: AsciiString, rcon: Option<RconError> },
     UnknownEvent(String),
     Rcon(RconError),
     Other(String),

battlefield_rcon/src/bf4/player_info_block.rs

@@ -21,15 +21,15 @@ pub struct PlayerInfo {
     pub eaid: Eaid,
     pub squad: Squad,
     pub team: Team,
-    pub kills: usize,
-    pub deahts: usize,
-    pub score: usize,
-    pub rank: usize,
-    pub ping: usize,
+    pub kills: i32,
+    pub deahts: i32,
+    pub score: i32,
+    pub rank: i32,
+    pub ping: i32,
 }
 
-fn parse_int(word: &AsciiString) -> RconResult<usize> {
-    word.as_str().parse::<usize>().map_err(|_| RconError::protocol_msg(format!("Failed to parse PlayerInfoBlock: \"{}\" is not an unsigned integer", word)))
+fn parse_int(word: &AsciiString) -> RconResult<i32> {
+    word.as_str().parse::<i32>().map_err(|_| RconError::protocol_msg(format!("Failed to parse PlayerInfoBlock: \"{}\" is not an unsigned integer", word)))
 }
 
 // fn assert_len(words: &[AsciiString], len: usize) -> Bf4Result<()> {
@@ -49,27 +49,28 @@ pub fn parse_pib(words: &[AsciiString]) -> RconResult<Vec<PlayerInfo>> {
     // word offset.
     let mut offset = 0;
 
-    let n_columns = parse_int(&words[offset])?;
-    if words.len() - offset < n_columns || n_columns != 9 { // currently there are 9 columns
-        return Err(RconError::protocol_msg(format!("Failed to parse PlayerInfoBlock: Expected 9 columns")));
+    const N_COLS : usize = 10;
+    let n_columns = parse_int(&words[offset])? as usize;
+    if words.len() - offset < n_columns || n_columns != N_COLS { // currently there are 9 columns
+        return Err(RconError::protocol_msg(format!("Failed to parse PlayerInfoBlock: Expected {} columns", N_COLS)));
     }
     offset += 1;
 
     // now read in the column names, make sure we're still talking about the same thing
-    const COLS : [&'static str; 9] = ["name", "guid", "teamId", "squadId", "kills", "deaths", "score", "rank", "ping"];
-    for i in 0..9 {
+    const COLS : [&'static str; N_COLS] = ["name", "guid", "teamId", "squadId", "kills", "deaths", "score", "rank", "ping", "type"];
+    for i in 0..N_COLS {
         let col_name = words[offset + i].as_str();
         if col_name != COLS[i] {
             return Err(RconError::protocol_msg(format!("Failed to parse PlayerInfoBlock: Column mismatch, did the rcon protocol change?")));
         }
     }
-    offset += 9;
+    offset += N_COLS;
 
     // now read in how many rows (= players) we have.
     if words.len() - offset == 0 {
         return Err(RconError::protocol_msg(format!("Failed to parse PlayerInfoBlock")));
     }
-    let m_rows = parse_int(&words[offset])?;
+    let m_rows = parse_int(&words[offset])? as usize;
     offset += 1;
 
     // make sure there actually is enough words to read in, that that packet isn't malformed.
@@ -80,9 +81,14 @@ pub fn parse_pib(words: &[AsciiString]) -> RconResult<Vec<PlayerInfo>> {
     // now we actually read in the data.
     let mut pib = Vec::new();
     for _ in 0..m_rows {
+        // let guid = if words[offset + 1].len() == 0 {
+        //     None
+        // } else {
+        //     Some(Eaid::from_rcon_format(&words[offset + 1]).map_err(|_:EaidParseError| RconError::protocol_msg(format!("Failed to parse PlayerInfoBlock: Invalid EA GUID: {}", words[offset + 1])))?)
+        // }
         let pi = PlayerInfo {
             player_name: words[offset + 0].clone(),
-            eaid: Eaid::from_rcon_format(&words[offset + 1]).map_err(|_:EaidParseError| RconError::protocol_msg("Failed to parse PlayerInfoBlock: Invalid EA GUID"))?,
+            eaid: Eaid::from_rcon_format(&words[offset + 1]).map_err(|_:EaidParseError| RconError::protocol_msg(format!("Failed to parse PlayerInfoBlock: Invalid EA GUID: {}", words[offset + 1])))?,
             team: Team::from_rcon_format(&words[offset + 2])?,
             squad: Squad::from_rcon_format(&words[offset + 3])?,
             kills: parse_int(&words[offset + 4])?,
@@ -94,7 +100,7 @@ pub fn parse_pib(words: &[AsciiString]) -> RconResult<Vec<PlayerInfo>> {
 
         pib.push(pi);
 
-        offset += 9;
+        offset += N_COLS;
     }
 
     Ok(pib)