fix: wrong usage of smallmap cause server crash. switched to indexmap (…

…8xFF#457)

Cargo.toml

@@ -28,7 +28,6 @@ convert-enum = "0.1"
 clap = "4.5"
 num_enum = "0.7"
 log = "0.4"
-smallmap = "1.4"
 serde = "1.0"
 derivative = "2.2"
 derive_more = "1.0"

packages/audio_mixer/Cargo.toml

@@ -5,3 +5,4 @@ edition = "2021"
 
 [dependencies]
 log.workspace = true
+indexmap.workspace = true

packages/audio_mixer/src/lib.rs

@@ -1,10 +1,11 @@
 use std::{
-    collections::HashMap,
     fmt::Debug,
     hash::Hash,
     time::{Duration, Instant},
 };
 
+use indexmap::IndexMap;
+
 const SILENT_LEVEL: i8 = -127;
 const SWITCH_AUDIO_THRESHOLD: i16 = 30;
 /// if no audio pkt received in AUDIO_SLOT_TIMEOUT, set audio level to SILENT_LEVEL
@@ -28,7 +29,7 @@ struct OutputSlotState<Src> {
 #[derive(Debug)]
 pub struct AudioMixer<Src> {
     len: usize,
-    sources: HashMap<Src, SourceState>,
+    sources: IndexMap<Src, SourceState>,
     outputs: Vec<Option<OutputSlotState<Src>>>,
 }
 
@@ -38,7 +39,7 @@ impl<Src: Debug + Clone + Eq + Hash> AudioMixer<Src> {
 
         Self {
             len: 0,
-            sources: HashMap::new(),
+            sources: Default::default(),
             outputs: vec![None; output],
         }
     }

packages/media_core/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 log = { workspace = true }
 num_enum = { workspace = true }
-smallmap = { workspace = true }
+indexmap = { workspace = true }
 derivative = { workspace = true }
 derive_more = { workspace = true, features = ["full"] }
 mockall = { workspace = true }
@@ -17,7 +17,6 @@ atm0s-sdn = { workspace = true }
 media-server-protocol = { path = "../protocol" }
 media-server-utils = { path = "../media_utils" }
 audio-mixer = { path = "../audio_mixer" }
-indexmap = { workspace = true }
 
 [dev-dependencies]
 tracing-subscriber = { workspace = true }

packages/media_core/src/cluster.rs

@@ -6,9 +6,9 @@
 //!
 
 use derive_more::{AsRef, Display, From};
+use indexmap::IndexMap;
 use sans_io_runtime::{return_if_none, TaskGroup, TaskGroupOutput, TaskSwitcherChild};
 use std::{
-    collections::HashMap,
     fmt::Debug,
     hash::{Hash, Hasher},
     time::Instant,
@@ -131,15 +131,15 @@ pub enum Output<Endpoint> {
 }
 
 pub struct MediaCluster<Endpoint: Debug + Copy + Clone + Hash + Eq> {
-    rooms_map: HashMap<ClusterRoomHash, usize>,
+    rooms_map: IndexMap<ClusterRoomHash, usize>,
     rooms: TaskGroup<room::Input<Endpoint>, room::Output<Endpoint>, ClusterRoom<Endpoint>, 16>,
     shutdown: bool,
 }
 
 impl<Endpoint: Debug + Copy + Hash + Eq + Clone> Default for MediaCluster<Endpoint> {
     fn default() -> Self {
         Self {
-            rooms_map: HashMap::new(),
+            rooms_map: IndexMap::new(),
             rooms: TaskGroup::default(),
             shutdown: false,
         }
@@ -197,7 +197,7 @@ impl<Endpoint: Debug + Hash + Copy + Clone + Debug + Eq> TaskSwitcherChild<Outpu
             room::Output::Endpoint(endpoints, event) => Some(Output::Endpoint(endpoints, event)),
             room::Output::OnResourceEmpty(room) => {
                 log::info!("[MediaCluster] remove room index {index}, hash {room}");
-                self.rooms_map.remove(&room).expect("Should have room with index");
+                self.rooms_map.swap_remove(&room).expect("Should have room with index");
                 self.rooms.remove_task(index);
                 Some(Output::Continue)
             }