fix: ffi build

Author: anunaym14

Cargo.lock

@@ -27,6 +27,8 @@ futures-util = { version = "0.3", default-features = false, features = ["sink"]
 parking_lot = { version = "0.12", features = ["deadlock_detection"] }
 prost = "0.12"
 prost-types = "0.12"
+pbjson = "0.6"
+pbjson-types = "0.6"
 lazy_static = "1.4"
 thiserror = "1.0"
 log = "0.4"

livekit-ffi/Cargo.toml

@@ -20,6 +20,8 @@ OUT_RUST=src
 protoc \
     -I=$PROTOCOL \
     --prost_out=$OUT_RUST \
+    --prost_opt=compile_well_known_types \
+    --prost_opt=extern_path=.google.protobuf=::pbjson_types \
     $PROTOCOL/ffi.proto \
     $PROTOCOL/handle.proto \
     $PROTOCOL/room.proto \

livekit-ffi/generate_proto.sh

@@ -20,6 +20,8 @@ set OUT_RUST=src
 protoc.exe ^
     -I=%PROTOCOL% ^
     --prost_out=%OUT_RUST% ^
+    --prost_opt=compile_well_known_types ^
+    --prost_opt=extern_path=.google.protobuf=::pbjson_types ^
     %PROTOCOL%/ffi.proto ^
     %PROTOCOL%/handle.proto ^
     %PROTOCOL%/room.proto ^

livekit-ffi/generate_proto_win.bat

@@ -38,7 +38,7 @@ impl From<protocol::MetricLabel> for proto::MetricLabel {
             protocol::MetricLabel::PublisherRtt => Self::PublisherRtt,
             protocol::MetricLabel::ServerMeshRtt => Self::ServerMeshRtt,
             protocol::MetricLabel::SubscriberRtt => Self::SubscriberRtt,
-            protocol::MetricLabel::PredefinedMaxValue => Self::MetricLabelPredefinedMaxValue,
+            protocol::MetricLabel::PredefinedMaxValue => Self::PredefinedMaxValue,
         }
     }
 }
