Merge branch 'dev' into resampling

CHANGELOG.md

@@ -99,6 +99,7 @@ https://github.com/librespot-org/librespot
 - [playback] Add metadata support via a `TrackChanged` event
 - [connect] Add `activate` and `load` functions to `Spirc`, allowing control over local connect sessions
 - [metadata] Add `Lyrics`
+- [discovery] Add discovery initialisation retries if within the 1st min of uptime
 - [playback] Add `normaliser`, `resampler` and `sample_pipeline`.
 - [playback] Add resampling support to 48kHz, 88.2kHz, and 96kHz.
 

Cargo.lock

@@ -1355,6 +1355,7 @@ dependencies = [
  "log",
  "rpassword",
  "sha1",
+ "sysinfo",
  "thiserror",
  "tokio",
  "url",

Cargo.toml

@@ -57,6 +57,7 @@ hex = "0.4"
 log = "0.4"
 rpassword = "7.2"
 sha1 = "0.10"
+sysinfo = { version = "0.29", default-features = false }
 thiserror = "1.0"
 tokio = { version = "1", features = ["rt", "macros", "signal", "sync", "parking_lot", "process"] }
 url = "2.4"

src/main.rs

@@ -1,3 +1,6 @@
+use futures_util::StreamExt;
+use log::{debug, error, info, trace, warn};
+use sha1::{Digest, Sha1};
 use std::{
     env,
     fs::create_dir_all,
@@ -8,10 +11,7 @@ use std::{
     str::FromStr,
     time::{Duration, Instant},
 };
-
+use sysinfo::{System, SystemExt};
-use futures_util::StreamExt;
-use log::{error, info, trace, warn};
-use sha1::{Digest, Sha1};
 use thiserror::Error;
 use url::Url;
 
@@ -1711,6 +1711,7 @@ fn get_setup() -> Setup {
 async fn main() {
     const RUST_BACKTRACE: &str = "RUST_BACKTRACE";
     const RECONNECT_RATE_LIMIT_WINDOW: Duration = Duration::from_secs(600);
+    const DISCOVERY_RETRY_TIMEOUT: Duration = Duration::from_secs(10);
     const RECONNECT_RATE_LIMIT: usize = 5;
 
     if env::var(RUST_BACKTRACE).is_err() {
@@ -1729,18 +1730,43 @@ async fn main() {
 
     let mut session = Session::new(setup.session_config.clone(), setup.cache.clone());
 
+    let mut sys = System::new();
+
     if setup.enable_discovery {
-        let device_id = setup.session_config.device_id.clone();
+        // When started at boot as a service discovery may fail due to it
-        let client_id = setup.session_config.client_id.clone();
+        // trying to bind to interfaces before the network is actually up.
-        match librespot::discovery::Discovery::builder(device_id, client_id)
+        // This could be prevented in systemd by starting the service after
-            .name(setup.connect_config.name.clone())
+        // network-online.target but it requires that a wait-online.service is
-            .device_type(setup.connect_config.device_type)
+        // also enabled which is not always the case since a wait-online.service
-            .port(setup.zeroconf_port)
+        // can potentially hang the boot process until it times out in certain situations.
-            .zeroconf_ip(setup.zeroconf_ip)
+        // This allows for discovery to retry every 10 secs in the 1st min of uptime
-            .launch()
+        // before giving up thus papering over the issue and not holding up the boot process.
-        {
+
-            Ok(d) => discovery = Some(d),
+        discovery = loop {
-            Err(err) => warn!("Could not initialise discovery: {}.", err),
+            let device_id = setup.session_config.device_id.clone();
+            let client_id = setup.session_config.client_id.clone();
+
+            match librespot::discovery::Discovery::builder(device_id, client_id)
+                .name(setup.connect_config.name.clone())
+                .device_type(setup.connect_config.device_type)
+                .port(setup.zeroconf_port)
+                .zeroconf_ip(setup.zeroconf_ip.clone())
+                .launch()
+            {
+                Ok(d) => break Some(d),
+                Err(e) => {
+                    sys.refresh_processes();
+
+                    if sys.uptime() <= 1 {
+                        debug!("Retrying to initialise discovery: {e}");
+                        tokio::time::sleep(DISCOVERY_RETRY_TIMEOUT).await;
+                    } else {
+                        debug!("System uptime > 1 min, not retrying to initialise discovery");
+                        warn!("Could not initialise discovery: {e}");
+                        break None;
+                    }
+                }
+            }
         };
     }