@flomentumsolutions/capacitor-health-extended 0.0.5 → 0.0.7

package/FlomentumsolutionsCapacitorHealthExtended.podspec

@@ -10,8 +10,11 @@ Pod::Spec.new do |s|
   s.homepage = package['repository']['url']
   s.author = package['author']
   s.source = { :git => package['repository']['url'], :tag => s.version.to_s }
-  s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
+  # Only include Swift/Obj-C source files that belong to the plugin
+  s.source_files = 'ios/Sources/HealthPluginPlugin/**/*.{swift,h,m}'
   s.ios.deployment_target  = '13.0'
-  s.dependency 'Capacitor'
-  s.swift_version = '5.1'
-end
+  s.dependency 'Capacitor',        '~> 6.2'
+  s.dependency 'CapacitorCordova', '~> 6.2'
+  # Match the Swift shipped with Xcode 16 (use 5.9 for Xcode 15.x)
+  s.swift_version = '6.0'
+end

package/README.md

@@ -35,14 +35,17 @@ npx cap sync
     </queries>
 
     <!-- Declare permissions you’ll request -->
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.health.READ_STEPS"/>
-    <uses-permission android:name="android.permission.health.READ_EXERCISE"/>
+    <uses-permission android:name="android.permission.health.READ_STEPS" />
+    <uses-permission android:name="android.permission.health.READ_ACTIVE_CALORIES_BURNED" />
+    <uses-permission android:name="android.permission.health.READ_TOTAL_CALORIES_BURNED" />
+    <uses-permission android:name="android.permission.health.READ_DISTANCE" />
+    <uses-permission android:name="android.permission.health.READ_EXERCISE" />
+    <uses-permission android:name="android.permission.health.READ_EXERCISE_ROUTE" />
+    <uses-permission android:name="android.permission.health.READ_HEART_RATE" />
     <uses-permission android:name="android.permission.health.READ_WEIGHT" />
