Skip to content

Tidepool Merge #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: dev
Choose a base branch
from
Open

Tidepool Merge #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
34a825e
[COASTAL-1291] plugin identifier is no longer class property (#39)
nhamming Sep 25, 2023
649e57c
Merge remote-tracking branch 'origin/dev' into ps2/LOOP-4735/cgm-even…
ps2 Sep 27, 2023
d64b29e
Merge pull request #40 from tidepool-org/ps2/LOOP-4735/cgm-event-store
ps2 Sep 27, 2023
8f2f54e
Updates for LOOP-4752
ps2 Dec 12, 2023
1e1b519
Update for remote data service protocol changes
ps2 May 23, 2024
b50a1c3
Remote data service can fetch device logs
ps2 Jun 4, 2024
25d67ff
Merge pull request #41 from tidepool-org/ps2/LOOP-1169/upload-device-…
ps2 Jun 10, 2024
f6a1d6e
Merge tidepool/dev
ps2 Oct 5, 2024
a70df07
service allowDebugFeatures (#42)
nhamming Oct 30, 2024
4ec123b
Merge tidepool/dev
ps2 Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions NightscoutServiceKit/Extensions/StoredSettings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ extension StoredSettings {

return NightscoutKit.LoopSettings(
dosingEnabled: dosingEnabled,
overridePresets: overridePresets?.map { $0.nsScheduleOverride(for: bloodGlucoseUnit) } ?? [],
scheduleOverride: scheduleOverride?.nsScheduleOverride(for: bloodGlucoseUnit),
overridePresets: overridePresets.map { $0.nsScheduleOverride(for: bloodGlucoseUnit) },
scheduleOverride: nil,
minimumBGGuard: suspendThreshold?.quantity.doubleValue(for: bloodGlucoseUnit),
preMealTargetRange: nightscoutPreMealTargetRange,
maximumBasalRatePerHour: maximumBasalRatePerHour,
Expand Down
244 changes: 135 additions & 109 deletions NightscoutServiceKit/NightscoutService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public enum NightscoutServiceError: Error {

public final class NightscoutService: Service {

public static let pluginIdentifier = "NightscoutService"
public let pluginIdentifier = "NightscoutService"

public static let localizedTitle = LocalizedString("Nightscout", comment: "The title of the Nightscout service")

Expand All @@ -30,6 +30,8 @@ public final class NightscoutService: Service {

public weak var stateDelegate: StatefulPluggableDelegate?

public weak var remoteDataServiceDelegate: RemoteDataServiceDelegate?

public var siteURL: URL?

public var apiSecret: String?
Expand Down Expand Up @@ -153,129 +155,129 @@ public final class NightscoutService: Service {
}

extension NightscoutService: RemoteDataService {

public func uploadTemporaryOverrideData(updated: [LoopKit.TemporaryScheduleOverride], deleted: [LoopKit.TemporaryScheduleOverride], completion: @escaping (Result<Bool, Error>) -> Void) {
public func uploadTemporaryOverrideData(updated: [LoopKit.TemporaryScheduleOverride], deleted: [LoopKit.TemporaryScheduleOverride]) async throws {
guard let uploader = uploader else {
completion(.success(true))
return
}

let updates = updated.map { OverrideTreatment(override: $0) }

let deletions = deleted.map { $0.syncIdentifier.uuidString }

uploader.deleteTreatmentsById(deletions, completionHandler: { (error) in
if let error = error {
self.log.error("Overrides deletions failed to delete %{public}@: %{public}@", String(describing: deletions), String(describing: error))
} else {
if deletions.count > 0 {
self.log.debug("Deleted ids: %@", deletions)
}
uploader.upload(updates) { (result) in
switch result {
case .failure(let error):
self.log.error("Failed to upload overrides %{public}@: %{public}@", String(describing: updates.map {$0.dictionaryRepresentation}), String(describing: error))
completion(.failure(error))
case .success:
self.log.debug("Uploaded overrides %@", String(describing: updates.map {$0.dictionaryRepresentation}))
completion(.success(true))
try await withCheckedThrowingContinuation({ (continuation: CheckedContinuation<Void, Error>) -> Void in
uploader.deleteTreatmentsById(deletions, completionHandler: { (error) in
if let error = error {
self.log.error("Overrides deletions failed to delete %{public}@: %{public}@", String(describing: deletions), String(describing: error))
} else {
if deletions.count > 0 {
self.log.debug("Deleted ids: %@", deletions)
}
uploader.upload(updates) { (result) in
switch result {
case .failure(let error):
self.log.error("Failed to upload overrides %{public}@: %{public}@", String(describing: updates.map {$0.dictionaryRepresentation}), String(describing: error))
continuation.resume(throwing: error)
case .success:
self.log.debug("Uploaded overrides %@", String(describing: updates.map {$0.dictionaryRepresentation}))
continuation.resume()
}
}
}
}
})
})
}


public var alertDataLimit: Int? { return 1000 }

public func uploadAlertData(_ stored: [SyncAlertObject], completion: @escaping (Result<Bool, Error>) -> Void) {
completion(.success(false))
public func uploadAlertData(_ stored: [SyncAlertObject]) async throws {
}

public var carbDataLimit: Int? { return 1000 }

public func uploadCarbData(created: [SyncCarbObject], updated: [SyncCarbObject], deleted: [SyncCarbObject], completion: @escaping (Result<Bool, Error>) -> Void) {
public func uploadCarbData(created: [SyncCarbObject], updated: [SyncCarbObject], deleted: [SyncCarbObject]) async throws {
guard hasConfiguration, let uploader = uploader else {
completion(.success(true))
return
}

uploader.createCarbData(created) { result in
switch result {
case .failure(let error):
completion(.failure(error))
case .success(let createdObjectIds):
let createdUploaded = !created.isEmpty
let syncIdentifiers = created.map { $0.syncIdentifier }
for (syncIdentifier, objectId) in zip(syncIdentifiers, createdObjectIds) {
if let syncIdentifier = syncIdentifier {
self.objectIdCache.add(syncIdentifier: syncIdentifier, objectId: objectId)
try await withCheckedThrowingContinuation({ (continuation: CheckedContinuation<Void, Error>) -> Void in
uploader.createCarbData(created) { result in
switch result {
case .failure(let error):
continuation.resume(throwing: error)
case .success(let createdObjectIds):
let createdUploaded = !created.isEmpty
let syncIdentifiers = created.map { $0.syncIdentifier }
for (syncIdentifier, objectId) in zip(syncIdentifiers, createdObjectIds) {
if let syncIdentifier = syncIdentifier {
self.objectIdCache.add(syncIdentifier: syncIdentifier, objectId: objectId)
}
}
}
self.stateDelegate?.pluginDidUpdateState(self)

uploader.updateCarbData(updated, usingObjectIdCache: self.objectIdCache) { result in
switch result {
case .failure(let error):
completion(.failure(error))
case .success(let updatedUploaded):
uploader.deleteCarbData(deleted, usingObjectIdCache: self.objectIdCache) { result in
switch result {
case .failure(let error):
completion(.failure(error))
case .success(let deletedUploaded):
self.objectIdCache.purge(before: Date().addingTimeInterval(-self.objectIdCacheKeepTime))
self.stateDelegate?.pluginDidUpdateState(self)
completion(.success(createdUploaded || updatedUploaded || deletedUploaded))
self.stateDelegate?.pluginDidUpdateState(self)

uploader.updateCarbData(updated, usingObjectIdCache: self.objectIdCache) { result in
switch result {
case .failure(let error):
continuation.resume(throwing: error)
case .success(let updatedUploaded):
uploader.deleteCarbData(deleted, usingObjectIdCache: self.objectIdCache) { result in
switch result {
case .failure(let error):
continuation.resume(throwing: error)
case .success(let deletedUploaded):
self.objectIdCache.purge(before: Date().addingTimeInterval(-self.objectIdCacheKeepTime))
self.stateDelegate?.pluginDidUpdateState(self)
continuation.resume()
}
}
}
}
}
}
}
})
}

public var doseDataLimit: Int? { return 1000 }

public func uploadDoseData(created: [DoseEntry], deleted: [DoseEntry], completion: @escaping (_ result: Result<Bool, Error>) -> Void) {
public func uploadDoseData(created: [DoseEntry], deleted: [DoseEntry]) async throws {
guard hasConfiguration, let uploader = uploader else {
completion(.success(true))
return
}

uploader.createDoses(created, usingObjectIdCache: self.objectIdCache) { (result) in
switch (result) {
case .failure(let error):
completion(.failure(error))
case .success(let createdObjectIds):
let createdUploaded = !created.isEmpty
let syncIdentifiers = created.map { $0.syncIdentifier }
for (syncIdentifier, objectId) in zip(syncIdentifiers, createdObjectIds) {
if let syncIdentifier = syncIdentifier {
self.objectIdCache.add(syncIdentifier: syncIdentifier, objectId: objectId)
try await withCheckedThrowingContinuation({ (continuation: CheckedContinuation<Void, Error>) -> Void in
uploader.createDoses(created, usingObjectIdCache: self.objectIdCache) { (result) in
switch (result) {
case .failure(let error):
continuation.resume(throwing: error)
case .success(let createdObjectIds):
let createdUploaded = !created.isEmpty
let syncIdentifiers = created.map { $0.syncIdentifier }
for (syncIdentifier, objectId) in zip(syncIdentifiers, createdObjectIds) {
if let syncIdentifier = syncIdentifier {
self.objectIdCache.add(syncIdentifier: syncIdentifier, objectId: objectId)
}
}
}
self.stateDelegate?.pluginDidUpdateState(self)

uploader.deleteDoses(deleted.filter { !$0.isMutable }, usingObjectIdCache: self.objectIdCache) { result in
switch result {
case .failure(let error):
completion(.failure(error))
case .success(let deletedUploaded):
self.objectIdCache.purge(before: Date().addingTimeInterval(-self.objectIdCacheKeepTime))
self.stateDelegate?.pluginDidUpdateState(self)
completion(.success(createdUploaded || deletedUploaded))
self.stateDelegate?.pluginDidUpdateState(self)

uploader.deleteDoses(deleted.filter { !$0.isMutable }, usingObjectIdCache: self.objectIdCache) { result in
switch result {
case .failure(let error):
continuation.resume(throwing: error)
case .success(let deletedUploaded):
self.objectIdCache.purge(before: Date().addingTimeInterval(-self.objectIdCacheKeepTime))
self.stateDelegate?.pluginDidUpdateState(self)
continuation.resume()
}
}
}
}
}
})
}

public var dosingDecisionDataLimit: Int? { return 50 } // Each can be up to 20K bytes of serialized JSON, target ~1M or less

public func uploadDosingDecisionData(_ stored: [StoredDosingDecision], completion: @escaping (Result<Bool, Error>) -> Void) {
public func uploadDosingDecisionData(_ stored: [StoredDosingDecision]) async throws {
guard hasConfiguration, let uploader = uploader else {
completion(.success(true))
return
}

Expand All @@ -297,42 +299,50 @@ extension NightscoutService: RemoteDataService {
}

guard statuses.count > 0 else {
completion(.success(false))
return
}

uploader.uploadDeviceStatuses(statuses) { result in
switch result {
case .success:
self.lastDosingDecisionForAutomaticDose = nil
default:
break
try await withCheckedThrowingContinuation({ (continuation: CheckedContinuation<Void, Error>) -> Void in
uploader.uploadDeviceStatuses(statuses) { result in
switch result {
case .success:
self.lastDosingDecisionForAutomaticDose = nil
default:
break
}
continuation.resume()
}
completion(result)
}
})
}

public var glucoseDataLimit: Int? { return 1000 }

public func uploadGlucoseData(_ stored: [StoredGlucoseSample], completion: @escaping (Result<Bool, Error>) -> Void) {
public func uploadGlucoseData(_ stored: [StoredGlucoseSample]) async throws {
guard hasConfiguration, let uploader = uploader else {
completion(.success(true))
return
}

uploader.uploadGlucoseSamples(stored, completion: completion)
try await withCheckedThrowingContinuation({ (continuation: CheckedContinuation<Void, Error>) -> Void in
uploader.uploadGlucoseSamples(stored) { result in
switch result {
case .success:
continuation.resume()
case .failure(let error):
continuation.resume(throwing: error)
}
}
})
}

public var pumpEventDataLimit: Int? { return 1000 }

public func uploadPumpEventData(_ stored: [PersistedPumpEvent], completion: @escaping (Result<Bool, Error>) -> Void) {
public func uploadPumpEventData(_ stored: [PersistedPumpEvent]) async throws {

guard hasConfiguration, let uploader = uploader else {
completion(.success(true))
return
}

let source = "loop://\(UIDevice.current.name)"
let source = "loop://\(await UIDevice.current.name)"

let treatments = stored.compactMap { (event) -> NightscoutTreatment? in
// ignore doses; we'll get those via uploadDoseData
Expand All @@ -342,29 +352,37 @@ extension NightscoutService: RemoteDataService {
return event.treatment(source: source)
}

uploader.upload(treatments) { (result) in
switch result {
case .failure(let error):
self.log.error("Failed to upload pump events %{public}@: %{public}@", String(describing: treatments.map {$0.dictionaryRepresentation}), String(describing: error))
completion(.failure(error))
case .success:
self.log.debug("Uploaded overrides %@", String(describing: treatments.map {$0.dictionaryRepresentation}))
completion(.success(true))
try await withCheckedThrowingContinuation({ (continuation: CheckedContinuation<Void, Error>) -> Void in
uploader.upload(treatments) { (result) in
switch result {
case .failure(let error):
self.log.error("Failed to upload pump events %{public}@: %{public}@", String(describing: treatments.map {$0.dictionaryRepresentation}), String(describing: error))
continuation.resume(throwing: error)
case .success:
self.log.debug("Uploaded overrides %@", String(describing: treatments.map {$0.dictionaryRepresentation}))
continuation.resume()
}
}
}

completion(.success(false))
})
}

public var settingsDataLimit: Int? { return 400 } // Each can be up to 2.5K bytes of serialized JSON, target ~1M or less

public func uploadSettingsData(_ stored: [StoredSettings], completion: @escaping (Result<Bool, Error>) -> Void) {
public func uploadSettingsData(_ stored: [StoredSettings]) async throws {
guard hasConfiguration, let uploader = uploader else {
completion(.success(true))
return
}

uploader.uploadProfiles(stored.compactMap { $0.profileSet }, completion: completion)
try await withCheckedThrowingContinuation({ (continuation: CheckedContinuation<Void, Error>) -> Void in
uploader.uploadProfiles(stored.compactMap { $0.profileSet }) { result in
switch result {
case .success:
continuation.resume()
case .failure(let error):
continuation.resume(throwing: error)
}
}
})
}

public func fetchStoredTherapySettings(completion: @escaping (Result<(TherapySettings,Date), Error>) -> Void) {
Expand All @@ -388,13 +406,21 @@ extension NightscoutService: RemoteDataService {
})
}

public func uploadCgmEventData(_ stored: [LoopKit.PersistedCgmEvent], completion: @escaping (Result<Bool, Error>) -> Void) {
public func uploadCgmEventData(_ stored: [LoopKit.PersistedCgmEvent]) async throws {
guard hasConfiguration, let uploader = uploader else {
completion(.success(true))
return
}

uploader.uploadCgmEvents(stored, completion: completion)
try await withCheckedThrowingContinuation({ (continuation: CheckedContinuation<Void, Error>) -> Void in
uploader.uploadCgmEvents(stored) { result in
switch result {
case .success:
continuation.resume()
case .failure(let error):
continuation.resume(throwing: error)
}
}
})
}


Expand Down
4 changes: 2 additions & 2 deletions NightscoutServiceKitUI/NightscoutService+UI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ extension NightscoutService: ServiceUI {
UIImage(named: "nightscout", in: Bundle(for: ServiceUICoordinator.self), compatibleWith: nil)!
}

public static func setupViewController(colorPalette: LoopUIColorPalette, pluginHost: PluginHost) -> SetupUIResult<ServiceViewController, ServiceUI> {
public static func setupViewController(colorPalette: LoopUIColorPalette, pluginHost: PluginHost, allowDebugFeatures: Bool) -> SetupUIResult<ServiceViewController, ServiceUI> {
return .userInteractionRequired(ServiceUICoordinator(colorPalette: colorPalette))
}

public func settingsViewController(colorPalette: LoopUIColorPalette) -> ServiceViewController {
public func settingsViewController(colorPalette: LoopUIColorPalette, allowDebugFeatures: Bool) -> ServiceViewController {
return ServiceUICoordinator(service: self, colorPalette: colorPalette)
}
}