diff --git a/Cargo.lock b/Cargo.lock index 4627d5f..5a86909 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1642,7 +1642,7 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" [[package]] name = "lesavka_client" -version = "0.14.7" +version = "0.14.8" dependencies = [ "anyhow", "async-stream", @@ -1676,7 +1676,7 @@ dependencies = [ [[package]] name = "lesavka_common" -version = "0.14.7" +version = "0.14.8" dependencies = [ "anyhow", "base64", @@ -1688,7 +1688,7 @@ dependencies = [ [[package]] name = "lesavka_server" -version = "0.14.7" +version = "0.14.8" dependencies = [ "anyhow", "base64", diff --git a/client/Cargo.toml b/client/Cargo.toml index 943f95a..47d1cbe 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -4,7 +4,7 @@ path = "src/main.rs" [package] name = "lesavka_client" -version = "0.14.7" +version = "0.14.8" edition = "2024" [dependencies] diff --git a/common/Cargo.toml b/common/Cargo.toml index 9561371..b7ccd5a 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lesavka_common" -version = "0.14.7" +version = "0.14.8" edition = "2024" build = "build.rs" diff --git a/server/Cargo.toml b/server/Cargo.toml index 59d8aa1..cb1f522 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -10,7 +10,7 @@ bench = false [package] name = "lesavka_server" -version = "0.14.7" +version = "0.14.8" edition = "2024" autobins = false diff --git a/server/src/main/relay_service.rs b/server/src/main/relay_service.rs index 61693c7..ec11f70 100644 --- a/server/src/main/relay_service.rs +++ b/server/src/main/relay_service.rs @@ -274,7 +274,7 @@ impl Relay for Handler { ); let upstream_lease = self.upstream_media_rt.activate_camera(); - let (session_id, relay, relay_reused) = self.camera_rt.activate(&cfg).await?; + let (session_id, relay, _relay_reused) = self.camera_rt.activate(&cfg).await?; let camera_rt = self.camera_rt.clone(); let upstream_media_rt = self.upstream_media_rt.clone(); info!(rpc_id, session_id, "🎥 stream_camera opened"); @@ -292,7 +292,7 @@ impl Relay for Handler { let startup_grace_us = upstream_camera_startup_grace() .as_micros() .min(u64::MAX as u128) as u64; - let mut cold_startup_grace_pending = !relay_reused && startup_grace_us > 0; + let mut cold_startup_grace_pending = startup_grace_us > 0; loop { if !camera_rt.is_active(session_id) || !upstream_media_rt.is_camera_active(upstream_lease.generation) diff --git a/server/src/main/relay_service_coverage.rs b/server/src/main/relay_service_coverage.rs index b6b7a8d..12d0350 100644 --- a/server/src/main/relay_service_coverage.rs +++ b/server/src/main/relay_service_coverage.rs @@ -173,7 +173,7 @@ impl Relay for Handler { ) -> Result, Status> { let cfg = camera::current_camera_config(); let upstream_lease = self.upstream_media_rt.activate_camera(); - let (session_id, relay, relay_reused) = self.camera_rt.activate(&cfg).await?; + let (session_id, relay, _relay_reused) = self.camera_rt.activate(&cfg).await?; let camera_rt = self.camera_rt.clone(); let upstream_media_rt = self.upstream_media_rt.clone(); let (tx, rx) = tokio::sync::mpsc::channel(1); @@ -187,7 +187,7 @@ impl Relay for Handler { let startup_grace_us = upstream_camera_startup_grace() .as_micros() .min(u64::MAX as u128) as u64; - let mut cold_startup_grace_pending = !relay_reused && startup_grace_us > 0; + let mut cold_startup_grace_pending = startup_grace_us > 0; loop { if !camera_rt.is_active(session_id) || !upstream_media_rt.is_camera_active(upstream_lease.generation)