@craft-native/ios 0.0.290 → 0.0.293

package/README.md

@@ -569,6 +569,11 @@ const readings = await health.getHeartRateSamples({ startDate: Date.now() - 8640
 const nights = await health.getSleepIntervals({ startDate: Date.now() - 86400000 })
 // An app built before these reads existed has neither; check first.
 if (health.supports('getHeartRateSamples')) { /* ... */ }
+// Diabetes: glucose (mg/dL), insulin (IU, each marked basal or bolus) and carbs (g),
+// one sample at a time with its UUID, oldest first. Ask for them read only.
+await health.requestAuthorization(['bloodGlucose', 'insulinDelivery', 'dietaryCarbohydrates'], { write: false })
+const glucose = await health.getSamples('bloodGlucose', { startDate: Date.now() - 86400000 })
+const doses = await health.getSamples('insulinDelivery', { startDate: Date.now() - 86400000 })
 // Mindful minutes: ask for 'mindful' (with writing allowed), then save a
 // meditation or breathing session. The id is kept as the sample's external
 // UUID, so saving it again keeps the first sample ({ existing: true }).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@craft-native/ios",
-  "version": "0.0.290",
+  "version": "0.0.293",
   "homepage": "https://github.com/craft-native/craft/tree/main/packages/ios#readme",
   "repository": {
     "type": "git",

package/templates/CraftApp.swift

@@ -3116,6 +3116,22 @@ struct CraftWebView: UIViewRepresentable {
                 } else {
                     rejectCallback(callbackId, error: "HealthKit is disabled", code: "CAPABILITY_DISABLED")
                 }
+            // Glucose, insulin and carbs, one sample at a time (CraftHealth.swift).
+            case "getHealthSamples":
+                if config.enableHealthKit {
+                    if let dataType = body["type"] as? String {
+                        CraftHealth.shared.getSamples(
+                            type: dataType,
+                            startDate: body["startDate"] as? Double,
+                            endDate: body["endDate"] as? Double,
+                            limit: body["limit"] as? Int
+                        ) { [weak self] in self?.answer(callbackId, $0) }
+                    } else {
+                        rejectCallback(callbackId, error: "getHealthSamples was called without a type", code: "INVALID_ARGUMENT")
+                    }
+                } else {
+                    rejectCallback(callbackId, error: "HealthKit is disabled", code: "CAPABILITY_DISABLED")
+                }
             case "getHealthSleepIntervals":
                 if config.enableHealthKit {
                     getHealthSleepIntervals(
@@ -5749,6 +5765,10 @@ struct CraftWebView: UIViewRepresentable {
                         options = options || {};
                         return craft._invoke('getHealthHeartRateSamples', {startDate: options.startDate, endDate: options.endDate, limit: options.limit});
                     },
+                    getSamples: function(type, options) {
+                        options = options || {};
+                        return craft._invoke('getHealthSamples', {type: type, startDate: options.startDate, endDate: options.endDate, limit: options.limit});
+                    },
                     getSleepIntervals: function(options) {
                         options = options || {};
                         return craft._invoke('getHealthSleepIntervals', {startDate: options.startDate, endDate: options.endDate});

package/templates/CraftHealth.swift

@@ -106,6 +106,9 @@ final class CraftHealth {
             getDailyStatistics(type: type, startDate: options(1)["startDate"] as? Double, endDate: options(1)["endDate"] as? Double, completion: completion)
         case "getHeartRateSamples":
             getHeartRateSamples(startDate: options(0)["startDate"] as? Double, endDate: options(0)["endDate"] as? Double, limit: options(0)["limit"] as? Int, completion: completion)
+        case "getSamples":
+            guard let type = args.first as? String else { return completion(.failure(CraftHealthError(message: "getSamples needs a type", code: "INVALID_ARGUMENT"))) }
+            getSamples(type: type, startDate: options(1)["startDate"] as? Double, endDate: options(1)["endDate"] as? Double, limit: options(1)["limit"] as? Int, completion: completion)
         case "getSleepIntervals":
             getSleepIntervals(startDate: options(0)["startDate"] as? Double, endDate: options(0)["endDate"] as? Double, completion: completion)
         case "saveMindfulSession":
@@ -196,6 +199,12 @@ final class CraftHealth {
                     readTypes.insert(mindfulType)
                     shareTypes.insert(mindfulType)
                 }
+            case "bloodGlucose", "insulinDelivery":
+                // A CGM, meter, pump or closed loop's own writes: read
+                // only, never written back, so the sheet only asks to read.
+                if let diabetesType = Self.healthQuantity(type)?.type {
+                    readTypes.insert(diabetesType)
+                }
             case "dietaryEnergy", "dietaryProtein", "dietaryCarbohydrates", "dietaryFat":
                 // What a food log (MyFitnessPal, Lose It!, Cronometer...)
                 // writes to Apple Health. Request the write grant too unless
@@ -404,6 +413,8 @@ final class CraftHealth {
         case "dietaryProtein": return (HKQuantityType.quantityType(forIdentifier: .dietaryProtein), .gram(), .cumulativeSum)
         case "dietaryCarbohydrates": return (HKQuantityType.quantityType(forIdentifier: .dietaryCarbohydrates), .gram(), .cumulativeSum)
         case "dietaryFat": return (HKQuantityType.quantityType(forIdentifier: .dietaryFatTotal), .gram(), .cumulativeSum)
+        case "bloodGlucose": return (HKQuantityType.quantityType(forIdentifier: .bloodGlucose), HKUnit(from: "mg/dL"), .discreteAverage)
+        case "insulinDelivery": return (HKQuantityType.quantityType(forIdentifier: .insulinDelivery), .internationalUnit(), .cumulativeSum)
         default: return nil
         }
     }
@@ -613,6 +624,71 @@ final class CraftHealth {
         healthStore.execute(query)
     }
 
+    /// The types `getSamples` reads, and the unit each answers in.
+    private static let sampleUnits: [String: String] = ["bloodGlucose": "mg/dL", "insulinDelivery": "IU", "dietaryCarbohydrates": "g"]
+
+    /// Every glucose reading, insulin dose or carb entry between two
+    /// instants, oldest first, as the writing app saved it: its UUID (so a
+    /// sync stores it once), value, source and device, plus what a diabetes
+    /// app needs to tell readings and doses apart: an insulin dose's reason
+    /// (basal or bolus) and a glucose reading's meal time.
+    func getSamples(type: String, startDate: Double?, endDate: Double?, limit: Int?, completion rawCompletion: @escaping Completion) {
+        let completion = completeOnMain(rawCompletion)
+        guard let healthStore = healthStore else {
+            completion(.failure(CraftHealthError(message: "HealthKit not available")))
+            return
+        }
+        guard let unitName = Self.sampleUnits[type], let spec = Self.healthQuantity(type), let sampleType = spec.type else {
+            completion(.failure(CraftHealthError(message: "getSamples reads bloodGlucose, insulinDelivery or dietaryCarbohydrates", code: "INVALID_ARGUMENT")))
+            return
+        }
+
+        let end = endDate.map { Date(timeIntervalSince1970: $0 / 1000) } ?? Date()
+        let start = startDate.map { Date(timeIntervalSince1970: $0 / 1000) } ?? Calendar.current.date(byAdding: .day, value: -7, to: end)!
+        let predicate = HKQuery.predicateForSamples(withStart: start, end: end, options: [])
+        let oldestFirst = NSSortDescriptor(key: HKSampleSortIdentifierStartDate, ascending: true)
+        let cap = max(1, min(limit ?? 10_000, 50_000))
+        let ownBundle = Bundle.main.bundleIdentifier
+
+        let query = HKSampleQuery(sampleType: sampleType, predicate: predicate, limit: cap, sortDescriptors: [oldestFirst]) { _, samples, error in
+            if let error = error, (error as? HKError)?.code != .errorNoData {
+                completion(.failure(CraftHealthError(message: error.localizedDescription)))
+                return
+            }
+            let rows: [[String: Any]] = (samples as? [HKQuantitySample] ?? []).map { sample in
+                let source = sample.sourceRevision.source
+                var item: [String: Any] = [
+                    "id": sample.uuid.uuidString,
+                    "value": sample.quantity.doubleValue(for: spec.unit),
+                    "unit": unitName,
+                    "startDate": sample.startDate.timeIntervalSince1970 * 1000,
+                    "endDate": sample.endDate.timeIntervalSince1970 * 1000,
+                    "sourceName": source.name,
+                    "sourceBundleId": source.bundleIdentifier,
+                    "ownApp": ownBundle != nil && source.bundleIdentifier == ownBundle,
+                ]
+                if let device = sample.device?.name { item["deviceName"] = device }
+                if let reason = sample.metadata?[HKMetadataKeyInsulinDeliveryReason] as? NSNumber {
+                    switch HKInsulinDeliveryReason(rawValue: reason.intValue) {
+                    case .basal: item["insulinReason"] = "basal"
+                    case .bolus: item["insulinReason"] = "bolus"
+                    default: break
+                    }
+                }
+                if let meal = sample.metadata?[HKMetadataKeyBloodGlucoseMealTime] as? NSNumber {
+                    switch HKBloodGlucoseMealTime(rawValue: meal.intValue) {
+                    case .preprandial: item["mealTime"] = "beforeMeal"
+                    case .postprandial: item["mealTime"] = "afterMeal"
+                    default: break
+                    }
+                }
+                return item
+            }
+            completion(.success(rows))
+        }
+        healthStore.execute(query)
+    }
+
     /// One heart-rate sample as a page sees it, from a read or the stream
     /// alike: bpm, when, the app and device that wrote it, a series' count,
     /// lowest and highest, and what the wearer was doing when the watch says.