@kingstinct/react-native-healthkit 15.1.0 → 16.0.0

package/ios/Helpers.swift

@@ -8,167 +8,14 @@
 import Foundation
 import HealthKit
 import NitroModules
+import ReactNativeHealthkitCore
 
-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
-  }
-
-  return Int(limit)
-}
-
-struct AnchoredQueryResponse {
-  var samples: [HKSample]
-  var deletedSamples: [DeletedSample]
-  var newAnchor: String
-}
-
-func sampleAnchoredQueryAsync(
-  sampleType: HKSampleType,
-  limit: Double,
-  queryAnchor: String?,
-  predicate: NSPredicate?
-) async throws -> AnchoredQueryResponse {
-  let queryAnchor = try deserializeHKQueryAnchor(base64String: queryAnchor)
-
-  return try await withCheckedThrowingContinuation { continuation in
-    let query = HKAnchoredObjectQuery(
-      type: sampleType,
-      predicate: predicate,
-      anchor: queryAnchor,
-      limit: getQueryLimit(limit)
-    ) {
-      (
-        _: HKAnchoredObjectQuery, samples: [HKSample]?, deletedSamples: [HKDeletedObject]?,
-        newAnchor:
-          HKQueryAnchor?, error: Error?
-      ) in
-      DispatchQueue.main.async {
-        if let error = error {
-          return continuation.resume(throwing: error)
-        }
-
-        if let samples = samples, let deletedSamples = deletedSamples,
-          let newAnchor = serializeAnchor(anchor: newAnchor) {
-          return continuation.resume(
-            returning: AnchoredQueryResponse(
-              samples: samples,
-              deletedSamples: deletedSamples.map({ deletedSample in
-                return serializeDeletedSample(sample: deletedSample)
-              }),
-              newAnchor: newAnchor
-            )
-          )
-        }
-
-        return continuation.resume(
-          throwing: runtimeErrorWithPrefix("Unexpected empty response"))
-      }
-    }
-
-    store.execute(query)
-  }
-}
-
-func serializeAnchor(anchor: HKQueryAnchor?) -> String? {
-  return toBase64(anchor)
-}
-
-func toBase64(_ data: Any?) -> String? {
-  guard let archivedData = try? NSKeyedArchiver.archivedData(withRootObject: data, requiringSecureCoding: true) else {
-    return nil
-  }
-
-  return archivedData.base64EncodedString()
-}
-
-func sampleQueryAsync(
-  sampleType: HKSampleType,
-  limit: Double,
-  predicate: NSPredicate?,
-  sortDescriptors: [NSSortDescriptor]?
-) async throws -> [HKSample] {
-  let limit = getQueryLimit(limit)
-  return try await withCheckedThrowingContinuation { continuation in
-    let q = HKSampleQuery(
-      sampleType: sampleType,
-      predicate: predicate,
-      limit: limit,
-      sortDescriptors: sortDescriptors,
-    ) { (_: HKSampleQuery, samples: [HKSample]?, error: Error?) in
-      DispatchQueue.main.async {
-        if let error = error {
-          return continuation.resume(throwing: error)
-        }
-
-        if let samples = samples {
-          return continuation.resume(returning: samples)
-        }
-
-        return continuation.resume(
-          throwing: runtimeErrorWithPrefix("Unexpected empty response"))
-      }
-    }
-
-    store.execute(q)
-  }
-}
-
-func saveAsync(sample: HKObject) async throws -> Bool {
-  return try await withCheckedThrowingContinuation { continuation in
-    store.save(sample) { (success: Bool, error: Error?) in
-      DispatchQueue.main.async {
-        if let error = error {
-          continuation.resume(throwing: error)
-        } else {
-          continuation.resume(returning: success)
-        }
-      }
-    }
-  }
-}
-
-func getSortDescriptors(ascending: Bool?) -> [NSSortDescriptor] {
-  return [NSSortDescriptor(key: HKSampleSortIdentifierStartDate, ascending: ascending ?? false)]
-}
-
-func fromBase64(base64String: String?) throws -> Any? {
-  if let base64String = base64String {
-    if base64String.isEmpty {
-      return nil
-    }
-
-    // Step 1: Decode the base64 string to a Data object
-    guard let data = Data(base64Encoded: base64String) else {
-      throw runtimeErrorWithPrefix("Invalid base64 string: \(base64String)")
-    }
-
-    // Step 2: Use NSKeyedUnarchiver to unarchive the data and create an HKQueryAnchor object
-    do {
-      let unarchiver = try NSKeyedUnarchiver(forReadingFrom: data)
-      unarchiver.requiresSecureCoding = true
-      return try? NSKeyedUnarchiver.unarchiveTopLevelObjectWithData(data)
-    } catch {
-      throw runtimeErrorWithPrefix(
-        "Error recreating HKQueryAnchor object: \(error.localizedDescription)")
-    }
+/// Anchored query results come back with raw HKDeletedObjects; this package
+/// serializes them into its own DeletedSample struct.
+extension AnchoredQueryResponse {
+  var deletedSamples: [DeletedSample] {
+    return deletedObjects.map { serializeDeletedSample(sample: $0) }
   }
-  return nil
-}
-
-func deserializeHKQueryAnchor(base64String: String?) throws -> HKQueryAnchor? {
-  return try fromBase64(base64String: base64String) as? HKQueryAnchor
 }
 
 func initializeCategoryType(_ identifier: String) throws -> HKCategoryType {
@@ -245,51 +92,7 @@ func sampleTypeFrom(sampleTypeIdentifierWriteable: SampleTypeIdentifierWriteable
 }
 
 private func sampleTypeFromStringNullable(typeIdentifier: String) throws -> HKSampleType? {
-  if typeIdentifier.starts(with: HKQuantityTypeIdentifier_PREFIX) {
-    return try initializeQuantityType(typeIdentifier)
-  }
-
-  if typeIdentifier.starts(with: HKCategoryTypeIdentifier_PREFIX) {
-    return try initializeCategoryType(typeIdentifier)
-  }
-
-  if typeIdentifier.starts(with: HKCorrelationTypeIdentifier_PREFIX) {
-    return try initializeCorrelationType(typeIdentifier)
-  }
-
-  if typeIdentifier == HKWorkoutTypeIdentifier {
-    return HKSampleType.workoutType()
-  }
-
-  if typeIdentifier == HKWorkoutRouteTypeIdentifier {
-    return try initializeSeriesType(typeIdentifier)
-  }
-
-  if typeIdentifier == HKAudiogramTypeIdentifier {
-    return HKObjectType.audiogramSampleType()
-  }
-
-  if typeIdentifier == HKDataTypeIdentifierHeartbeatSeries {
-    return try initializeSeriesType(typeIdentifier)
-  }
-
-  if typeIdentifier == HKAudiogramTypeIdentifier {
-    return HKSampleType.audiogramSampleType()
-  }
-
-  if typeIdentifier == HKElectrocardiogramType {
-    return HKSampleType.electrocardiogramType()
-  }
-
-  #if compiler(>=6)
-    if #available(iOS 18, *) {
-      if typeIdentifier == HKStateOfMindTypeIdentifier {
-        return HKObjectType.stateOfMindType()
-      }
-    }
-  #endif
-
-  return nil
+  return sampleType(fromIdentifier: typeIdentifier)
 }
 
 func objectTypesFromArray(typeIdentifiers: [ObjectTypeIdentifier]) -> Set<HKObjectType> {
@@ -305,14 +108,6 @@ func objectTypesFromArray(typeIdentifiers: [ObjectTypeIdentifier]) -> Set<HKObje
   return share
 }
 
-func initializeUUID(_ uuidString: String) throws -> UUID {
-  if let uuid = UUID(uuidString: uuidString) {
-    return uuid
-  }
-
-  throw runtimeErrorWithPrefix("Got invalid UUID: \(uuidString)")
-}
-
 func sampleTypesFromArray(typeIdentifiers: [SampleTypeIdentifier]) -> Set<HKSampleType> {
   return Set(
     typeIdentifiers.compactMap { typeIdentifier in
@@ -348,7 +143,7 @@ func objectTypeFrom(objectTypeIdentifier: ObjectTypeIdentifier) throws -> HKObje
     return sampleType
   }
 
-  if typeIdentifier.starts(with: HKCharacteristicTypeIdentifier_PREFIX) {
+  if typeIdentifier.starts(with: characteristicTypeIdentifierPrefix) {
     let identifier = HKCharacteristicTypeIdentifier.init(rawValue: typeIdentifier)
     if let type = HKObjectType.characteristicType(forIdentifier: identifier) as HKObjectType? {
       return type
@@ -434,11 +229,11 @@ func anyMapToDictionary(_ anyMap: AnyMap) -> [String: Any] {
 }
 
 func runtimeErrorWithPrefix(_ withMessage: String) -> Error {
-  return RuntimeError.error(withMessage: "[react-native-healthkit] \(withMessage)")
+  return makeRuntimeError(withMessage, prefix: logPrefix)
 }
 
 func warnWithPrefix(_ withMessage: String) {
-  print("[react-native-healthkit] \(withMessage)")
+  logWarning(withMessage, prefix: logPrefix)
 }
 
 func buildStatisticsOptions(statistics: [StatisticsOptions], quantityType: HKQuantityType) -> HKStatisticsOptions {
@@ -483,31 +278,3 @@ func buildStatisticsOptions(statistics: [StatisticsOptions], quantityType: HKQua
   }
   return opts
 }
-
-private let storeReopenRetryDelay: UInt64 = 1_000_000_000
-
-/// HealthKit seals its store the moment the device locks and re-opens it a beat
-/// after it unlocks, and iOS can resume the app inside that beat. A query that
-/// hits the gap fails with `errorDatabaseInaccessible` although protected data is
-/// reported available — the store is re-opening, not sealed. Runs `operation`
-/// and, on exactly that refusal, gives it one more attempt after a short delay.
-/// A refusal while protected data is unavailable is the sealed store itself and
-/// is thrown as-is, as is every other error.
-func retryingWhileStoreReopens<T>(
-  _ operation: () async throws -> T
-) async throws -> T {
-  do {
-    return try await operation()
-  } catch {
-    let nsError = error as NSError
-    guard nsError.domain == HKError.errorDomain,
-      nsError.code == HKError.Code.errorDatabaseInaccessible.rawValue
-    else { throw error }
-    let protectedDataAvailable = await MainActor.run {
-      UIApplication.shared.isProtectedDataAvailable
-    }
-    guard protectedDataAvailable else { throw error }
-    try await Task.sleep(nanoseconds: storeReopenRetryDelay)
-    return try await operation()
-  }
-}

package/ios/MedicationModule.swift

@@ -7,12 +7,13 @@
 
 import HealthKit
 import NitroModules
+import ReactNativeHealthkitCore
 
 #if compiler(>=6.2)
   @available(iOS 26.0, *)
   func deserializeHKMedicationConceptIdentifier(base64String: String?) throws
     -> HKHealthConceptIdentifier? {
-    return try fromBase64(base64String: base64String) as? HKHealthConceptIdentifier
+    return try fromBase64(base64String: base64String, as: HKHealthConceptIdentifier.self)
   }
 
   @available(iOS 26.0, *)
@@ -50,7 +51,7 @@ import NitroModules
     var lookup: [String: (name: String, nickname: String?)] = [:]
     do {
       let q = HKUserAnnotatedMedicationQueryDescriptor()
-      let medications = try await q.result(for: store)
+      let medications = try await q.result(for: healthStore)
       for med in medications {
         let medPredicate = HKQuery.predicateForMedicationDoseEvent(
           medicationConceptIdentifier: med.medication.identifier)
@@ -97,16 +98,16 @@ import NitroModules
       startDate: sample.startDate,
       endDate: sample.endDate,
       hasUndeterminedDuration: sample.hasUndeterminedDuration,
+      uuid: sample.uuid.uuidString,
+      sourceRevision: serializeSourceRevision(sample.sourceRevision),
+      device: serializeDevice(hkDevice: sample.device),
       metadata: {
         var meta = serializeMetadata(sample.metadata)
         if let nick = info?.nickname {
           meta.setString(key: "HKMedicationNickname", value: nick)
         }
         return meta
-      }(),
-      uuid: sample.uuid.uuidString,
-      sourceRevision: serializeSourceRevision(sample.sourceRevision),
-      device: serializeDevice(hkDevice: sample.device)
+      }()
     )
   }
 
@@ -152,7 +153,7 @@ import NitroModules
         if #available(iOS 26.0, *) {
           let q = HKUserAnnotatedMedicationQueryDescriptor()
 
-          let medications = try await q.result(for: store)
+          let medications = try await q.result(for: healthStore)
 
           return try medications.compactMap({ medication in
             return try serializeMedication(medication: medication)
@@ -193,7 +194,7 @@ import NitroModules
     func requestMedicationsAuthorization() -> Promise<Bool> {
       return Promise.async {
         if #available(iOS 26.0, *) {
-          try await store.requestPerObjectReadAuthorization(
+          try await healthStore.requestPerObjectReadAuthorization(
             for: .userAnnotatedMedicationType(), predicate: nil)
           return true
         } else {

package/ios/MemoryEstimation.swift

@@ -9,6 +9,7 @@
 //
 
 import HealthKit
+import ReactNativeHealthkitCore
 
 /// Approximate per-object bridging overhead of a Nitro HybridObject that Nitro
 /// does not account for itself. The generated `*Spec_cxx.swift` adds the Swift

package/ios/PredicateHelpers.swift

@@ -6,6 +6,7 @@
 //
 
 import HealthKit
+import ReactNativeHealthkitCore
 
 func createSourcePredicate(_ sources: [HybridSourceProxySpec]?) -> NSPredicate? {
   if let sources = sources {
@@ -147,103 +148,32 @@ func createPredicateForWorkout(_ filter: FilterForWorkouts?) -> NSPredicate? {
   return nil
 }
 
-func createDatePredicate(_ dateFilter: DateFilter?) -> NSPredicate? {
-  if let dateFilter = dateFilter {
-    let strictStartDate = dateFilter.strictStartDate ?? false
-    let strictEndDate = dateFilter.strictEndDate ?? false
-
-    let options: HKQueryOptions =
-      strictStartDate && strictEndDate
-      ? [.strictStartDate, .strictEndDate]
-      : strictEndDate
-        ? .strictEndDate
-        : strictStartDate
-          ? .strictStartDate
-          : []
-
-    return HKQuery.predicateForSamples(
-      withStart: dateFilter.startDate,
-      end: dateFilter.endDate,
-      options: options
-    )
-  }
-  return nil
-}
-
-func createUUIDsPredicate(uuids: [String]?) -> NSPredicate? {
-  if let uuids = uuids {
-    let uuids = uuids.compactMap { uuidStr -> UUID? in
-      do {
-        let uuid = try initializeUUID(uuidStr)
-        return uuid
-      } catch {
-        warnWithPrefix(error.localizedDescription)
-        return nil
-      }
-    }
-    return HKQuery.predicateForObjects(with: Set(uuids))
-  }
-  return nil
-}
+// The generated filter structs adopt the core protocols so the shared
+// predicate builders in ReactNativeHealthkitCore can read them.
+extension DateFilter: DateFilterConvertible {}
 
-func createUUIDPredicate(_ uuid: String?) -> NSPredicate? {
-  if let uuidStr = uuid {
-    do {
-      let uuid = try initializeUUID(uuidStr)
-      return HKQuery.predicateForObject(with: uuid)
-    } catch {
-      warnWithPrefix("createUUIDPredicate: \(error.localizedDescription)")
+extension PredicateWithMetadataKey: MetadataPredicateConvertible {
+  public var operatorRawValue: Int? {
+    guard let operatorType = operatorType else {
       return nil
     }
+    return Int(operatorType.rawValue)
   }
-  return nil
-}
-
-func getComparisonPredicateOperator(_ op: ComparisonPredicateOperator?) -> NSComparisonPredicate
-  .Operator? {
-  if let rawValue = op?.rawValue {
-    if let op = NSComparisonPredicate.Operator.init(rawValue: UInt(rawValue)) {
-      return op
-    } else {
-      warnWithPrefix(
-        "getComparisonPredicateOperator: Unsupported operator in metadata filter: \(rawValue)")
-    }
-  }
-  return nil
-}
-
-func createMetadataPredicate(_ metadata: PredicateWithMetadataKey?) -> NSPredicate? {
-  if let metadata = metadata {
-
-    guard let valueVariant = metadata.value else {
-      return HKQuery.predicateForObjects(withMetadataKey: metadata.withMetadataKey)
-    }
-
-    let actualValue: Any
 
-    switch valueVariant {
+  public var metadataValue: Any? {
+    switch value {
     case .first(let boolValue):
-      actualValue = NSNumber(value: boolValue ? 1 : 0)
+      return NSNumber(value: boolValue ? 1 : 0)
     case .second(let stringValue):
-      actualValue = stringValue
+      return stringValue
     case .third(let doubleValue):
-      actualValue = NSNumber(value: doubleValue)
+      return NSNumber(value: doubleValue)
     case .fourth(let dateValue):
-      actualValue = dateValue
-    }
-
-    if let operatorType = metadata.operatorType != nil
-      ? getComparisonPredicateOperator(metadata.operatorType)
-      : .equalTo {
-      return HKQuery.predicateForObjects(
-        withMetadataKey: metadata.withMetadataKey,
-        operatorType: operatorType,
-        value: actualValue
-      )
+      return dateValue
+    case nil:
+      return nil
     }
-
   }
-  return nil
 }
 
 func createPredicateForSamplesBase(_ filter: FilterForSamplesBase?) -> NSPredicate? {

package/ios/QuantityTypeModule.swift

@@ -1,5 +1,6 @@
 import HealthKit
 import NitroModules
+import ReactNativeHealthkitCore
 
 func emptyStatisticsResponse(from: Date?, to: Date?) -> QueryStatisticsResponse {
   return QueryStatisticsResponse(
@@ -47,7 +48,7 @@ func queryStatisticsForQuantityInternal(
       }
     }
 
-    store.execute(query)
+    healthStore.execute(query)
   }
 }
 
@@ -178,7 +179,7 @@ func queryStatisticsCollectionForQuantityInternal(
       }
     }
 
-    store.execute(query)
+    healthStore.execute(query)
   }
 }
 

package/ios/Serializers.swift

@@ -8,12 +8,7 @@
 import Foundation
 import HealthKit
 import NitroModules
-
-private let metadataDateFormatter: ISO8601DateFormatter = {
-  let formatter = ISO8601DateFormatter()
-  formatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
-  return formatter
-}()
+import ReactNativeHealthkitCore
 
 func serializeQuantityTyped(unit: HKUnit, quantityNullable: HKQuantity?) -> Quantity? {
   guard let q = quantityNullable else {
@@ -43,10 +38,10 @@ func serializeQuantitySample(sample: HKQuantitySample, unit: HKUnit) throws -> Q
       startDate: sample.startDate,
       endDate: sample.endDate,
       hasUndeterminedDuration: sample.hasUndeterminedDuration,
-      metadata: serializeMetadata(sample.metadata),
       uuid: sample.uuid.uuidString,
       sourceRevision: serializeSourceRevision(sample.sourceRevision),
-      device: serializeDevice(hkDevice: sample.device)
+      device: serializeDevice(hkDevice: sample.device),
+      metadata: serializeMetadata(sample.metadata)
     )
   }
   throw runtimeErrorWithPrefix(
@@ -70,10 +65,10 @@ func serializeCategorySample(sample: HKCategorySample) -> CategorySample {
     startDate: sample.startDate,
     endDate: sample.endDate,
     hasUndeterminedDuration: sample.hasUndeterminedDuration,
-    metadata: serializeMetadata(sample.metadata),
     uuid: sample.uuid.uuidString,
     sourceRevision: serializeSourceRevision(sample.sourceRevision),
-    device: serializeDevice(hkDevice: sample.device)
+    device: serializeDevice(hkDevice: sample.device),
+    metadata: serializeMetadata(sample.metadata)
   )
 }
 
@@ -223,59 +218,19 @@ func serializeUnknownQuantity(quantity: HKQuantity) -> [String: AnyValue]? {
   return nil
 }
 
-func serializeMetadata(_ metadata: [String: Any]?) -> AnyMap {
-  let serialized = AnyMap()
-  if let m = metadata {
-    for item in m {
-      if let number = item.value as? NSNumber {
-        if isKnownBooleanMetadataKey(item.key) {
-          serialized.setBoolean(key: item.key, value: number.boolValue)
-        } else if isKnownNumericMetadataKey(item.key) {
-          serialized.setDouble(key: item.key, value: number.doubleValue)
-        } else if CFGetTypeID(number) == CFBooleanGetTypeID() {
-          serialized.setBoolean(key: item.key, value: number.boolValue)
-        } else {
-          serialized.setDouble(key: item.key, value: number.doubleValue)
-        }
-        continue
-      }
-
-      if let bool = item.value as? Bool {
-        serialized.setBoolean(key: item.key, value: bool)
-        continue
-      }
-
-      if let str = item.value as? String {
-        serialized.setString(key: item.key, value: str)
-        continue
-      }
-
-      if let double = item.value as? Double {
-        serialized.setDouble(key: item.key, value: double)
-        continue
-      }
-
-      if let date = item.value as? Date {
-        serialized.setString(
-          key: item.key,
-          value: metadataDateFormatter.string(from: date)
-        )
-        continue
-      }
-
-      if let quantity = item.value as? HKQuantity {
-        if let s = serializeUnknownQuantity(quantity: quantity) {
-          serialized.setObject(key: item.key, value: s)
-        }
-        continue
-      }
-
-      if let dict = item.value as? [String: AnyValue] {
-        serialized.setObject(key: item.key, value: dict)
-      }
+private let metadataSerializationOptions = MetadataSerializationOptions(
+  isBooleanKey: isKnownBooleanMetadataKey,
+  isNumericKey: isKnownNumericMetadataKey,
+  serializeQuantity: { quantity in
+    if let serialized = serializeUnknownQuantity(quantity: quantity) {
+      return .object(serialized)
     }
+    return nil
   }
-  return serialized
+)
+
+func serializeMetadata(_ metadata: [String: Any]?) -> AnyMap {
+  return ReactNativeHealthkitCore.serializeMetadata(metadata, options: metadataSerializationOptions)
 }
 
 func serializeDevice(hkDevice: HKDevice?) -> Device? {
@@ -295,12 +250,6 @@ func serializeDevice(hkDevice: HKDevice?) -> Device? {
   )
 }
 
-func serializeOperatingSystemVersion(_ version: OperatingSystemVersion) -> String {
-  let versionString = "\(version.majorVersion).\(version.minorVersion).\(version.patchVersion)"
-
-  return versionString
-}
-
 func serializeSourceRevision(_ hkSourceRevision: HKSourceRevision) -> SourceRevision {
   return SourceRevision(
     source: serializeSourceStruct(hkSourceRevision.source),

package/ios/SourceProxy.swift

@@ -7,6 +7,7 @@
 
 import HealthKit
 import NitroModules
+import ReactNativeHealthkitCore
 
 class SourceProxy: HybridSourceProxySpec {
   func toJSON(key: String?) throws -> Source {

package/ios/StateOfMindModule.swift

@@ -1,5 +1,6 @@
 import HealthKit
 import NitroModules
+import ReactNativeHealthkitCore
 
 #if compiler(>=6)
 
@@ -40,10 +41,10 @@ import NitroModules
       startDate: sample.startDate,
       endDate: sample.endDate,
       hasUndeterminedDuration: sample.hasUndeterminedDuration,
-      metadata: serializeMetadata(sample.metadata),
       uuid: sample.uuid.uuidString,
       sourceRevision: serializeSourceRevision(sample.sourceRevision),
-      device: serializeDevice(hkDevice: sample.device)
+      device: serializeDevice(hkDevice: sample.device),
+      metadata: serializeMetadata(sample.metadata)
     )
   }
 

package/ios/WorkoutProxy.swift

@@ -8,6 +8,7 @@
 import CoreLocation
 import HealthKit
 import NitroModules
+import ReactNativeHealthkitCore
 
 @available(iOS 17.0.0, *)
 func getWorkoutPlanInternal(workout: HKWorkout) async throws -> WorkoutPlan? {
@@ -84,7 +85,7 @@ func getRouteLocations(
       }
     }
 
-    store.execute(query)
+    healthStore.execute(query)
   }
 }
 
@@ -166,7 +167,7 @@ func saveWorkoutRouteInternal(
         // create CLLocations and return if locations are empty
         let clLocations = mapLocations(from: locations)
         let routeBuilder = HKWorkoutRouteBuilder(
-          healthStore: store,
+          healthStore: healthStore,
           device: nil
         )
         try await routeBuilder.insertRouteData(clLocations)