fix/minor fixes

e2e/tests/audiobridge.rs

@@ -19,7 +19,7 @@ use tokio::sync::mpsc::UnboundedReceiver;
 async fn room_crud_e2e() {
     let default_timeout = Duration::from_secs(4);
     let handle = make_audiobridge_attachment().await.0;
-    let room_id = JanusId::Uint(rand::random());
+    let room_id = JanusId::Uint(rand::random::<u64>().into());
 
     'before_creation: {
         let exists = handle

jarust/Cargo.toml

@@ -42,6 +42,9 @@ tokio-rt = [
 [dev-dependencies]
 anyhow = "1.0.93"
 async-trait.workspace = true
+jarust_core = { version = "0.8.0", path = "../jarust_core" }
+jarust_interface = { version = "0.8.0", path = "../jarust_interface" }
+jarust_plugins = { version = "0.8.0", path = "../jarust_plugins" }
 serde_json.workspace = true
 serde.workspace = true
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }

jarust/examples/streaming.rs

@@ -15,7 +15,7 @@ async fn main() -> anyhow::Result<()> {
     let env_filter = EnvFilter::from_default_env()
         .add_directive("jarust_core=trace".parse()?)
         .add_directive("jarust_plugins=trace".parse()?)
-        .add_directive("jarust_transport=trace".parse()?)
+        .add_directive("jarust_interface=trace".parse()?)
         .add_directive("jarust_rt=trace".parse()?)
         .add_directive(format!("{filename}=trace").parse()?);
     tracing_subscriber::fmt().with_env_filter(env_filter).init();
@@ -44,7 +44,7 @@ async fn main() -> anyhow::Result<()> {
             StreamingCreateParams {
                 mountpoint_type: StreamingMountpointType::RTP,
                 optional: StreamingCreateParamsOptional {
-                    id: Some(JanusId::Uint(1337)),
+                    id: Some(JanusId::Uint(1337.into())),
                     name: Some(String::from("stream name")),
                     description: Some(String::from("stream description")),
                     media: Some(vec![StreamingRtpMedia {
@@ -71,7 +71,9 @@ async fn main() -> anyhow::Result<()> {
     let mountpoints = handle.list(timeout).await?;
     tracing::info!("Mountpoints {:#?}", mountpoints);
 
-    let info = handle.info(JanusId::Uint(1337), None, timeout).await?;
+    let info = handle
+        .info(JanusId::Uint(1337.into()), None, timeout)
+        .await?;
     tracing::info!("Info: {:#?}", info);
 
     handle

jarust/examples/video_room.rs

@@ -126,7 +126,7 @@ async fn main() -> anyhow::Result<()> {
             VideoRoomPublisherJoinParams {
                 room: room_id.clone(),
                 optional: VideoRoomPublisherJoinParamsOptional {
-                    id: Some(JanusId::Uint(1337)),
+                    id: Some(JanusId::Uint(1337.into())),
                     display: Some(String::from("Publisher name")),
                     token: None,
                 },

jarust_core/Cargo.toml

@@ -28,5 +28,7 @@ tokio-rt = ["jarust_rt/tokio-rt", "jarust_interface/tokio-rt"]
 
 [dev-dependencies]
 anyhow = "1.0.93"
+jarust_interface = { version = "0.8.0", path = "../jarust_interface" }
+jarust_rt = { version = "0.8.0", path = "../jarust_rt" }
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }

jarust_plugins/Cargo.toml

@@ -39,5 +39,8 @@ __experimental = []
 
 [dev-dependencies]
 anyhow = "1.0.93"
+jarust_core = { version = "0.8.0", path = "../jarust_core" }
+jarust_interface = { version = "0.8.0", path = "../jarust_interface" }
+jarust_rt = { version = "0.8.0", path = "../jarust_rt" }
 tokio = { workspace = true, features = ["time", "macros", "rt-multi-thread"] }
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }

jarust_plugins/src/audio_bridge/events.rs

@@ -133,6 +133,7 @@ impl TryFrom<JaResponse> for PluginEvent {
 mod tests {
     use super::PluginEvent;
     use crate::audio_bridge::events::AudioBridgeEvent;
+
     use crate::JanusId;
     use jarust_interface::japrotocol::JaHandleEvent;
     use jarust_interface::japrotocol::JaResponse;
@@ -151,8 +152,8 @@ mod tests {
                     plugin: "janus.plugin.audiobridge".to_string(),
                     data: PluginInnerData::Data(json!({
                         "audiobridge": "joined",
-                        "room": 684657u32,
-                        "id": 751378u32,
+                        "room": 684657u64,
+                        "id": 751378u64,
                         "participants": []
                     })),
                 },
@@ -166,8 +167,8 @@ mod tests {
         assert_eq!(
             event,
             PluginEvent::AudioBridgeEvent(AudioBridgeEvent::RoomJoined {
-                id: JanusId::Uint(751378u32),
-                room: JanusId::Uint(684657),
+                id: JanusId::Uint(751378u64.into()),
+                room: JanusId::Uint(684657.into()),
                 participants: vec![],
             })
         );
@@ -181,8 +182,8 @@ mod tests {
                     plugin: "janus.plugin.audiobridge".to_string(),
                     data: PluginInnerData::Data(json!({
                         "audiobridge": "joined",
-                        "room": 684657u32,
-                        "id": 751378u32,
+                        "room": 684657u64,
+                        "id": 751378u64,
                         "participants": []
                     })),
                 },
@@ -200,8 +201,8 @@ mod tests {
         assert_eq!(
             event,
             PluginEvent::AudioBridgeEvent(AudioBridgeEvent::RoomJoinedWithEstabilshment {
-                id: JanusId::Uint(751378),
-                room: JanusId::Uint(684657),
+                id: JanusId::Uint(751378.into()),
+                room: JanusId::Uint(684657.into()),
                 participants: vec![],
                 jsep: Jsep {
                     jsep_type: JsepType::Answer,
@@ -220,8 +221,8 @@ mod tests {
                     plugin: "janus.plugin.audiobridge".to_string(),
                     data: PluginInnerData::Data(json!({
                         "audiobridge": "left",
-                        "room": 684657u32,
-                        "id": 751378u32
+                        "room": 684657u64,
+                        "id": 751378u64
                     })),
                 },
             }),
@@ -234,8 +235,8 @@ mod tests {
         assert_eq!(
             event,
             PluginEvent::AudioBridgeEvent(AudioBridgeEvent::RoomLeft {
-                id: JanusId::Uint(751378),
-                room: JanusId::Uint(684657),
+                id: JanusId::Uint(751378.into()),
+                room: JanusId::Uint(684657.into()),
             })
         );
     }
@@ -248,8 +249,8 @@ mod tests {
                     plugin: "janus.plugin.audiobridge".to_string(),
                     data: PluginInnerData::Data(json!({
                         "audiobridge": "roomchanged",
-                        "room": 61682u32,
-                        "id": 38626u32,
+                        "room": 61682u64,
+                        "id": 38626u64,
                         "participants": []
                     })),
                 },
@@ -263,8 +264,8 @@ mod tests {
         assert_eq!(
             event,
             PluginEvent::AudioBridgeEvent(AudioBridgeEvent::RoomChanged {
-                id: JanusId::Uint(38626),
-                room: JanusId::Uint(61682),
+                id: JanusId::Uint(38626.into()),
+                room: JanusId::Uint(61682.into()),
                 participants: vec![],
             })
         );

jarust_plugins/src/common.rs

@@ -12,5 +12,34 @@ pub enum JanusId {
     /// String Identifier
     String(String),
     /// Unsigned Integer Identifier
-    Uint(u32),
+    Uint(U63),
+}
+
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Serialize, Deserialize)]
+pub struct U63(u64);
+
+impl U63 {
+    pub const MAX: u64 = (1 << 63) - 1;
+
+    pub fn new(value: u64) -> Self {
+        Self::new_wrapping(value)
+    }
+
+    pub fn new_wrapping(value: u64) -> Self {
+        Self(value & U63::MAX)
+    }
+
+    pub fn new_saturating(value: u64) -> Self {
+        if value > U63::MAX {
+            Self(U63::MAX)
+        } else {
+            Self(value)
+        }
+    }
+}
+
+impl From<u64> for U63 {
+    fn from(value: u64) -> Self {
+        Self::new(value)
+    }
 }

jarust_plugins/src/streaming/events.rs

@@ -79,6 +79,7 @@ impl TryFrom<JaResponse> for PluginEvent {
 #[cfg(test)]
 mod tests {
     use super::PluginEvent;
+
     use crate::streaming::events::StreamingEvent;
     use crate::JanusId;
     use jarust_interface::japrotocol::JaHandleEvent;
@@ -96,7 +97,7 @@ mod tests {
                     plugin: "janus.plugin.streaming".to_string(),
                     data: PluginInnerData::Data(json!({
                         "streaming": "created",
-                        "id": 63807u32,
+                        "id": 63807u64,
                         "type": "live",
                     })),
                 },
@@ -110,7 +111,7 @@ mod tests {
         assert_eq!(
             event,
             PluginEvent::StreamingEvent(StreamingEvent::MountpointCreated {
-                id: JanusId::Uint(63807u32),
+                id: JanusId::Uint(63807u64.into()),
                 mountpoint_type: "live".to_string(),
             })
         );
@@ -124,7 +125,7 @@ mod tests {
                     plugin: "janus.plugin.streaming".to_string(),
                     data: PluginInnerData::Data(json!({
                         "streaming": "destroyed",
-                        "id": 63807u32,
+                        "id": 63807u64,
                     })),
                 },
             }),
@@ -137,7 +138,7 @@ mod tests {
         assert_eq!(
             event,
             PluginEvent::StreamingEvent(StreamingEvent::MountpointDestroyed {
-                id: JanusId::Uint(63807u32),
+                id: JanusId::Uint(63807u64.into()),
             })
         );
     }

jarust_plugins/src/streaming/params.rs

@@ -27,7 +27,7 @@ make_dto!(
 );
 
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Serialize)]
-#[serde(untagged, rename_all = "lowercase")]
+#[serde(rename_all = "lowercase")]
 pub enum StreamingMountpointType {
     RTP,
     LIVE,
@@ -59,7 +59,7 @@ make_dto!(
 );
 
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Serialize)]
-#[serde(untagged, rename_all = "lowercase")]
+#[serde(rename_all = "lowercase")]
 pub enum StreamingRtpMediaType {
     AUDIO,
     VIDEO,