-    <uses-permission android:name="android.permission.health.READ_DISTANCE"/>
-    <uses-permission android:name="android.permission.health.READ_ACTIVE_CALORIES_BURNED"/>
-    <uses-permission android:name="android.permission.health.READ_TOTAL_CALORIES_BURNED"/>
-    <uses-permission android:name="android.permission.health.READ_HEART_RATE"/>
+    <uses-permission android:name="android.permission.health.READ_HEIGHT" />
+    <uses-permission android:name="android.permission.health.READ_HEART_RATE_VARIABILITY" />
+    <uses-permission android:name="android.permission.health.READ_BLOOD_PRESSURE" />
 ```
 
 
@@ -277,12 +280,12 @@ Query workouts
 
 #### QueryAggregatedRequest
 
-| Prop            | Type                               |
-| --------------- | ---------------------------------- |
-| **`startDate`** | <code>string</code>                |
-| **`endDate`**   | <code>string</code>                |
-| **`dataType`**  | <code>'steps' \| 'calories'</code> |
-| **`bucket`**    | <code>string</code>                |
+| Prop            | Type                                                                                    |
+| --------------- | --------------------------------------------------------------------------------------- |
+| **`startDate`** | <code>string</code>                                                                     |
+| **`endDate`**   | <code>string</code>                                                                     |
+| **`dataType`**  | <code>'steps' \| 'active-calories' \| 'mindfulness' \| 'hrv' \| 'blood-pressure'</code> |
+| **`bucket`**    | <code>string</code>                                                                     |
 
 
 #### QueryWorkoutResponse
@@ -303,6 +306,7 @@ Query workouts
 | **`id`**             | <code>string</code>            |
 | **`duration`**       | <code>number</code>            |
 | **`distance`**       | <code>number</code>            |
+| **`steps`**          | <code>number</code>            |
 | **`calories`**       | <code>number</code>            |
 | **`sourceBundleId`** | <code>string</code>            |
 | **`route`**          | <code>RouteSample[]</code>     |
@@ -335,6 +339,7 @@ Query workouts
 | **`endDate`**          | <code>string</code>  |
 | **`includeHeartRate`** | <code>boolean</code> |
 | **`includeRoute`**     | <code>boolean</code> |
+| **`includeSteps`**     | <code>boolean</code> |
 
 
 ### Type Aliases
@@ -342,6 +347,6 @@ Query workouts
 
 #### HealthPermission
 
-<code>'READ_STEPS' | 'READ_WORKOUTS' | 'READ_CALORIES' | 'READ_DISTANCE' | 'READ_HEART_RATE' | 'READ_ROUTE'</code>
+<code>'READ_STEPS' | 'READ_WORKOUTS' | 'READ_ACTIVE_CALORIES' | 'READ_TOTAL_CALORIES' | 'READ_DISTANCE' | 'READ_WEIGHT' | 'READ_HEIGHT' | 'READ_HEART_RATE' | 'READ_ROUTE' | 'READ_MINDFULNESS' | 'READ_HRV' | 'READ_BLOOD_PRESSURE'</code>
 
 </docgen-api>

package/android/src/main/java/com/flomentum/health/capacitor/HealthPlugin.kt

@@ -32,7 +32,8 @@ import java.util.concurrent.atomic.AtomicReference
 import androidx.core.net.toUri
 
 enum class CapHealthPermission {
-    READ_STEPS, READ_WORKOUTS, READ_HEART_RATE, READ_ACTIVE_CALORIES, READ_TOTAL_CALORIES, READ_DISTANCE, READ_WEIGHT;
+    READ_STEPS, READ_WORKOUTS, READ_HEART_RATE, READ_ACTIVE_CALORIES, READ_TOTAL_CALORIES, READ_DISTANCE, READ_WEIGHT
+    , READ_HRV, READ_BLOOD_PRESSURE;
 
     companion object {
         fun from(s: String): CapHealthPermission? {
@@ -50,11 +51,14 @@ enum class CapHealthPermission {
     permissions = [
         Permission(alias = "READ_STEPS", strings = ["android.permission.health.READ_STEPS"]),
         Permission(alias = "READ_WEIGHT", strings = ["android.permission.health.READ_WEIGHT"]),
+        Permission(alias = "READ_HEIGHT", strings = ["android.permission.health.READ_HEIGHT"]),
         Permission(alias = "READ_WORKOUTS", strings = ["android.permission.health.READ_EXERCISE"]),
         Permission(alias = "READ_DISTANCE", strings = ["android.permission.health.READ_DISTANCE"]),
         Permission(alias = "READ_ACTIVE_CALORIES", strings = ["android.permission.health.READ_ACTIVE_CALORIES_BURNED"]),
         Permission(alias = "READ_TOTAL_CALORIES", strings = ["android.permission.health.READ_TOTAL_CALORIES_BURNED"]),
-        Permission(alias = "READ_HEART_RATE", strings = ["android.permission.health.READ_HEART_RATE"])
+        Permission(alias = "READ_HEART_RATE", strings = ["android.permission.health.READ_HEART_RATE"]),
+        Permission(alias = "READ_HRV", strings = ["android.permission.health.READ_HEART_RATE_VARIABILITY"]),
+        Permission(alias = "READ_BLOOD_PRESSURE", strings = ["android.permission.health.READ_BLOOD_PRESSURE"])
     ]
 )
 
@@ -75,7 +79,9 @@ class HealthPlugin : Plugin() {
         CapHealthPermission.READ_ACTIVE_CALORIES to HealthPermission.getReadPermission(ActiveCaloriesBurnedRecord::class),
         CapHealthPermission.READ_TOTAL_CALORIES to HealthPermission.getReadPermission(TotalCaloriesBurnedRecord::class),
         CapHealthPermission.READ_DISTANCE to HealthPermission.getReadPermission(DistanceRecord::class),
-        CapHealthPermission.READ_WORKOUTS to HealthPermission.getReadPermission(ExerciseSessionRecord::class)
+        CapHealthPermission.READ_WORKOUTS to HealthPermission.getReadPermission(ExerciseSessionRecord::class),
+        CapHealthPermission.READ_HRV to HealthPermission.getReadPermission(HeartRateVariabilitySdnnRecord::class),
+        CapHealthPermission.READ_BLOOD_PRESSURE to HealthPermission.getReadPermission(BloodPressureRecord::class)
     )
 
     override fun load() {
@@ -258,6 +264,7 @@ class HealthPlugin : Plugin() {
                 TotalCaloriesBurnedRecord.ENERGY_TOTAL
             ) { it?.inKilocalories }
             "distance" -> metricAndMapper("distance", CapHealthPermission.READ_DISTANCE, DistanceRecord.DISTANCE_TOTAL) { it?.inMeters }
+            "hrv" -> metricAndMapper("hrv", CapHealthPermission.READ_HRV, HeartRateVariabilitySdnnRecord.SDNN_AVG) { it }
             else -> throw RuntimeException("Unsupported dataType: $dataType")
         }
     }
@@ -277,6 +284,8 @@ class HealthPlugin : Plugin() {
                     "heart-rate" -> readLatestHeartRate()
                     "weight" -> readLatestWeight()
                     "steps" -> readLatestSteps()
+                    "hrv" -> readLatestHrv()
+                    "blood-pressure" -> readLatestBloodPressure()
                     else -> {
                         call.reject("Unsupported data type: $dataType")
                         return@launch
@@ -284,7 +293,7 @@ class HealthPlugin : Plugin() {
                 }
                 call.resolve(result)
             } catch (e: Exception) {
-                Log.e(tag, "queryLatestSample: Error fetching latest heart-rate", e)
+                Log.e(tag, "queryLatestSample: Error fetching latest $dataType", e)
                 call.reject("Error fetching latest $dataType: ${e.message}")
             }
         }
@@ -344,6 +353,41 @@ class HealthPlugin : Plugin() {
         }
     }
 
+    private suspend fun readLatestHrv(): JSObject {
+        if (!hasPermission(CapHealthPermission.READ_HRV)) {
+            throw Exception("Permission for HRV not granted")
+        }
+        val request = ReadRecordsRequest(
+            recordType = HeartRateVariabilitySdnnRecord::class,
+            timeRangeFilter = TimeRangeFilter.after(Instant.EPOCH),
+            pageSize = 1
+        )
+        val result = healthConnectClient.readRecords(request)
+        val record = result.records.firstOrNull() ?: throw Exception("No HRV data found")
+        return JSObject().apply {
+            put("timestamp", record.time.toString())
+            put("value", record.sdnnMillis)
+        }
+    }
+
+    private suspend fun readLatestBloodPressure(): JSObject {
+        if (!hasPermission(CapHealthPermission.READ_BLOOD_PRESSURE)) {
+            throw Exception("Permission for blood pressure not granted")
+        }
+        val request = ReadRecordsRequest(
+            recordType = BloodPressureRecord::class,
+            timeRangeFilter = TimeRangeFilter.after(Instant.EPOCH),
+            pageSize = 1
+        )
+        val result = healthConnectClient.readRecords(request)
+        val record = result.records.firstOrNull() ?: throw Exception("No blood pressure data found")
+        return JSObject().apply {
+            put("timestamp", record.time.toString())
+            put("systolic", record.systolic.inMillimetersOfMercury)
+            put("diastolic", record.diastolic.inMillimetersOfMercury)
+        }
+    }
+
     @PluginMethod
     fun queryAggregated(call: PluginCall) {
         if (!ensureClientInitialized(call)) return

package/dist/esm/definitions.d.ts

@@ -51,7 +51,7 @@ export interface HealthPlugin {
      */
     queryWorkouts(request: QueryWorkoutRequest): Promise<QueryWorkoutResponse>;
 }
-export declare type HealthPermission = 'READ_STEPS' | 'READ_WORKOUTS' | 'READ_ACTIVE_CALORIES' | 'READ_TOTAL_CALORIES' | 'READ_DISTANCE' | 'READ_HEART_RATE' | 'READ_ROUTE' | 'READ_MINDFULNESS';
+export declare type HealthPermission = 'READ_STEPS' | 'READ_WORKOUTS' | 'READ_ACTIVE_CALORIES' | 'READ_TOTAL_CALORIES' | 'READ_DISTANCE' | 'READ_WEIGHT' | 'READ_HEIGHT' | 'READ_HEART_RATE' | 'READ_ROUTE' | 'READ_MINDFULNESS' | 'READ_HRV' | 'READ_BLOOD_PRESSURE';
 export interface PermissionsRequest {
     permissions: HealthPermission[];
 }
@@ -97,7 +97,7 @@ export interface Workout {
 export interface QueryAggregatedRequest {
     startDate: string;
     endDate: string;
-    dataType: 'steps' | 'active-calories' | 'mindfulness';
+    dataType: 'steps' | 'active-calories' | 'mindfulness' | 'hrv' | 'blood-pressure';
     bucket: string;
 }
 export interface QueryAggregatedResponse {

package/dist/esm/definitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["export interface HealthPlugin {\n  /**\n   * Checks if health API is available.\n   * Android: If false is returned, the Google Health Connect app is probably not installed.\n   * See showHealthConnectInPlayStore()\n   *\n   */\n  isHealthAvailable(): Promise<{ available: boolean }>;\n\n  /**\n   * Android only: Returns for each given permission, if it was granted by the underlying health API\n   * @param permissions permissions to query\n   */\n  checkHealthPermissions(permissions: PermissionsRequest): Promise<PermissionResponse>;\n\n  /**\n   * Requests the permissions from the user.\n   *\n   * Android: Apps can ask only a few times for permissions, after that the user has to grant them manually in\n   * the Health Connect app. See openHealthConnectSettings()\n   *\n   * iOS: If the permissions are already granted or denied, this method will just return without asking the user. In iOS\n   * we can't really detect if a user granted or denied a permission. The return value reflects the assumption that all\n   * permissions were granted.\n   *\n   * @param permissions permissions to request\n   */\n  requestHealthPermissions(permissions: PermissionsRequest): Promise<PermissionResponse>;\n\n  /**\n   * Opens the apps settings, which is kind of wrong, because health permissions are configured under:\n   * Settings > Apps > (Apple) Health > Access and Devices > [app-name]\n   * But we can't go there directly.\n   */\n  openAppleHealthSettings(): Promise<void>;\n\n  /**\n   * Opens the Google Health Connect app\n   */\n  openHealthConnectSettings(): Promise<void>;\n\n  /**\n   * Opens the Google Health Connect app in PlayStore\n   */\n  showHealthConnectInPlayStore(): Promise<void>;\n\n  /**\n   * Query aggregated data\n   * @param request\n   */\n  queryAggregated(request: QueryAggregatedRequest): Promise<QueryAggregatedResponse>;\n\n  /**\n   * Query workouts\n   * @param request\n   */\n  queryWorkouts(request: QueryWorkoutRequest): Promise<QueryWorkoutResponse>;\n}\n\nexport declare type HealthPermission =\n  | 'READ_STEPS'\n  | 'READ_WORKOUTS'\n  | 'READ_ACTIVE_CALORIES'\n  | 'READ_TOTAL_CALORIES'\n  | 'READ_DISTANCE'\n  | 'READ_HEART_RATE'\n  | 'READ_ROUTE'\n  | 'READ_MINDFULNESS';\n\nexport interface PermissionsRequest {\n  permissions: HealthPermission[];\n}\n\nexport interface PermissionResponse {\n  permissions: { [key: string]: boolean }[];\n}\n\nexport interface QueryWorkoutRequest {\n  startDate: string;\n  endDate: string;\n  includeHeartRate: boolean;\n  includeRoute: boolean;\n  includeSteps: boolean;\n}\n\nexport interface HeartRateSample {\n  timestamp: string;\n  bpm: number;\n}\n\nexport interface RouteSample {\n  timestamp: string;\n  lat: number;\n  lng: number;\n  alt?: number;\n}\n\nexport interface QueryWorkoutResponse {\n  workouts: Workout[];\n}\n\nexport interface Workout {\n  startDate: string;\n  endDate: string;\n  workoutType: string;\n  sourceName: string;\n  id?: string;\n  duration: number;\n  distance?: number;\n  steps?: number;\n  calories: number;\n  sourceBundleId: string;\n  route?: RouteSample[];\n  heartRate?: HeartRateSample[];\n}\n\nexport interface QueryAggregatedRequest {\n  startDate: string;\n  endDate: string;\n  dataType: 'steps' | 'active-calories' | 'mindfulness';\n  bucket: string;\n}\n\nexport interface QueryAggregatedResponse {\n  aggregatedData: AggregatedSample[];\n}\n\nexport interface AggregatedSample {\n  startDate: string;\n  endDate: string;\n  value: number;\n}\n"]}
+{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["export interface HealthPlugin {\n  /**\n   * Checks if health API is available.\n   * Android: If false is returned, the Google Health Connect app is probably not installed.\n   * See showHealthConnectInPlayStore()\n   *\n   */\n  isHealthAvailable(): Promise<{ available: boolean }>;\n\n  /**\n   * Android only: Returns for each given permission, if it was granted by the underlying health API\n   * @param permissions permissions to query\n   */\n  checkHealthPermissions(permissions: PermissionsRequest): Promise<PermissionResponse>;\n\n  /**\n   * Requests the permissions from the user.\n   *\n   * Android: Apps can ask only a few times for permissions, after that the user has to grant them manually in\n   * the Health Connect app. See openHealthConnectSettings()\n   *\n   * iOS: If the permissions are already granted or denied, this method will just return without asking the user. In iOS\n   * we can't really detect if a user granted or denied a permission. The return value reflects the assumption that all\n   * permissions were granted.\n   *\n   * @param permissions permissions to request\n   */\n  requestHealthPermissions(permissions: PermissionsRequest): Promise<PermissionResponse>;\n\n  /**\n   * Opens the apps settings, which is kind of wrong, because health permissions are configured under:\n   * Settings > Apps > (Apple) Health > Access and Devices > [app-name]\n   * But we can't go there directly.\n   */\n  openAppleHealthSettings(): Promise<void>;\n\n  /**\n   * Opens the Google Health Connect app\n   */\n  openHealthConnectSettings(): Promise<void>;\n\n  /**\n   * Opens the Google Health Connect app in PlayStore\n   */\n  showHealthConnectInPlayStore(): Promise<void>;\n\n  /**\n   * Query aggregated data\n   * @param request\n   */\n  queryAggregated(request: QueryAggregatedRequest): Promise<QueryAggregatedResponse>;\n\n  /**\n   * Query workouts\n   * @param request\n   */\n  queryWorkouts(request: QueryWorkoutRequest): Promise<QueryWorkoutResponse>;\n}\n\nexport declare type HealthPermission =\n  | 'READ_STEPS'\n  | 'READ_WORKOUTS'\n  | 'READ_ACTIVE_CALORIES'\n  | 'READ_TOTAL_CALORIES'\n  | 'READ_DISTANCE'\n  | 'READ_WEIGHT'\n  | 'READ_HEIGHT'\n  | 'READ_HEART_RATE'\n  | 'READ_ROUTE'\n  | 'READ_MINDFULNESS'\n  | 'READ_HRV'\n  | 'READ_BLOOD_PRESSURE';\n\nexport interface PermissionsRequest {\n  permissions: HealthPermission[];\n}\n\nexport interface PermissionResponse {\n  permissions: { [key: string]: boolean }[];\n}\n\nexport interface QueryWorkoutRequest {\n  startDate: string;\n  endDate: string;\n  includeHeartRate: boolean;\n  includeRoute: boolean;\n  includeSteps: boolean;\n}\n\nexport interface HeartRateSample {\n  timestamp: string;\n  bpm: number;\n}\n\nexport interface RouteSample {\n  timestamp: string;\n  lat: number;\n  lng: number;\n  alt?: number;\n}\n\nexport interface QueryWorkoutResponse {\n  workouts: Workout[];\n}\n\nexport interface Workout {\n  startDate: string;\n  endDate: string;\n  workoutType: string;\n  sourceName: string;\n  id?: string;\n  duration: number;\n  distance?: number;\n  steps?: number;\n  calories: number;\n  sourceBundleId: string;\n  route?: RouteSample[];\n  heartRate?: HeartRateSample[];\n}\n\nexport interface QueryAggregatedRequest {\n  startDate: string;\n  endDate: string;\n  dataType: 'steps' | 'active-calories' | 'mindfulness' | 'hrv' | 'blood-pressure';\n  bucket: string;\n}\n\nexport interface QueryAggregatedResponse {\n  aggregatedData: AggregatedSample[];\n}\n\nexport interface AggregatedSample {\n  startDate: string;\n  endDate: string;\n  value: number;\n}\n"]}

package/dist/plugin.js

@@ -1,4 +1,4 @@
-var capacitorHealthPlugin = (function (exports, core) {
+var capacitorHealthExtendedPlugin = (function (exports, core) {
 	'use strict';
 
 	const Health = core.registerPlugin('HealthPlugin', {});

package/ios/Sources/HealthPluginPlugin/HealthPlugin.swift

@@ -86,6 +86,53 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
             call.reject("Missing data type")
             return
         }
+        // ---- Special handling for blood‑pressure correlation ----
+        if dataTypeString == "blood-pressure" {
+            guard let bpType = HKObjectType.correlationType(forIdentifier: .bloodPressure) else {
+                call.reject("Blood pressure type not available")
+                return
+            }
+            
+            let sortDescriptor = NSSortDescriptor(key: HKSampleSortIdentifierStartDate, ascending: false)
+            let predicate = HKQuery.predicateForSamples(withStart: Date.distantPast, end: Date(), options: .strictEndDate)
+            
+            let query = HKSampleQuery(sampleType: bpType, predicate: predicate, limit: 1, sortDescriptors: [sortDescriptor]) { _, samples, error in
+                
+                guard let bpCorrelation = samples?.first as? HKCorrelation else {
+                    if let error = error {
+                        call.reject("Error fetching latest blood pressure sample", "NO_SAMPLE", error)
+                    } else {
+                        call.reject("No blood pressure sample found", "NO_SAMPLE")
+                    }
+                    return
+                }
+                
+                let unit = HKUnit.millimeterOfMercury()
+                
+                let systolicSamples = bpCorrelation.objects(for: HKObjectType.quantityType(forIdentifier: .bloodPressureSystolic)!)
+                let diastolicSamples = bpCorrelation.objects(for: HKObjectType.quantityType(forIdentifier: .bloodPressureDiastolic)!)
+                
+                guard let systolicSample = systolicSamples.first as? HKQuantitySample,
+                      let diastolicSample = diastolicSamples.first as? HKQuantitySample else {
+                    call.reject("Incomplete blood pressure data", "NO_SAMPLE")
+                    return
+                }
+                
+                let systolicValue = systolicSample.quantity.doubleValue(for: unit)
+                let diastolicValue = diastolicSample.quantity.doubleValue(for: unit)
+                let timestamp = bpCorrelation.startDate.timeIntervalSince1970 * 1000
+                
+                call.resolve([
+                    "systolic": systolicValue,
+                    "diastolic": diastolicValue,
+                    "timestamp": timestamp,
+                    "unit": unit.unitString
+                ])
+            }
+            
+            healthStore.execute(query)
+            return
+        }
         guard aggregateTypeToHKQuantityType(dataTypeString) != nil else {
             call.reject("Invalid data type")
             return
@@ -99,6 +146,18 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
                 return HKObjectType.quantityType(forIdentifier: .bodyMass)
             case "steps":
                 return HKObjectType.quantityType(forIdentifier: .stepCount)
+            case "hrv":
+                return HKObjectType.quantityType(forIdentifier: .heartRateVariabilitySDNN)
+            case "height":
+                return HKObjectType.quantityType(forIdentifier: .height)
+            case "distance":
+                return HKObjectType.quantityType(forIdentifier: .distanceWalkingRunning)
+            case "active-calories":
+                return HKObjectType.quantityType(forIdentifier: .activeEnergyBurned)
+            case "total-calories":
+                return HKObjectType.quantityType(forIdentifier: .activeEnergyBurned)
+            case "blood-pressure":
+                return nil // handled above
             default:
                 return nil
             }
@@ -130,8 +189,15 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
                 unit = HKUnit.count().unitDivided(by: HKUnit.minute())
             } else if dataTypeString == "weight" {
                 unit = .gramUnit(with: .kilo)
+            } else if dataTypeString == "hrv" {
+                unit = HKUnit.secondUnit(with: .milli)
+            } else if dataTypeString == "distance" {
+                unit = HKUnit.meter()
+            } else if dataTypeString == "active-calories" || dataTypeString == "total-calories" {
+                unit = HKUnit.kilocalorie()
+            } else if dataTypeString == "height" {
+                unit = HKUnit.meter()
             }
-
             let value = quantitySample.quantity.doubleValue(for: unit)
             let timestamp = quantitySample.startDate.timeIntervalSince1970 * 1000
 
@@ -163,6 +229,13 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
             return [HKObjectType.quantityType(forIdentifier: .stepCount)].compactMap{$0}
         case "READ_WEIGHT":
             return [HKObjectType.quantityType(forIdentifier: .bodyMass)].compactMap{$0}
+        case "READ_HEIGHT":
+            return [HKObjectType.quantityType(forIdentifier: .height)].compactMap { $0 }
+        case "READ_TOTAL_CALORIES":
+            return [
+                HKObjectType.quantityType(forIdentifier: .activeEnergyBurned),
+                HKObjectType.quantityType(forIdentifier: .basalEnergyBurned)   // iOS 16+
+            ].compactMap { $0 }
         case "READ_ACTIVE_CALORIES":
             return [HKObjectType.quantityType(forIdentifier: .activeEnergyBurned)].compactMap{$0}
         case "READ_WORKOUTS":
@@ -180,6 +253,13 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
             ].compactMap{$0}
         case "READ_MINDFULNESS":
             return [HKObjectType.categoryType(forIdentifier: .mindfulSession)!].compactMap{$0}
+        case "READ_HRV":
+            return [HKObjectType.quantityType(forIdentifier: .heartRateVariabilitySDNN)].compactMap { $0 }
+        case "READ_BLOOD_PRESSURE":
+            return [
+                HKObjectType.quantityType(forIdentifier: .bloodPressureSystolic),
+                HKObjectType.quantityType(forIdentifier: .bloodPressureDiastolic)
+            ].compactMap { $0 }
         default:
             return []
         }
@@ -195,6 +275,14 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
             return HKObjectType.quantityType(forIdentifier: .heartRate)
         case "weight":
             return HKObjectType.quantityType(forIdentifier: .bodyMass)
+        case "hrv":
+            return HKObjectType.quantityType(forIdentifier: .heartRateVariabilitySDNN)
+        case "distance":
+            return HKObjectType.quantityType(forIdentifier: .distanceWalkingRunning)  // pick one rep type
+        case "total-calories":
+            return HKObjectType.quantityType(forIdentifier: .activeEnergyBurned)
+        case "height":
+            return HKObjectType.quantityType(forIdentifier: .height)
         default:
             return nil
         }
@@ -234,11 +322,12 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
             }
 
             let options: HKStatisticsOptions = {
-                switch dataType.identifier {
-                case HKQuantityTypeIdentifier.heartRate.rawValue,
-                     HKQuantityTypeIdentifier.bodyMass.rawValue:
-                    return .discreteAverage
-                default:
+                switch dataType.aggregationStyle {
+                case .cumulative:
+                    return .cumulativeSum
+                case .discrete:
+                    return .discreteAverage     // or .discreteMin / Max when needed
+                @unknown default:
                     return .cumulativeSum
                 }
             }()
@@ -250,41 +339,63 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
                 anchorDate: startDate,
                 intervalComponents: interval
             )
-            
+
             query.initialResultsHandler = { query, result, error in
                 if let error = error {
                     call.reject("Error fetching aggregated data: \(error.localizedDescription)")
                     return
                 }
-                
+
                 var aggregatedSamples: [[String: Any]] = []
-                
-                result?.enumerateStatistics(from: startDate, to: endDate) { statistics, stop in
-                    if let sum = statistics.sumQuantity() {
-                        let startDate = statistics.startDate.timeIntervalSince1970 * 1000
-                        let endDate = statistics.endDate.timeIntervalSince1970 * 1000
-                        
-                        var value: Double = -1.0
-                        if(dataTypeString == "steps" && dataType.is(compatibleWith: HKUnit.count())) {
-                            value = sum.doubleValue(for: HKUnit.count())
-                        } else if(dataTypeString == "active-calories" && dataType.is(compatibleWith: HKUnit.kilocalorie())) {
-                            value = sum.doubleValue(for: HKUnit.kilocalorie())
-                        } else if(dataTypeString == "mindfulness" && dataType.is(compatibleWith: HKUnit.second())) {
-                            value = sum.doubleValue(for: HKUnit.second())
+
+                result?.enumerateStatistics(from: startDate, to: endDate) { statistics, _ in
+                    // Choose sum or average based on the options we picked
+                    let quantity: HKQuantity? = options.contains(.cumulativeSum)
+                        ? statistics.sumQuantity()
+                        : statistics.averageQuantity()
+
+                    guard let quantity = quantity else { return }
+
+                    // Time‑bounds of this bucket
+                    let bucketStart = statistics.startDate.timeIntervalSince1970 * 1000
+                    let bucketEnd   = statistics.endDate.timeIntervalSince1970 * 1000
+
+                    // Map dataType → correct HKUnit
+                    let unit: HKUnit = {
+                        switch dataTypeString {
+                        case "steps":
+                            return .count()
+                        case "active-calories", "total-calories":
+                            return .kilocalorie()
+                        case "distance":
+                            return .meter()
+                        case "weight":
+                            return .gramUnit(with: .kilo)
+                        case "height":
+                            return .meter()
+                        case "heart-rate":
+                            return HKUnit.count().unitDivided(by: HKUnit.minute())
+                        case "hrv":
+                            return HKUnit.secondUnit(with: .milli)
+                        case "mindfulness":
+                            return HKUnit.second()
+                        default:
+                            return .count()
                         }
-                        
-                        
-                        aggregatedSamples.append([
-                            "startDate": startDate,
-                            "endDate": endDate,
-                            "value": value
-                        ])
-                    }
+                    }()
+
+                    let value = quantity.doubleValue(for: unit)
+
+                    aggregatedSamples.append([
+                        "startDate": bucketStart,
+                        "endDate":   bucketEnd,
+                        "value":     value
+                    ])
                 }
-                
+
                 call.resolve(["aggregatedData": aggregatedSamples])
             }
-            
+
             healthStore.execute(query)
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flomentumsolutions/capacitor-health-extended",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "Capacitor plugin for Apple HealthKit and Google Health Connect Platform",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -19,7 +19,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/Flomentum-Solutions/capacitor-health-extended.git"
+    "url": "https://github.com/Flomentum-Solutions/capacitor-health-extended.git"
   },
   "bugs": {
     "url": "https://github.com/Flomentum-Solutions/capacitor-health-extended/issues"

package/Package.swift

@@ -1,28 +0,0 @@
-// swift-tools-version: 5.9
-import PackageDescription
-
-let package = Package(
-    name: "CapacitorHealth",
-    platforms: [.iOS(.v13)],
-    products: [
-        .library(
-            name: "CapacitorHealth",
-            targets: ["HealthPluginPlugin"])
-    ],
-    dependencies: [
-        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", branch: "main")
-    ],
-    targets: [
-        .target(
-            name: "HealthPluginPlugin",
-            dependencies: [
-                .product(name: "Capacitor", package: "capacitor-swift-pm"),
-                .product(name: "Cordova", package: "capacitor-swift-pm")
-            ],
-            path: "ios/Sources/HealthPluginPlugin"),
-        .testTarget(
-            name: "HealthPluginPluginTests",
-            dependencies: ["HealthPluginPlugin"],
-            path: "ios/Tests/HealthPluginPluginTests")
-    ]
-)