-
Notifications
You must be signed in to change notification settings - Fork 27
Defer forgetting sensor on suspected session end to avoid long reconnection outages #62
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.
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
cheets
wants to merge
1
commit into
LoopKit:main
Choose a base branch
from
cheets:fix/g7-suspected-session-end-grace
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
G7SensorKit.xcodeproj/xcshareddata/xcschemes/G7SensorKit.xcscheme
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <Scheme | ||
| LastUpgradeVersion = "1640" | ||
| version = "1.7"> | ||
| <BuildAction | ||
| parallelizeBuildables = "YES" | ||
| buildImplicitDependencies = "YES"> | ||
| <BuildActionEntries> | ||
| <BuildActionEntry | ||
| buildForTesting = "YES" | ||
| buildForRunning = "YES" | ||
| buildForProfiling = "YES" | ||
| buildForArchiving = "YES" | ||
| buildForAnalyzing = "YES"> | ||
| <BuildableReference | ||
| BuildableIdentifier = "primary" | ||
| BlueprintIdentifier = "C17F50C5291EAC3800555EB5" | ||
| BuildableName = "G7SensorKit.framework" | ||
| BlueprintName = "G7SensorKit" | ||
| ReferencedContainer = "container:G7SensorKit.xcodeproj"> | ||
| </BuildableReference> | ||
| </BuildActionEntry> | ||
| </BuildActionEntries> | ||
| </BuildAction> | ||
| <TestAction | ||
| buildConfiguration = "Debug" | ||
| selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" | ||
| selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" | ||
| shouldUseLaunchSchemeArgsEnv = "YES"> | ||
| <Testables> | ||
| <TestableReference | ||
| skipped = "NO"> | ||
| <BuildableReference | ||
| BuildableIdentifier = "primary" | ||
| BlueprintIdentifier = "C17F50CD291EAC3800555EB5" | ||
| BuildableName = "G7SensorKitTests.xctest" | ||
| BlueprintName = "G7SensorKitTests" | ||
| ReferencedContainer = "container:G7SensorKit.xcodeproj"> | ||
| </BuildableReference> | ||
| </TestableReference> | ||
| </Testables> | ||
| </TestAction> | ||
| <LaunchAction | ||
| buildConfiguration = "Debug" | ||
| selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" | ||
| selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" | ||
| launchStyle = "0" | ||
| useCustomWorkingDirectory = "NO" | ||
| ignoresPersistentStateOnLaunch = "NO" | ||
| debugDocumentVersioning = "YES" | ||
| debugServiceExtension = "internal" | ||
| allowLocationSimulation = "YES"> | ||
| </LaunchAction> | ||
| <ProfileAction | ||
| buildConfiguration = "Release" | ||
| shouldUseLaunchSchemeArgsEnv = "YES" | ||
| savedToolIdentifier = "" | ||
| useCustomWorkingDirectory = "NO" | ||
| debugDocumentVersioning = "YES"> | ||
| </ProfileAction> | ||
| <AnalyzeAction | ||
| buildConfiguration = "Debug"> | ||
| </AnalyzeAction> | ||
| <ArchiveAction | ||
| buildConfiguration = "Release" | ||
| revealArchiveInOrganizer = "YES"> | ||
| </ArchiveAction> | ||
| </Scheme> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| // | ||
| // G7CGMManagerTests.swift | ||
| // G7SensorKitTests | ||
| // | ||
| // Copyright © 2026 LoopKit Authors. All rights reserved. | ||
| // | ||
|
|
||
| import XCTest | ||
| import CoreBluetooth | ||
| @testable import G7SensorKit | ||
|
|
||
| /// CBCentralManager with the state restoration option raises an exception in a | ||
| /// test bundle, which lacks the bluetooth-central background mode. | ||
| private class TestBluetoothManager: G7BluetoothManager { | ||
| override func makeCentralManager(queue: DispatchQueue) -> CBCentralManager { | ||
| return CBCentralManager(delegate: self, queue: queue) | ||
| } | ||
| } | ||
|
|
||
| final class G7CGMManagerTests: XCTestCase { | ||
|
|
||
| private static let sensorID = "DXCM99" | ||
|
|
||
| private func makeManager(gracePeriod: TimeInterval) -> G7CGMManager { | ||
| var state = G7CGMManagerState() | ||
| state.sensorID = Self.sensorID | ||
| state.activatedAt = Date(timeIntervalSinceNow: -54000) // ~15h old session | ||
| let sensor = G7Sensor(sensorID: state.sensorID, bluetoothManager: TestBluetoothManager()) | ||
| let manager = G7CGMManager(state: state, sensor: sensor) | ||
| manager.suspectedSessionEndGracePeriod = gracePeriod | ||
| return manager | ||
| } | ||
|
|
||
| private var okGlucoseMessage: G7GlucoseMessage { | ||
| // Same sample as G7GlucoseMessageTests: glucose 138, algorithm state ok | ||
| return G7GlucoseMessage(data: Data(hexadecimalString: "4e00c35501002601000106008a00060187000f")!)! | ||
| } | ||
|
|
||
| func testSuspectedSessionEndKeepsSensorDuringGracePeriod() { | ||
| let manager = makeManager(gracePeriod: 10) | ||
|
|
||
| manager.sensorDisconnected(manager.sensor, suspectedEndOfSession: true) | ||
|
|
||
| XCTAssertEqual(Self.sensorID, manager.state.sensorID) | ||
| } | ||
|
|
||
| func testSuspectedSessionEndForgetsSensorAfterGracePeriodWithoutReadings() { | ||
| let manager = makeManager(gracePeriod: 0.1) | ||
|
|
||
| manager.sensorDisconnected(manager.sensor, suspectedEndOfSession: true) | ||
|
|
||
| let forgotten = XCTNSPredicateExpectation( | ||
| predicate: NSPredicate { _, _ in manager.state.sensorID == nil }, | ||
| object: nil | ||
| ) | ||
| wait(for: [forgotten], timeout: 5) | ||
| } | ||
|
|
||
| func testReadingDuringGracePeriodPreventsForgettingSensor() { | ||
| let manager = makeManager(gracePeriod: 0.5) | ||
|
|
||
| manager.sensorDisconnected(manager.sensor, suspectedEndOfSession: true) | ||
| manager.sensor(manager.sensor, didRead: okGlucoseMessage) | ||
|
|
||
| let graceElapsed = expectation(description: "grace period elapsed") | ||
| DispatchQueue.global().asyncAfter(deadline: .now() + 1.5) { | ||
| graceElapsed.fulfill() | ||
| } | ||
| wait(for: [graceElapsed], timeout: 5) | ||
|
|
||
| XCTAssertEqual(Self.sensorID, manager.state.sensorID) | ||
| } | ||
|
|
||
| func testNonSuspectedDisconnectDoesNotForgetSensor() { | ||
| let manager = makeManager(gracePeriod: 0.1) | ||
|
|
||
| manager.sensorDisconnected(manager.sensor, suspectedEndOfSession: false) | ||
|
|
||
| let graceElapsed = expectation(description: "grace period elapsed") | ||
| DispatchQueue.global().asyncAfter(deadline: .now() + 0.5) { | ||
| graceElapsed.fulfill() | ||
| } | ||
| wait(for: [graceElapsed], timeout: 5) | ||
|
|
||
| XCTAssertEqual(Self.sensorID, manager.state.sensorID) | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we add a log here for future troubleshooting?
guard scheduled else { logDeviceCommunication("Suspected session end during active grace period; original deadline unchanged.", type: .connection) return }