add service uuids to notifications (#445)

* add service uuids to notifications

* make find_characteristic_by_id return service info

Author: MnlPhlp

src/api/mod.rs

@@ -86,6 +86,8 @@ impl AddressType {
 pub struct ValueNotification {
     /// UUID of the characteristic that fired the notification.
     pub uuid: Uuid,
+    /// UUID of the service that contains the characteristic.
+    pub service_uuid: Uuid,
     /// The new value of the characteristic.
     pub value: Vec<u8>,
 }

src/bluez/peripheral.rs

@@ -298,8 +298,12 @@ fn value_notification(
             event: CharacteristicEvent::Value { value },
         } if id.service().device() == *device_id => {
             let services = services.lock().unwrap();
-            let uuid = find_characteristic_by_id(&services, id)?.uuid;
-            Some(ValueNotification { uuid, value })
+            let (charac, service) = find_characteristic_by_id(&services, id.clone())?;
+            Some(ValueNotification {
+                uuid: charac.uuid,
+                service_uuid: service.uuid,
+                value,
+            })
         }
         _ => None,
     }
@@ -308,11 +312,11 @@ fn value_notification(
 fn find_characteristic_by_id(
     services: &HashMap<Uuid, ServiceInternal>,
     characteristic_id: CharacteristicId,
-) -> Option<&CharacteristicInfo> {
+) -> Option<(&CharacteristicInfo, &ServiceInfo)> {
     for service in services.values() {
         for characteristic in service.characteristics.values() {
             if characteristic.info.id == characteristic_id {
-                return Some(&characteristic.info);
+                return Some((&characteristic.info, &service.info));
             }
         }
     }

src/corebluetooth/internal.rs

@@ -157,7 +157,7 @@ pub enum CoreBluetoothReply {
 #[derive(Debug)]
 pub enum PeripheralEventInternal {
     Disconnected,
-    Notification(Uuid, Vec<u8>),
+    Notification(Uuid, Uuid, Vec<u8>),
     ManufacturerData(u16, Vec<u8>, i16),
     ServiceData(HashMap<Uuid, Vec<u8>>, i16),
     Services(Vec<Uuid>, i16),
@@ -818,6 +818,7 @@ impl CoreBluetoothInternal {
                         .event_sender
                         .send(PeripheralEventInternal::Notification(
                             characteristic_uuid,
+                            service_uuid,
                             data,
                         ))
                         .await

src/corebluetooth/peripheral.rs

@@ -118,8 +118,12 @@ impl Peripheral {
 
             loop {
                 match event_receiver.next().await {
-                    Some(PeripheralEventInternal::Notification(uuid, data)) => {
-                        let notification = ValueNotification { uuid, value: data };
+                    Some(PeripheralEventInternal::Notification(uuid, service_uuid, data)) => {
+                        let notification = ValueNotification {
+                            uuid,
+                            service_uuid,
+                            value: data,
+                        };
 
                         // Note: we ignore send errors here which may happen while there are no
                         // receivers...

src/droidplug/peripheral.rs

@@ -26,6 +26,7 @@ use std::{
     pin::Pin,
     sync::{Arc, Mutex},
 };
+use uuid::Uuid;
 
 use super::jni::{
     global_jvm,
@@ -367,7 +368,11 @@ impl api::Peripheral for Peripheral {
                     let characteristic = JBluetoothGattCharacteristic::from_env(&env, item)?;
                     let uuid = characteristic.get_uuid()?;
                     let value = characteristic.get_value()?;
-                    Ok(ValueNotification { uuid, value })
+                    Ok(ValueNotification {
+                        uuid,
+                        service_uuid: Uuid::default(),
+                        value,
+                    }) // TODO: get service UUID
                 }
                 Err(err) => Err(err),
             })

src/winrtble/peripheral.rs

@@ -509,9 +509,14 @@ impl ApiPeripheral for Peripheral {
             .ok_or_else(|| Error::NotSupported("Characteristic not found for subscribe".into()))?;
         let notifications_sender = self.shared.notifications_channel.clone();
         let uuid = characteristic.uuid;
+        let service_uuid = characteristic.service_uuid;
         ble_characteristic
             .subscribe(Box::new(move |value| {
-                let notification = ValueNotification { uuid, value };
+                let notification = ValueNotification {
+                    uuid,
+                    service_uuid,
+                    value,
+                };
                 // Note: we ignore send errors here which may happen while there are no
                 // receivers...
                 let _ = notifications_sender.send(notification);