Address PR feedback

Author: AlfioEmanueleFresta

libwebauthn/src/transport/ble/btleplug/manager.rs

@@ -78,10 +78,10 @@ async fn on_peripheral_service_data(
 }
 
 #[instrument(level = Level::DEBUG, skip_all)]
-/// Starts a discovery for devices with specific service data
+/// Starts a discovery for devices advertising service data on any of the provided UUIDs
 pub async fn start_discovery_for_service_data(
-    uuids: Vec<Uuid>,
-) -> Result<impl Stream<Item = (Peripheral, Vec<u8>)>, Error> {
+    uuids: &[Uuid],
+) -> Result<impl Stream<Item = (Peripheral, Vec<u8>)> + use<'_>, Error> {
     let adapter = get_adapter().await?;
     let scan_filter = ScanFilter::default();
 
@@ -93,11 +93,9 @@ pub async fn start_discovery_for_service_data(
         .or(Err(Error::ConnectionFailed))?;
 
     let stream = events.filter_map({
-        let adapter = adapter.clone();
-        let uuids = uuids.clone();
         move |event| {
             let adapter = adapter.clone();
-            let uuids = uuids.clone();
+            let uuids = uuids.to_vec();
             async move {
                 // trace!(?event);
                 match event {

libwebauthn/src/transport/cable/qr_code_device.rs

@@ -184,12 +184,13 @@ impl CableQrCodeDevice<'_> {
     }
 
     async fn await_advertisement(&self) -> Result<(FidoDevice, DecryptedAdvert), Error> {
-        let stream = btleplug::manager::start_discovery_for_service_data(vec![
-            Uuid::parse_str(CABLE_UUID_GOOGLE).unwrap(),
+        let uuids = &[
             Uuid::parse_str(CABLE_UUID_FIDO).unwrap(),
-        ])
-        .await
-        .or(Err(Error::Transport(TransportError::TransportUnavailable)))?;
+            Uuid::parse_str(CABLE_UUID_GOOGLE).unwrap(), // Deprecated, but may still be in use.
+        ];
+        let stream = btleplug::manager::start_discovery_for_service_data(uuids)
+            .await
+            .or(Err(Error::Transport(TransportError::TransportUnavailable)))?;
 
         let mut stream = pin!(stream);
         while let Some((peripheral, data)) = stream.as_mut().next().await {
@@ -225,7 +226,8 @@ impl CableQrCodeDevice<'_> {
             return Ok((device, advert));
         }
 
-        unreachable!()
+        warn!("BLE advertisement discovery stream terminated");
+        Err(Error::Transport(TransportError::TransportUnavailable))
     }
 }