Update Rust crate async-trait to v0.1.89

Cargo.lock

@@ -14,6 +14,12 @@ version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -638,15 +644,16 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "chrono"
-version = "0.4.44"
+version = "0.4.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0"
+checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
 dependencies = [
+ "android-tzdata",
  "iana-time-zone",
  "js-sys",
  "num-traits",
  "wasm-bindgen",
- "windows-link 0.2.1",
+ "windows-link 0.1.3",
 ]
 
 [[package]]

rnex-core/src/nex/user.rs

@@ -52,8 +52,6 @@ use rnex_core::rmc::structures::ranking::UploadCompetitionData;
 use std::sync::{Arc, Weak};
 use tokio::sync::{Mutex, RwLock};
 
-use crate::rmc::structures::Error;
-
 cfg_if! {
     if #[cfg(feature = "datastore")] {
         use rnex_core::rmc::protocols::datastore::{DataStore, RawDataStore, RawDataStoreInfo, RemoteDataStore};
@@ -182,14 +180,11 @@ impl MatchmakeExtension for User {
     }
 
     async fn update_progress_score(&self, gid: u32, progress: u8) -> Result<(), ErrorCode> {
-        #[cfg(feature = "v3-5-0")]
-        {
-            let session = self.matchmake_manager.get_session(gid).await?;
+        let session = self.matchmake_manager.get_session(gid).await?;
 
-            let mut session = session.lock().await;
+        let mut session = session.lock().await;
 
-            session.session.progress_score = progress;
-        }
+        session.session.progress_score = progress;
 
         Ok(())
     }
@@ -500,7 +495,7 @@ impl MatchmakeExtension for User {
         gid: u32,
         message: String,
         dont_care_block_list: bool,
-        //participation_count: u16,
+        participation_count: u16,
     ) -> Result<Vec<u8>, ErrorCode> {
         let sess = self.matchmake_manager.get_session(gid).await?;
         let mut sess = sess.lock().await;
@@ -511,15 +506,6 @@ impl MatchmakeExtension for User {
 }
 
 impl Matchmake for User {
-    async fn find_by_single_id(&self, gid: u32) -> Result<(bool, Any), ErrorCode> {
-        let s = self.matchmake_manager.get_session(gid).await?;
-        let s = s.lock().await;
-        Ok((
-            true,
-            Any::new(&s.session).map_err(|_| ErrorCode::Custom_Unknown)?,
-        ))
-    }
-
     async fn unregister_gathering(&self, _gid: u32) -> Result<bool, ErrorCode> {
         Ok(true)
     }

rnex-core/src/rmc/protocols/matchmake.rs

@@ -4,14 +4,10 @@ use rnex_core::rmc::response::ErrorCode;
 
 use rnex_core::PID;
 
-use crate::rmc::structures::any::Any;
-
 #[rmc_proto(21)]
 pub trait Matchmake {
     #[method_id(2)]
     async fn unregister_gathering(&self, gid: u32) -> Result<bool, ErrorCode>;
-    #[method_id(21)]
-    async fn find_by_single_id(&self, gid: u32) -> Result<(bool, Any), ErrorCode>;
     #[method_id(41)]
     async fn get_session_urls(&self, gid: u32) -> Result<Vec<StationUrl>, ErrorCode>;
     #[method_id(42)]

rnex-core/src/rmc/protocols/matchmake_extension.rs

@@ -42,8 +42,7 @@ pub trait MatchmakeExtension {
         gid: u32,
         message: String,
         dont_care_block_list: bool,
-        // this is to cheat support for v3-3-0
-        //participation_count: u16,
+        participation_count: u16,
     ) -> Result<Vec<u8>, ErrorCode>;
 
     #[method_id(8)]

rnex-core/src/rmc/structures/any.rs

@@ -1,3 +1,4 @@
+use log::{info, warn};
 use rnex_core::rmc::structures::{Result, RmcSerialize};
 use std::io::{Cursor, Read, Write};
 use v_byte_helpers::{IS_BIG_ENDIAN, ReadExtensions};
@@ -11,21 +12,32 @@ pub struct Any {
 impl RmcSerialize for Any {
     fn serialize(&self, writer: &mut impl Write) -> Result<()> {
         self.name.serialize(writer)?;
-
-        let u32_len = self.data.len() as u32;
+        let u32_len = self.data.len() as u32 - 1;
         (u32_len + 4).serialize(writer)?;
-        self.data.serialize(writer)?;
+        u32_len.serialize(writer)?;
+        writer.write_all(&self.data)?;
 
         Ok(())
     }
     fn deserialize(reader: &mut impl Read) -> Result<Self> {
         let name = String::deserialize(reader)?;
 
-        // also length ?
-        let _len2: u32 = reader.read_struct(IS_BIG_ENDIAN)?;
-        let data = Vec::deserialize(reader)?;
+        let size = u32::deserialize(reader)? as usize + 1;
+        let mut buf = vec![0; size];
+        reader.read_exact(&mut buf[..])?;
+        let mut cursor = Cursor::new(&buf);
+        let len2: u32 = cursor.read_struct(IS_BIG_ENDIAN)?;
 
-        Ok(Any { name, data })
+        if len2 as usize + 3 != size {
+            warn!("mismatched sizes on any: {} vs {}", size, len2 + 1);
+        }
+
+        info!("any data: {}", hex::encode(&buf));
+
+        Ok(Any {
+            name,
+            data: (&buf[4..]).to_owned(),
+        })
     }
 }
 
@@ -46,6 +58,8 @@ impl Any {
 
 #[cfg(test)]
 mod test {
+    use std::io::Cursor;
+
     use crate::rmc::structures::{
         RmcSerialize,
         any::Any,
@@ -54,21 +68,6 @@ mod test {
 
     #[test]
     fn test() {
-        let any = Any {
-            name: "MatchmakeSession".into(),
-            data: [
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 98, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0,
-                0, 0, 0, 0, 0, 20, 0, 68, 111, 111, 114, 115, 32, 70, 114, 105, 101, 110, 100, 32,
-                73, 110, 118, 105, 116, 101, 0, 0, 0, 0, 0, 6, 0, 0, 0, 2, 0, 0, 0, 3, 0, 0, 0, 0,
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 3, 0, 0, 0, 1, 2, 3, 0,
-                0, 0, 0, 0, 0, 0, 0, 0,
-            ]
-            .into(),
-        };
-
-        println!("{}", hex::encode(&any.data));
-
-        let _: MatchmakeSession = any.try_get().unwrap().unwrap();
         let sess = MatchmakeSession {
             gathering: Gathering {
                 self_gid: 0,
@@ -88,15 +87,18 @@ mod test {
             matchmake_system_type: 2,
             application_buffer: [1, 2, 3].into(),
             participation_count: 0,
-            #[cfg(feature = "v3-5-0")]
             progress_score: 0,
             session_key: [].into(),
         };
 
-        let any = Any::new(&sess).unwrap();
+        let any = Any::new(&sess).unwrap().to_data().unwrap();
 
-        let sess2: MatchmakeSession = any.try_get().unwrap().unwrap();
+        let sess2: MatchmakeSession = Any::deserialize(&mut Cursor::new(any))
+            .unwrap()
+            .try_get()
+            .unwrap()
+            .unwrap();
 
-        assert_eq!(sess, sess2)
+        assert_eq!(sess, sess2);
     }
 }

rnex-core/src/rmc/structures/matchmake.rs

@@ -67,6 +67,7 @@ cfg_if! {
             pub matchmake_system_type: u32,
             pub application_buffer: Vec<u8>,
             pub participation_count: u32,
+            pub progress_score: u8,
             pub session_key: Vec<u8>,
         }
     }