react-native-ble-manager 7.6.0 → 8.0.0

package/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Before open an issue**
+- Check the closed issues, your question maybe is not new.
+- We can't debug or reproduce hardware issue.
+- If the library is not working 99% you did something wrong, in the code, installation or in the phone permissions.
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - react-native-ble-manager version: 
+ - react-native version:
+
+**Additional context**
+Add any other context about the problem here.

package/README.md

@@ -22,8 +22,8 @@ RN 0.30-0.39 supported until 2.4.3
 
 ```shell
 npm i --save react-native-ble-manager
-npx react-native link
 ```
+The library support the react native autolink feature.
 
 
 ##### Android - Update Manifest

package/android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
         }
 
         dependencies {
-            classpath("com.android.tools.build:gradle:3.6.1")
+            classpath("com.android.tools.build:gradle:4.2.2")
         }
     }
 }
@@ -20,7 +20,7 @@ def safeExtGet(prop, fallback) {
 }
 
 android {
-	compileSdkVersion safeExtGet("compileSdkVersion", 29)
+	compileSdkVersion safeExtGet("compileSdkVersion", 30)
 
 	defaultConfig {
 		minSdkVersion safeExtGet("minSdkVersion", 21)
@@ -36,8 +36,8 @@ repositories {
 	jcenter()
 	maven {
 		// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-		url "$rootDir/../node_modules/react-native/android"
-		// To test url "$rootDir/../example/node_modules/react-native/android"
+		//url "$rootDir/../node_modules/react-native/android"
+		url "$rootDir/../example/node_modules/react-native/android"
 	}
 }
 

package/android/src/main/java/it/innove/BleManager.java

@@ -722,4 +722,14 @@ class BleManager extends ReactContextBaseJavaModule {
         return peripheral;
     }
 
+   @ReactMethod
+    public void addListener(String eventName) {
+      // Keep: Required for RN built in Event Emitter Calls.
+    }
+
+    @ReactMethod
+     public void removeListeners(Integer count) {
+      // Keep: Required for RN built in Event Emitter Calls.
+    }
+
 }

package/android/src/main/java/it/innove/Peripheral.java

@@ -33,6 +33,8 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.UUID;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
 
 import static android.os.Build.VERSION_CODES.LOLLIPOP;
 import static com.facebook.react.common.ReactConstants.TAG;
@@ -43,6 +45,8 @@ import static com.facebook.react.common.ReactConstants.TAG;
 public class Peripheral extends BluetoothGattCallback {
 
 	private static final String CHARACTERISTIC_NOTIFICATION_CONFIG = "00002902-0000-1000-8000-00805f9b34fb";
+	public static final int GATT_INSUFFICIENT_AUTHENTICATION = 5;
+	public static final int GATT_AUTH_FAIL = 137;
 
 	private final BluetoothDevice device;
 	private final Map<String, NotifyBufferContainer> bufferedCharacteristics;
@@ -61,6 +65,11 @@ public class Peripheral extends BluetoothGattCallback {
 	private Callback registerNotifyCallback;
 	private Callback requestMTUCallback;
 
+	private final Queue<Runnable> commandQueue = new ConcurrentLinkedQueue<>();
+	private final Handler mainHandler = new Handler(Looper.getMainLooper());
+	private Runnable discoverServicesRunnable;
+	private boolean commandQueueBusy = false;
+
 	private List<byte[]> writeQueue = new ArrayList<>();
 
 	public Peripheral(BluetoothDevice device, int advertisingRSSI, byte[] scanRecord, ReactContext reactContext) {
@@ -127,6 +136,9 @@ public class Peripheral extends BluetoothGattCallback {
 		connectCallback = null;
 		connected = false;
 		clearBuffers();
+		commandQueue.clear();
+		commandQueueBusy = false;
+
 		if (gatt != null) {
 			try {
 				gatt.disconnect();
@@ -272,11 +284,27 @@ public class Peripheral extends BluetoothGattCallback {
 
 		if (status != BluetoothGatt.GATT_SUCCESS) {
 		    gatt.close();
+		    // change the state to ensure the connection is teared down properly in the code below
+		    newState = BluetoothProfile.STATE_DISCONNECTED;
 		}
 
 		if (newState == BluetoothProfile.STATE_CONNECTED) {
 			connected = true;
 
+			discoverServicesRunnable = new Runnable() {
+				@Override
+				public void run() {
+					try {
+						gatt.discoverServices();
+					} catch (NullPointerException e) {
+						Log.d(BleManager.LOG_TAG, "onConnectionStateChange connected but gatt of Run method was null");
+					}
+					discoverServicesRunnable = null;
+				}
+			};
+
+			mainHandler.post(discoverServicesRunnable);
+
 			sendConnectionEvent(device, "BleManagerConnectPeripheral", status);
 
 			if (connectCallback != null) {
@@ -289,6 +317,11 @@ public class Peripheral extends BluetoothGattCallback {
 
 			this.disconnect(true);
 
+			if (discoverServicesRunnable != null) {
+				mainHandler.removeCallbacks(discoverServicesRunnable);
+				discoverServicesRunnable = null;
+			}
+
 			sendConnectionEvent(device, "BleManagerDisconnectPeripheral", status);
 			List<Callback> callbacks = Arrays.asList(writeCallback, retrieveServicesCallback, readRSSICallback,
 					readCallback, registerNotifyCallback, requestMTUCallback);
@@ -308,6 +341,8 @@ public class Peripheral extends BluetoothGattCallback {
 			readRSSICallback = null;
 			registerNotifyCallback = null;
 			requestMTUCallback = null;
+			commandQueue.clear();
+			commandQueueBusy = false;
 		}
 
 	}
@@ -367,54 +402,60 @@ public class Peripheral extends BluetoothGattCallback {
 	@Override
 	public void onCharacteristicRead(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {
 		super.onCharacteristicRead(gatt, characteristic, status);
-		Log.d(BleManager.LOG_TAG, "onCharacteristicRead " + characteristic);
-
-		if (readCallback != null) {
-
-			if (status == BluetoothGatt.GATT_SUCCESS) {
-				byte[] dataValue = characteristic.getValue();
 
-				if (readCallback != null) {
-					readCallback.invoke(null, BleManager.bytesToWritableArray(dataValue));
-				}
-			} else {
-				readCallback.invoke("Error reading " + characteristic.getUuid() + " status=" + status, null);
+		if (status != BluetoothGatt.GATT_SUCCESS) {
+			if (status == GATT_AUTH_FAIL || status == GATT_INSUFFICIENT_AUTHENTICATION) {
+				Log.d(BleManager.LOG_TAG, "Read needs bonding");
+				// *not* doing completedCommand()
+				return;
 			}
-
+			sendBackrError(readCallback, "Error reading " + characteristic.getUuid() + " status=" + status);
+		} else if (readCallback != null) {
+			final byte[] dataValue = copyOf(characteristic.getValue());
+			final Callback callback = readCallback;
 			readCallback = null;
-
+			mainHandler.post(new Runnable() {
+					@Override
+					public void run() {
+						callback.invoke(null, BleManager.bytesToWritableArray(dataValue));
+					}
+				});
 		}
+
+		completedCommand();
 	}
 
 	@Override
 	public void onCharacteristicWrite(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {
 		super.onCharacteristicWrite(gatt, characteristic, status);
 
-		if (writeCallback != null) {
-
-			if (writeQueue.size() > 0) {
-				byte[] data = writeQueue.get(0);
-				writeQueue.remove(0);
-				doWrite(characteristic, data);
-			} else {
-
-				if (status == BluetoothGatt.GATT_SUCCESS) {
-					writeCallback.invoke();
-				} else {
-					Log.e(BleManager.LOG_TAG, "Error onCharacteristicWrite:" + status);
-					writeCallback.invoke("Error writing status: " + status);
-				}
-
-				writeCallback = null;
+		if (writeQueue.size() > 0) {
+			byte[] data = writeQueue.get(0);
+			writeQueue.remove(0);
+			doWrite(characteristic, data, writeCallback);
+		} else if (status != BluetoothGatt.GATT_SUCCESS) {
+			if (status == GATT_AUTH_FAIL || status == GATT_INSUFFICIENT_AUTHENTICATION) {
+				Log.d(BleManager.LOG_TAG, "Write needs bonding");
+				// *not* doing completedCommand()
+				return;
 			}
-		} else {
-			Log.e(BleManager.LOG_TAG, "No callback on write");
+			sendBackrError(writeCallback, "Error writing " + characteristic.getUuid() + " status=" + status);
+		} else if (writeCallback != null) {
+			final Callback callback = writeCallback;
+			mainHandler.post(new Runnable() {
+					@Override
+					public void run() {
+						callback.invoke();
+					}
+				});
+			writeCallback = null;
 		}
+
+		completedCommand();
 	}
 
 	@Override
 	public void onDescriptorWrite(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {
-		super.onDescriptorWrite(gatt, descriptor, status);
 		if (registerNotifyCallback != null) {
 			if (status == BluetoothGatt.GATT_SUCCESS) {
 				registerNotifyCallback.invoke();
@@ -428,6 +469,8 @@ public class Peripheral extends BluetoothGattCallback {
 		} else {
 			Log.e(BleManager.LOG_TAG, "onDescriptorWrite with no callback");
 		}
+
+		completedCommand();
 	}
 
 	@Override
@@ -454,85 +497,90 @@ public class Peripheral extends BluetoothGattCallback {
 			entry.getValue().resetBuffer();
 	}
 
-	private void setNotify(UUID serviceUUID, UUID characteristicUUID, Boolean notify, Integer buffer,
-			Callback callback) {
-		if (!isConnected()) {
+	private void setNotify(UUID serviceUUID, UUID characteristicUUID, final Boolean notify, Callback callback) {
+		if (! isConnected() || gatt == null) {
 			callback.invoke("Device is not connected", null);
 			return;
 		}
-		Log.d(BleManager.LOG_TAG, "setNotify");
 
-		if (gatt == null) {
-			callback.invoke("BluetoothGatt is null");
+		BluetoothGattService service = gatt.getService(serviceUUID);
+		final BluetoothGattCharacteristic characteristic = findNotifyCharacteristic(service, characteristicUUID);
+
+		if (characteristic == null) {
+			callback.invoke("Characteristic " + characteristicUUID + " not found");			
 			return;
 		}
-		BluetoothGattService service = gatt.getService(serviceUUID);
-		BluetoothGattCharacteristic characteristic = findNotifyCharacteristic(service, characteristicUUID);
 
-		if (characteristic != null) {
-			if (gatt.setCharacteristicNotification(characteristic, notify)) {
+		if (! gatt.setCharacteristicNotification(characteristic, notify)) {
+			callback.invoke("Failed to register notification for " + characteristicUUID);
+			return;
+		}
 
-				if (buffer > 1) {
-					Log.d(BleManager.LOG_TAG, "Characteristic buffering " + characteristicUUID + " count:" + buffer);
-					String key = this.bufferedCharacteristicsKey(serviceUUID.toString(), characteristicUUID.toString());
-					this.bufferedCharacteristics.put(key, new NotifyBufferContainer(key, buffer));
-				}
+		final BluetoothGattDescriptor descriptor = characteristic.getDescriptor(UUIDHelper.uuidFromString(CHARACTERISTIC_NOTIFICATION_CONFIG));
+		if (descriptor == null) {
+			callback.invoke("Set notification failed for " + characteristicUUID);
+			return;
+		}
+
+		// Prefer notify over indicate
+		byte[] value;
+		if ((characteristic.getProperties() & BluetoothGattCharacteristic.PROPERTY_NOTIFY) != 0) {
+			Log.d(BleManager.LOG_TAG, "Characteristic " + characteristicUUID + " set NOTIFY");
+			value = notify ? BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE : BluetoothGattDescriptor.DISABLE_NOTIFICATION_VALUE;
+		} else if ((characteristic.getProperties() & BluetoothGattCharacteristic.PROPERTY_INDICATE) != 0) {
+			Log.d(BleManager.LOG_TAG, "Characteristic " + characteristicUUID + " set INDICATE");
+			value = notify ? BluetoothGattDescriptor.ENABLE_INDICATION_VALUE : BluetoothGattDescriptor.DISABLE_NOTIFICATION_VALUE;
+		} else {
+			String msg = "Characteristic " + characteristicUUID + " does not have NOTIFY or INDICATE property set";
+			Log.d(BleManager.LOG_TAG, msg);
+			callback.invoke(msg);
+			return;
+		}
+		final byte[] finalValue = notify ? value : BluetoothGattDescriptor.DISABLE_NOTIFICATION_VALUE;
+		final Callback finalCallback = callback;
 
-				BluetoothGattDescriptor descriptor = characteristic
-						.getDescriptor(UUIDHelper.uuidFromString(CHARACTERISTIC_NOTIFICATION_CONFIG));
-				if (descriptor != null) {
-
-					// Prefer notify over indicate
-					if ((characteristic.getProperties() & BluetoothGattCharacteristic.PROPERTY_NOTIFY) != 0) {
-						Log.d(BleManager.LOG_TAG, "Characteristic " + characteristicUUID + " set NOTIFY");
-						descriptor.setValue(notify ? BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE
-								: BluetoothGattDescriptor.DISABLE_NOTIFICATION_VALUE);
-					} else if ((characteristic.getProperties() & BluetoothGattCharacteristic.PROPERTY_INDICATE) != 0) {
-						Log.d(BleManager.LOG_TAG, "Characteristic " + characteristicUUID + " set INDICATE");
-						descriptor.setValue(notify ? BluetoothGattDescriptor.ENABLE_INDICATION_VALUE
-								: BluetoothGattDescriptor.DISABLE_NOTIFICATION_VALUE);
-					} else {
-						Log.d(BleManager.LOG_TAG, "Characteristic " + characteristicUUID
-								+ " does not have NOTIFY or INDICATE property set");
+		boolean result = commandQueue.add(new Runnable() {
+				@Override
+				public void run() {
+					if (! isConnected()) {
+						completedCommand();
+						return;
 					}
 
+					boolean result = false;
 					try {
-						registerNotifyCallback = callback;
-						if (gatt.writeDescriptor(descriptor)) {
-							Log.d(BleManager.LOG_TAG, "setNotify complete");
-						} else {
-							registerNotifyCallback = null;
-							callback.invoke(
-									"Failed to set client characteristic notification for " + characteristicUUID);
-						}
-					} catch (Exception e) {
-						Log.d(BleManager.LOG_TAG, "Error on setNotify", e);
-						callback.invoke("Failed to set client characteristic notification for " + characteristicUUID
-								+ ", error: " + e.getMessage());
+						result = gatt.setCharacteristicNotification(characteristic, notify);
+						// Then write to descriptor
+						descriptor.setValue(finalValue);
+						registerNotifyCallback = finalCallback;
+						result = gatt.writeDescriptor(descriptor);
+					} catch(Exception e) {
+						Log.d(BleManager.LOG_TAG, "Exception in setNotify", e);
 					}
 
-				} else {
-					callback.invoke("Set notification failed for " + characteristicUUID);
+					if (! result) {
+						sendBackrError(registerNotifyCallback, "writeDescriptor failed for descriptor: " + descriptor.getUuid());
+						registerNotifyCallback = null;
+						completedCommand();
+					}
 				}
+			});
 
-			} else {
-				callback.invoke("Failed to register notification for " + characteristicUUID);
-			}
-
+		if (result) {
+			nextCommand();
 		} else {
-			callback.invoke("Characteristic " + characteristicUUID + " not found");
+			Log.e(BleManager.LOG_TAG, "Could not enqueue setNotify command");
 		}
-
 	}
 
 	public void registerNotify(UUID serviceUUID, UUID characteristicUUID, Integer buffer, Callback callback) {
 		Log.d(BleManager.LOG_TAG, "registerNotify");
-		this.setNotify(serviceUUID, characteristicUUID, true, buffer, callback);
+		this.setNotify(serviceUUID, characteristicUUID, true, callback);
 	}
 
 	public void removeNotify(UUID serviceUUID, UUID characteristicUUID, Callback callback) {
 		Log.d(BleManager.LOG_TAG, "removeNotify");
-		this.setNotify(serviceUUID, characteristicUUID, false, 1, callback);
+		this.setNotify(serviceUUID, characteristicUUID, false, callback);
 	}
 
 	// Some devices reuse UUIDs across characteristics, so we can't use
@@ -572,30 +620,100 @@ public class Peripheral extends BluetoothGattCallback {
 
 	public void read(UUID serviceUUID, UUID characteristicUUID, Callback callback) {
 
-		if (!isConnected()) {
+		if (!isConnected() || gatt == null) {
 			callback.invoke("Device is not connected", null);
 			return;
 		}
-		if (gatt == null) {
-			callback.invoke("BluetoothGatt is null", null);
-			return;
-		}
 
 		BluetoothGattService service = gatt.getService(serviceUUID);
-		BluetoothGattCharacteristic characteristic = findReadableCharacteristic(service, characteristicUUID);
+		final BluetoothGattCharacteristic characteristic = findReadableCharacteristic(service, characteristicUUID);
 
 		if (characteristic == null) {
 			callback.invoke("Characteristic " + characteristicUUID + " not found.", null);
+			return;
+		}
+
+		final Callback reactcb = callback;
+		boolean result = commandQueue.add(new Runnable() {
+				@Override
+				public void run() {
+					readCallback = reactcb;
+					if (! gatt.readCharacteristic(characteristic)) {
+						readCallback = null;
+						sendBackrError(reactcb, "Read failed");
+						completedCommand();
+					}
+				}
+			});
+
+		if (result) {
+			nextCommand();
 		} else {
-			readCallback = callback;
-			if (!gatt.readCharacteristic(characteristic)) {
-				readCallback = null;
-				callback.invoke("Read failed", null);
+			Log.d(BleManager.LOG_TAG, "Could not queue read characteristic command");
+		}
+	}
+
+	private void sendBackrError(final Callback callback, final String message) {
+		new Handler(Looper.getMainLooper()).post(new Runnable() {
+				@Override
+				public void run() {
+					callback.invoke(message, null);
+				}
+			});
+	}
+
+	private byte[] copyOf(byte[] source) {
+		if (source == null) return new byte[0];
+		final int sourceLength = source.length;
+		final byte[] copy = new byte[sourceLength];
+		System.arraycopy(source, 0, copy, 0, sourceLength);
+		return copy;
+	}
+
+	private void completedCommand() {
+		commandQueue.poll();
+		commandQueueBusy = false;
+		nextCommand();
+	}
+
+	private void nextCommand() {
+		synchronized (this) {
+			if (commandQueueBusy) {
+				Log.d(BleManager.LOG_TAG, "Command queue busy");
+				return;
+			}
+
+			final Runnable nextCommand = commandQueue.peek();
+			if (nextCommand == null) {
+				Log.d(BleManager.LOG_TAG, "Command queue empty");
+				return;
+			}
+
+			// Check if we still have a valid gatt object
+			if (gatt == null) {
+				Log.d(BleManager.LOG_TAG, "Error, gatt is null");
+				commandQueue.clear();
+				commandQueueBusy = false;
+				return;
 			}
+
+			// Execute the next command in the queue
+			commandQueueBusy = true;
+			mainHandler.post(new Runnable() {
+					@Override
+					public void run() {
+						try {
+							nextCommand.run();
+						} catch (Exception ex) {
+							Log.d(BleManager.LOG_TAG, "Error, command exception");
+							completedCommand();
+						}
+					}
+				});
 		}
 	}
 
-	public void readRSSI(Callback callback) {
+	public void readRSSI(final Callback callback) {
 		if (!isConnected()) {
 			callback.invoke("Device is not connected", null);
 			return;
@@ -605,11 +723,26 @@ public class Peripheral extends BluetoothGattCallback {
 			return;
 		}
 
-		readRSSICallback = callback;
+		final boolean result = commandQueue.add(new Runnable() {
+			@Override
+			public void run() {
+			    if (isConnected()) {
+				readRSSICallback = callback;
+				if (! gatt.readRemoteRssi()) {
+				    readCallback = null;
+				    sendBackrError(callback, "Read RSSI failed");
+				    completedCommand();
+				}
+			    } else {
+				completedCommand();
+			    }
+			}
+		    });
 
-		if (!gatt.readRemoteRssi()) {
-			readCallback = null;
-			callback.invoke("Read RSSI failed", null);
+		if (result) {
+		    nextCommand();
+		} else {
+		    Log.d(BleManager.LOG_TAG, "Could not queue readRemoteRssi command");
 		}
 	}
 
@@ -667,112 +800,105 @@ public class Peripheral extends BluetoothGattCallback {
 		return null;
 	}
 
-	public boolean doWrite(BluetoothGattCharacteristic characteristic, byte[] data) {
-		characteristic.setValue(data);
+	public boolean doWrite(final BluetoothGattCharacteristic characteristic, byte[] data, final Callback callback) {
+		final byte[] copyOfData = copyOf(data);
+		boolean result = commandQueue.add(new Runnable() {
+				@Override
+				public void run() {
+					characteristic.setValue(copyOfData);
+					if (characteristic.getWriteType() == BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT)
+						writeCallback = callback;
+					else
+						writeCallback = null;
+					if (!gatt.writeCharacteristic(characteristic)) {
+						sendBackrError(writeCallback, "Write failed");
+						writeCallback = null;
+						completedCommand();
+					}
+				}
+			});
 
-		if (!gatt.writeCharacteristic(characteristic)) {
-			Log.d(BleManager.LOG_TAG, "Error on doWrite");
-			return false;
+		if (result) {
+			nextCommand();
+		} else {
+			Log.d(BleManager.LOG_TAG, "Could not queue write characteristic command");
 		}
-		return true;
+
+		return result;
 	}
 
-	public void write(UUID serviceUUID, UUID characteristicUUID, byte[] data, Integer maxByteSize,
-			Integer queueSleepTime, Callback callback, int writeType) {
-		if (!isConnected()) {
+	public void write(UUID serviceUUID, UUID characteristicUUID, byte[] data, Integer maxByteSize, Integer queueSleepTime, Callback callback, int writeType) {
+		if (!isConnected() || gatt == null) {
 			callback.invoke("Device is not connected", null);
 			return;
 		}
-		if (gatt == null) {
-			callback.invoke("BluetoothGatt is null");
-		} else {
-			BluetoothGattService service = gatt.getService(serviceUUID);
-			BluetoothGattCharacteristic characteristic = findWritableCharacteristic(service, characteristicUUID,
-					writeType);
 
-			if (characteristic == null) {
-				callback.invoke("Characteristic " + characteristicUUID + " not found.");
-			} else {
-				characteristic.setWriteType(writeType);
+		BluetoothGattService service = gatt.getService(serviceUUID);
+		BluetoothGattCharacteristic characteristic = findWritableCharacteristic(service, characteristicUUID, writeType);
 
-				if (writeQueue.size() > 0) {
-					callback.invoke("You have already an queued message");
-					return;
-				}
+		if (characteristic == null) {
+			callback.invoke("Characteristic " + characteristicUUID + " not found.");
+			return;
+		}
 
-				if (writeCallback != null) {
-					callback.invoke("You're already writing");
-					return;
-				}
+		characteristic.setWriteType(writeType);
 
-				if (writeQueue.size() == 0 && writeCallback == null) {
+		if (data.length <= maxByteSize) {
+			if (! doWrite(characteristic, data, callback)) {
+				callback.invoke("Write failed");
+				writeCallback = null;
+			}
+		} else {
+			int dataLength = data.length;
+			int count = 0;
+			byte[] firstMessage = null;
+			List<byte[]> splittedMessage = new ArrayList<>();
+
+			while (count < dataLength && (dataLength - count > maxByteSize)) {
+				if (count == 0) {
+					firstMessage = Arrays.copyOfRange(data, count, count + maxByteSize);
+				} else {
+					byte[] splitMessage = Arrays.copyOfRange(data, count, count + maxByteSize);
+					splittedMessage.add(splitMessage);
+				}
+				count += maxByteSize;
+			}
+			if (count < dataLength) {
+				// Other bytes in queue
+				byte[] splitMessage = Arrays.copyOfRange(data, count, data.length);
+				splittedMessage.add(splitMessage);
+			}
 
-					if (BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT == writeType) {
-						writeCallback = callback;
+			if (BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT == writeType) {
+				writeQueue.addAll(splittedMessage);
+				if (! doWrite(characteristic, firstMessage, callback)) {
+					writeQueue.clear();
+					writeCallback = null;
+					callback.invoke("Write failed");
+				}
+			} else {
+				try {
+					boolean writeError = false;
+					if (! doWrite(characteristic, firstMessage, callback)) {
+						writeError = true;
+						callback.invoke("Write failed");
 					}
-
-					if (data.length > maxByteSize) {
-						int dataLength = data.length;
-						int count = 0;
-						byte[] firstMessage = null;
-						List<byte[]> splittedMessage = new ArrayList<>();
-
-						while (count < dataLength && (dataLength - count > maxByteSize)) {
-							if (count == 0) {
-								firstMessage = Arrays.copyOfRange(data, count, count + maxByteSize);
-							} else {
-								byte[] splitMessage = Arrays.copyOfRange(data, count, count + maxByteSize);
-								splittedMessage.add(splitMessage);
-							}
-							count += maxByteSize;
-						}
-						if (count < dataLength) {
-							// Other bytes in queue
-							byte[] splitMessage = Arrays.copyOfRange(data, count, data.length);
-							splittedMessage.add(splitMessage);
-						}
-
-						if (BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT == writeType) {
-							writeQueue.addAll(splittedMessage);
-							if (!doWrite(characteristic, firstMessage)) {
-								writeQueue.clear();
-								writeCallback = null;
+					if (! writeError) {
+						Thread.sleep(queueSleepTime);
+						for (byte[] message : splittedMessage) {
+							if (! doWrite(characteristic, message, callback)) {
+								writeError = true;
 								callback.invoke("Write failed");
+								break;
 							}
-						} else {
-							try {
-								boolean writeError = false;
-								if (!doWrite(characteristic, firstMessage)) {
-									writeError = true;
-									callback.invoke("Write failed");
-								}
-								if (!writeError) {
-									Thread.sleep(queueSleepTime);
-									for (byte[] message : splittedMessage) {
-										if (!doWrite(characteristic, message)) {
-											writeError = true;
-											callback.invoke("Write failed");
-											break;
-										}
-										Thread.sleep(queueSleepTime);
-									}
-									if (!writeError) {
-										callback.invoke();
-									}
-								}
-							} catch (InterruptedException e) {
-								callback.invoke("Error during writing");
-							}
+							Thread.sleep(queueSleepTime);
 						}
-					} else if (doWrite(characteristic, data)) {
-						Log.d(BleManager.LOG_TAG, "Write completed");
-						if (BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE == writeType) {
+						if (! writeError) {
 							callback.invoke();
 						}
-					} else {
-						callback.invoke("Write failed");
-						writeCallback = null;
 					}
+				} catch (InterruptedException e) {
+					callback.invoke("Error during writing");
 				}
 			}
 		}

package/index.d.ts

@@ -120,9 +120,42 @@ declare module "react-native-ble-manager" {
   export function getBondedPeripherals(): Promise<Peripheral[]>;
   export function removePeripheral(peripheralID: string): Promise<void>;
 
-  export interface PeripheralInfo {
+  
+  export interface Service {
+    uuid: string;
+  }
+
+  export interface Descriptor {
+    value: string;
+    uuid: string;
+  }
+
+  export interface Characteristic {
+    // See https://developer.apple.com/documentation/corebluetooth/cbcharacteristicproperties
+    properties: {
+      Broadcast?: "Broadcast";
+      Read?: "Read";
+      WriteWithoutResponse?: "WriteWithoutResponse";
+      Write?: "Write";
+      Notify?: "Notify";
+      Indicate?: "Indicate";
+      AuthenticatedSignedWrites?: "AuthenticatedSignedWrites";
+      ExtendedProperties?: "ExtendedProperties";
+      NotifyEncryptionRequired?: "NotifyEncryptionRequired";
+      IndicateEncryptionRequired?: "IndicateEncryptionRequired";
+    }
+    characteristic: string;
+    service: string;
+    descriptors?: Descriptor[];
+    
+  }
+
+  export interface PeripheralInfo extends Peripheral {
     serviceUUIDs?: string[];
+    characteristics?: Characteristic[];
+    services?: Service[];
   }
+
   export function retrieveServices(
     peripheralID: string,
     serviceUUIDs?: string[]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-ble-manager",
-  "version": "7.6.0",
+  "version": "8.0.0",
   "description": "A BLE module for react native.",
   "main": "BleManager",
   "types": "./index.d.ts",

package/ISSUE_TEMPLATE.md

@@ -1,33 +0,0 @@
-### Before open an issue
-- Check the closed issues, your question maybe is not new.
-- We can't debug your physical devices.
-- If the library is not working 99% you did something wrong, in the code or in the phone permissions.
-
-### Version
-
-Tell us which versions you are using:
-
-- react-native-ble-manager v?.?.?
-- react-native v?.?
-- iOS/Android v.?
-
-### Expected behaviour
-
-Tell us what should happen
-
-### Actual behaviour
-
-Tell us what happens instead
-
-### Steps to reproduce
-
-1.
-2.
-3.
-
-### Stack trace and console log
-
-Hint: it would help a lot if you enable the debugger ("Pause on exceptions" in the "Source" panel of Chrome dev tools) and spot the place where the error is thrown
-
-```
-```