fix(rtmp): connect command

Author: lennartkloock

crates/amf0/src/de.rs

@@ -567,7 +567,7 @@ impl<'a, 'de> VariantAccess<'de> for Enum<'a> {
 #[cfg_attr(all(test, coverage_nightly), coverage(off))]
 mod tests {
     use core::f64;
-    use std::collections::BTreeMap;
+    use std::collections::HashMap;
     use std::fmt::Debug;
 
     use bytes::Bytes;
@@ -915,7 +915,7 @@ mod tests {
         struct Test<'a> {
             b: String,
             #[serde(flatten, borrow)]
-            other: BTreeMap<StringCow<'a>, Amf0Value<'a>>,
+            other: HashMap<StringCow<'a>, Amf0Value<'a>>,
         }
 
         let value: Test = from_bytes(Bytes::from_owner(bytes)).unwrap();

crates/amf0/src/lib.rs

@@ -18,7 +18,8 @@
 //! ```rust
 //! # fn test() -> Result<(), Box<dyn std::error::Error>> {
 //! use scuffle_amf0::{Deserializer, Serializer};
-//! # let bytes = &[0x02, 0, 1, b'a'];
+//! # let payload = &[0x02, 0, 1, b'a'];
+//! # let bytes = bytes::Bytes::from_static(payload);
 //! # let mut writer = Vec::new();
 //!
 //! // Decode a string value from bytes
@@ -28,7 +29,7 @@
 //!
 //! // Encode a value into a writer
 //! scuffle_amf0::to_writer(&mut writer, &value)?;
-//! # assert_eq!(writer, bytes);
+//! # assert_eq!(writer, payload);
 //! # Ok(())
 //! # }
 //! # test().expect("test failed");

crates/flv/src/script.rs

@@ -1,6 +1,6 @@
 //! Script data structures
 
-use std::collections::BTreeMap;
+use std::collections::HashMap;
 use std::io;
 
 use bytes::Bytes;
@@ -152,7 +152,7 @@ pub struct OnMetaData<'a> {
     pub video_track_id_info_map: Option<Amf0Object<'a>>,
     /// Any other metadata contained in the script data.
     #[serde(flatten, borrow)]
-    pub other: BTreeMap<StringCow<'a>, Amf0Value<'a>>,
+    pub other: HashMap<StringCow<'a>, Amf0Value<'a>>,
 }
 
 /// XMP Metadata
@@ -169,7 +169,7 @@ pub struct OnXmpData<'a> {
     live_xml: Option<String>,
     /// Any other metadata contained in the script data.
     #[serde(flatten, borrow)]
-    other: BTreeMap<StringCow<'a>, Amf0Value<'a>>,
+    other: HashMap<StringCow<'a>, Amf0Value<'a>>,
 }
 
 /// FLV `SCRIPTDATA` tag
@@ -279,7 +279,7 @@ mod tests {
                 width: Some(1280.0),
                 audio_track_id_info_map: None,
                 video_track_id_info_map: None,
-                other: BTreeMap::new(),
+                other: HashMap::new(),
             }
         );
     }
@@ -351,7 +351,7 @@ mod tests {
                 width: Some(1280.0),
                 audio_track_id_info_map: Some([("test".into(), Amf0Value::Number(1.0))].into_iter().collect()),
                 video_track_id_info_map: Some([("test2".into(), Amf0Value::Number(2.0))].into_iter().collect()),
-                other: BTreeMap::new(),
+                other: HashMap::new(),
             }
         );
     }

crates/rtmp/src/command_messages/netconnection/mod.rs

@@ -1,8 +1,8 @@
 //! NetConnection command messages.
 
-use std::collections::BTreeMap;
+use std::collections::HashMap;
 
-use scuffle_amf0::Amf0Object;
+use scuffle_amf0::{Amf0Object, Amf0Value};
 use scuffle_bytes_util::StringCow;
 
 use super::on_status::OnStatusCode;
@@ -32,7 +32,7 @@ pub struct NetConnectionCommandConnect<'a> {
     /// - Legacy RTMP spec, page 30
     /// - Enhanced RTMP spec, page 36-37
     #[serde(flatten, borrow)]
-    pub others: BTreeMap<StringCow<'a>, Amf0Object<'a>>,
+    pub others: HashMap<StringCow<'a>, Amf0Value<'a>>,
 }
 
 /// Extended capabilities mask used by the [enhanced connect command](NetConnectionCommandConnect).

crates/rtmp/src/session/server/mod.rs

@@ -224,6 +224,8 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Unpin, H: SessionHandler>
             && self.caps_ex.is_some_and(|c| c.intersects(CapsExMask::Reconnect))
             && self.ctx.as_ref().is_some_and(|ctx| ctx.is_done())
         {
+            tracing::debug!("sending reconnect request");
+
             OnStatus {
                 code: OnStatusCode::NET_CONNECTION_CONNECT_RECONNECT_REQUEST,
                 level: CommandResultLevel::Status,