@kingstinct/react-native-healthkit 13.3.0 → 13.3.1

package/ios/CoreModule.swift

@@ -59,18 +59,20 @@ async throws -> [HKQuantityType: HKUnit] {
   return try await withCheckedThrowingContinuation { continuation in
     store.preferredUnits(for: Set(quantityTypes)) {
       (typePerUnits: [HKQuantityType: HKUnit], error: Error?) in
-      if let error = error {
-        return continuation.resume(throwing: error)
-      }
+      DispatchQueue.main.async {
+        if let error = error {
+          return continuation.resume(throwing: error)
+        }
 
-      // Thread-safe write: barrier ensures exclusive access
-      quantityTypeCacheQueue.sync(flags: .barrier) {
-        typePerUnits.forEach { (type: HKQuantityType, unit: HKUnit) in
-          quantityTypeUnitCache.updateValue(unit, forKey: type)
+        // Thread-safe write: barrier ensures exclusive access
+        quantityTypeCacheQueue.sync(flags: .barrier) {
+          typePerUnits.forEach { (type: HKQuantityType, unit: HKUnit) in
+            quantityTypeUnitCache.updateValue(unit, forKey: type)
+          }
         }
-      }
 
-      return continuation.resume(returning: typePerUnits)
+        return continuation.resume(returning: typePerUnits)
+      }
     }
   }
 }
@@ -157,17 +159,18 @@ class CoreModule: HybridCoreModuleSpec {
         }
         return store.getRequestStatusForAuthorization(toShare: toShare, read: toRead) {
           status, error in
-          if let error = error {
-            continuation.resume(throwing: error)
-          } else {
-            if let authStatus = AuthorizationRequestStatus(rawValue: Int32(status.rawValue)) {
-              continuation.resume(returning: authStatus)
+          DispatchQueue.main.async {
+            if let error = error {
+              continuation.resume(throwing: error)
             } else {
-              continuation.resume(
-                throwing: runtimeErrorWithPrefix(
-                  "Unrecognized authStatus returned: \(status.rawValue)"))
+              if let authStatus = AuthorizationRequestStatus(rawValue: Int32(status.rawValue)) {
+                continuation.resume(returning: authStatus)
+              } else {
+                continuation.resume(
+                  throwing: runtimeErrorWithPrefix(
+                    "Unrecognized authStatus returned: \(status.rawValue)"))
+              }
             }
-
           }
         }
       }
@@ -181,10 +184,12 @@ class CoreModule: HybridCoreModuleSpec {
 
       return try await withCheckedThrowingContinuation { continuation in
         store.requestAuthorization(toShare: share, read: toRead) { status, error in
-          if let error = error {
-            continuation.resume(throwing: error)
-          } else {
-            continuation.resume(returning: status)
+          DispatchQueue.main.async {
+            if let error = error {
+              continuation.resume(throwing: error)
+            } else {
+              continuation.resume(returning: status)
+            }
           }
         }
       }
@@ -203,25 +208,27 @@ class CoreModule: HybridCoreModuleSpec {
           sampleType: sampleType,
           samplePredicate: predicate
         ) { (_: HKSourceQuery, sources: Set<HKSource>?, error: Error?) in
-          if let error = error {
-            continuation.resume(throwing: error)
-            return
-          }
+          DispatchQueue.main.async {
+            if let error = error {
+              continuation.resume(throwing: error)
+              return
+            }
 
-          guard let sources = sources else {
-            return continuation.resume(
-              throwing: runtimeErrorWithPrefix(
-                "Empty response for sample type \(identifier.stringValue)"))
-          }
+            guard let sources = sources else {
+              return continuation.resume(
+                throwing: runtimeErrorWithPrefix(
+                  "Empty response for sample type \(identifier.stringValue)"))
+            }
 
-          let serializedSources = sources.map { source -> SourceProxy in
+            let serializedSources = sources.map { source -> SourceProxy in
 
-            return SourceProxy(
-              source: source
-            )
-          }
+              return SourceProxy(
+                source: source
+              )
+            }
 
-          continuation.resume(returning: serializedSources)
+            continuation.resume(returning: serializedSources)
+          }
         }
 
         store.execute(query)
@@ -240,10 +247,12 @@ class CoreModule: HybridCoreModuleSpec {
             for: type,
             frequency: frequency
           ) { (success, error) in
-            if let err = error {
-              return continuation.resume(throwing: err)
+            DispatchQueue.main.async {
+              if let err = error {
+                return continuation.resume(throwing: err)
+              }
+              return continuation.resume(returning: success)
             }
-            return continuation.resume(returning: success)
           }
         }
       } else {
@@ -262,10 +271,12 @@ class CoreModule: HybridCoreModuleSpec {
         store.disableBackgroundDelivery(
           for: type
         ) { (success, error) in
-          if let err = error {
-            return continuation.resume(throwing: err)
+          DispatchQueue.main.async {
+            if let err = error {
+              return continuation.resume(throwing: err)
+            }
+            return continuation.resume(returning: success)
           }
-          return continuation.resume(returning: success)
         }
       }
     }
@@ -275,10 +286,12 @@ class CoreModule: HybridCoreModuleSpec {
     return Promise.async {
       try await withCheckedThrowingContinuation { continuation in
         store.disableAllBackgroundDelivery(completion: { (success, error) in
-          guard let err = error else {
-            return continuation.resume(returning: success)
+          DispatchQueue.main.async {
+            guard let err = error else {
+              return continuation.resume(returning: success)
+            }
+            return continuation.resume(throwing: err)
           }
-          return continuation.resume(throwing: err)
         })
       }
     }
@@ -345,10 +358,12 @@ class CoreModule: HybridCoreModuleSpec {
         let of = try sampleTypeFrom(sampleTypeIdentifierWriteable: objectTypeIdentifier)
         return try await withCheckedThrowingContinuation { continuation in
           store.deleteObjects(of: of, predicate: predicate) { (_, count, error) in
-            if let error = error {
-              continuation.resume(throwing: error)
-            } else {
-              continuation.resume(returning: Double(count))
+            DispatchQueue.main.async {
+              if let error = error {
+                continuation.resume(throwing: error)
+              } else {
+                continuation.resume(returning: Double(count))
+              }
             }
           }
         }

package/ios/ElectrocardiogramModule.swift

@@ -84,26 +84,28 @@ func getECGVoltages(sample: HKElectrocardiogram) async throws -> [Electrocardiog
 
     // Stream measurements
     let q = HKElectrocardiogramQuery(sample) { _, result in
-      switch result {
-      case .error(let error):
-        continuation.resume(throwing: error)
-
-      case .measurement(let m):
-        // Lead I-like from Apple Watch
-        if let v = m.quantity(for: .appleWatchSimilarToLeadI)?.doubleValue(for: .volt()) {
-          let item = ElectrocardiogramVoltage(
-            timeSinceSampleStart: m.timeSinceSampleStart,
-            voltage: v,
-            lead: ElectrocardiogramLead(fromString: "appleWatchSimilarToLeadI")!
-          )
-          all.append(item)
-        }
+      DispatchQueue.main.async {
+        switch result {
+        case .error(let error):
+          continuation.resume(throwing: error)
+
+        case .measurement(let m):
+          // Lead I-like from Apple Watch
+          if let v = m.quantity(for: .appleWatchSimilarToLeadI)?.doubleValue(for: .volt()) {
+            let item = ElectrocardiogramVoltage(
+              timeSinceSampleStart: m.timeSinceSampleStart,
+              voltage: v,
+              lead: ElectrocardiogramLead(fromString: "appleWatchSimilarToLeadI")!
+            )
+            all.append(item)
+          }
 
-      case .done:
-        continuation.resume(returning: all)
-      @unknown default:
-        continuation.resume(
-          throwing: runtimeErrorWithPrefix("HKElectrocardiogramQuery received unknown result type"))
+        case .done:
+          continuation.resume(returning: all)
+        @unknown default:
+          continuation.resume(
+            throwing: runtimeErrorWithPrefix("HKElectrocardiogramQuery received unknown result type"))
+        }
       }
     }
     store.execute(q)

package/ios/HeartbeatSeriesModule.swift

@@ -60,20 +60,22 @@ func getHeartbeatSeriesHeartbeats(sample: HKHeartbeatSeriesSample) async throws
         done: Bool, error: Error?
       ) in
 
-      if let error = error {
-        continuation.resume(throwing: error)
-        return
-      }
-
-      let heartbeat = Heartbeat(
-        timeSinceSeriesStart: timeSinceSeriesStart,
-        precededByGap: precededByGap
-      )
-
-      allBeats.append(heartbeat)
-
-      if done {
-        continuation.resume(returning: allBeats)
+      DispatchQueue.main.async {
+        if let error = error {
+          continuation.resume(throwing: error)
+          return
+        }
+
+        let heartbeat = Heartbeat(
+          timeSinceSeriesStart: timeSinceSeriesStart,
+          precededByGap: precededByGap
+        )
+
+        allBeats.append(heartbeat)
+
+        if done {
+          continuation.resume(returning: allBeats)
+        }
       }
     }
 

package/ios/Helpers.swift

@@ -54,25 +54,27 @@ func sampleAnchoredQueryAsync(
         newAnchor:
           HKQueryAnchor?, error: Error?
       ) in
-      if let error = error {
-        return continuation.resume(throwing: error)
-      }
+      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
+            )
+          )
+        }
 
-      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
-          )
-        )
+          throwing: runtimeErrorWithPrefix("Unexpected empty response"))
       }
-
-      return continuation.resume(
-        throwing: runtimeErrorWithPrefix("Unexpected empty response"))
     }
 
     store.execute(query)
@@ -108,16 +110,18 @@ func sampleQueryAsync(
       limit: limit,
       sortDescriptors: sortDescriptors,
     ) { (_: HKSampleQuery, samples: [HKSample]?, error: Error?) in
-      if let error = error {
-        return continuation.resume(throwing: error)
-      }
+      DispatchQueue.main.async {
+        if let error = error {
+          return continuation.resume(throwing: error)
+        }
 
-      if let samples = samples {
-        return continuation.resume(returning: samples)
-      }
+        if let samples = samples {
+          return continuation.resume(returning: samples)
+        }
 
-      return continuation.resume(
-        throwing: runtimeErrorWithPrefix("Unexpected empty response"))
+        return continuation.resume(
+          throwing: runtimeErrorWithPrefix("Unexpected empty response"))
+      }
     }
 
     store.execute(q)
@@ -127,10 +131,12 @@ func sampleQueryAsync(
 func saveAsync(sample: HKObject) async throws -> Bool {
   return try await withCheckedThrowingContinuation { continuation in
     store.save(sample) { (success: Bool, error: Error?) in
-      if let error = error {
-        continuation.resume(throwing: error)
-      } else {
-        continuation.resume(returning: success)
+      DispatchQueue.main.async {
+        if let error = error {
+          continuation.resume(throwing: error)
+        } else {
+          continuation.resume(returning: success)
+        }
       }
     }
   }

package/ios/QuantityTypeModule.swift

@@ -163,17 +163,19 @@ func queryStatisticsCollectionForQuantityInternal(
     )
 
     query.initialResultsHandler = { (_, results: HKStatisticsCollection?, error: Error?) in
-      if let error = error {
-        return handleHKNoDataOrThrow(error: error, continuation: continuation, noDataFallback: {
-          return nil
-        })
-      }
+      DispatchQueue.main.async {
+        if let error = error {
+          return handleHKNoDataOrThrow(error: error, continuation: continuation, noDataFallback: {
+            return nil
+          })
+        }
 
-      guard let statistics = results else {
-        return continuation.resume(throwing: runtimeErrorWithPrefix("queryStatisticsCollectionForQuantityInternal: unexpected empty results"))
-      }
+        guard let statistics = results else {
+          return continuation.resume(throwing: runtimeErrorWithPrefix("queryStatisticsCollectionForQuantityInternal: unexpected empty results"))
+        }
 
-      return continuation.resume(returning: statistics)
+        return continuation.resume(returning: statistics)
+      }
     }
 
     store.execute(query)

package/ios/WorkoutProxy.swift

@@ -57,21 +57,23 @@ func getRouteLocations(
     let query = HKWorkoutRouteQuery(route: route) {
       (_, locationsOrNil, done, errorOrNil) in
 
-      if let error = errorOrNil {
-        continuation.resume(throwing: error)
-        return
-      }
+      DispatchQueue.main.async {
+        if let error = errorOrNil {
+          continuation.resume(throwing: error)
+          return
+        }
 
-      guard let currentLocationBatch = locationsOrNil else {
-        return continuation.resume(
-          throwing: runtimeErrorWithPrefix("Unexpected empty response")
-        )
-      }
+        guard let currentLocationBatch = locationsOrNil else {
+          return continuation.resume(
+            throwing: runtimeErrorWithPrefix("Unexpected empty response")
+          )
+        }
 
-      allLocations.append(contentsOf: currentLocationBatch)
+        allLocations.append(contentsOf: currentLocationBatch)
 
-      if done {
-        continuation.resume(returning: allLocations)
+        if done {
+          continuation.resume(returning: allLocations)
+        }
       }
     }
 

package/ios/WorkoutsModule.swift

@@ -43,13 +43,15 @@ class WorkoutsModule: HybridWorkoutsModuleSpec {
     return Promise.async {
       try await withCheckedThrowingContinuation { continuation in
         store.startWatchApp(with: configuration) { success, error in
-          if let error {
-            continuation.resume(
-              throwing: error
-            )
+          DispatchQueue.main.async {
+            if let error {
+              continuation.resume(
+                throwing: error
+              )
+            } else {
+              continuation.resume(returning: success)
+            }
           }
-
-          continuation.resume(returning: success)
         }
       }
     }
@@ -192,19 +194,22 @@ class WorkoutsModule: HybridWorkoutsModuleSpec {
       try await withCheckedThrowingContinuation({ continuation in
         // saving workout, samples and route
         store.save(workout) { (_: Bool, error: Error?) in
-          if let error = error {
-            return continuation.resume(throwing: error)
-          } else if !initializedSamples.isEmpty {
-            store.add(initializedSamples, to: workout) { (_, error: Error?) in
-              if let error = error {
-                return continuation.resume(throwing: error)
+          DispatchQueue.main.async {
+            if let error = error {
+              return continuation.resume(throwing: error)
+            } else if !initializedSamples.isEmpty {
+              store.add(initializedSamples, to: workout) { (_, error: Error?) in
+                DispatchQueue.main.async {
+                  if let error = error {
+                    return continuation.resume(throwing: error)
+                  }
+                  return continuation.resume()
+                }
               }
+            } else {
               return continuation.resume()
             }
-          } else {
-            return continuation.resume()
           }
-
         }
       }) as Void
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kingstinct/react-native-healthkit",
-  "version": "13.3.0",
+  "version": "13.3.1",
   "description": "React Native bindings for HealthKit",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",