@@ -47,7 +47,7 @@ impl From<protocol::MetricSample> for proto::MetricSample {
     fn from(value: protocol::MetricSample) -> Self {
         Self {
             timestamp_ms: value.timestamp_ms,
-            normalized_timestamp: value.normalized_timestamp.map(Into::into),
+            normalized_timestamp: value.normalized_timestamp,
             value: value.value,
         }
     }
@@ -73,8 +73,8 @@ impl From<protocol::EventMetric> for proto::EventMetric {
             track_sid: value.track_sid,
             start_timestamp_ms: value.start_timestamp_ms,
             end_timestamp_ms: value.end_timestamp_ms,
-            normalized_start_timestamp: value.normalized_start_timestamp.map(Into::into),
-            normalized_end_timestamp: value.normalized_end_timestamp.map(Into::into),
+            normalized_start_timestamp: value.normalized_start_timestamp,
+            normalized_end_timestamp: value.normalized_end_timestamp,
             metadata: value.metadata,
             rid: value.rid,
         }
@@ -85,7 +85,57 @@ impl From<protocol::MetricsBatch> for proto::MetricsBatch {
     fn from(value: protocol::MetricsBatch) -> Self {
         Self {
             timestamp_ms: value.timestamp_ms,
-            normalized_timestamp: value.normalized_timestamp.map(Into::into),
+            normalized_timestamp: value.normalized_timestamp,
+            str_data: value.str_data,
+            time_series: value.time_series.into_iter().map(Into::into).collect(),
+            events: value.events.into_iter().map(Into::into).collect(),
+        }
+    }
+}
+
+impl From<proto::TimeSeriesMetric> for protocol::TimeSeriesMetric {
+    fn from(value: proto::TimeSeriesMetric) -> Self {
+        Self {
+            label: value.label,
+            participant_identity: value.participant_identity,
+            track_sid: value.track_sid,
+            samples: value.samples.into_iter().map(Into::into).collect(),
+            rid: value.rid,
+        }
+    }
+}
+
+impl From<proto::MetricSample> for protocol::MetricSample {
+    fn from(value: proto::MetricSample) -> Self {
+        Self {
+            timestamp_ms: value.timestamp_ms,
+            normalized_timestamp: value.normalized_timestamp,
+            value: value.value,
+        }
+    }
+}
+
+impl From<proto::EventMetric> for protocol::EventMetric {
+    fn from(value: proto::EventMetric) -> Self {
+        Self {
+            label: value.label,
+            participant_identity: value.participant_identity,
+            track_sid: value.track_sid,
+            start_timestamp_ms: value.start_timestamp_ms,
+            end_timestamp_ms: value.end_timestamp_ms,
+            normalized_start_timestamp: value.normalized_start_timestamp,
+            normalized_end_timestamp: value.normalized_end_timestamp,
+            metadata: value.metadata,
+            rid: value.rid,
+        }
+    }
+}
+
+impl From<proto::MetricsBatch> for protocol::MetricsBatch {
+    fn from(value: proto::MetricsBatch) -> Self {
+        Self {
+            timestamp_ms: value.timestamp_ms,
+            normalized_timestamp: value.normalized_timestamp,
             str_data: value.str_data,
             time_series: value.time_series.into_iter().map(Into::into).collect(),
             events: value.events.into_iter().map(Into::into).collect(),

livekit-ffi/src/conversion/metrics.rs

@@ -4780,7 +4780,7 @@ pub struct MetricsBatch {
     #[prost(int64, tag="1")]
     pub timestamp_ms: i64,
     #[prost(message, optional, tag="2")]
-    pub normalized_timestamp: ::core::option::Option<::prost_types::Timestamp>,
+    pub normalized_timestamp: ::core::option::Option<::pbjson_types::Timestamp>,
     /// To avoid repeating string values, we store them in a separate list and reference them by index
     /// This is useful for storing participant identities, track names, etc.
     /// There is also a predefined list of labels that can be used to reference common metrics.
@@ -4820,7 +4820,7 @@ pub struct MetricSample {
     #[prost(int64, tag="1")]
     pub timestamp_ms: i64,
     #[prost(message, optional, tag="2")]
-    pub normalized_timestamp: ::core::option::Option<::prost_types::Timestamp>,
+    pub normalized_timestamp: ::core::option::Option<::pbjson_types::Timestamp>,
     #[prost(float, tag="3")]
     pub value: f32,
 }
@@ -4842,9 +4842,9 @@ pub struct EventMetric {
     #[prost(int64, optional, tag="5")]
     pub end_timestamp_ms: ::core::option::Option<i64>,
     #[prost(message, optional, tag="6")]
-    pub normalized_start_timestamp: ::core::option::Option<::prost_types::Timestamp>,
+    pub normalized_start_timestamp: ::core::option::Option<::pbjson_types::Timestamp>,
     #[prost(message, optional, tag="7")]
-    pub normalized_end_timestamp: ::core::option::Option<::prost_types::Timestamp>,
+    pub normalized_end_timestamp: ::core::option::Option<::pbjson_types::Timestamp>,
     #[prost(string, tag="8")]
     pub metadata: ::prost::alloc::string::String,
     /// index into 'str_data'

livekit-ffi/src/livekit.proto.rs

@@ -1425,9 +1425,9 @@ pub fn handle_request(
             )
         }
         proto::ffi_request::Message::PublishMetrics(publish_metrics) => {
-            on_publish_metrics(server, publish_metrics).map(|res| {
-                proto::ffi_response::Message::PublishMetrics(res)
-            })
+            proto::ffi_response::Message::PublishMetrics(
+                on_publish_metrics(server, publish_metrics)?
+            )
         },
     });