Fix characteristic observations on Apple and JavaScript targets (#155)

Author: twyatt

core/src/androidMain/kotlin/Peripheral.kt

@@ -205,7 +205,7 @@ public class AndroidPeripheral internal constructor(
             discoverServices()
             onServicesDiscovered(ServicesDiscoveredPeripheral(this@AndroidPeripheral))
             _state.value = State.Connecting.Observes
-            logger.verbose { message = "rewire" }
+            logger.verbose { message = "Configuring characteristic observations" }
             observers.rewire()
         } catch (t: Throwable) {
             closeConnection()

core/src/appleMain/kotlin/Observers.kt

@@ -63,7 +63,7 @@ internal class Observers(
     ): Flow<NSData> {
         return characteristicChanges
             .onSubscription {
-                peripheral.suspendUntil<State.Connecting.Observes>()
+                peripheral.suspendUntilAtLeast<State.Connecting.Observes>()
                 if (observations.add(characteristic, onSubscription) == 1) {
                     peripheral.startNotifications(characteristic)
                 }

core/src/appleMain/kotlin/Peripheral.kt

@@ -106,6 +106,12 @@ public class ApplePeripheral internal constructor(
         centralManager.delegate
             .connectionState
             .filter { event -> event.identifier == cbPeripheral.identifier }
+            .onEach { event ->
+                logger.debug {
+                    message = "CentralManagerDelegate state change"
+                    detail("state", event.toString())
+                }
+            }
             .map { event -> event.toState() }
             .onEach { _state.value = it }
             .launchIn(scope)
@@ -169,8 +175,9 @@ public class ApplePeripheral internal constructor(
             suspendUntil<State.Connecting.Services>()
             discoverServices()
             onServicesDiscovered(ServicesDiscoveredPeripheral(this@ApplePeripheral))
+
             _state.value = State.Connecting.Observes
-            logger.verbose { message = "rewire" }
+            logger.verbose { message = "Configuring characteristic observations" }
             observers.rewire()
         } catch (t: Throwable) {
             logger.error(t) { message = "Failed to connect" }
@@ -337,7 +344,7 @@ public class ApplePeripheral internal constructor(
 
     internal suspend fun startNotifications(characteristic: Characteristic) {
         logger.debug {
-            message = "notify"
+            message = "CentralManager.notify"
             detail(characteristic)
         }
 
@@ -349,7 +356,7 @@ public class ApplePeripheral internal constructor(
 
     internal suspend fun stopNotifications(characteristic: Characteristic) {
         logger.debug {
-            message = "cancelNotify"
+            message = "CentralManager.cancelNotify"
             detail(characteristic)
         }
 

core/src/commonMain/kotlin/State.kt

@@ -4,7 +4,7 @@ public sealed class State {
 
     public sealed class Connecting : State() {
         /**
-         * [Peripheral] has initiating the process of connecting, via Bluetooth.
+         * [Peripheral] has initiated the process of connecting, via Bluetooth.
          *
          * I/O operations (e.g. [write][Peripheral.write] and [read][Peripheral.read]) will throw [NotReadyException]
          * while in this state.

core/src/jsMain/kotlin/Observers.kt

@@ -36,7 +36,7 @@ internal class Observers(
         onSubscription: OnSubscriptionAction,
     ): Flow<DataView> = characteristicChanges
         .onSubscription {
-            peripheral.suspendUntil<State.Connecting.Observes>()
+            peripheral.suspendUntilAtLeast<State.Connecting.Observes>()
             if (observations.add(characteristic, onSubscription) == 1) {
                 peripheral.startObservation(characteristic)
             }

core/src/jsMain/kotlin/Peripheral.kt

@@ -134,7 +134,7 @@ public class JsPeripheral internal constructor(
             discoverServices()
             onServicesDiscovered(ServicesDiscoveredPeripheral(this@JsPeripheral))
             _state.value = State.Connecting.Observes
-            logger.verbose { message = "rewire" }
+            logger.verbose { message = "Configuring characteristic observations" }
             observers.rewire()
         } catch (t: Throwable) {
             logger.error(t) { message = "Failed to connect" }