@kingstinct/react-native-healthkit 12.2.0 → 13.0.1

package/ReactNativeHealthkit.podspec

@@ -22,6 +22,8 @@ Pod::Spec.new do |s|
     "cpp/**/*.{hpp,cpp}",
   ]
 
+  s.public_header_files = "ios/**/*.h"
+
   s.pod_target_xcconfig = {
     # C++ compiler flags, mainly for folly.
     "GCC_PREPROCESSOR_DEFINITIONS" => "$(inherited) FOLLY_NO_CONFIG FOLLY_CFG_NO_COROUTINES"

package/ios/CategoryTypeModule.swift

@@ -7,8 +7,8 @@ class CategoryTypeModule: HybridCategoryTypeModuleSpec {
         value: Double,
         startDate: Date,
         endDate: Date,
-        metadata: AnyMap
-    ) -> Promise<Bool> {
+        metadata: AnyMap?
+    ) -> Promise<CategorySample?> {
         return Promise.async {
           let type = try initializeCategoryType(identifier.stringValue)
 
@@ -17,10 +17,12 @@ class CategoryTypeModule: HybridCategoryTypeModuleSpec {
               value: Int(value),
               start: startDate,
               end: endDate,
-              metadata: anyMapToDictionary(metadata)
+              metadata: anyMapToDictionaryOptional(metadata)
           )
 
-          return try await saveAsync(sample: sample)
+          let succeeded = try await saveAsync(sample: sample)
+
+          return succeeded ? serializeCategorySample(sample: sample) : nil
         }
     }
 

package/ios/CoreModule.swift

@@ -19,7 +19,7 @@ private var quantityTypeUnitCache = [HKQuantityType: HKUnit]()
 
 func getUnitToUse(unitOverride: String?, quantityType: HKQuantityType) async throws -> HKUnit {
   if let unitOverride = unitOverride {
-    let unit = HKUnit(from: unitOverride)
+    let unit = try parseUnitStringSafe(unitOverride)
 
     if !quantityType.is(compatibleWith: unit) {
       throw runtimeErrorWithPrefix(

package/ios/CorrelationTypeModule.swift

@@ -121,8 +121,8 @@ class CorrelationTypeModule: HybridCorrelationTypeModuleSpec {
     samples: [SampleForSaving],
     start: Date,
     end: Date,
-    metadata: AnyMap
-  ) -> Promise<Bool> {
+    metadata: AnyMap?
+  ) -> Promise<CorrelationSample?> {
     return Promise.async {
       let correlationType = try initializeCorrelationType(typeIdentifier.stringValue)
 
@@ -137,14 +137,17 @@ class CorrelationTypeModule: HybridCorrelationTypeModuleSpec {
             continue
           }
 
-          let unit = HKUnit(from: quantitySample.unit)
-          let quantity = HKQuantity(unit: unit, doubleValue: quantitySample.quantity)
+          let unit = try parseUnitStringSafe(quantitySample.unit)
+          let quantity = HKQuantity(
+            unit: unit,
+            doubleValue: quantitySample.quantity
+          )
           let hkQuantitySample = HKQuantitySample(
             type: quantityType,
             quantity: quantity,
             start: start,
             end: end,
-            metadata: anyMapToDictionary(quantitySample.metadata)
+            metadata: anyMapToDictionaryOptional(quantitySample.metadata)
           )
           initializedSamples.insert(hkQuantitySample)
 
@@ -171,10 +174,16 @@ class CorrelationTypeModule: HybridCorrelationTypeModuleSpec {
         start: start,
         end: end,
         objects: initializedSamples,
-        metadata: anyMapToDictionary(metadata)
+        metadata: anyMapToDictionaryOptional(metadata)
       )
 
-      return try await saveAsync(sample: correlation)
+      let succeeded = try await saveAsync(sample: correlation)
+
+      let unitMap = try await getUnitMap(correlations: [correlation])
+
+      return succeeded
+        ? serializeCorrelationSample(correlation: correlation, unitMap: unitMap)
+        : nil
     }
   }
 

package/ios/ExceptionCatcher.h

@@ -0,0 +1,17 @@
+#import <Foundation/Foundation.h>
+#import <HealthKit/HealthKit.h>
+
+NS_INLINE HKUnit * _Nullable HKUnitFromStringCatchingExceptions(NSString * _Nonnull unitString, NSError * _Nullable * _Nullable outError) {
+    if (outError) { *outError = nil; }
+    @try {
+        HKUnit *unit = [HKUnit unitFromString:unitString];
+        return unit;
+    }
+    @catch (NSException *exception) {
+        if (outError) {
+            NSDictionary *userInfo = exception.userInfo ?: @{};
+            *outError = [NSError errorWithDomain:exception.name code:0 userInfo:userInfo];
+        }
+        return nil;
+    }
+}

package/ios/Helpers.swift

@@ -9,6 +9,17 @@ import Foundation
 import HealthKit
 import NitroModules
 
+func parseUnitStringSafe(_ unitString: String) throws -> HKUnit {
+  var err: NSError?
+  let unitOut = HKUnitFromStringCatchingExceptions(unitString, &err)
+
+  if let hkUnit = unitOut {
+    return hkUnit
+  }
+
+  throw runtimeErrorWithPrefix("Supplied invalid '\(unitString)' as HKUnit")
+}
+
 func getQueryLimit(_ limit: Double) -> Int {
   if limit == .infinity || limit <= 0 || limit == .nan || limit == .signalingNaN {
     return HKObjectQueryNoLimit
@@ -355,39 +366,6 @@ func objectTypeFrom(objectTypeIdentifier: ObjectTypeIdentifier) throws -> HKObje
     "Failed initializing unrecognized objectType identifier " + typeIdentifier)
 }
 
-func hkStatisticsOptionsFromOptions(_ options: NSArray) -> HKStatisticsOptions {
-  var opts = HKStatisticsOptions()
-
-  for o in options {
-    guard let str = o as? String else { continue }
-
-    switch str {
-    case "cumulativeSum":
-      opts.insert(.cumulativeSum)
-    case "discreteAverage":
-      opts.insert(.discreteAverage)
-    case "discreteMax":
-      opts.insert(.discreteMax)
-    case "discreteMin":
-      opts.insert(.discreteMin)
-    case "duration":
-      if #available(iOS 13, *) {
-        opts.insert(.duration)
-      }
-    case "mostRecent":
-      if #available(iOS 13, *) {
-        opts.insert(.mostRecent)
-      }
-    case "separateBySource":
-      opts.insert(.separateBySource)
-    default:
-      continue
-    }
-  }
-
-  return opts
-}
-
 func componentsFromInterval(_ interval: NSDictionary) -> DateComponents {
   let componentKeys: [String: WritableKeyPath<DateComponents, Int?>] = [
     "minute": \.minute,
@@ -421,6 +399,13 @@ func parseWorkoutConfiguration(_ config: WorkoutConfiguration) -> HKWorkoutConfi
   return configuration
 }
 
+func anyMapToDictionaryOptional(_ anyMap: AnyMap?) -> [String: Any]? {
+  if let anyMap = anyMap {
+    return anyMapToDictionary(anyMap)
+  }
+  return nil
+}
+
 func anyMapToDictionary(_ anyMap: AnyMap) -> [String: Any] {
   var dict = [String: Any]()
   anyMap.getAllKeys().forEach { key in
@@ -436,3 +421,47 @@ func runtimeErrorWithPrefix(_ withMessage: String) -> Error {
 func warnWithPrefix(_ withMessage: String) {
   print("[react-native-healthkit] \(withMessage)")
 }
+
+func buildStatisticsOptions(statistics: [StatisticsOptions], quantityType: HKQuantityType) -> HKStatisticsOptions {
+
+  // Build statistics options
+  var opts = HKStatisticsOptions()
+  opts.insert(.separateBySource)
+  for statistic in statistics {
+    if statistic == .cumulativesum {
+      if quantityType.aggregationStyle == .cumulative {
+        opts.insert(HKStatisticsOptions.cumulativeSum)
+      } else {
+        warnWithPrefix("buildStatisticsOptions: cumulativesum statistic requested for discrete quantity type \(quantityType.identifier)")
+      }
+
+    } else if statistic == .discreteaverage {
+      if quantityType.aggregationStyle != .cumulative {
+        opts.insert(HKStatisticsOptions.discreteAverage)
+      } else {
+        warnWithPrefix("buildStatisticsOptions: discreteaverage statistic requested for cumulative quantity type \(quantityType.identifier)")
+      }
+    } else if statistic == .discretemax {
+      if quantityType.aggregationStyle != .cumulative {
+        opts.insert(HKStatisticsOptions.discreteMax)
+      } else {
+        warnWithPrefix("buildStatisticsOptions: discretemax statistic requested for cumulative quantity type \(quantityType.identifier)")
+      }
+    } else if statistic == .discretemin {
+      if quantityType.aggregationStyle != .cumulative {
+        opts.insert(HKStatisticsOptions.discreteMin)
+      } else {
+        warnWithPrefix("buildStatisticsOptions: discretemin statistic requested for cumulative quantity type \(quantityType.identifier)")
+      }
+    }
+    if #available(iOS 13, *) {
+      if statistic == .duration {
+        opts.insert(HKStatisticsOptions.duration)
+      }
+      if statistic == .mostrecent {
+        opts.insert(HKStatisticsOptions.mostRecent)
+      }
+    }
+  }
+  return opts
+}

package/ios/PredicateHelpers.swift

@@ -71,11 +71,11 @@ func getPredicateForWorkoutBase(_ filter: FilterForWorkouts?) -> FilterForWorkou
     return FilterForWorkoutsBase(
       workoutActivityType: filter.workoutActivityType,
       duration: filter.duration,
+      sources: filter.sources,
       uuid: filter.uuid,
       uuids: filter.uuids,
       metadata: filter.metadata,
       date: filter.date,
-      sources: filter.sources
     )
   }
   return nil