Skip to content

fix: actually handle NonTerminatingCancellation error #249

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

Merged
iinuwa merged 1 commit into from
Nov 2, 2026
Merged

fix: actually handle NonTerminatingCancellation error #249

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
- ui: Basic recovery from failed attempts to use devices (e.g. flaky bluetooth)
- build: Make daemon, credentialsd-ui, demo client and web extension optional
- build: Rename `default` profile to `release`.
- daemon: Fix hybrid cancellation handling

# 0.3.1 [2026-09-05]

Expand Down
11 changes: 5 additions & 6 deletions credentialsd/src/credential_service/hybrid.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,14 @@ impl HybridHandler for InternalHybridHandler {
let _ = tx.send(HybridStateInternal::Completed(auth_response)).await;
break;
}
Err(CredentialServiceError::NonTerminatingCancellation) => {
tracing::trace!("Hybrid handler cancelled, exiting silently");
break;
}
Err(err) if super::is_ceremony_terminating(&err) => {
// Terminating errors (CredentialExcluded, NonTerminatingCancellation
// from a winning transport, etc.) stop the loop.
// NonTerminatingCancellation exits silently; others surface as Failed.
if !matches!(err, CredentialServiceError::NonTerminatingCancellation) {
let _ = tx.send(HybridStateInternal::Failed(err)).await;
} else {
tracing::debug!("Hybrid handler cancelled, exiting silently");
}
let _ = tx.send(HybridStateInternal::Failed(err)).await;
break;
}
Err(err) => {
Expand Down