bluetooth: fix dongle connections

Author: manio

src/bluetooth.rs

@@ -162,29 +162,29 @@ async fn power_up_and_wait_for_connection(
 
     // try to connect to saved devices or provided one via command line
     let mut connect_task: Option<JoinHandle<Result<()>>> = None;
-    if !dongle_mode {
-        if let Some(address) = connect {
-            let adapter_cloned = adapter.clone();
-
-            connect_task = Some(tokio::spawn(async move {
-                let addresses = if address == Address::any() {
-                    info!("{} 🥏 Enumerating known bluetooth devices...", NAME);
-                    adapter_cloned.device_addresses().await?
-                } else {
-                    vec![address]
-                };
-                // exit if we don't have anything to connect to
-                if addresses.is_empty() {
-                    return Ok(());
-                }
-                loop {
-                    for addr in &addresses {
-                        let device = adapter_cloned.device(*addr)?;
-                        let dev_name = match device.name().await {
-                            Ok(Some(name)) => format!(" (<b><blue>{}</>)", name),
-                            _ => String::default(),
-                        };
-                        info!("{} 🧲 Trying to connect to: {}{}", NAME, addr, dev_name);
+    if let Some(address) = connect {
+        let adapter_cloned = adapter.clone();
+
+        connect_task = Some(tokio::spawn(async move {
+            let addresses = if address == Address::any() {
+                info!("{} 🥏 Enumerating known bluetooth devices...", NAME);
+                adapter_cloned.device_addresses().await?
+            } else {
+                vec![address]
+            };
+            // exit if we don't have anything to connect to
+            if addresses.is_empty() {
+                return Ok(());
+            }
+            loop {
+                for addr in &addresses {
+                    let device = adapter_cloned.device(*addr)?;
+                    let dev_name = match device.name().await {
+                        Ok(Some(name)) => format!(" (<b><blue>{}</>)", name),
+                        _ => String::default(),
+                    };
+                    info!("{} 🧲 Trying to connect to: {}{}", NAME, addr, dev_name);
+                    if !dongle_mode {
                         match device.connect_profile(&HSP_AG_UUID).await {
                             Ok(_) => {
                                 info!(
@@ -197,11 +197,49 @@ async fn power_up_and_wait_for_connection(
                                 warn!("{} 🔇 {}{}: Error connecting: {}", NAME, addr, dev_name, e)
                             }
                         }
+                    } else {
+                        match device.connect().await {
+                            Ok(_) => {
+                                info!(
+                                    "{} 🔗 Successfully connected to device: {}{}",
+                                    NAME, addr, dev_name
+                                );
+                                return Ok(());
+                            }
+                            Err(e) => {
+                                // should be handled with the following code:
+                                // match e.kind {bluer::ErrorKind::ConnectionAttemptFailed} ...
+                                // but the problem is that not all errors are defined in bluer,
+                                // so just fallback for text-searching in error :(
+                                let error_text = e.to_string();
+
+                                if let Some(code) =
+                                    error_text.splitn(2, ':').nth(1).map(|s| s.trim())
+                                {
+                                    if code == "br-connection-page-timeout"
+                                        || code == "br-connection-canceled"
+                                    {
+                                        warn!(
+                                            "{} 🔇 {}{}: Error connecting: {}",
+                                            NAME, addr, dev_name, e
+                                        )
+                                    } else {
+                                        info!(
+                                            "{} 🔗 Connection success, waiting for AA profile connection: {}{}, ignored error: {}",
+                                            NAME, addr, dev_name, e
+                                        );
+                                        return Ok(());
+                                    }
+                                } else {
+                                    warn!("{} Unknown bluetooth error: {}", NAME, e);
+                                }
+                            }
+                        }
                     }
-                    sleep(Duration::from_secs(1)).await;
                 }
-            }));
-        }
+                sleep(Duration::from_secs(1)).await;
+            }
+        }));
     }
 
     // handling connection to headset profile in own task