fix proto compilation & v0.3.2

livekit · Feb 28, 2024 · fca3466 · fca3466
1 parent 418e67c
commit fca3466
Show file tree

Hide file tree

Showing 19 changed files with 43 additions and 38 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/Cargo.lock b/examples/Cargo.lock
diff --git a/examples/api/Cargo.toml b/examples/api/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2021"
 
 [dependencies]
 tokio = { version = "1", features = ["full", "parking_lot"] }
-livekit-api = { path = "../../livekit-api", version = "0.3.1", features = ["native-tls"] }
+livekit-api = { path = "../../livekit-api", version = "0.3.2", features = ["native-tls"] }
 futures = "0.3"
 
diff --git a/examples/basic_room/Cargo.toml b/examples/basic_room/Cargo.toml
@@ -6,6 +6,6 @@ edition = "2021"
 [dependencies]
 tokio = { version = "1", features = ["full"] }
 env_logger = "0.10"
-livekit = { path = "../../livekit", version = "0.3.1", features = ["native-tls"]}
-livekit-api = { path = "../../livekit-api", version = "0.3.1"}
+livekit = { path = "../../livekit", version = "0.3.2", features = ["native-tls"]}
+livekit-api = { path = "../../livekit-api", version = "0.3.2"}
 log = "0.4"
diff --git a/examples/mobile/Cargo.toml b/examples/mobile/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 lazy_static = "1.4.0"
-livekit = { path = "../../livekit", version = "0.3.1", features = ["rustls-tls-webpki-roots"] }
+livekit = { path = "../../livekit", version = "0.3.2", features = ["rustls-tls-webpki-roots"] }
 log = "0.4.19"
 tokio = { version = "1", features = ["full"] }
 
@@ -14,7 +14,7 @@ jni = "0.21.1"
 android_logger = "0.13.1"
 
 [build-dependencies]
-webrtc-sys-build = { path = "../../webrtc-sys/build", version = "0.3.1" }
+webrtc-sys-build = { path = "../../webrtc-sys/build", version = "0.3.2" }
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/examples/play_from_disk/Cargo.toml b/examples/play_from_disk/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 tokio = { version = "1", features = ["full"] }
-livekit = { path = "../../livekit", version = "0.3.1" }
+livekit = { path = "../../livekit", version = "0.3.2" }
 thiserror = "1.0.47"
 log = "0.4.20"
 env_logger = "0.10.0"
diff --git a/examples/save_to_disk/Cargo.toml b/examples/save_to_disk/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 tokio = { version = "1", features = ["full"] }
-livekit = { path = "../../livekit", version = "0.3.1" }
+livekit = { path = "../../livekit", version = "0.3.2" }
 bytes = "1.4.0"
 tokio-util = "0.7.8"
 futures = "0.3.28"
diff --git a/examples/webhooks/Cargo.toml b/examples/webhooks/Cargo.toml
@@ -4,6 +4,6 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-livekit-api = { version = "0.3.1", path = "../../livekit-api" }
+livekit-api = { version = "0.3.2", path = "../../livekit-api" }
 hyper = { version = "0.14", features = ["full"] }
 tokio = { version = "1", features = ["full"] }
diff --git a/examples/wgpu_room/Cargo.toml b/examples/wgpu_room/Cargo.toml
@@ -9,7 +9,7 @@ tracing = ["console-subscriber", "tokio/tracing"]
 
 [dependencies]
 tokio = { version = "1", features = ["full", "parking_lot"] }
-livekit = { path = "../../livekit", version = "0.3.1", features = ["native-tls"] }
+livekit = { path = "../../livekit", version = "0.3.2", features = ["native-tls"] }
 futures = "0.3"
 winit = "0.28"
 parking_lot = { version = "0.12.1", features = ["deadlock_detection"] }

diff --git a/libwebrtc/Cargo.toml b/libwebrtc/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
 name = "libwebrtc"
-version = "0.3.1"
+version = "0.3.2"
 edition = "2021"
 homepage = "https://livekit.io"
 license = "Apache-2.0"
 description = "Livekit safe bindings to libwebrtc"
 repository = "https://github.com/livekit/rust-sdks"
 
 [dependencies]
-livekit-protocol = { path = "../livekit-protocol", version = "0.3.1" }
+livekit-protocol = { path = "../livekit-protocol", version = "0.3.2" }
 log = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
@@ -18,7 +18,7 @@ thiserror = "1.0"
 jni = "0.21"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-webrtc-sys = { path = "../webrtc-sys", version = "0.3.1" }
+webrtc-sys = { path = "../webrtc-sys", version = "0.3.2" }
 lazy_static = "1.4"
 parking_lot = { version = "0.12" }
 tokio = { version = "1", features = ["full"] }

diff --git a/livekit-api/Cargo.toml b/livekit-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "livekit-api"
-version = "0.3.1"
+version = "0.3.2"
 license = "Apache-2.0"
 description = "Rust Server SDK for LiveKit"
 edition = "2021"
