react-native-polar-bridge 0.2.0 → 0.2.2

package/android/src/main/java/com/polarbridge/PolarBridgeModule.kt

@@ -17,12 +17,14 @@ import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.core.Single
 import java.util.*
 import java.util.concurrent.atomic.AtomicInteger
+import java.util.concurrent.TimeUnit
 import java.time.Instant
 
 @ReactModule(name = PolarBridgeModule.NAME)
 class PolarBridgeModule(reactContext: ReactApplicationContext) :
   NativePolarBridgeSpec(reactContext) {
   private val reactContext: ReactApplicationContext = reactContext
+  private val SENSOR_BUFFER_SECONDS = 10L
 
   override fun getName(): String {
     return NAME
@@ -617,17 +619,34 @@ class PolarBridgeModule(reactContext: ReactApplicationContext) :
     }
   }
 
+  data class HrSampleWithTimestamp(
+    val data: PolarHrData.PolarHrSample,
+    val timestampMs: Long
+  )
+
   override fun fetchHrData(deviceId: String) {
     Log.e(TAG, "Fetch Heart Data called on: $deviceId ")
     val isDisposed = hrDisposable?.isDisposed ?: true
     try{
       if (isDisposed) {
         hrDisposable = api.startHrStreaming(deviceId)
+          .flatMapIterable { hrData ->
+            hrData.samples.map { sample ->
+              HrSampleWithTimestamp(
+                data = sample,
+                timestampMs = System.currentTimeMillis()
+              )
+            }
+          }
+          .buffer(SENSOR_BUFFER_SECONDS, TimeUnit.SECONDS)
           .observeOn(AndroidSchedulers.mainThread())
           .subscribe(
-            { hrData: PolarHrData ->
-              Log.i(TAG, "PolarHrData ${hrData.samples.size}")
-              for (sample in hrData.samples) {
+            { samples ->
+              if (samples.isEmpty()) return@subscribe
+
+              Log.d(TAG, "Flushing HR buffer (${samples.size} samples)")
+              for (item in samples) {
+                val sample = item.data
                 Log.d(TAG, "HR     bpm: ${sample.hr} " +
                   "rrs: ${sample.rrsMs} " +
                   "rrAvailable: ${sample.rrAvailable} " +
@@ -645,6 +664,7 @@ class PolarBridgeModule(reactContext: ReactApplicationContext) :
                 event.putBoolean("rrAvailable", sample.rrAvailable)
                 event.putBoolean("contactStatus", sample.contactStatus)
                 event.putBoolean("contactStatusSupported", sample.contactStatusSupported)
+                event.putDouble("timestamp", item.timestampMs.toDouble())
 
                 sendEvent("PolarHrData", event)
               }
@@ -719,10 +739,15 @@ class PolarBridgeModule(reactContext: ReactApplicationContext) :
           .flatMap { settings: PolarSensorSetting ->
             api.startAccStreaming(deviceId, settings)
           }
+          .flatMapIterable { it.samples }
+          .buffer(SENSOR_BUFFER_SECONDS, TimeUnit.SECONDS)
           .observeOn(AndroidSchedulers.mainThread())
           .subscribe(
-            { polarAccelerometerData: PolarAccelerometerData ->
-              for (data in polarAccelerometerData.samples) {
+            { samples ->
+              if (samples.isEmpty()) return@subscribe
+              Log.d(TAG, "Flushing ACC buffer (${samples.size} samples)")
+
+              for (data in samples) {
                 Log.d(TAG, "ACC    x: ${data.x} y: ${data.y} z: ${data.z} timeStamp: ${data.timeStamp}")
 
                 val event: WritableMap = Arguments.createMap()
@@ -770,10 +795,16 @@ class PolarBridgeModule(reactContext: ReactApplicationContext) :
           .flatMap { settings: PolarSensorSetting ->
             api.startGyroStreaming(deviceId, settings)
           }
+          .flatMapIterable { it.samples }
+          .buffer(SENSOR_BUFFER_SECONDS, TimeUnit.SECONDS)
           .observeOn(AndroidSchedulers.mainThread())
           .subscribe(
-            { polarGyroData: PolarGyroData ->
-              for (data in polarGyroData.samples) {
+            { samples ->
+              if (samples.isEmpty()) return@subscribe
+
+              Log.d(TAG, "Flushing GYR buffer (${samples.size} samples)")
+
+              for (data in samples) {
                 Log.d(TAG, "GYR    x: ${data.x} y: ${data.y} z: ${data.z} timeStamp: ${data.timeStamp}")
 
                 val event: WritableMap = Arguments.createMap()
@@ -822,25 +853,31 @@ class PolarBridgeModule(reactContext: ReactApplicationContext) :
           .flatMap { settings: PolarSensorSetting ->
             api.startPpgStreaming(deviceId, settings)
           }
+          .filter { it.type == PolarPpgData.PpgDataType.PPG3_AMBIENT1 }
+          .flatMapIterable { it.samples }
+          .buffer(SENSOR_BUFFER_SECONDS, TimeUnit.SECONDS)
+          .observeOn(AndroidSchedulers.mainThread())
           .subscribe(
-            { polarPpgData: PolarPpgData ->
-              if (polarPpgData.type == PolarPpgData.PpgDataType.PPG3_AMBIENT1) {
-                for (data in polarPpgData.samples) {
-                  Log.d(TAG, "PPG    ppg0: ${data.channelSamples[0]} ppg1: ${data.channelSamples[1]} ppg2: ${data.channelSamples[2]} ambient: ${data.channelSamples[3]} timeStamp: ${data.timeStamp}")
-
-                  val event: WritableMap = Arguments.createMap()
-                  // Float not supported
-                  // See: https://github.com/facebook/react-native/issues/9685
-                  // See: https://javadoc.io/doc/com.facebook.react/react-native/0.20.1/com/facebook/react/bridge/WritableMap.html
-                  event.putString("ppg0", "${data.channelSamples[0]}")
-                  event.putString("ppg1", "${data.channelSamples[1]}")
-                  event.putString("ppg2", "${data.channelSamples[2]}")
-                  event.putString("ambient", "${data.channelSamples[3]}")
-                  // Long not supported, use double as workaround
-                  event.putDouble("ppgTimestamp", data.timeStamp.toDouble())
-
-                  sendEvent("PolarPpgData", event)
-                }
+            { samples ->
+              if (samples.isEmpty()) return@subscribe
+
+              Log.d(TAG, "Flushing PPG buffer (${samples.size} samples)")
+
+              for (data in samples) {
+                Log.d(TAG, "PPG    ppg0: ${data.channelSamples[0]} ppg1: ${data.channelSamples[1]} ppg2: ${data.channelSamples[2]} ambient: ${data.channelSamples[3]} timeStamp: ${data.timeStamp}")
+
+                val event: WritableMap = Arguments.createMap()
+                // Float not supported
+                // See: https://github.com/facebook/react-native/issues/9685
+                // See: https://javadoc.io/doc/com.facebook.react/react-native/0.20.1/com/facebook/react/bridge/WritableMap.html
+                event.putString("ppg0", "${data.channelSamples[0]}")
+                event.putString("ppg1", "${data.channelSamples[1]}")
+                event.putString("ppg2", "${data.channelSamples[2]}")
+                event.putString("ambient", "${data.channelSamples[3]}")
+                // Long not supported, use double as workaround
+                event.putDouble("ppgTimestamp", data.timeStamp.toDouble())
+
+                sendEvent("PolarPpgData", event)
               }
             },
             { error: Throwable ->

package/ios/PolarBridge.swift

@@ -46,6 +46,9 @@ class PolarBridge: RCTEventEmitter, ObservableObject
     private var isPpgStreaming = false
     private let disposeBag = DisposeBag()
 
+    /// Flush interval for all sensor buffers (seconds)
+    private let sensorFlushInterval: TimeInterval = 10.0
+
     @objc
     func multiply(_ a: NSNumber,withB b: NSNumber) -> NSNumber {
         let result = a.doubleValue * b.doubleValue
@@ -158,6 +161,53 @@ class PolarBridge: RCTEventEmitter, ObservableObject
             .asObservable()
     }
 
+    private var hrBuffer: [[String: Any]] = []
+    private let hrBufferQueue = DispatchQueue(label: "com.polarbridge.hrBufferQueue")
+    private var hrFlushTimer: Timer?
+
+    private func startHrFlushTimer() {
+        stopHrFlushTimer()
+
+        DispatchQueue.main.async { [weak self] in
+            guard let self = self else { return }
+
+            self.hrFlushTimer = Timer(
+                timeInterval: self.sensorFlushInterval,
+                repeats: true
+            ) { [weak self] _ in
+                self?.flushHrBuffer()
+            }
+
+            RunLoop.main.add(self.hrFlushTimer!, forMode: .common)
+        }
+    }
+
+    private func stopHrFlushTimer() {
+        DispatchQueue.main.async { [weak self] in
+            self?.hrFlushTimer?.invalidate()
+            self?.hrFlushTimer = nil
+        }
+    }
+
+    private func flushHrBuffer() {
+        hrBufferQueue.async { [weak self] in
+            guard let self = self else { return }
+            guard !self.hrBuffer.isEmpty else { return }
+
+            let events = self.hrBuffer
+            self.hrBuffer.removeAll()
+
+            DispatchQueue.main.async {
+                for event in events {
+                    self.sendEvent(
+                        withName: PolarEvent.PolarHrData.rawValue,
+                        body: event
+                    )
+                }
+            }
+        }
+    }
+
     @objc(fetchHrData:)
     func fetchHrData(_ deviceId: String) {
         NSLog("PolarBridge: Fetch HR Data called on: \(deviceId)")
@@ -170,12 +220,17 @@ class PolarBridge: RCTEventEmitter, ObservableObject
         // Dispose previous subscription if running
         if isHrStreaming {
             disposeHrStream()
+            stopHrFlushTimer()
+            flushHrBuffer()
+            isHrStreaming = false
+
             NSLog("PolarBridge: HR Stream stopped")
             sendEvent(withName: PolarEvent.PolarHrComplete.rawValue, body: ["message": "HR Stream stopped"])
             return
         }
 
         isHrStreaming = true
+        startHrFlushTimer()
 
         // Start HR streaming
         hrDisposable = api.startHrStreaming(deviceId)
@@ -185,28 +240,39 @@ class PolarBridge: RCTEventEmitter, ObservableObject
                     guard let self = self else { return }
                     NSLog("PolarBridge: HR data samples count: \(hrData.count)")
 
-                    for sample in hrData {
-                        NSLog("HR bpm: \(sample.hr), rrs: \(sample.rrsMs), rrAvailable: \(sample.rrAvailable), contactStatus: \(sample.contactStatus), contactStatusSupported: \(sample.contactStatusSupported)")
-
-                        // Create dictionary to send as event
-                        var event: [String: Any] = [:]
-                        event["hr"] = sample.hr
-                        event["rrsMs"] = sample.rrsMs
-                        event["rrAvailable"] = sample.rrAvailable
-                        event["contactStatus"] = sample.contactStatus
-                        event["contactStatusSupported"] = sample.contactStatusSupported
+                    self.hrBufferQueue.async {
+                        for sample in hrData {
+                            NSLog("HR bpm: \(sample.hr), rrs: \(sample.rrsMs), rrAvailable: \(sample.rrAvailable), contactStatus: \(sample.contactStatus), contactStatusSupported: \(sample.contactStatusSupported)")
 
-                        self.sendEvent(withName: PolarEvent.PolarHrData.rawValue, body: event)
+                            // Create dictionary to send as event
+                            var event: [String: Any] = [:]
+                            event["hr"] = sample.hr
+                            event["rrsMs"] = sample.rrsMs
+                            event["rrAvailable"] = sample.rrAvailable
+                            event["contactStatus"] = sample.contactStatus
+                            event["contactStatusSupported"] = sample.contactStatusSupported
+                            event["timestamp"] = Date().timeIntervalSince1970 * 1000
+
+//                             self.sendEvent(withName: PolarEvent.PolarHrData.rawValue, body: event)
+                            self.hrBuffer.append(event)
+                        }
                     }
                 },
                 onError: { [weak self] error in
                     guard let self = self else { return }
                     NSLog("PolarBridge: HR stream failed: \(error.localizedDescription)")
+                    self.stopHrFlushTimer()
+                    self.flushHrBuffer()
+                    self.isHrStreaming = false
+
                     self.sendEvent(withName: PolarEvent.PolarHrError.rawValue, body: ["error": error.localizedDescription])
                 },
                 onCompleted: { [weak self] in
                     guard let self = self else { return }
                     NSLog("PolarBridge: HR stream complete")
+                    self.stopHrFlushTimer()
+                    self.flushHrBuffer()
+                    self.isHrStreaming = false
                     self.sendEvent(withName: PolarEvent.PolarHrComplete.rawValue, body: ["message": "HR stream complete"])
                 }
             )
@@ -215,6 +281,64 @@ class PolarBridge: RCTEventEmitter, ObservableObject
 
     }
 
+    // ACC
+    private var accBuffer: [[String: Any]] = []
+    private let accBufferQueue = DispatchQueue(label: "com.polarbridge.accBufferQueue")
+    private var accFlushTimer: Timer?
+
+    // GYR
+    private var gyrBuffer: [[String: Any]] = []
+    private let gyrBufferQueue = DispatchQueue(label: "com.polarbridge.gyrBufferQueue")
+    private var gyrFlushTimer: Timer?
+
+    // PPG
+    private var ppgBuffer: [[String: Any]] = []
+    private let ppgBufferQueue = DispatchQueue(label: "com.polarbridge.ppgBufferQueue")
+    private var ppgFlushTimer: Timer?
+
+    private func startAccFlushTimer() {
+        stopAccFlushTimer()
+
+        DispatchQueue.main.async { [weak self] in
+            guard let self = self else { return }
+
+            self.accFlushTimer = Timer(
+                timeInterval: self.sensorFlushInterval,
+                repeats: true
+            ) { [weak self] _ in
+                self?.flushAccBuffer()
+            }
+
+            RunLoop.main.add(self.accFlushTimer!, forMode: .common)
+        }
+    }
+
+    private func stopAccFlushTimer() {
+        DispatchQueue.main.async { [weak self] in
+            self?.accFlushTimer?.invalidate()
+            self?.accFlushTimer = nil
+        }
+    }
+
+    private func flushAccBuffer() {
+        accBufferQueue.async { [weak self] in
+            guard let self = self else { return }
+            guard !self.accBuffer.isEmpty else { return }
+
+            let events = self.accBuffer
+            self.accBuffer.removeAll()
+
+            DispatchQueue.main.async {
+                for event in events {
+                    self.sendEvent(
+                        withName: PolarEvent.PolarAccData.rawValue,
+                        body: event
+                    )
+                }
+            }
+        }
+    }
+
     @objc(fetchAccData:)
     func fetchAccData(_ deviceId: String) {
         NSLog("PolarBridge: Fetch ACC Data called on: \(deviceId)")
@@ -227,12 +351,17 @@ class PolarBridge: RCTEventEmitter, ObservableObject
         // Stop existing ACC stream if running
         if isAccStreaming {
             disposeAccStream()
+            stopAccFlushTimer()
+            flushAccBuffer()
+            isAccStreaming = false
+
             NSLog("PolarBridge: ACC Stream stopped")
             sendEvent(withName: PolarEvent.PolarAccComplete.rawValue, body: ["message": "ACC Stream stopped"])
             return
         }
 
         isAccStreaming = true
+        startAccFlushTimer()
 
         accDisposable = requestStreamSettings(deviceId, feature: .acc)
             .flatMap { settings in
@@ -243,21 +372,28 @@ class PolarBridge: RCTEventEmitter, ObservableObject
                 onNext: { [weak self] accData in
                     guard let self = self else { return }
 
-                    for sample in accData.samples {
-                        NSLog("ACC x: \(sample.x) y: \(sample.y) z: \(sample.z) timestamp: \(sample.timeStamp)")
+                    self.accBufferQueue.async {
+                        for sample in accData.samples {
+                            NSLog("ACC x: \(sample.x) y: \(sample.y) z: \(sample.z) timestamp: \(sample.timeStamp)")
 
-                        var event: [String: Any] = [:]
-                        event["accX"] = sample.x
-                        event["accY"] = sample.y
-                        event["accZ"] = sample.z
-                        event["accTimestamp"] = Double(sample.timeStamp)  // RN doesn’t support int64
+                            var event: [String: Any] = [:]
+                            event["accX"] = sample.x
+                            event["accY"] = sample.y
+                            event["accZ"] = sample.z
+                            event["accTimestamp"] = Double(sample.timeStamp)  // RN doesn’t support int64
 
-                        self.sendEvent(withName: PolarEvent.PolarAccData.rawValue, body: event)
+                            self.accBuffer.append(event)
+//                             self.sendEvent(withName: PolarEvent.PolarAccData.rawValue, body: event)
+                        }
                     }
                 },
                 onError: { [weak self] error in
                     guard let self = self else { return }
 
+                    self.stopAccFlushTimer()
+                    self.flushAccBuffer()
+                    self.isAccStreaming = false
+
                     NSLog("PolarBridge: ACC stream failed: \(error.localizedDescription)")
 
                     self.sendEvent(
@@ -270,6 +406,10 @@ class PolarBridge: RCTEventEmitter, ObservableObject
                 onCompleted: { [weak self] in
                     guard let self = self else { return }
 
+                    self.stopAccFlushTimer()
+                    self.flushAccBuffer()
+                    self.isAccStreaming = false
+
                     NSLog("PolarBridge: ACC stream complete")
 
                     self.sendEvent(
@@ -284,6 +424,49 @@ class PolarBridge: RCTEventEmitter, ObservableObject
         accDisposable?.disposed(by: disposeBag)
     }
 
+    private func startGyrFlushTimer() {
+        stopGyrFlushTimer()
+
+        DispatchQueue.main.async { [weak self] in
+            guard let self = self else { return }
+
+            self.gyrFlushTimer = Timer(
+                timeInterval: self.sensorFlushInterval,
+                repeats: true
+            ) { [weak self] _ in
+                self?.flushGyrBuffer()
+            }
+
+            RunLoop.main.add(self.gyrFlushTimer!, forMode: .common)
+        }
+    }
+
+    private func stopGyrFlushTimer() {
+        DispatchQueue.main.async { [weak self] in
+            self?.gyrFlushTimer?.invalidate()
+            self?.gyrFlushTimer = nil
+        }
+    }
+
+    private func flushGyrBuffer() {
+        gyrBufferQueue.async { [weak self] in
+            guard let self = self else { return }
+            guard !self.gyrBuffer.isEmpty else { return }
+
+            let events = self.gyrBuffer
+            self.gyrBuffer.removeAll()
+
+            DispatchQueue.main.async {
+                for event in events {
+                    self.sendEvent(
+                        withName: PolarEvent.PolarGyrData.rawValue,
+                        body: event
+                    )
+                }
+            }
+        }
+    }
+
     @objc(fetchGyrData:)
     func fetchGyrData(_ deviceId: String) {
         NSLog("PolarBridge: Fetch Gyroscope Data called on: \(deviceId)")
@@ -295,12 +478,17 @@ class PolarBridge: RCTEventEmitter, ObservableObject
 
         if isGyrStreaming {
             disposeGyrStream()
+            stopGyrFlushTimer()
+            flushGyrBuffer()
+            isGyrStreaming = false
+
             NSLog("PolarBridge: GYR Stream stopped")
             sendEvent(withName: PolarEvent.PolarAccComplete.rawValue, body: ["message": "GYR Stream stopped"])
             return
         }
 
         isGyrStreaming = true
+        startGyrFlushTimer()
 
         gyrDisposable = requestStreamSettings(deviceId, feature: .gyro)
             .flatMap { settings in
@@ -311,28 +499,35 @@ class PolarBridge: RCTEventEmitter, ObservableObject
                 onNext: { [weak self] gyrData in
                     guard let self = self else { return }
 
-                    for sample in gyrData.samples {
-                        NSLog("GYR x: \(sample.x) y: \(sample.y) z: \(sample.z) timestamp: \(sample.timeStamp)")
+                    self.gyrBufferQueue.async {
+                        for sample in gyrData.samples {
+                            NSLog("GYR x: \(sample.x) y: \(sample.y) z: \(sample.z) timestamp: \(sample.timeStamp)")
 
-                        var event: [String: Any] = [:]
+                            var event: [String: Any] = [:]
 
-                        // JS does NOT support Float — convert to String
-                        event["gyrX"] = "\(sample.x)"
-                        event["gyrY"] = "\(sample.y)"
-                        event["gyrZ"] = "\(sample.z)"
+                            // JS does NOT support Float — convert to String
+                            event["gyrX"] = "\(sample.x)"
+                            event["gyrY"] = "\(sample.y)"
+                            event["gyrZ"] = "\(sample.z)"
 
-                        // JS does NOT support Int64 — convert to Double
-                        event["gyrTimestamp"] = Double(sample.timeStamp)
+                            // JS does NOT support Int64 — convert to Double
+                            event["gyrTimestamp"] = Double(sample.timeStamp)
 
-                        self.sendEvent(
-                            withName: PolarEvent.PolarGyrData.rawValue,
-                            body: event
-                        )
+                            self.gyrBuffer.append(event)
+//                             self.sendEvent(
+//                                 withName: PolarEvent.PolarGyrData.rawValue,
+//                                 body: event
+//                             )
+                        }
                     }
                 },
                 onError: { [weak self] error in
                     guard let self = self else { return }
 
+                    stopGyrFlushTimer()
+                    flushGyrBuffer()
+                    isGyrStreaming = false
+
                     NSLog("PolarBridge: GYR stream failed: \(error.localizedDescription)")
 
                     self.sendEvent(
@@ -345,6 +540,10 @@ class PolarBridge: RCTEventEmitter, ObservableObject
                 onCompleted: { [weak self] in
                     guard let self = self else { return }
 
+                    stopGyrFlushTimer()
+                    flushGyrBuffer()
+                    isGyrStreaming = false
+
                     NSLog("PolarBridge: GYR stream complete")
 
                     self.sendEvent(
@@ -359,6 +558,49 @@ class PolarBridge: RCTEventEmitter, ObservableObject
         gyrDisposable?.disposed(by: disposeBag)
     }
 
+    private func startPpgFlushTimer() {
+        stopPpgFlushTimer()
+
+        DispatchQueue.main.async { [weak self] in
+            guard let self = self else { return }
+
+            self.ppgFlushTimer = Timer(
+                timeInterval: self.sensorFlushInterval,
+                repeats: true
+            ) { [weak self] _ in
+                self?.flushPpgBuffer()
+            }
+
+            RunLoop.main.add(self.ppgFlushTimer!, forMode: .common)
+        }
+    }
+
+    private func stopPpgFlushTimer() {
+        DispatchQueue.main.async { [weak self] in
+            self?.ppgFlushTimer?.invalidate()
+            self?.ppgFlushTimer = nil
+        }
+    }
+
+    private func flushPpgBuffer() {
+        ppgBufferQueue.async { [weak self] in
+            guard let self = self else { return }
+            guard !self.ppgBuffer.isEmpty else { return }
+
+            let events = self.ppgBuffer
+            self.ppgBuffer.removeAll()
+
+            DispatchQueue.main.async {
+                for event in events {
+                    self.sendEvent(
+                        withName: PolarEvent.PolarPpgData.rawValue,
+                        body: event
+                    )
+                }
+            }
+        }
+    }
+
     @objc(fetchPpgData:)
     func fetchPpgData(_ deviceId: String) {
         NSLog("PolarBridge: Fetch PPG Data called on: \(deviceId)")
@@ -370,13 +612,17 @@ class PolarBridge: RCTEventEmitter, ObservableObject
 
         if isPpgStreaming {
             disposePpgStream()
+            stopPpgFlushTimer()
+            flushPpgBuffer()
+            isPpgStreaming = false
+
             NSLog("PolarBridge: PPG Stream stopped")
             sendEvent(withName: PolarEvent.PolarAccComplete.rawValue, body: ["message": "PPG Stream stopped"])
             return
         }
 
         isPpgStreaming = true
-
+        startPpgFlushTimer()
 
         ppgDisposable = requestStreamSettings(deviceId, feature: .ppg)
             .flatMap { settings in
@@ -389,31 +635,38 @@ class PolarBridge: RCTEventEmitter, ObservableObject
 
                     // Only handle PPG3_AMBIENT1 type (just like Kotlin)
                     if ppgData.type == PpgDataType.ppg3_ambient1 {
-                        for sample in ppgData.samples {
+                        self.ppgBufferQueue.async {
+                            for sample in ppgData.samples {
 
-                            NSLog("PPG ppg0: \(sample.channelSamples[0]) ppg1: \(sample.channelSamples[1]) ppg2: \(sample.channelSamples[2]) ambient: \(sample.channelSamples[3]) ts: \(sample.timeStamp)")
+                                NSLog("PPG ppg0: \(sample.channelSamples[0]) ppg1: \(sample.channelSamples[1]) ppg2: \(sample.channelSamples[2]) ambient: \(sample.channelSamples[3]) ts: \(sample.timeStamp)")
 
-                            var event: [String: Any] = [:]
+                                var event: [String: Any] = [:]
 
-                            // Float → String (React Native cannot handle Float)
-                            event["ppg0"] = "\(sample.channelSamples[0])"
-                            event["ppg1"] = "\(sample.channelSamples[1])"
-                            event["ppg2"] = "\(sample.channelSamples[2])"
-                            event["ambient"] = "\(sample.channelSamples[3])"
+                                // Float → String (React Native cannot handle Float)
+                                event["ppg0"] = "\(sample.channelSamples[0])"
+                                event["ppg1"] = "\(sample.channelSamples[1])"
+                                event["ppg2"] = "\(sample.channelSamples[2])"
+                                event["ambient"] = "\(sample.channelSamples[3])"
 
-                            // Int64 timestamp → Double
-                            event["ppgTimestamp"] = Double(sample.timeStamp)
+                                // Int64 timestamp → Double
+                                event["ppgTimestamp"] = Double(sample.timeStamp)
 
-                            self.sendEvent(
-                                withName: PolarEvent.PolarPpgData.rawValue,
-                                body: event
-                            )
+                                self.ppgBuffer.append(event)
+//                                 self.sendEvent(
+//                                     withName: PolarEvent.PolarPpgData.rawValue,
+//                                     body: event
+//                                 )
+                            }
                         }
                     }
                 },
                 onError: { [weak self] error in
                     guard let self = self else { return }
 
+                    self.stopPpgFlushTimer()
+                    self.flushPpgBuffer()
+                    self.isPpgStreaming = false
+
                     NSLog("PolarBridge: PPG stream failed: \(error.localizedDescription)")
 
                     self.sendEvent(
@@ -426,6 +679,10 @@ class PolarBridge: RCTEventEmitter, ObservableObject
                 onCompleted: { [weak self] in
                     guard let self = self else { return }
 
+                    self.stopPpgFlushTimer()
+                    self.flushPpgBuffer()
+                    self.isPpgStreaming = false
+
                     NSLog("PolarBridge: PPG stream complete")
 
                     self.sendEvent(

package/lib/typescript/src/PolarDataModel.d.ts

@@ -21,6 +21,7 @@ export type HrData = {
     rrAvailable: boolean;
     contactStatus: boolean;
     contactStatusSupported: boolean;
+    timestamp: number;
 };
 export type AccData = {
     accX: number;

package/lib/typescript/src/PolarDataModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PolarDataModel.d.ts","sourceRoot":"","sources":["../../../src/PolarDataModel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,OAAO,CAAC;IACvB,sBAAsB,EAAE,OAAO,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAG,MAAM,CAAC;CACvB,CAAC"}
+{"version":3,"file":"PolarDataModel.d.ts","sourceRoot":"","sources":["../../../src/PolarDataModel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,OAAO,CAAC;IACvB,sBAAsB,EAAE,OAAO,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAG,MAAM,CAAC;CACvB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-polar-bridge",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Polar SDK for React Native",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",

package/src/PolarDataModel.tsx

@@ -23,6 +23,7 @@ export type HrData = {
   rrAvailable: boolean;
   contactStatus: boolean;
   contactStatusSupported: boolean;
+  timestamp: number;
 };
 
 export type AccData = {