Use the serial as an ID for the arm macos component

Author: guillaumecl

src/unix/apple/macos/component/arm.rs

@@ -11,6 +11,7 @@ use crate::sys::inner::ffi::{
     HID_DEVICE_PROPERTY_PRODUCT, IOHIDEventFieldBase, IOHIDEventGetFloatValue,
     IOHIDEventSystemClientCreate, IOHIDEventSystemClientSetMatching, IOHIDServiceClientCopyEvent,
     kHIDPage_AppleVendor, kHIDUsage_AppleVendor_TemperatureSensor, kIOHIDEventTypeTemperature,
+    kIOHIDSerialNumberKey,
 };
 
 pub(crate) struct ComponentsInner {
@@ -89,11 +90,17 @@ impl ComponentsInner {
             let services = CFRetained::cast_unchecked::<CFArray<IOHIDServiceClient>>(services);
 
             let key = CFString::from_static_str(HID_DEVICE_PROPERTY_PRODUCT);
+            let serial_key = CFString::from_static_str(kIOHIDSerialNumberKey);
 
             for service in services {
                 let Some(name) = service.property(&key) else {
                     continue;
                 };
+                let serial = service
+                    .property(&serial_key)
+                    .and_then(|value| value.downcast::<CFString>().ok())
+                    .as_deref()
+                    .map(CFString::to_string);
                 let name = name.downcast::<CFString>().unwrap();
                 let name_str = name.to_string();
 
@@ -107,7 +114,7 @@ impl ComponentsInner {
                     continue;
                 }
 
-                let mut component = ComponentInner::new(name_str, None, None, service);
+                let mut component = ComponentInner::new(serial, name_str, None, None, service);
                 component.refresh();
 
                 self.components.push(Component { inner: component });
@@ -117,6 +124,7 @@ impl ComponentsInner {
 }
 
 pub(crate) struct ComponentInner {
+    id: Option<String>,
     service: CFRetained<IOHIDServiceClient>,
     temperature: Option<f32>,
     label: String,
@@ -132,12 +140,14 @@ unsafe impl Sync for ComponentInner {}
 
 impl ComponentInner {
     pub(crate) fn new(
+        id: Option<String>,
         label: String,
         max: Option<f32>,
         critical: Option<f32>,
         service: CFRetained<IOHIDServiceClient>,
     ) -> Self {
         Self {
+            id,
             service,
             label,
             max: max.unwrap_or(0.),
@@ -164,7 +174,7 @@ impl ComponentInner {
     }
 
     pub(crate) fn id(&self) -> Option<&str> {
-        None
+        self.id.as_deref()
     }
 
     pub(crate) fn refresh(&mut self) {

src/unix/apple/macos/ffi.rs

@@ -153,6 +153,9 @@ mod private {
 
     pub(crate) const HID_DEVICE_PROPERTY_PRODUCT: &str = "Product";
 
+    #[allow(non_upper_case_globals)]
+    pub(crate) const kIOHIDSerialNumberKey: &str = "SerialNumber";
+
     pub(crate) const HID_DEVICE_PROPERTY_PRIMARY_USAGE: &str = "PrimaryUsage";
     pub(crate) const HID_DEVICE_PROPERTY_PRIMARY_USAGE_PAGE: &str = "PrimaryUsagePage";
 

src/unix/freebsd/component.rs

@@ -122,8 +122,8 @@ impl ComponentsInner {
 
 #[cfg(test)]
 mod tests {
-    use crate::unix::freebsd::{ComponentInner, ComponentsInner};
     use crate::Component;
+    use crate::unix::freebsd::{ComponentInner, ComponentsInner};
 
     #[test]
     fn test_components() {