Skip to content

fix(ble): debounce RNode reconnect during OS pairing #20

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
rinchen wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(ble): debounce RNode reconnect during OS pairing #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 20 additions & 1 deletion crates/rns-interface/src/ble_rnode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ const RECONNECT_WAIT: u64 = 1;
/// Fast early recovery, then indefinite low-duty retries. A two-minute cap made
/// a reachable radio appear dead long after returning to range.
const RECONNECT_WAIT_MAX: u64 = 30;
/// After a mid-SMP disconnect (`BLE pairing in progress`), wait before
/// reconnecting so the OS passkey dialog is not re-fired every second while
/// the user is typing the PIN (desktop BLE pairing UX).
const PAIRING_TRANSITION_RETRY_WAIT: u64 = 30;
/// `None` retries forever; teardown goes via `stop_ble_rnode_interface`.
const MAX_RECONNECT_TRIES: Option<usize> = None;
const SCAN_TIMEOUT: u64 = 3;
Expand Down Expand Up @@ -2785,7 +2789,11 @@ pub async fn spawn_ble_rnode_interface_with_driver_and_options(
Ok(c) => c,
Err(e) => {
let pairing_transition = is_pairing_transition_error(&e);
let retry_wait = if pairing_transition { 1 } else { backoff };
let retry_wait = if pairing_transition {
PAIRING_TRANSITION_RETRY_WAIT
} else {
backoff
};
snapshot_publisher.connection_attempt_failed();
tracing::warn!(name = %log_name, error = %e, "BLE RNode connect failed");
ble_diag(format!(
Expand Down Expand Up @@ -4924,6 +4932,17 @@ mod tests {
assert!(!reconnect.allows_packet());
}

#[test]
fn test_pairing_transition_uses_long_retry_wait() {
assert_eq!(PAIRING_TRANSITION_RETRY_WAIT, 30);
assert!(is_pairing_transition_error(&InterfaceError::SendFailed(
"BLE pairing in progress: Authentication required".into()
)));
assert!(!is_pairing_transition_error(&InterfaceError::SendFailed(
"BLE device not found: RNode".into()
)));
}

#[test]
fn test_ble_rnode_config_defaults() {
let cfg = BleRNodeConfig::new("ble-rnode", "ble://RNode 3B87");
Expand Down