Merge pull request #702 from bastiaanv/master

[Feature] Added support for multiple & same uuid's

Author: randdusing

readme.md

@@ -1149,7 +1149,9 @@ bluetoothle.read(readSuccess, readError, params);
 ##### Params #####
 * address = The address/identifier provided by the scan's return object
 * service = The service's UUID
+* serviceIndex = When dealing with multiple services with the same UUID, this index will determine which service will be used (OPTIONAL)
 * characteristic = The characteristic's UUID
+* characteristicIndex = When dealing with multiple characteristics with the same UUID, this index will determine which chracteristic will be used (OPTIONAL)
 
 ```javascript
 {
@@ -1187,7 +1189,9 @@ bluetoothle.subscribe(subscribeSuccess, subscribeError, params);
 ##### Params #####
 * address = The address/identifier provided by the scan's return object
 * service = The service's UUID
+* serviceIndex = When dealing with multiple services with the same UUID, this index will determine which service will be used (OPTIONAL)
 * characteristic = The characteristic's UUID
+* characteristicIndex = When dealing with multiple characteristics with the same UUID, this index will determine which chracteristic will be used (OPTIONAL)
 
 ```javascript
 {
@@ -1208,17 +1212,21 @@ bluetoothle.subscribe(subscribeSuccess, subscribeError, params);
 {
   "status": "subscribed",
   "characteristic": "2a37",
+  "characteristicIndex": 0,
   "name": "Polar H7 3B321015",
   "service": "180d",
+  "serviceIndex": 0,
   "address": "ECC037FD-72AE-AFC5-9213-CA785B3B5C63"
 }
 
 {
   "status": "subscribedResult",
   "value": "U3Vic2NyaWJlIEhlbGxvIFdvcmxk", //Subscribe Hello World
   "characteristic": "2a37",
+  "characteristicIndex": 0,
   "name": "Polar H7 3B321015",
   "service": "180d",
+  "serviceIndex": 0,
   "address": "ECC037FD-72AE-AFC5-9213-CA785B3B5C63"
 }
 ```
@@ -1235,7 +1243,9 @@ bluetoothle.unsubscribe(unsubscribeSuccess, unsubscribeError, params);
 ##### Params #####
 * address = The address/identifier provided by the scan's return object
 * service = The service's UUID
+* serviceIndex = When dealing with multiple services with the same UUID, this index will determine which service will be used (OPTIONAL)
 * characteristic = The characteristic's UUID
+* characteristicIndex = When dealing with multiple characteristics with the same UUID, this index will determine which chracteristic will be used (OPTIONAL)
 
 ```javascript
 {
@@ -1272,7 +1282,9 @@ bluetoothle.write(writeSuccess, writeError, params);
 ##### Params #####
 * address = The address/identifier provided by the scan's return object
 * service = The service's UUID
+* serviceIndex = When dealing with multiple services with the same UUID, this index will determine which service will be used (OPTIONAL)
 * characteristic = The characteristic's UUID
+* characteristicIndex = When dealing with multiple characteristics with the same UUID, this index will determine which chracteristic will be used (OPTIONAL)
 * value = Base64 encoded string
 * type = Set to "noResponse" to enable write without response, all other values will write normally.
 
@@ -1319,7 +1331,9 @@ bluetoothle.writeQ(writeSuccess, writeError, params);
 ##### Params #####
 * address = The address/identifier provided by the scan's return object
 * service = The service's UUID
+* serviceIndex = When dealing with multiple services with the same UUID, this index will determine which service will be used (OPTIONAL)
 * characteristic = The characteristic's UUID
+* characteristicIndex = When dealing with multiple characteristics with the same UUID, this index will determine which chracteristic will be used (OPTIONAL)
 * value = Base64 encoded string
 * type = Set to "noResponse" to enable write without response, all other values will write normally.
 * chunkSize = Define the size of packets. This should be according to MTU value

src/android/BluetoothLePlugin.java

@@ -3148,25 +3148,35 @@ private UUID getUUID(String value) {
   private BluetoothGattService getService(BluetoothGatt bluetoothGatt, JSONObject obj) {
     UUID uuid = getUUID(obj.optString("service", null));
 
-    BluetoothGattService service = bluetoothGatt.getService(uuid);
-
-    if (service == null) {
-      return null;
+    int serviceIndex = obj.optInt("serviceIndex", 0);
+    int found = 0;
+    List<BluetoothGattService> services = bluetoothGatt.getServices();
+    for (BluetoothGattService service : services) {
+      if (service.getUuid().equals(uuid) && serviceIndex == found) {
+        return service;
+      } else if (service.getUuid().equals(uuid) && serviceIndex != found) {
+        found++;
+      }
     }
 
-    return service;
+    return null;
   }
 
   private BluetoothGattCharacteristic getCharacteristic(JSONObject obj, BluetoothGattService service) {
     UUID uuid = getUUID(obj.optString("characteristic", null));
 
-    BluetoothGattCharacteristic characteristic = service.getCharacteristic(uuid);
-
-    if (characteristic == null) {
-      return null;
+    int characteristicIndex = obj.optInt("characteristicIndex", 0);
+    int found = 0;
+    List<BluetoothGattCharacteristic> characteristics = service.getCharacteristics();
+    for (BluetoothGattCharacteristic characteristic : characteristics) {
+      if (characteristic.getUuid().equals(uuid) && characteristicIndex == found) {
+        return characteristic;
+      } else if (characteristic.getUuid().equals(uuid) && characteristicIndex != found) {
+        found++;
+      }
     }
 
-    return characteristic;
+    return null;
   }
 
   private BluetoothGattDescriptor getDescriptor(JSONObject obj, BluetoothGattCharacteristic characteristic) {
@@ -4252,6 +4262,29 @@ public void onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteris
       addProperty(returnObj, keyStatus, statusSubscribedResult);
       addPropertyBytes(returnObj, keyValue, characteristic.getValue());
 
+      int serviceIndex = 0;
+      BluetoothGattService serviceFromCharacteristic = characteristic.getService();
+
+      for (BluetoothGattService service : gatt.getServices()) {
+        if (service.equals(serviceFromCharacteristic)) {
+          break;
+        } else if(service.getUuid().equals(serviceFromCharacteristic.getUuid())) {
+          serviceIndex++;
+        }
+      }
+
+      int characteristicIndex = 0;
+      for (BluetoothGattCharacteristic characteristicFromService : serviceFromCharacteristic.getCharacteristics()) {
+        if (characteristicFromService.equals(characteristic)) {
+          break;
+        } else if (characteristicFromService.getUuid().equals(characteristic.getUuid())) {
+          characteristicIndex++;
+        }
+      }
+
+      addProperty(returnObj, "serviceIndex", serviceIndex);
+      addProperty(returnObj, "characteristicIndex", characteristicIndex);
+
       //Return the characteristic value
       callbackContext.sendSequentialResult(returnObj);
     }

src/ios/BluetoothLePlugin.m

@@ -14,9 +14,11 @@
 NSString *const keyAdvertisement = @"advertisement";
 NSString *const keyUuid = @"uuid";
 NSString *const keyService = @"service";
+NSString *const keyServiceIndex = @"serviceIndex";
 NSString *const keyServices = @"services";
 NSString *const keyCharacteristic = @"characteristic";
 NSString *const keyCharacteristics = @"characteristics";
+NSString *const keyCharacteristicIndex = @"characteristicIndex";
 NSString *const keyDescriptor = @"descriptor";
 NSString *const keyDescriptors = @"descriptors";
 NSString *const keyValue = @"value";
@@ -2576,6 +2578,28 @@ - (void)peripheral:(CBPeripheral *)peripheral didUpdateValueForCharacteristic:(C
   [self addDevice:peripheral :returnObj];
   [self addCharacteristic:characteristic :returnObj];
 
+  // find & set serviceIndex & characteristicIndex
+  int serviceIndex = 0;
+  for (CBService* item in peripheral.services) {
+    if ([item isEqual: characteristic.service]) {
+      break;
+    } else if ([item.UUID isEqual: characteristic.service.UUID]) {
+      serviceIndex++;
+    }
+  }
+
+  int characteristicIndex = 0;
+  for (CBCharacteristic* item in characteristic.service.characteristics) {
+    if ([item isEqual: characteristic]) {
+      break;
+    } else if ([item.UUID isEqual: characteristic.UUID]) {
+      characteristicIndex++;
+    }
+  }
+
+  [returnObj setValue:@(serviceIndex) forKey:keyServiceIndex];
+  [returnObj setValue:@(characteristicIndex) forKey:keyCharacteristicIndex];
+
   //If an error exists...
   if (error != nil) {
     //Get the callback based on whether subscription or read
@@ -3615,15 +3639,23 @@ -(CBService*) getService:(NSDictionary *)obj forPeripheral:(CBPeripheral*)periph
     return nil;
   }
 
-  CBService* service = nil;
+  NSString* serviceIndexFromDict = [obj valueForKey:keyServiceIndex];
+  int serviceIndex = 0;
 
+  if (serviceIndexFromDict != nil) {
+    serviceIndex = [serviceIndexFromDict intValue];
+  }
+
+  int found = 0;
   for (CBService* item in peripheral.services) {
-    if ([item.UUID isEqual: uuid]) {
-      service = item;
+    if ([item.UUID isEqual: uuid] && (serviceIndex == found)) {
+      return item;
+    } else if ([item.UUID isEqual: uuid] && (serviceIndex != found)) {
+      found++;
     }
   }
-
-  return service;
+    
+    return nil;
 }
 
 -(CBCharacteristic*) getCharacteristic:(NSDictionary *) obj forService:(CBService*) service {
@@ -3647,15 +3679,23 @@ -(CBCharacteristic*) getCharacteristic:(NSDictionary *) obj forService:(CBServic
     return nil;
   }
 
-  CBCharacteristic* characteristic = nil;
+  NSString* characteristicIndexFromDict = [obj valueForKey:keyCharacteristicIndex];
+  int characteristicIndex = 0;
 
+  if (characteristicIndexFromDict != nil) {
+    characteristicIndex = [characteristicIndexFromDict intValue];
+  }
+
+  int found = 0;
   for (CBCharacteristic* item in service.characteristics) {
-    if ([item.UUID isEqual: uuid]) {
-      characteristic = item;
+    if ([item.UUID isEqual: uuid] && (characteristicIndex == found)) {
+      return item;
+    } else if ([item.UUID isEqual: uuid] && (characteristicIndex != found)) {
+      found++;
     }
   }
-
-  return characteristic;
+    
+    return nil;
 }
 
 -(CBDescriptor*) getDescriptor:(NSDictionary *) obj forCharacteristic:(CBCharacteristic*) characteristic {

types/index.d.ts

@@ -625,7 +625,9 @@ declare namespace BluetoothlePlugin {
         /** The address/identifier provided by the scan's return object */
         address: string,
         /** The service's ID */
-        service: string
+        service: string,
+        /** When dealing with multiple services with the same UUID, this index will determine which service will be used */
+        serviceIndex?: number
     }
 
     interface InitPeripheralParams {
@@ -714,8 +716,10 @@ declare namespace BluetoothlePlugin {
     }
 
     interface DescriptorParams extends Params {
-        /** The characteristic's ID */
-        characteristic: string
+      /** The characteristic's ID */
+      characteristic: string;
+      /** When dealing with multiple characteristics with the same UUID, this index will determine which chracteristic will be used */
+      characteristicIndex?: number;
     }
 
     interface OperationDescriptorParams  extends DescriptorParams {
@@ -917,8 +921,12 @@ declare namespace BluetoothlePlugin {
     interface OperationResult extends DeviceInfo {
         /** Characteristic UUID */
         characteristic: string,
+        /** When dealing with multiple characteristics with the same UUID, this index will determine which characteristic it is */
+        characteristicIndex: number,
         /** Service's UUID */
         service: string,
+        /** When dealing with multiple services with the same UUID, this index will determine which service it is */
+        serviceIndex: number,
         /** Base64 encoded string of bytes */
         value: string
     }