ffi: be more flexible with optional options

livekit-ffi/protocol/room.proto

@@ -286,12 +286,12 @@ message RtcConfig {
 }
 
 message RoomOptions {
-  required bool auto_subscribe = 1;
-  required bool adaptive_stream = 2;
-  required bool dynacast = 3;
+  optional bool auto_subscribe = 1;
+  optional bool adaptive_stream = 2;
+  optional bool dynacast = 3;
   optional E2eeOptions e2ee = 4;
   optional RtcConfig rtc_config = 5; // allow to setup a custom RtcConfiguration
-  required uint32 join_retries = 6;
+  optional uint32 join_retries = 6;
 }
 
 //

livekit-ffi/src/conversion/room.rs

@@ -177,13 +177,12 @@ impl From<proto::RoomOptions> for RoomOptions {
             value.rtc_config.map(Into::into).unwrap_or(RoomOptions::default().rtc_config);
 
         let mut options = RoomOptions::default();
-        options.adaptive_stream = value.adaptive_stream;
-        options.auto_subscribe = value.auto_subscribe;
-        options.dynacast = value.dynacast;
-        options.e2ee = e2ee;
+        options.adaptive_stream = value.adaptive_stream.unwrap_or(options.adaptive_stream);
+        options.auto_subscribe = value.auto_subscribe.unwrap_or(options.auto_subscribe);
+        options.dynacast = value.dynacast.unwrap_or(options.dynacast);
         options.rtc_config = rtc_config;
-        options.join_retries = value.join_retries;
-        options.sdk_options = RoomSdkOptions::default();
+        options.join_retries = value.join_retries.unwrap_or(options.join_retries);
+        options.e2ee = e2ee;
         options
     }
 }

livekit-ffi/src/livekit.proto.rs

@@ -2460,19 +2460,19 @@ pub struct RtcConfig {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct RoomOptions {
-    #[prost(bool, required, tag="1")]
-    pub auto_subscribe: bool,
-    #[prost(bool, required, tag="2")]
-    pub adaptive_stream: bool,
-    #[prost(bool, required, tag="3")]
-    pub dynacast: bool,
+    #[prost(bool, optional, tag="1")]
+    pub auto_subscribe: ::core::option::Option<bool>,
+    #[prost(bool, optional, tag="2")]
+    pub adaptive_stream: ::core::option::Option<bool>,
+    #[prost(bool, optional, tag="3")]
+    pub dynacast: ::core::option::Option<bool>,
     #[prost(message, optional, tag="4")]
     pub e2ee: ::core::option::Option<E2eeOptions>,
     /// allow to setup a custom RtcConfiguration
     #[prost(message, optional, tag="5")]
     pub rtc_config: ::core::option::Option<RtcConfig>,
-    #[prost(uint32, required, tag="6")]
-    pub join_retries: u32,
+    #[prost(uint32, optional, tag="6")]
+    pub join_retries: ::core::option::Option<u32>,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]

livekit-ffi/src/server/mod.rs

@@ -130,6 +130,8 @@ impl FfiServer {
         *self.config.lock() = Some(config.clone());
         self.logger.set_capture_logs(config.capture_logs);
 
+        log::info!("sdk v{}", config.sdk);
+        log::info!("v{}", config.sdk_version);
         log::info!("initializing ffi server v{}", env!("CARGO_PKG_VERSION")); // TODO: Move this log
     }