@flomentumsolutions/capacitor-health-extended 0.1.0 → 0.3.1

package/dist/esm/definitions.d.ts

@@ -55,7 +55,7 @@ export interface HealthPlugin {
      * @param request
      */
     queryLatestSample(request: {
-        dataType: string;
+        dataType: LatestDataType;
     }): Promise<QueryLatestSampleResponse>;
     /**
      * Query latest weight sample
@@ -74,14 +74,13 @@ export interface HealthPlugin {
      */
     querySteps(): Promise<QueryLatestSampleResponse>;
 }
-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 declare type HealthPermission = 'READ_STEPS' | 'READ_WORKOUTS' | 'READ_ACTIVE_CALORIES' | 'READ_TOTAL_CALORIES' | 'READ_DISTANCE' | 'READ_WEIGHT' | 'READ_HEIGHT' | 'READ_HEART_RATE' | 'READ_RESTING_HEART_RATE' | 'READ_ROUTE' | 'READ_MINDFULNESS' | 'READ_HRV' | 'READ_BLOOD_PRESSURE' | 'READ_BASAL_CALORIES' | 'READ_RESPIRATORY_RATE' | 'READ_OXYGEN_SATURATION' | 'READ_BLOOD_GLUCOSE' | 'READ_BODY_TEMPERATURE' | 'READ_BASAL_BODY_TEMPERATURE' | 'READ_BODY_FAT' | 'READ_FLOORS_CLIMBED' | 'READ_SLEEP' | 'READ_EXERCISE_TIME';
+export type LatestDataType = 'steps' | 'active-calories' | 'total-calories' | 'basal-calories' | 'distance' | 'weight' | 'height' | 'heart-rate' | 'resting-heart-rate' | 'respiratory-rate' | 'oxygen-saturation' | 'blood-glucose' | 'body-temperature' | 'basal-body-temperature' | 'body-fat' | 'flights-climbed' | 'exercise-time' | 'distance-cycling' | 'mindfulness' | 'sleep' | 'hrv' | 'blood-pressure';
 export interface PermissionsRequest {
     permissions: HealthPermission[];
 }
 export interface PermissionResponse {
-    permissions: {
-        [key: string]: boolean;
-    }[];
+    permissions: Record<HealthPermission, boolean>;
 }
 export interface QueryWorkoutRequest {
     startDate: string;
@@ -120,7 +119,7 @@ export interface Workout {
 export interface QueryAggregatedRequest {
     startDate: string;
     endDate: string;
-    dataType: 'steps' | 'active-calories' | 'mindfulness' | 'hrv' | 'blood-pressure';
+    dataType: 'steps' | 'active-calories' | 'total-calories' | 'basal-calories' | 'distance' | 'weight' | 'height' | 'heart-rate' | 'resting-heart-rate' | 'respiratory-rate' | 'oxygen-saturation' | 'blood-glucose' | 'body-temperature' | 'basal-body-temperature' | 'body-fat' | 'flights-climbed' | 'exercise-time' | 'distance-cycling' | 'sleep' | 'mindfulness' | 'hrv' | 'blood-pressure';
     bucket: string;
 }
 export interface QueryAggregatedResponse {
@@ -136,5 +135,7 @@ export interface QueryLatestSampleResponse {
     systolic?: number;
     diastolic?: number;
     timestamp: number;
+    endTimestamp?: number;
     unit: string;
+    metadata?: Record<string, unknown>;
 }

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  /**\n   * Query latest sample for a specific data type\n   * @param request\n   */\n  queryLatestSample(request: { dataType: string }): Promise<QueryLatestSampleResponse>;\n\n  /**\n   * Query latest weight sample\n   */\n  queryWeight(): Promise<QueryLatestSampleResponse>;\n\n  /**\n   * Query latest height sample\n   */\n  queryHeight(): Promise<QueryLatestSampleResponse>;\n\n  /**\n   * Query latest heart rate sample\n   */\n  queryHeartRate(): Promise<QueryLatestSampleResponse>;\n\n  /**\n   * Query latest steps sample\n   */\n  querySteps(): Promise<QueryLatestSampleResponse>;\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\nexport interface QueryLatestSampleResponse {\n  value?: number;\n  systolic?: number;\n  diastolic?: number;\n  timestamp: number;\n  unit: string;\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  /**\n   * Query latest sample for a specific data type\n   * @param request\n   */\n  queryLatestSample(request: { dataType: LatestDataType }): Promise<QueryLatestSampleResponse>;\n\n  /**\n   * Query latest weight sample\n   */\n  queryWeight(): Promise<QueryLatestSampleResponse>;\n\n  /**\n   * Query latest height sample\n   */\n  queryHeight(): Promise<QueryLatestSampleResponse>;\n\n  /**\n   * Query latest heart rate sample\n   */\n  queryHeartRate(): Promise<QueryLatestSampleResponse>;\n\n  /**\n   * Query latest steps sample\n   */\n  querySteps(): Promise<QueryLatestSampleResponse>;\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_RESTING_HEART_RATE'\n  | 'READ_ROUTE'\n  | 'READ_MINDFULNESS'\n  | 'READ_HRV'\n  | 'READ_BLOOD_PRESSURE'\n  | 'READ_BASAL_CALORIES'\n  | 'READ_RESPIRATORY_RATE'\n  | 'READ_OXYGEN_SATURATION'\n  | 'READ_BLOOD_GLUCOSE'\n  | 'READ_BODY_TEMPERATURE'\n  | 'READ_BASAL_BODY_TEMPERATURE'\n  | 'READ_BODY_FAT'\n  | 'READ_FLOORS_CLIMBED'\n  | 'READ_SLEEP'\n  | 'READ_EXERCISE_TIME';\n\nexport type LatestDataType =\n  | 'steps'\n  | 'active-calories'\n  | 'total-calories'\n  | 'basal-calories'\n  | 'distance'\n  | 'weight'\n  | 'height'\n  | 'heart-rate'\n  | 'resting-heart-rate'\n  | 'respiratory-rate'\n  | 'oxygen-saturation'\n  | 'blood-glucose'\n  | 'body-temperature'\n  | 'basal-body-temperature'\n  | 'body-fat'\n  | 'flights-climbed'\n  | 'exercise-time'\n  | 'distance-cycling'\n  | 'mindfulness'\n  | 'sleep'\n  | 'hrv'\n  | 'blood-pressure';\n\nexport interface PermissionsRequest {\n  permissions: HealthPermission[];\n}\n\nexport interface PermissionResponse {\n  permissions: Record<HealthPermission, 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:\n    | 'steps'\n    | 'active-calories'\n    | 'total-calories'\n    | 'basal-calories'\n    | 'distance'\n    | 'weight'\n    | 'height'\n    | 'heart-rate'\n    | 'resting-heart-rate'\n    | 'respiratory-rate'\n    | 'oxygen-saturation'\n    | 'blood-glucose'\n    | 'body-temperature'\n    | 'basal-body-temperature'\n    | 'body-fat'\n    | 'flights-climbed'\n    | 'exercise-time'\n    | 'distance-cycling'\n    | 'sleep'\n    | 'mindfulness'\n    | 'hrv'\n    | '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\nexport interface QueryLatestSampleResponse {\n  value?: number;\n  systolic?: number;\n  diastolic?: number;\n  timestamp: number;\n  endTimestamp?: number;\n  unit: string;\n  metadata?: Record<string, unknown>;\n}\n"]}

package/ios/Sources/HealthPluginPlugin/HealthPlugin.swift

@@ -27,7 +27,7 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
     let healthStore = HKHealthStore()
     
     /// Serial queue to make route‑location mutations thread‑safe without locks
-    private let routeSyncQueue = DispatchQueue(label: "com.flomentum.healthplugin.routeSync")
+    private let routeSyncQueue = DispatchQueue(label: "com.flomentumsolutions.healthplugin.routeSync")
     
     @objc func isHealthAvailable(_ call: CAPPluginCall) {
         let isAvailable = HKHealthStore.isHealthDataAvailable()
@@ -153,6 +153,68 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
             healthStore.execute(query)
             return
         }
+        // ---- Special handling for sleep sessions (category samples) ----
+        if dataTypeString == "sleep" {
+            guard let sleepType = HKObjectType.categoryType(forIdentifier: .sleepAnalysis) else {
+                call.reject("Sleep 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: sleepType, predicate: predicate, limit: 1, sortDescriptors: [sortDescriptor]) { _, samples, error in
+                guard let sleepSample = samples?.first as? HKCategorySample else {
+                    if let error = error {
+                        call.reject("Error fetching latest sleep sample", "NO_SAMPLE", error)
+                    } else {
+                        call.reject("No sleep sample found", "NO_SAMPLE")
+                    }
+                    return
+                }
+                let durationMinutes = sleepSample.endDate.timeIntervalSince(sleepSample.startDate) / 60
+                call.resolve([
+                    "value": durationMinutes,
+                    "timestamp": sleepSample.startDate.timeIntervalSince1970 * 1000,
+                    "endTimestamp": sleepSample.endDate.timeIntervalSince1970 * 1000,
+                    "unit": "min",
+                    "metadata": ["state": sleepSample.value]
+                ])
+            }
+            healthStore.execute(query)
+            return
+        }
+        // ---- Special handling for mindfulness sessions (category samples) ----
+        if dataTypeString == "mindfulness" {
+            guard let mindfulType = HKObjectType.categoryType(forIdentifier: .mindfulSession) else {
+                call.reject("Mindfulness 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: mindfulType, predicate: predicate, limit: 1, sortDescriptors: [sortDescriptor]) { _, samples, error in
+                guard let mindfulSample = samples?.first as? HKCategorySample else {
+                    if let error = error {
+                        call.reject("Error fetching latest mindfulness sample", "NO_SAMPLE", error)
+                    } else {
+                        call.reject("No mindfulness sample found", "NO_SAMPLE")
+                    }
+                    return
+                }
+                let durationMinutes = mindfulSample.endDate.timeIntervalSince(mindfulSample.startDate) / 60
+                call.resolve([
+                    "value": durationMinutes,
+                    "timestamp": mindfulSample.startDate.timeIntervalSince1970 * 1000,
+                    "endTimestamp": mindfulSample.endDate.timeIntervalSince1970 * 1000,
+                    "unit": "min",
+                    "metadata": ["value": mindfulSample.value]
+                ])
+            }
+            healthStore.execute(query)
+            return
+        }
         guard aggregateTypeToHKQuantityType(dataTypeString) != nil else {
             call.reject("Invalid data type")
             return
@@ -162,6 +224,10 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
             switch dataTypeString {
             case "heart-rate":
                 return HKObjectType.quantityType(forIdentifier: .heartRate)
+            case "resting-heart-rate":
+                return HKObjectType.quantityType(forIdentifier: .restingHeartRate)
+            case "respiratory-rate":
+                return HKObjectType.quantityType(forIdentifier: .respiratoryRate)
             case "weight":
                 return HKObjectType.quantityType(forIdentifier: .bodyMass)
             case "steps":
@@ -172,12 +238,30 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
                 return HKObjectType.quantityType(forIdentifier: .height)
             case "distance":
                 return HKObjectType.quantityType(forIdentifier: .distanceWalkingRunning)
+            case "distance-cycling":
+                return HKObjectType.quantityType(forIdentifier: .distanceCycling)
             case "active-calories":
                 return HKObjectType.quantityType(forIdentifier: .activeEnergyBurned)
             case "total-calories":
                 return HKObjectType.quantityType(forIdentifier: .activeEnergyBurned)
+            case "basal-calories":
+                return HKObjectType.quantityType(forIdentifier: .basalEnergyBurned)
             case "blood-pressure":
                 return nil // handled above
+            case "oxygen-saturation":
+                return HKObjectType.quantityType(forIdentifier: .oxygenSaturation)
+            case "blood-glucose":
+                return HKObjectType.quantityType(forIdentifier: .bloodGlucose)
+            case "body-temperature":
+                return HKObjectType.quantityType(forIdentifier: .bodyTemperature)
+            case "basal-body-temperature":
+                return HKObjectType.quantityType(forIdentifier: .basalBodyTemperature)
+            case "body-fat":
+                return HKObjectType.quantityType(forIdentifier: .bodyFatPercentage)
+            case "flights-climbed":
+                return HKObjectType.quantityType(forIdentifier: .flightsClimbed)
+            case "exercise-time":
+                return HKObjectType.quantityType(forIdentifier: .appleExerciseTime)
             default:
                 return nil
             }
@@ -209,16 +293,36 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
             var unit: HKUnit = .count()
             if dataTypeString == "heart-rate" {
                 unit = HKUnit.count().unitDivided(by: HKUnit.minute())
+            } else if dataTypeString == "resting-heart-rate" {
+                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 == "distance-cycling" {
+                unit = HKUnit.meter()
             } else if dataTypeString == "active-calories" || dataTypeString == "total-calories" {
                 unit = HKUnit.kilocalorie()
+            } else if dataTypeString == "basal-calories" {
+                unit = HKUnit.kilocalorie()
             } else if dataTypeString == "height" {
                 unit = HKUnit.meter()
+            } else if dataTypeString == "oxygen-saturation" {
+                unit = HKUnit.percent()
+            } else if dataTypeString == "blood-glucose" {
+                unit = HKUnit(from: "mg/dL")
+            } else if dataTypeString == "body-temperature" || dataTypeString == "basal-body-temperature" {
+                unit = HKUnit.degreeCelsius()
+            } else if dataTypeString == "body-fat" {
+                unit = HKUnit.percent()
+            } else if dataTypeString == "flights-climbed" {
+                unit = HKUnit.count()
+            } else if dataTypeString == "exercise-time" {
+                unit = HKUnit.minute()
+            } else if dataTypeString == "respiratory-rate" {
+                unit = HKUnit.count().unitDivided(by: HKUnit.minute())
             }
             let value = quantitySample.quantity.doubleValue(for: unit)
             let timestamp = quantitySample.startDate.timeIntervalSince1970 * 1000
@@ -317,6 +421,8 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
             return [HKObjectType.workoutType()].compactMap{$0}
         case "READ_HEART_RATE":
             return  [HKObjectType.quantityType(forIdentifier: .heartRate)].compactMap{$0}
+        case "READ_RESTING_HEART_RATE":
+            return [HKObjectType.quantityType(forIdentifier: .restingHeartRate)].compactMap { $0 }
         case "READ_ROUTE":
             return  [HKSeriesType.workoutRoute()].compactMap{$0}
         case "READ_DISTANCE":
@@ -335,6 +441,28 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
                 HKObjectType.quantityType(forIdentifier: .bloodPressureSystolic),
                 HKObjectType.quantityType(forIdentifier: .bloodPressureDiastolic)
             ].compactMap { $0 }
+        case "READ_RESPIRATORY_RATE":
+            return [HKObjectType.quantityType(forIdentifier: .respiratoryRate)].compactMap { $0 }
+        case "READ_OXYGEN_SATURATION":
+            return [HKObjectType.quantityType(forIdentifier: .oxygenSaturation)].compactMap { $0 }
+        case "READ_BLOOD_GLUCOSE":
+            return [HKObjectType.quantityType(forIdentifier: .bloodGlucose)].compactMap { $0 }
+        case "READ_BODY_TEMPERATURE":
+            return [HKObjectType.quantityType(forIdentifier: .bodyTemperature)].compactMap { $0 }
+        case "READ_BASAL_BODY_TEMPERATURE":
+            return [HKObjectType.quantityType(forIdentifier: .basalBodyTemperature)].compactMap { $0 }
+        case "READ_BODY_FAT":
+            return [HKObjectType.quantityType(forIdentifier: .bodyFatPercentage)].compactMap { $0 }
+        case "READ_FLOORS_CLIMBED":
+            return [HKObjectType.quantityType(forIdentifier: .flightsClimbed)].compactMap { $0 }
+        case "READ_BASAL_CALORIES":
+            return [
+                HKObjectType.quantityType(forIdentifier: .basalEnergyBurned)
+            ].compactMap { $0 }
+        case "READ_SLEEP":
+            return [HKObjectType.categoryType(forIdentifier: .sleepAnalysis)!].compactMap { $0 }
+        case "READ_EXERCISE_TIME":
+            return [HKObjectType.quantityType(forIdentifier: .appleExerciseTime)].compactMap { $0 }
         // Add common alternative permission names
         case "steps":
             return [HKObjectType.quantityType(forIdentifier: .stepCount)].compactMap{$0}
@@ -371,6 +499,26 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
                 HKObjectType.quantityType(forIdentifier: .bloodPressureSystolic),
                 HKObjectType.quantityType(forIdentifier: .bloodPressureDiastolic)
             ].compactMap { $0 }
+        case "respiratory-rate":
+            return [HKObjectType.quantityType(forIdentifier: .respiratoryRate)].compactMap { $0 }
+        case "oxygen-saturation":
+            return [HKObjectType.quantityType(forIdentifier: .oxygenSaturation)].compactMap { $0 }
+        case "blood-glucose":
+            return [HKObjectType.quantityType(forIdentifier: .bloodGlucose)].compactMap { $0 }
+        case "body-temperature":
+            return [HKObjectType.quantityType(forIdentifier: .bodyTemperature)].compactMap { $0 }
+        case "basal-body-temperature":
+            return [HKObjectType.quantityType(forIdentifier: .basalBodyTemperature)].compactMap { $0 }
+        case "body-fat":
+            return [HKObjectType.quantityType(forIdentifier: .bodyFatPercentage)].compactMap { $0 }
+        case "flights-climbed":
+            return [HKObjectType.quantityType(forIdentifier: .flightsClimbed)].compactMap { $0 }
+        case "basal-calories":
+            return [HKObjectType.quantityType(forIdentifier: .basalEnergyBurned)].compactMap { $0 }
+        case "exercise-time":
+            return [HKObjectType.quantityType(forIdentifier: .appleExerciseTime)].compactMap { $0 }
+        case "sleep":
+            return [HKObjectType.categoryType(forIdentifier: .sleepAnalysis)!].compactMap { $0 }
         default:
             print("⚡️ [HealthPlugin] Unknown permission: \(permission)")
             return []
@@ -385,16 +533,38 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
             return HKObjectType.quantityType(forIdentifier: .activeEnergyBurned)
         case "heart-rate":
             return HKObjectType.quantityType(forIdentifier: .heartRate)
+        case "resting-heart-rate":
+            return HKObjectType.quantityType(forIdentifier: .restingHeartRate)
         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 "distance-cycling":
+            return HKObjectType.quantityType(forIdentifier: .distanceCycling)
         case "total-calories":
             return HKObjectType.quantityType(forIdentifier: .activeEnergyBurned)
+        case "basal-calories":
+            return HKObjectType.quantityType(forIdentifier: .basalEnergyBurned)
         case "height":
             return HKObjectType.quantityType(forIdentifier: .height)
+        case "respiratory-rate":
+            return HKObjectType.quantityType(forIdentifier: .respiratoryRate)
+        case "oxygen-saturation":
+            return HKObjectType.quantityType(forIdentifier: .oxygenSaturation)
+        case "blood-glucose":
+            return HKObjectType.quantityType(forIdentifier: .bloodGlucose)
+        case "body-temperature":
+            return HKObjectType.quantityType(forIdentifier: .bodyTemperature)
+        case "basal-body-temperature":
+            return HKObjectType.quantityType(forIdentifier: .basalBodyTemperature)
+        case "body-fat":
+            return HKObjectType.quantityType(forIdentifier: .bodyFatPercentage)
+        case "flights-climbed":
+            return HKObjectType.quantityType(forIdentifier: .flightsClimbed)
+        case "exercise-time":
+            return HKObjectType.quantityType(forIdentifier: .appleExerciseTime)
         default:
             return nil
         }
@@ -423,6 +593,16 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
                     }
                 }
             }
+        } else if dataTypeString == "sleep" {
+            self.querySleepAggregated(startDate: startDate, endDate: endDate) { result, error in
+                DispatchQueue.main.async {
+                    if let error = error {
+                        call.reject(error.localizedDescription)
+                    } else if let result = result {
+                        call.resolve(["aggregatedData": result])
+                    }
+                }
+            }
         } else {
             let predicate = HKQuery.predicateForSamples(withStart: startDate, end: endDate, options: .strictStartDate)
             guard let interval = calculateInterval(bucket: bucket) else {
@@ -441,7 +621,10 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
                 switch dataType.aggregationStyle {
                 case .cumulative:
                     return .cumulativeSum
-                case .discrete:
+                case .discrete,
+                     .discreteArithmetic,
+                     .discreteTemporallyWeighted,
+                     .discreteEquivalentContinuousLevel:
                     return .discreteAverage
                 @unknown default:
                     return .discreteAverage
@@ -471,12 +654,19 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
                         let unit: HKUnit = {
                             switch dataTypeString {
                             case "steps": return .count()
-                            case "active-calories", "total-calories": return .kilocalorie()
-                            case "distance": return .meter()
+                            case "active-calories", "total-calories", "basal-calories": return .kilocalorie()
+                            case "distance", "distance-cycling": return .meter()
                             case "weight": return .gramUnit(with: .kilo)
                             case "height": return .meter()
-                            case "heart-rate": return HKUnit.count().unitDivided(by: HKUnit.minute())
+                            case "heart-rate", "resting-heart-rate": return HKUnit.count().unitDivided(by: HKUnit.minute())
+                            case "respiratory-rate": return HKUnit.count().unitDivided(by: HKUnit.minute())
                             case "hrv": return HKUnit.secondUnit(with: .milli)
+                            case "oxygen-saturation": return HKUnit.percent()
+                            case "blood-glucose": return HKUnit(from: "mg/dL")
+                            case "body-temperature", "basal-body-temperature": return HKUnit.degreeCelsius()
+                            case "body-fat": return HKUnit.percent()
+                            case "flights-climbed": return .count()
+                            case "exercise-time": return HKUnit.minute()
                             case "mindfulness": return HKUnit.second()
                             default: return .count()
                             }
@@ -532,6 +722,46 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
         }
         healthStore.execute(query)
     }
+    
+    func querySleepAggregated(startDate: Date, endDate: Date, completion: @escaping ([[String: Any]]?, Error?) -> Void) {
+        guard let sleepType = HKObjectType.categoryType(forIdentifier: .sleepAnalysis) else {
+            DispatchQueue.main.async {
+                completion(nil, NSError(domain: "HealthKit", code: -1, userInfo: [NSLocalizedDescriptionKey: "SleepAnalysis type unavailable"]))
+            }
+            return
+        }
+        let predicate = HKQuery.predicateForSamples(withStart: startDate, end: endDate, options: .strictStartDate)
+        let query = HKSampleQuery(sampleType: sleepType, predicate: predicate, limit: HKObjectQueryNoLimit, sortDescriptors: nil) { _, samples, error in
+            var dailyDurations: [Date: TimeInterval] = [:]
+            let calendar = Calendar.current
+            if let categorySamples = samples as? [HKCategorySample], error == nil {
+                for sample in categorySamples {
+                    // Ignore in-bed samples; we care about actual sleep
+                    if sample.value == HKCategoryValueSleepAnalysis.inBed.rawValue { continue }
+                    let startOfDay = calendar.startOfDay(for: sample.startDate)
+                    let duration = sample.endDate.timeIntervalSince(sample.startDate)
+                    dailyDurations[startOfDay, default: 0] += duration
+                }
+                var aggregatedSamples: [[String: Any]] = []
+                let dayComponent = DateComponents(day: 1)
+                for (date, duration) in dailyDurations {
+                    aggregatedSamples.append([
+                        "startDate": date,
+                        "endDate": calendar.date(byAdding: dayComponent, to: date) as Any,
+                        "value": duration
+                    ])
+                }
+                DispatchQueue.main.async {
+                    completion(aggregatedSamples, nil)
+                }
+            } else {
+                DispatchQueue.main.async {
+                    completion(nil, error)
+                }
+            }
+        }
+        healthStore.execute(query)
+    }
 
     private func queryAggregated(for startDate: Date, for endDate: Date, for dataType: HKQuantityType?, completion: @escaping (Double?) -> Void) {
         guard let quantityType = dataType else {
@@ -609,7 +839,7 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
                 return
             }
             let outerGroup = DispatchGroup()
-            let resultsQueue = DispatchQueue(label: "com.flomentum.healthplugin.workoutResults")
+            let resultsQueue = DispatchQueue(label: "com.flomentumsolutions.healthplugin.workoutResults")
             var workoutResults: [[String: Any]] = []
             var errors: [String: String] = [:]
             
@@ -627,48 +857,54 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
                     "distance": workout.totalDistance?.doubleValue(for: .meter()) ?? 0
                 ]
                 let innerGroup = DispatchGroup()
+                let heartRateQueue = DispatchQueue(label: "com.flomentumsolutions.healthplugin.heartRates")
+                let routeQueue = DispatchQueue(label: "com.flomentumsolutions.healthplugin.routes")
                 var localHeartRates: [[String: Any]] = []
                 var localRoutes: [[String: Any]] = []
                 
                 if includeHeartRate {
                     innerGroup.enter()
                     self.queryHeartRate(for: workout) { rates, error in
-                        localHeartRates = rates
-                        if let error = error { 
-                            resultsQueue.async {
-                                errors["heart-rate"] = error 
+                        heartRateQueue.async {
+                            localHeartRates = rates
+                            if let error = error {
+                                errors["heart-rate"] = error
                             }
+                            innerGroup.leave()
                         }
-                        innerGroup.leave()
                     }
                 }
                 if includeRoute {
                     innerGroup.enter()
                     self.queryRoute(for: workout) { routes, error in
-                        localRoutes = routes
-                        if let error = error { 
-                            resultsQueue.async {
-                                errors["route"] = error 
+                        routeQueue.async {
+                            localRoutes = routes
+                            if let error = error {
+                                errors["route"] = error
                             }
+                            innerGroup.leave()
                         }
-                        innerGroup.leave()
                     }
                 }
                 if includeSteps {
                     innerGroup.enter()
                     self.queryAggregated(for: workout.startDate, for: workout.endDate, for: HKObjectType.quantityType(forIdentifier: .stepCount)) { steps in
-                        if let steps = steps {
-                            localDict["steps"] = steps
+                        resultsQueue.async {
+                            if let steps = steps {
+                                localDict["steps"] = steps
+                            }
+                            innerGroup.leave()
                         }
-                        innerGroup.leave()
                     }
                 }
-                innerGroup.notify(queue: .main) {
-                    localDict["heartRate"] = localHeartRates
-                    localDict["route"] = localRoutes
-                    resultsQueue.async {
-                        workoutResults.append(localDict)
+                innerGroup.notify(queue: resultsQueue) {
+                    heartRateQueue.sync {
+                        localDict["heartRate"] = localHeartRates
+                    }
+                    routeQueue.sync {
+                        localDict["route"] = localRoutes
                     }
+                    workoutResults.append(localDict)
                     outerGroup.leave()
                 }
             }
@@ -721,7 +957,7 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
             guard let self = self else { return }
             if let routes = samples as? [HKWorkoutRoute], error == nil {
                 let routeDispatchGroup = DispatchGroup()
-                let allLocationsQueue = DispatchQueue(label: "com.flomentum.healthplugin.allLocations")
+                let allLocationsQueue = DispatchQueue(label: "com.flomentumsolutions.healthplugin.allLocations")
                 var allLocations: [[String: Any]] = []
                 
                 for route in routes {
@@ -870,4 +1106,4 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
         3000 : "other"
     ]
     
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flomentumsolutions/capacitor-health-extended",
-  "version": "0.1.0",
+  "version": "0.3.1",
   "description": "Capacitor plugin for Apple HealthKit and Google Health Connect Platform",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -13,13 +13,30 @@
     "ios/Sources",
     "ios/Tests",
     "Package.swift",
-    "FlomentumsolutionsCapacitorHealthExtended.podspec"
+    "FlomentumSolutionsCapacitorHealthExtended.podspec"
   ],
-  "author": "Flomentum Solutions, LLC",
+  "author": {
+    "name": "Flomentum Solutions, LLC",
+    "url": "https://github.com/Flomentum-Solutions"
+  },
   "license": "MIT",
+  "contributors": [
+    {
+      "name": "Michael Ley",
+      "url": "https://github.com/mley"
+    },
+    {
+      "name": "Flomentum Solutions, LLC",
+      "url": "https://github.com/Flomentum-Solutions"
+    },
+    {
+      "name": "MBRO95",
+      "url": "https://github.com/MBRO95"
+    }
+  ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/Flomentum-Solutions/capacitor-health-extended.git"
+    "url": "git+https://github.com/Flomentum-Solutions/capacitor-health-extended.git"
   },
   "bugs": {
     "url": "https://github.com/Flomentum-Solutions/capacitor-health-extended/issues"
@@ -36,7 +53,7 @@
   ],
   "scripts": {
     "verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
-    "verify:ios": "xcodebuild -scheme CapacitorHealthExtended -destination generic/platform=iOS",
+    "verify:ios": "xcodebuild -scheme FlomentumSolutionsCapacitorHealthExtended -destination generic/platform=iOS",
     "verify:android": "cd android && ./gradlew clean build test && cd ..",
     "verify:web": "npm run build",
     "lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
@@ -51,23 +68,24 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^7.0.0",
-    "@capacitor/core": "^7.0.0",
-    "@capacitor/docgen": "^0.3.0",
-    "@capacitor/ios": "^7.0.0",
+    "@capacitor/android": "^8.0.0",
+    "@capacitor/cli": "^8.0.0",
+    "@capacitor/core": "^8.0.0",
+    "@capacitor/docgen": "^0.3.1",
+    "@capacitor/ios": "^8.0.0",
     "@ionic/eslint-config": "^0.4.0",
     "@ionic/prettier-config": "^4.0.0",
     "@ionic/swiftlint-config": "^2.0.0",
-    "eslint": "^8.57.0",
-    "prettier": "^3.4.2",
-    "prettier-plugin-java": "^2.6.6",
-    "rimraf": "^6.0.1",
-    "rollup": "^4.30.1",
+    "eslint": "^8.57.1",
+    "prettier": "^3.6.2",
+    "prettier-plugin-java": "^2.7.7",
+    "rimraf": "^6.1.0",
+    "rollup": "^4.53.2",
     "swiftlint": "^2.0.0",
-    "typescript": "~4.1.5"
+    "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "@capacitor/core": ">=7.0.0"
+    "@capacitor/core": ">=8.0.0"
   },
   "prettier": "@ionic/prettier-config",
   "swiftlint": "@ionic/swiftlint-config",