@@ -24,7 +24,7 @@ rustls-tls-webpki-roots = ["tokio-tungstenite?/rustls-tls-webpki-roots", "reqwes
 __rustls-tls = ["tokio-tungstenite?/__rustls-tls", "reqwest?/__rustls"]
 
 [dependencies]
-livekit-protocol = { path = "../livekit-protocol", version = "0.3.1" }
+livekit-protocol = { path = "../livekit-protocol", version = "0.3.2" }
 thiserror = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 sha2 = "0.10"

diff --git a/livekit-api/src/services/ingress.rs b/livekit-api/src/services/ingress.rs
@@ -21,6 +21,7 @@ use crate::{access_token::VideoGrants, get_env_keys, services::twirp_client::Twi
 pub struct IngressOptions {
     pub name: String,
     pub room_name: String,
+    pub participant_metadata: String,
     pub participant_identity: String,
     pub participant_name: String,
     pub audio: proto::IngressAudioOptions,
@@ -94,6 +95,7 @@ impl IngressClient {
                     ingress_id: ingress_id.to_owned(),
                     name: options.name,
                     room_name: options.room_name,
+                    participant_metadata: options.participant_metadata,
                     participant_identity: options.participant_identity,
                     participant_name: options.participant_name,
                     audio: Some(options.audio),

diff --git a/livekit-ffi/Cargo.toml b/livekit-ffi/Cargo.toml
@@ -18,8 +18,8 @@ __rustls-tls = ["livekit/__rustls-tls"]
 tracing = ["tokio/tracing", "console-subscriber"]
 
 [dependencies]
-livekit = { path = "../livekit", version = "0.3.1" }
-livekit-protocol = { path = "../livekit-protocol", version = "0.3.1" }
+livekit = { path = "../livekit", version = "0.3.2" }
+livekit-protocol = { path = "../livekit-protocol", version = "0.3.2" }
 tokio = { version = "1", features = ["full", "parking_lot"] }
 futures-util = { version = "0.3", default-features = false, features = ["sink"] }
 parking_lot = { version = "0.12", features = ["deadlock_detection"] }
@@ -38,10 +38,10 @@ imgproc = "0.3.11"
 jni = "0.21.1"
 
 [build-dependencies]
-webrtc-sys-build = { path = "../webrtc-sys/build", version = "0.3.0" }
+webrtc-sys-build = { path = "../webrtc-sys/build", version = "0.3.2" }
 
 [dev-dependencies]
-livekit-api = { path = "../livekit-api", version = "0.3.0" }
+livekit-api = { path = "../livekit-api", version = "0.3.2" }
 
 [lib]
 crate-type = ["lib", "cdylib"]
diff --git a/livekit-protocol/Cargo.toml b/livekit-protocol/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "livekit-protocol"
-version = "0.3.1"
+version = "0.3.2"
 edition = "2021"
 license = "Apache-2.0"
 description = "Livekit protocol and utilities for the Rust SDK"

diff --git a/livekit/Cargo.toml b/livekit/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "livekit"
-version = "0.3.1"
+version = "0.3.2"
 edition = "2021"
 license = "Apache-2.0"
 description = "Rust Client SDK for LiveKit"
@@ -22,9 +22,9 @@ __rustls-tls = ["livekit-api/__rustls-tls"]
 __lk-internal = []
 
 [dependencies]
-livekit-api = { path = "../livekit-api", version = "0.3.1", default-features = false, features = ["signal-client"] }
-libwebrtc = { path = "../libwebrtc", version = "0.3.1" }
-livekit-protocol = { path = "../livekit-protocol", version = "0.3.1" }
+livekit-api = { path = "../livekit-api", version = "0.3.2", default-features = false, features = ["signal-client"] }
+libwebrtc = { path = "../libwebrtc", version = "0.3.2" }
+livekit-protocol = { path = "../livekit-protocol", version = "0.3.2" }
 prost = "0.12"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1.0"

diff --git a/livekit/src/room/mod.rs b/livekit/src/room/mod.rs
@@ -801,6 +801,7 @@ impl RoomSession {
                 sdp: offer.to_string(),
                 r#type: offer.sdp_type().to_string(),
             }),
+            track_sids_disabled: Vec::default(), // TODO: New protocol version
             subscription: Some(proto::UpdateSubscription {
                 track_sids,
                 subscribe: !auto_subscribe,

diff --git a/livekit/src/rtc_engine/rtc_session.rs b/livekit/src/rtc_engine/rtc_session.rs
@@ -695,6 +695,7 @@ impl SessionInner {
             .send(proto::signal_request::Message::Leave(proto::LeaveRequest {
                 can_reconnect: false,
                 reason: DisconnectReason::ClientInitiated as i32,
+                ..Default::default()
             }))
             .await;
 
@@ -709,6 +710,7 @@ impl SessionInner {
             self.on_signal_event(proto::signal_response::Message::Leave(proto::LeaveRequest {
                 reason: DisconnectReason::ClientInitiated as i32,
                 can_reconnect: true,
+                ..Default::default()
             }))
         };
 

diff --git a/webrtc-sys/Cargo.toml b/webrtc-sys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "webrtc-sys"
-version = "0.3.1"
+version = "0.3.2"
 edition = "2021"
 homepage = "https://livekit.io"
 license = "Apache-2.0"
@@ -12,7 +12,7 @@ cxx = "1.0"
 log = "0.4"
 
 [build-dependencies]
-webrtc-sys-build = { version = "0.3.1", path = "./build" }
+webrtc-sys-build = { version = "0.3.2", path = "./build" }
 cxx-build = "1.0"
 glob = "0.3"
 cc = "1.0"

diff --git a/webrtc-sys/build/Cargo.toml b/webrtc-sys/build/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "webrtc-sys-build"
-version = "0.3.1"
+version = "0.3.2"
 edition = "2021"
 license = "Apache-2.0"
 description = "Build utilities when working with libwebrtc"