Fix carah error of get session stats request (#490)

livekit · Nov 22, 2024 · 15a5a7f · 15a5a7f
1 parent fe8037a
commit 15a5a7f
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 1 deletion.
diff --git a/libwebrtc/src/stats.rs b/libwebrtc/src/stats.rs
@@ -28,6 +28,7 @@ pub enum RtcStats {
     LocalCandidate(LocalCandidateStats),
     RemoteCandidate(RemoteCandidateStats),
     Certificate(CertificateStats),
+    Stream(StreamStats),
     Track, // Deprecated
 }
 
@@ -272,6 +273,15 @@ pub struct CertificateStats {
     pub certificate: dictionaries::CertificateStats,
 }
 
+#[derive(Debug, Default, Clone, Deserialize)]
+pub struct StreamStats {
+    #[serde(flatten)]
+    pub rtc: dictionaries::RtcStats,
+
+    #[serde(flatten)]
+    pub stream: dictionaries::StreamStats,
+}
+
 #[derive(Debug, Default, Clone, Deserialize)]
 pub struct TrackStats {}
 
@@ -588,4 +598,13 @@ pub mod dictionaries {
         pub base64_certificate: String,
         pub issuer_certificate_id: String,
     }
+
+    #[derive(Debug, Default, Clone, Deserialize)]
+    #[serde(rename_all = "camelCase")]
+    #[serde(default)]
+    pub struct StreamStats {
+        pub id: String,
+        pub stream_identifier: String,
+        // pub timestamp: i64,
+    }
 }
diff --git a/livekit-ffi/protocol/stats.proto b/livekit-ffi/protocol/stats.proto
@@ -170,6 +170,11 @@ message RtcStats {
 	    required CertificateStats certificate = 2;
     }
 
+    message Stream {
+        required RtcStatsData rtc = 1;
+	    required StreamStats stream = 2;
+    }
+
     message Track {
 	// Deprecated
     }
@@ -189,7 +194,8 @@ message RtcStats {
 	LocalCandidate local_candidate = 14;
 	RemoteCandidate remote_candidate = 15;
 	Certificate certificate = 16;
-	Track track = 17;
+    Stream stream = 17;
+	Track track = 18;
     }
 }
 
@@ -447,3 +453,9 @@ message CertificateStats {
     required string issuer_certificate_id = 4;
 }
 
+message StreamStats {
+    required string id = 1;
+    required string stream_identifier = 2;
+    // required int64 timestamp = 3;
+}
+
diff --git a/livekit-ffi/src/conversion/stats.rs b/livekit-ffi/src/conversion/stats.rs
@@ -164,6 +164,7 @@ impl From<rtc::RtcStats> for proto::RtcStats {
                 rtc::RtcStats::Certificate(certificate) => {
                     proto::rtc_stats::Stats::Certificate(certificate.into())
                 }
+                rtc::RtcStats::Stream(stream) => proto::rtc_stats::Stats::Stream(stream.into()),
                 rtc::RtcStats::Track {} => {
                     proto::rtc_stats::Stats::Track(proto::rtc_stats::Track {})
                 }
@@ -281,6 +282,12 @@ impl From<rtc::CertificateStats> for proto::rtc_stats::Certificate {
     }
 }
 
+impl From<rtc::StreamStats> for proto::rtc_stats::Stream {
+    fn from(value: rtc::StreamStats) -> Self {
+        Self { rtc: value.rtc.into(), stream: value.stream.into() }
+    }
+}
+
 // Dictionaries
 
 impl From<rtc::dictionaries::RtcStats> for proto::RtcStatsData {
@@ -289,6 +296,12 @@ impl From<rtc::dictionaries::RtcStats> for proto::RtcStatsData {
     }
 }
 
+impl From<rtc::dictionaries::StreamStats> for proto::StreamStats {
+    fn from(value: rtc::dictionaries::StreamStats) -> Self {
+        Self { id: value.id, stream_identifier: value.stream_identifier }
+    }
+}
+
 impl From<rtc::dictionaries::CodecStats> for proto::CodecStats {
     fn from(value: rtc::dictionaries::CodecStats) -> Self {
         Self {