@flomentumsolutions/capacitor-health-extended 0.0.9 → 0.0.11

package/ios/Sources/HealthPluginPlugin/HealthPlugin.swift

@@ -6,7 +6,6 @@ import HealthKit
  * Please read the Capacitor iOS Plugin Development Guide
  * here: https://capacitorjs.com/docs/plugins/ios
  */
-@MainActor
 @objc(HealthPlugin)
 public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
     public let identifier = "HealthPlugin"
@@ -66,8 +65,19 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
             return
         }
         
+        print("⚡️ [HealthPlugin] Requesting permissions: \(permissions)")
+        
         let types: [HKObjectType] = permissions.flatMap { permissionToHKObjectType($0) }
         
+        print("⚡️ [HealthPlugin] Mapped to \(types.count) HKObjectTypes")
+        
+        // Validate that we have at least one valid permission type
+        guard !types.isEmpty else {
+            let invalidPermissions = permissions.filter { permissionToHKObjectType($0).isEmpty }
+            call.reject("No valid permission types found. Invalid permissions: \(invalidPermissions)")
+            return
+        }
+        
         healthStore.requestAuthorization(toShare: nil, read: Set(types)) { success, error in
             if success {
                 //we don't know which actual permissions were granted, so we assume all
@@ -264,7 +274,44 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
                 HKObjectType.quantityType(forIdentifier: .bloodPressureSystolic),
                 HKObjectType.quantityType(forIdentifier: .bloodPressureDiastolic)
             ].compactMap { $0 }
+        // Add common alternative permission names
+        case "steps":
+            return [HKObjectType.quantityType(forIdentifier: .stepCount)].compactMap{$0}
+        case "weight":
+            return [HKObjectType.quantityType(forIdentifier: .bodyMass)].compactMap{$0}
+        case "height":
+            return [HKObjectType.quantityType(forIdentifier: .height)].compactMap { $0 }
+        case "calories", "total-calories":
+            return [
+                HKObjectType.quantityType(forIdentifier: .activeEnergyBurned),
+                HKObjectType.quantityType(forIdentifier: .basalEnergyBurned)   // iOS 16+
+            ].compactMap { $0 }
+        case "active-calories":
+            return [HKObjectType.quantityType(forIdentifier: .activeEnergyBurned)].compactMap{$0}
+        case "workouts":
+            return [HKObjectType.workoutType()].compactMap{$0}
+        case "heart-rate", "heartrate":
+            return  [HKObjectType.quantityType(forIdentifier: .heartRate)].compactMap{$0}
+        case "route":
+            return  [HKSeriesType.workoutRoute()].compactMap{$0}
+        case "distance":
+            return [
+                HKObjectType.quantityType(forIdentifier: .distanceCycling),
+                HKObjectType.quantityType(forIdentifier: .distanceSwimming),
+                HKObjectType.quantityType(forIdentifier: .distanceWalkingRunning),
+                HKObjectType.quantityType(forIdentifier: .distanceDownhillSnowSports)
+            ].compactMap{$0}
+        case "mindfulness":
+            return [HKObjectType.categoryType(forIdentifier: .mindfulSession)!].compactMap{$0}
+        case "hrv":
+            return [HKObjectType.quantityType(forIdentifier: .heartRateVariabilitySDNN)].compactMap { $0 }
+        case "blood-pressure", "bloodpressure":
+            return [
+                HKObjectType.quantityType(forIdentifier: .bloodPressureSystolic),
+                HKObjectType.quantityType(forIdentifier: .bloodPressureDiastolic)
+            ].compactMap { $0 }
         default:
+            print("⚡️ [HealthPlugin] Unknown permission: \(permission)")
             return []
         }
     }
@@ -333,17 +380,6 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
                 switch dataType.aggregationStyle {
                 case .cumulative:
                     return .cumulativeSum
-                case .discreteAverage:
-                    return .discreteAverage
-                @available(iOS 17.0, *)
-                case .discreteTemporallyWeighted:
-                    return .discreteAverage
-                @available(iOS 17.0, *)
-                case .discreteEquivalentContinuousLevel:
-                    return .discreteAverage
-                @available(iOS 17.0, *)
-                case .discreteArithmetic:
-                    return .discreteAverage
                 case .discrete:
                     return .discreteAverage
                 @unknown default:
@@ -512,8 +548,10 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
                 return
             }
             let outerGroup = DispatchGroup()
+            let resultsQueue = DispatchQueue(label: "com.flomentum.healthplugin.workoutResults")
             var workoutResults: [[String: Any]] = []
             var errors: [String: String] = [:]
+            
             for workout in workouts {
                 outerGroup.enter()
                 var localDict: [String: Any] = [
@@ -530,11 +568,16 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
                 let innerGroup = DispatchGroup()
                 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 { errors["heart-rate"] = error }
+                        if let error = error { 
+                            resultsQueue.async {
+                                errors["heart-rate"] = error 
+                            }
+                        }
                         innerGroup.leave()
                     }
                 }
@@ -542,7 +585,11 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
                     innerGroup.enter()
                     self.queryRoute(for: workout) { routes, error in
                         localRoutes = routes
-                        if let error = error { errors["route"] = error }
+                        if let error = error { 
+                            resultsQueue.async {
+                                errors["route"] = error 
+                            }
+                        }
                         innerGroup.leave()
                     }
                 }
@@ -558,7 +605,9 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
                 innerGroup.notify(queue: .main) {
                     localDict["heartRate"] = localHeartRates
                     localDict["route"] = localRoutes
-                    workoutResults.append(localDict)
+                    resultsQueue.async {
+                        workoutResults.append(localDict)
+                    }
                     outerGroup.leave()
                 }
             }
@@ -611,11 +660,15 @@ 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")
                 var allLocations: [[String: Any]] = []
+                
                 for route in routes {
                     routeDispatchGroup.enter()
                     self.queryLocations(for: route) { locations in
-                        allLocations.append(contentsOf: locations)
+                        allLocationsQueue.async {
+                            allLocations.append(contentsOf: locations)
+                        }
                         routeDispatchGroup.leave()
                     }
                 }
@@ -634,8 +687,6 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
     
     // MARK: - Query Route Locations
     private func queryLocations(for route: HKWorkoutRoute, completion: @escaping @Sendable ([[String: Any]]) -> Void) {
-        var routeLocations: [[String: Any]] = []
-
         let locationQuery = HKWorkoutRouteQuery(route: route) { [weak self] _, locations, done, error in
             guard let self = self else { return }
             guard let locations = locations, error == nil else {
@@ -645,8 +696,10 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
                 return
             }
 
-            // Append on a dedicated serial queue so we’re race‑free without NSLock
+            // Process locations on the serial queue to avoid race conditions
             self.routeSyncQueue.async {
+                var routeLocations: [[String: Any]] = []
+                
                 for location in locations {
                     let locationDict: [String: Any] = [
                         "timestamp": location.timestamp,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flomentumsolutions/capacitor-health-extended",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "Capacitor plugin for Apple HealthKit and Google Health Connect Platform",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",