@capgo/capacitor-health 8.5.0 → 8.5.2

package/android/src/main/java/app/capgo/plugin/health/HealthPlugin.kt

@@ -330,7 +330,7 @@ class HealthPlugin : Plugin() {
     @PluginMethod
     fun openHealthConnectSettings(call: PluginCall) {
         try {
-            val intent = Intent(HEALTH_CONNECT_SETTINGS_ACTION)
+            val intent = Intent(HealthConnectClient.ACTION_HEALTH_CONNECT_SETTINGS)
             intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
             context.startActivity(intent)
             call.resolve()
@@ -440,6 +440,5 @@ class HealthPlugin : Plugin() {
     companion object {
         private const val DEFAULT_LIMIT = 100
         private val DEFAULT_PAST_DURATION: Duration = Duration.ofDays(1)
-        private const val HEALTH_CONNECT_SETTINGS_ACTION = "androidx.health.ACTION_HEALTH_CONNECT_SETTINGS"
     }
 }

package/ios/Sources/HealthPlugin/Health.swift

@@ -881,17 +881,17 @@ final class Health {
                     return
                 }
 
-                let results = categorySamples.map { sample -> [String: Any] in
+                let results = categorySamples.compactMap { sample -> [String: Any]? in
                     let sleepValue = sample.value
                     let durationMinutes = sample.endDate.timeIntervalSince(sample.startDate) / 60.0
-                    
-                    var payload: [String: Any] = [
-                        "dataType": dataType.rawValue,
-                        "value": durationMinutes,
-                        "unit": dataType.unitIdentifier,
-                        "startDate": self.isoFormatter.string(from: sample.startDate),
-                        "endDate": self.isoFormatter.string(from: sample.endDate)
-                    ]
+                    guard var payload = self.readSamplePayload(
+                        dataType: dataType,
+                        value: durationMinutes,
+                        startDate: sample.startDate,
+                        endDate: sample.endDate
+                    ) else {
+                        return nil
+                    }
                     
                     // Map HKCategoryValueSleepAnalysis to sleep state
                     let sleepState = self.sleepStateFromValue(sleepValue)
@@ -925,16 +925,16 @@ final class Health {
                     return
                 }
 
-                let results = categorySamples.map { sample -> [String: Any] in
+                let results = categorySamples.compactMap { sample -> [String: Any]? in
                     let durationMinutes = sample.endDate.timeIntervalSince(sample.startDate) / 60.0
-                    
-                    var payload: [String: Any] = [
-                        "dataType": dataType.rawValue,
-                        "value": durationMinutes,
-                        "unit": dataType.unitIdentifier,
-                        "startDate": self.isoFormatter.string(from: sample.startDate),
-                        "endDate": self.isoFormatter.string(from: sample.endDate)
-                    ]
+                    guard var payload = self.readSamplePayload(
+                        dataType: dataType,
+                        value: durationMinutes,
+                        startDate: sample.startDate,
+                        endDate: sample.endDate
+                    ) else {
+                        return nil
+                    }
 
                     self.addSampleMetadata(sample, to: &payload)
 
@@ -972,16 +972,19 @@ final class Health {
                     
                     let systolicValue = systolicSample.quantity.doubleValue(for: HKUnit.millimeterOfMercury())
                     let diastolicValue = diastolicSample.quantity.doubleValue(for: HKUnit.millimeterOfMercury())
-                    
-                    var payload: [String: Any] = [
-                        "dataType": dataType.rawValue,
-                        "value": systolicValue,
-                        "unit": dataType.unitIdentifier,
-                        "startDate": self.isoFormatter.string(from: correlation.startDate),
-                        "endDate": self.isoFormatter.string(from: correlation.endDate),
-                        "systolic": systolicValue,
-                        "diastolic": diastolicValue
-                    ]
+                    guard systolicValue.isFinite,
+                          diastolicValue.isFinite,
+                          var payload = self.readSamplePayload(
+                              dataType: dataType,
+                              value: systolicValue,
+                              startDate: correlation.startDate,
+                              endDate: correlation.endDate
+                          ) else {
+                        return nil
+                    }
+
+                    payload["systolic"] = systolicValue
+                    payload["diastolic"] = diastolicValue
 
                     self.addSampleMetadata(correlation, to: &payload)
 
@@ -1008,15 +1011,16 @@ final class Health {
                 return
             }
 
-            let results = quantitySamples.map { sample -> [String: Any] in
+            let results = quantitySamples.compactMap { sample -> [String: Any]? in
                 let value = sample.quantity.doubleValue(for: dataType.defaultUnit)
-                var payload: [String: Any] = [
-                    "dataType": dataType.rawValue,
-                    "value": value,
-                    "unit": dataType.unitIdentifier,
-                    "startDate": self.isoFormatter.string(from: sample.startDate),
-                    "endDate": self.isoFormatter.string(from: sample.endDate)
-                ]
+                guard var payload = self.readSamplePayload(
+                    dataType: dataType,
+                    value: value,
+                    startDate: sample.startDate,
+                    endDate: sample.endDate
+                ) else {
+                    return nil
+                }
 
                 self.addSampleMetadata(sample, to: &payload)
 
@@ -1028,6 +1032,20 @@ final class Health {
 
         healthStore.execute(query)
     }
+
+    func readSamplePayload(dataType: HealthDataType, value: Double, startDate: Date, endDate: Date) -> [String: Any]? {
+        guard value.isFinite else {
+            return nil
+        }
+
+        return [
+            "dataType": dataType.rawValue,
+            "value": value,
+            "unit": dataType.unitIdentifier,
+            "startDate": isoFormatter.string(from: startDate),
+            "endDate": isoFormatter.string(from: endDate)
+        ]
+    }
     
     private func addSampleMetadata(_ sample: HKSample, to payload: inout [String: Any]) {
         let source = sample.sourceRevision.source

package/ios/Sources/HealthPlugin/HealthPlugin.swift

@@ -3,7 +3,7 @@ import Capacitor
 
 @objc(HealthPlugin)
 public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
-    private let pluginVersion: String = "8.5.0"
+    private let pluginVersion: String = "8.5.2"
     public let identifier = "HealthPlugin"
     public let jsName = "Health"
     public let pluginMethods: [CAPPluginMethod] = [

package/ios/Tests/HealthPluginTests/HealthPluginTests.swift

@@ -2,14 +2,72 @@ import XCTest
 @testable import HealthPlugin
 
 class HealthTests: XCTestCase {
-    func testEcho() {
-        // This is an example of a functional test case for a plugin.
-        // Use XCTAssert and related functions to verify your tests produce the correct results.
+    func testReadSamplePayloadIncludesFiniteValue() throws {
+        let implementation = Health()
+        let startDate = Date(timeIntervalSince1970: 0)
+        let endDate = Date(timeIntervalSince1970: 60)
+        let formatter = ISO8601DateFormatter()
+        formatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
+
+        let payload = implementation.readSamplePayload(
+            dataType: .oxygenSaturation,
+            value: 0.96,
+            startDate: startDate,
+            endDate: endDate
+        )
+
+        XCTAssertEqual(payload?["dataType"] as? String, "oxygenSaturation")
+        XCTAssertEqual(payload?["value"] as? Double, 0.96)
+        XCTAssertEqual(payload?["unit"] as? String, "percent")
 
+        let startDateString = try XCTUnwrap(payload?["startDate"] as? String)
+        let endDateString = try XCTUnwrap(payload?["endDate"] as? String)
+        let parsedStartDate = try XCTUnwrap(formatter.date(from: startDateString))
+        let parsedEndDate = try XCTUnwrap(formatter.date(from: endDateString))
+
+        XCTAssertEqual(parsedStartDate.timeIntervalSince1970, startDate.timeIntervalSince1970, accuracy: 0.001)
+        XCTAssertEqual(parsedEndDate.timeIntervalSince1970, endDate.timeIntervalSince1970, accuracy: 0.001)
+    }
+
+    func testReadSamplePayloadRejectsNaNValue() {
         let implementation = Health()
-        let value = "Hello, World!"
-        let result = implementation.echo(value)
+        let startDate = Date(timeIntervalSince1970: 0)
+
+        let payload = implementation.readSamplePayload(
+            dataType: .oxygenSaturation,
+            value: .nan,
+            startDate: startDate,
+            endDate: startDate
+        )
+
+        XCTAssertNil(payload)
+    }
+
+    func testReadSamplePayloadRejectsInfiniteValue() {
+        let implementation = Health()
+        let startDate = Date(timeIntervalSince1970: 0)
+
+        let payload = implementation.readSamplePayload(
+            dataType: .bloodGlucose,
+            value: .infinity,
+            startDate: startDate,
+            endDate: startDate
+        )
+
+        XCTAssertNil(payload)
+    }
+
+    func testReadSamplePayloadRejectsNegativeInfiniteValue() {
+        let implementation = Health()
+        let startDate = Date(timeIntervalSince1970: 0)
+
+        let payload = implementation.readSamplePayload(
+            dataType: .bloodGlucose,
+            value: -.infinity,
+            startDate: startDate,
+            endDate: startDate
+        )
 
-        XCTAssertEqual(value, result)
+        XCTAssertNil(payload)
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-health",
-  "version": "8.5.0",
+  "version": "8.5.2",
   "description": "Capacitor plugin to interact with data from Apple HealthKit and Health Connect",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",