Added a constructor so you could create a platform specific device. A…

…dded isnofiying property (#149)
Reedyuk · Nov 26, 2024 · aae937d · aae937d
1 parent 34dee01
commit aae937d
Show file tree

Hide file tree

Showing 18 changed files with 59 additions and 31 deletions.
diff --git a/library/gradle.properties b/library/gradle.properties
@@ -10,7 +10,7 @@ org.gradle.configureondemand = false
 android.useAndroidX=true
 android.enableJetifier=true
 
-version=2.0.0
+version=2.0.1
 group=dev.bluefalcon
 libraryName=blue-falcon
 kotlinx_coroutines_version=1.8.1

diff --git a/library/src/androidMain/kotlin/dev/bluefalcon/BlueFalcon.kt b/library/src/androidMain/kotlin/dev/bluefalcon/BlueFalcon.kt
@@ -34,7 +34,7 @@ actual class BlueFalcon actual constructor(
 
     actual fun connect(bluetoothPeripheral: BluetoothPeripheral, autoConnect: Boolean) {
         log?.info("connect")
-        bluetoothPeripheral.bluetoothDevice.connectGatt(
+        bluetoothPeripheral.device.connectGatt(
             context,
             autoConnect,
             mGattClientCallback,
@@ -44,7 +44,7 @@ actual class BlueFalcon actual constructor(
 
     actual fun disconnect(bluetoothPeripheral: BluetoothPeripheral) {
         log?.info("disconnect")
-        val gatt = mGattClientCallback.gattForDevice(bluetoothPeripheral.bluetoothDevice)
+        val gatt = mGattClientCallback.gattForDevice(bluetoothPeripheral.device)
         gatt?.apply {
             disconnect()
             close()
@@ -84,15 +84,15 @@ actual class BlueFalcon actual constructor(
         serviceUUIDs: List<String>
     ) {
         // cant individually get services.
-        mGattClientCallback.gattForDevice(bluetoothPeripheral.bluetoothDevice)?.discoverServices()
+        mGattClientCallback.gattForDevice(bluetoothPeripheral.device)?.discoverServices()
     }
     actual fun discoverCharacteristics(
         bluetoothPeripheral: BluetoothPeripheral,
         bluetoothService: BluetoothService,
         characteristicUUIDs: List<String>
     ) {
         if (!bluetoothPeripheral.services.containsKey(bluetoothService.uuid)) {
-            mGattClientCallback.gattForDevice(bluetoothPeripheral.bluetoothDevice)?.discoverServices()
+            mGattClientCallback.gattForDevice(bluetoothPeripheral.device)?.discoverServices()
         }
         // no need to do anything here for android.
     }
@@ -120,7 +120,7 @@ actual class BlueFalcon actual constructor(
         bluetoothPeripheral: BluetoothPeripheral,
         bluetoothCharacteristic: BluetoothCharacteristic
     ) {
-        mGattClientCallback.gattForDevice(bluetoothPeripheral.bluetoothDevice)?.let { gatt ->
+        mGattClientCallback.gattForDevice(bluetoothPeripheral.device)?.let { gatt ->
             fetchCharacteristic(bluetoothCharacteristic, gatt)
                 .forEach { gatt.readCharacteristic(it.characteristic) }
         }
@@ -133,7 +133,7 @@ actual class BlueFalcon actual constructor(
         descriptorValue: ByteArray
     ) {
         log?.info("setCharacteristicNotification ${bluetoothCharacteristic.uuid} enable $enable")
-        mGattClientCallback.gattForDevice(bluetoothPeripheral.bluetoothDevice)?.let { gatt ->
+        mGattClientCallback.gattForDevice(bluetoothPeripheral.device)?.let { gatt ->
             fetchCharacteristic(bluetoothCharacteristic, gatt).forEach {
                 log?.info("setCharacteristicNotification ${it.uuid} enable $enable ${gatt}")
                 gatt.setCharacteristicNotification(it.characteristic, enable)
@@ -157,7 +157,7 @@ actual class BlueFalcon actual constructor(
         value: ByteArray
     ) {
         log?.info("writeDescriptor ${bluetoothCharacteristicDescriptor.uuid} value $value")
-        mGattClientCallback.gattForDevice(bluetoothPeripheral.bluetoothDevice)?.let { gatt ->
+        mGattClientCallback.gattForDevice(bluetoothPeripheral.device)?.let { gatt ->
             bluetoothCharacteristicDescriptor.value = value
             gatt.writeDescriptor(bluetoothCharacteristicDescriptor)
         }
@@ -264,14 +264,14 @@ actual class BlueFalcon actual constructor(
         writeType: Int?
     ) {
         log?.info("Writing value {length = ${value.size}, bytes = 0x${value.toHexString()}} with response $writeType")
-        mGattClientCallback.gattForDevice(bluetoothPeripheral.bluetoothDevice)?.let { gatt ->
+        mGattClientCallback.gattForDevice(bluetoothPeripheral.device)?.let { gatt ->
             fetchCharacteristic(bluetoothCharacteristic, gatt)
                 .forEach {
                     writeType?.let { writeType ->
                         it.characteristic.writeType = writeType
                     }
                     it.characteristic.setValue(value)
-                    val resp = gatt.writeCharacteristic(it.characteristic)
+                    gatt.writeCharacteristic(it.characteristic)
                 }
         }
     }
@@ -281,13 +281,13 @@ actual class BlueFalcon actual constructor(
         bluetoothCharacteristic: BluetoothCharacteristic,
         bluetoothCharacteristicDescriptor: BluetoothCharacteristicDescriptor
     ) {
-        mGattClientCallback.gattForDevice(bluetoothPeripheral.bluetoothDevice)
+        mGattClientCallback.gattForDevice(bluetoothPeripheral.device)
             ?.readDescriptor(bluetoothCharacteristicDescriptor)
         log?.debug("readDescriptor -> ${bluetoothCharacteristicDescriptor.uuid}")
     }
 
     actual fun changeMTU(bluetoothPeripheral: BluetoothPeripheral, mtuSize: Int) {
-        mGattClientCallback.gattForDevice(bluetoothPeripheral.bluetoothDevice)?.requestMtu(mtuSize)
+        mGattClientCallback.gattForDevice(bluetoothPeripheral.device)?.requestMtu(mtuSize)
     }
 
     inner class BluetoothScanCallBack : ScanCallback() {

diff --git a/library/src/androidMain/kotlin/dev/bluefalcon/BluetoothCharacteristic.kt b/library/src/androidMain/kotlin/dev/bluefalcon/BluetoothCharacteristic.kt
@@ -42,7 +42,8 @@ actual class BluetoothCharacteristic(val characteristic: BluetoothGattCharacteri
     actual val uuid: String
         get() = characteristic.uuid.toString().uppercase()
 
-
+    actual val isNotifying: Boolean
+        get() = (characteristic.properties and BluetoothGattCharacteristic.PROPERTY_NOTIFY) == BluetoothGattCharacteristic.PROPERTY_NOTIFY
 }
 
 actual typealias BluetoothCharacteristicDescriptor = BluetoothGattDescriptor
diff --git a/library/src/androidMain/kotlin/dev/bluefalcon/BluetoothPeripheral.android.kt b/library/src/androidMain/kotlin/dev/bluefalcon/BluetoothPeripheral.android.kt
@@ -0,0 +1,3 @@
+package dev.bluefalcon
+
+actual typealias NativeBluetoothDevice = android.bluetooth.BluetoothDevice
diff --git a/library/src/androidMain/kotlin/dev/bluefalcon/BluetoothPeripheral.kt b/library/src/androidMain/kotlin/dev/bluefalcon/BluetoothPeripheral.kt
@@ -5,13 +5,13 @@ import android.os.Parcel
 import android.os.Parcelable
 import kotlinx.coroutines.flow.MutableStateFlow
 
-actual class BluetoothPeripheral(val bluetoothDevice: BluetoothDevice) : Parcelable {
+actual class BluetoothPeripheral actual constructor(val device: NativeBluetoothDevice) : Parcelable {
     actual val name: String?
-        get() = bluetoothDevice.name ?: bluetoothDevice.address
+        get() = device.name ?: device.address
     actual val services: Map<String, BluetoothService>
         get() = _servicesFlow.value.associateBy { it.uuid }
     actual val uuid: String
-        get() = bluetoothDevice.address
+        get() = device.address
 
     actual var rssi: Float? = null
     actual var mtuSize: Int? = null
@@ -32,7 +32,7 @@ actual class BluetoothPeripheral(val bluetoothDevice: BluetoothDevice) : Parcela
     }
 
     override fun writeToParcel(parcel: Parcel, flags: Int) {
-        parcel.writeParcelable(bluetoothDevice, flags)
+        parcel.writeParcelable(device, flags)
         parcel.writeValue(rssi)
     }
 

diff --git a/library/src/appleMain/kotlin/dev/bluefalcon/BluetoothCharacteristic.kt b/library/src/appleMain/kotlin/dev/bluefalcon/BluetoothCharacteristic.kt
@@ -26,6 +26,9 @@ actual class BluetoothCharacteristic(val characteristic: CBCharacteristic) {
     internal actual val _descriptorsFlow = MutableStateFlow<List<BluetoothCharacteristicDescriptor>>(emptyList())
     actual val uuid: String
         get() = characteristic.UUID.UUIDString.uppercase()
+
+    actual val isNotifying: Boolean
+        get() = characteristic.isNotifying
 }
 
 actual typealias  BluetoothCharacteristicDescriptor = CBDescriptor
diff --git a/library/src/appleMain/kotlin/dev/bluefalcon/BluetoothPeripheral.kt b/library/src/appleMain/kotlin/dev/bluefalcon/BluetoothPeripheral.kt
@@ -5,6 +5,8 @@ import platform.CoreBluetooth.CBPeripheral
 import platform.CoreBluetooth.CBService
 
 actual class BluetoothPeripheral(val bluetoothDevice: CBPeripheral, val rssiValue: Float?) {
+    actual constructor(device: NativeBluetoothDevice): this(device, null)
+
     actual val name: String? = bluetoothDevice.name
     actual var rssi: Float? = rssiValue
     actual var mtuSize: Int? = null

diff --git a/library/src/commonMain/kotlin/dev/bluefalcon/BluetoothCharacteristic.kt b/library/src/commonMain/kotlin/dev/bluefalcon/BluetoothCharacteristic.kt
@@ -7,6 +7,7 @@ expect class BluetoothCharacteristic {
     val uuid: String
     val value: ByteArray?
     val descriptors: List<BluetoothCharacteristicDescriptor>
+    val isNotifying: Boolean
     internal val _descriptorsFlow: MutableStateFlow<List<BluetoothCharacteristicDescriptor>>
 }
 

diff --git a/library/src/commonMain/kotlin/dev/bluefalcon/BluetoothPeripheral.kt b/library/src/commonMain/kotlin/dev/bluefalcon/BluetoothPeripheral.kt
@@ -2,7 +2,7 @@ package dev.bluefalcon
 
 import kotlinx.coroutines.flow.MutableStateFlow
 
-expect class BluetoothPeripheral {
+expect class BluetoothPeripheral(device: NativeBluetoothDevice) {
     val name: String?
     val uuid: String
     var rssi: Float?
@@ -12,3 +12,5 @@ expect class BluetoothPeripheral {
 
     val characteristics: Map<String, BluetoothCharacteristic>
 }
+
+expect class NativeBluetoothDevice
diff --git a/library/src/jsMain/kotlin/dev/bluefalcon/BluetoothCharacteristic.kt b/library/src/jsMain/kotlin/dev/bluefalcon/BluetoothCharacteristic.kt
@@ -18,6 +18,8 @@ actual class BluetoothCharacteristic(val characteristic: BluetoothRemoteGATTChar
     internal actual val _descriptorsFlow = MutableStateFlow<List<BluetoothCharacteristicDescriptor>>(emptyList())
     actual val uuid: String
         get() = characteristic.uuid.uppercase()
+    actual val isNotifying: Boolean
+        get() = false
 }
 
 actual class BluetoothCharacteristicDescriptor

diff --git a/library/src/jsMain/kotlin/dev/bluefalcon/BluetoothPeripheral.js.kt b/library/src/jsMain/kotlin/dev/bluefalcon/BluetoothPeripheral.js.kt
@@ -0,0 +1,5 @@
+package dev.bluefalcon
+
+import dev.bluefalcon.external.BluetoothDevice
+
+actual typealias NativeBluetoothDevice = BluetoothDevice
diff --git a/library/src/jsMain/kotlin/dev/bluefalcon/BluetoothPeripheral.kt b/library/src/jsMain/kotlin/dev/bluefalcon/BluetoothPeripheral.kt
@@ -1,9 +1,8 @@
 package dev.bluefalcon
 
-import dev.bluefalcon.external.BluetoothDevice
 import kotlinx.coroutines.flow.MutableStateFlow
 
-actual class BluetoothPeripheral(val device: BluetoothDevice) {
+actual class BluetoothPeripheral actual constructor(val device: NativeBluetoothDevice) {
     actual val name: String?
         get() = device.name
     actual val uuid: String

diff --git a/library/src/jsMain/kotlin/dev/bluefalcon/external/BluetoothDevice.kt b/library/src/jsMain/kotlin/dev/bluefalcon/external/BluetoothDevice.kt
@@ -4,7 +4,7 @@ import org.w3c.dom.events.EventTarget
 import kotlin.js.Promise
 
 //https://developer.mozilla.org/en-US/docs/Web/API/BluetoothDevice
-abstract external class BluetoothDevice : EventTarget {
+external class BluetoothDevice : EventTarget {
     val id: String
     val name: String?
     val gatt: BluetoothRemoteGATTServer?

diff --git a/library/src/nativeMain/kotlin/dev/bluefalcon/BluetoothPeripheral.native.kt b/library/src/nativeMain/kotlin/dev/bluefalcon/BluetoothPeripheral.native.kt
@@ -0,0 +1,3 @@
+package dev.bluefalcon
+
+actual typealias NativeBluetoothDevice = platform.CoreBluetooth.CBPeripheral
diff --git a/library/src/rpiMain/kotlin/dev/bluefalcon/BlueFalcon.kt b/library/src/rpiMain/kotlin/dev/bluefalcon/BlueFalcon.kt
@@ -70,11 +70,11 @@ actual class BlueFalcon actual constructor(
     private val bluetoothManager = BluetoothCentralManager(bluetoothManagerCallback)
 
     actual fun connect(bluetoothPeripheral: BluetoothPeripheral, autoConnect: Boolean) {
-        bluetoothManager.connectPeripheral(bluetoothPeripheral.bluetoothDevice, bluetoothPeripheralCallback)
+        bluetoothManager.connectPeripheral(bluetoothPeripheral.device, bluetoothPeripheralCallback)
     }
 
     actual fun disconnect(bluetoothPeripheral: BluetoothPeripheral) {
-        bluetoothManager.cancelConnection(bluetoothPeripheral.bluetoothDevice)
+        bluetoothManager.cancelConnection(bluetoothPeripheral.device)
     }
 
     @Throws(
@@ -117,15 +117,15 @@ actual class BlueFalcon actual constructor(
         bluetoothPeripheral: BluetoothPeripheral,
         bluetoothCharacteristic: BluetoothCharacteristic
     ) {
-        bluetoothPeripheral.bluetoothDevice.readCharacteristic(bluetoothCharacteristic.characteristic)
+        bluetoothPeripheral.device.readCharacteristic(bluetoothCharacteristic.characteristic)
     }
 
     actual fun notifyCharacteristic(
         bluetoothPeripheral: BluetoothPeripheral,
         bluetoothCharacteristic: BluetoothCharacteristic,
         notify: Boolean
     ) {
-        bluetoothPeripheral.bluetoothDevice.setNotify(bluetoothCharacteristic.characteristic, notify)
+        bluetoothPeripheral.device.setNotify(bluetoothCharacteristic.characteristic, notify)
     }
 
     actual fun indicateCharacteristic(
@@ -150,7 +150,7 @@ actual class BlueFalcon actual constructor(
         value: String,
         writeType: Int?
     ) {
-        bluetoothPeripheral.bluetoothDevice.writeCharacteristic(bluetoothCharacteristic.characteristic, value.toByteArray(), writeType.writeType)
+        bluetoothPeripheral.device.writeCharacteristic(bluetoothCharacteristic.characteristic, value.toByteArray(), writeType.writeType)
     }
 
     actual fun writeCharacteristic(
@@ -159,7 +159,7 @@ actual class BlueFalcon actual constructor(
         value: ByteArray,
         writeType: Int?
     ) {
-        bluetoothPeripheral.bluetoothDevice.writeCharacteristic(bluetoothCharacteristic.characteristic, value, writeType.writeType)
+        bluetoothPeripheral.device.writeCharacteristic(bluetoothCharacteristic.characteristic, value, writeType.writeType)
     }
 
     actual fun writeCharacteristicWithoutEncoding(
@@ -168,7 +168,7 @@ actual class BlueFalcon actual constructor(
         value: ByteArray,
         writeType: Int?
     ){
-        bluetoothPeripheral.bluetoothDevice.writeCharacteristic(bluetoothCharacteristic.characteristic, value, writeType.writeType)
+        bluetoothPeripheral.device.writeCharacteristic(bluetoothCharacteristic.characteristic, value, writeType.writeType)
     }
 
     private val Int?.writeType: BluetoothGattCharacteristic.WriteType

diff --git a/library/src/rpiMain/kotlin/dev/bluefalcon/BluetoothCharacteristic.kt b/library/src/rpiMain/kotlin/dev/bluefalcon/BluetoothCharacteristic.kt
@@ -16,6 +16,8 @@ actual class BluetoothCharacteristic(val characteristic: BluetoothGattCharacteri
     internal actual val _descriptorsFlow = MutableStateFlow<List<BluetoothCharacteristicDescriptor>>(emptyList())
     actual val uuid: String
         get() = characteristic.uuid.toString().uppercase()
+    actual val isNotifying: Boolean
+        get() = characteristic.supportsNotifying()
 }
 
 actual typealias BluetoothCharacteristicDescriptor = BluetoothGattDescriptor
diff --git a/library/src/rpiMain/kotlin/dev/bluefalcon/BluetoothPeripheral.kt b/library/src/rpiMain/kotlin/dev/bluefalcon/BluetoothPeripheral.kt
@@ -3,11 +3,11 @@ package dev.bluefalcon
 import com.welie.blessed.BluetoothPeripheral
 import kotlinx.coroutines.flow.MutableStateFlow
 
-actual class BluetoothPeripheral(val bluetoothDevice: BluetoothPeripheral) {
+actual class BluetoothPeripheral actual constructor(val device: NativeBluetoothDevice) {
     actual val name: String?
-        get() = bluetoothDevice.name
+        get() = device.name
     actual val uuid: String
-        get() = bluetoothDevice.address
+        get() = device.address
 
     actual var rssi: Float? = null
     actual var mtuSize: Int? = null

diff --git a/library/src/rpiMain/kotlin/dev/bluefalcon/BluetoothPeripheral.rpi.kt b/library/src/rpiMain/kotlin/dev/bluefalcon/BluetoothPeripheral.rpi.kt
@@ -0,0 +1,5 @@
+package dev.bluefalcon
+
+import com.welie.blessed.BluetoothPeripheral
+
+actual typealias NativeBluetoothDevice = BluetoothPeripheral
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		package dev.bluefalcon

		actual typealias NativeBluetoothDevice = android.bluetooth.BluetoothDevice