fix: make local_name in corebluetooth more descriptive

deviceplug · Jun 6, 2024 · dfcc0a6 · dfcc0a6
1 parent eb27a10
commit dfcc0a6
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 9 deletions.
diff --git a/src/corebluetooth/central_delegate.rs b/src/corebluetooth/central_delegate.rs
@@ -16,16 +16,18 @@
 // This file may not be copied, modified, or distributed except
 // according to those terms.
 
+use super::utils::nsstring_to_string;
 use super::utils::{core_bluetooth::cbuuid_to_uuid, nsuuid_to_uuid};
 use futures::channel::mpsc::Sender;
 use futures::sink::SinkExt;
 use log::{error, trace};
 use objc2::runtime::{AnyObject, ProtocolObject};
 use objc2::{declare_class, msg_send_id, mutability, rc::Retained, ClassType, DeclaredClass};
 use objc2_core_bluetooth::{
-    CBAdvertisementDataManufacturerDataKey, CBAdvertisementDataServiceDataKey,
-    CBAdvertisementDataServiceUUIDsKey, CBCentralManager, CBCentralManagerDelegate,
-    CBCharacteristic, CBDescriptor, CBPeripheral, CBPeripheralDelegate, CBService, CBUUID,
+    CBAdvertisementDataLocalNameKey, CBAdvertisementDataManufacturerDataKey,
+    CBAdvertisementDataServiceDataKey, CBAdvertisementDataServiceUUIDsKey, CBCentralManager,
+    CBCentralManagerDelegate, CBCharacteristic, CBDescriptor, CBPeripheral, CBPeripheralDelegate,
+    CBService, CBUUID,
 };
 use objc2_foundation::{
     NSArray, NSData, NSDictionary, NSError, NSNumber, NSObject, NSObjectProtocol, NSString,
@@ -42,6 +44,7 @@ pub enum CentralDelegateEvent {
     DidUpdateState,
     DiscoveredPeripheral {
         cbperipheral: Retained<CBPeripheral>,
+        local_name: Option<String>,
     },
     DiscoveredServices {
         peripheral_uuid: Uuid,
@@ -126,9 +129,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,
@@ -371,8 +378,14 @@ declare_class!(
                 peripheral_debug(peripheral)
             );
 
+            let local_name = adv_data
+                .get(unsafe { CBAdvertisementDataLocalNameKey })
+                .map(|name| (name as *const AnyObject as *const NSString))
+                .and_then(nsstring_to_string);
+
             self.send_event(CentralDelegateEvent::DiscoveredPeripheral {
                 cbperipheral: peripheral.retain(),
+                local_name,
             });
 
             let rssi_value = rssi.as_i16();

diff --git a/src/corebluetooth/internal.rs b/src/corebluetooth/internal.rs
@@ -529,9 +529,24 @@ impl CoreBluetoothInternal {
         }
     }
 
-    async fn on_discovered_peripheral(&mut self, peripheral: Retained<CBPeripheral>) {
+    async fn on_discovered_peripheral(
+        &mut self,
+        peripheral: Retained<CBPeripheral>,
+        local_name: Option<String>,
+    ) {
         let uuid = nsuuid_to_uuid(unsafe { &peripheral.identifier() });
-        let name = unsafe { peripheral.name() };
+        let peripheral_name = unsafe { peripheral.name() };
+
+        let name = match (peripheral_name.map(|n| n.to_string()), 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 {
@@ -1045,8 +1060,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)

diff --git a/src/corebluetooth/utils/mod.rs b/src/corebluetooth/utils/mod.rs
@@ -16,11 +16,22 @@
 // This file may not be copied, modified, or distributed except
 // according to those terms.
 
-use objc2_foundation::NSUUID;
+use std::ffi::CStr;
+
+use objc2_foundation::{NSString, NSUUID};
 use uuid::Uuid;
 
 pub mod core_bluetooth;
 
 pub fn nsuuid_to_uuid(uuid: &NSUUID) -> Uuid {
     uuid.UUIDString().to_string().parse().unwrap()
 }
+
+pub fn nsstring_to_string(nsstring: *const NSString) -> Option<String> {
+    unsafe {
+        nsstring
+            .as_ref()
+            .and_then(|ns| CStr::from_ptr(ns.UTF8String()).to_str().ok())
+            .map(String::from)
+    }
+}