fix: make local_name in corebluetooth more descriptive

Author: yuyoyuppe

src/corebluetooth/central_delegate.rs

@@ -51,6 +51,7 @@ pub enum CentralDelegateEvent {
     DidUpdateState,
     DiscoveredPeripheral {
         cbperipheral: StrongPtr,
+        local_name: Option<String>,
     },
     DiscoveredServices {
         peripheral_uuid: Uuid,
@@ -136,9 +137,13 @@ impl Debug for CentralDelegateEvent {
     fn fmt(&self, f: &mut Formatter) -> fmt::Result {
         match self {
             CentralDelegateEvent::DidUpdateState => f.debug_tuple("DidUpdateState").finish(),
-            CentralDelegateEvent::DiscoveredPeripheral { cbperipheral } => f
+            CentralDelegateEvent::DiscoveredPeripheral {
+                cbperipheral,
+                local_name,
+            } => f
                 .debug_struct("CentralDelegateEvent")
                 .field("cbperipheral", cbperipheral.deref())
+                .field("local_name", local_name)
                 .finish(),
             CentralDelegateEvent::DiscoveredServices {
                 peripheral_uuid,
@@ -520,10 +525,24 @@ pub mod CentralDelegate {
         );
 
         let held_peripheral = unsafe { StrongPtr::retain(peripheral) };
+
+        let local_name = unsafe {
+            let name_key = ns::dictionary_objectforkey(
+                adv_data,
+                cb::ADVERTISEMENT_DATA_MANUFACTURER_LOCAL_NAME_KEY,
+            );
+            if name_key != nil {
+                nsstring_to_string(name_key)
+            } else {
+                None
+            }
+        };
+
         send_delegate_event(
             delegate,
             CentralDelegateEvent::DiscoveredPeripheral {
                 cbperipheral: held_peripheral,
+                local_name,
             },
         );
 

src/corebluetooth/framework.rs

@@ -135,6 +135,7 @@ pub mod cb {
             pub static CBAdvertisementDataManufacturerDataKey: id;
             pub static CBAdvertisementDataServiceDataKey: id;
             pub static CBAdvertisementDataServiceUUIDsKey: id;
+            pub static CBAdvertisementDataLocalNameKey: id;
 
             pub static CBCentralManagerScanOptionAllowDuplicatesKey: id;
         }
@@ -381,4 +382,5 @@ pub mod cb {
     pub use self::link::CBAdvertisementDataManufacturerDataKey as ADVERTISEMENT_DATA_MANUFACTURER_DATA_KEY;
     pub use self::link::CBAdvertisementDataServiceDataKey as ADVERTISEMENT_DATA_SERVICE_DATA_KEY;
     pub use self::link::CBAdvertisementDataServiceUUIDsKey as ADVERTISEMENT_DATA_SERVICE_UUIDS_KEY;
+    pub use self::link::CBAdvertisementDataLocalNameKey as ADVERTISEMENT_DATA_MANUFACTURER_LOCAL_NAME_KEY;
 }

src/corebluetooth/internal.rs

@@ -38,7 +38,7 @@ use log::{error, trace, warn};
 use objc::{rc::StrongPtr, runtime::YES};
 use std::{
     collections::{BTreeSet, HashMap, VecDeque},
-    fmt::{self, Debug, Formatter},
+    fmt::{self, format, Debug, Formatter},
     ops::Deref,
     thread,
 };
@@ -512,9 +512,24 @@ impl CoreBluetoothInternal {
         }
     }
 
-    async fn on_discovered_peripheral(&mut self, peripheral: StrongPtr) {
+    async fn on_discovered_peripheral(
+        &mut self,
+        peripheral: StrongPtr,
+        local_name: Option<String>,
+    ) {
         let uuid = nsuuid_to_uuid(cb::peer_identifier(*peripheral));
-        let name = nsstring_to_string(cb::peripheral_name(*peripheral));
+        let peripheral_name = nsstring_to_string(cb::peripheral_name(*peripheral));
+
+        let name = match (peripheral_name, local_name) {
+            (Some(p_name), Some(l_name)) if p_name != l_name => {
+                Some(format!("{p_name} [{l_name}]"))
+            }
+            (Some(p_name), Some(_)) => Some(p_name),
+            (Some(p_name), None) => Some(p_name),
+            (None, Some(l_name)) => Some(l_name),
+            (None, None) => None,
+        };
+
         if self.peripherals.contains_key(&uuid) {
             if let Some(name) = name {
                 self.dispatch_event(CoreBluetoothEvent::DeviceUpdated { uuid, name })
@@ -1012,8 +1027,8 @@ impl CoreBluetoothInternal {
                     CentralDelegateEvent::DidUpdateState => {
                         self.dispatch_event(CoreBluetoothEvent::AdapterConnected).await
                     }
-                    CentralDelegateEvent::DiscoveredPeripheral{cbperipheral} => {
-                        self.on_discovered_peripheral(cbperipheral).await
+                    CentralDelegateEvent::DiscoveredPeripheral{cbperipheral, local_name} => {
+                        self.on_discovered_peripheral(cbperipheral, local_name).await
                     }
                     CentralDelegateEvent::DiscoveredServices{peripheral_uuid, services} => {
                         self.on_discovered_services(peripheral_uuid, services)