Skip to content

fix: clear stale keyring to prevent USB reconnect flapping #66

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
BitHighlander merged 2 commits into from
Mar 30, 2026
Merged

fix: clear stale keyring to prevent USB reconnect flapping #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e78fb0b
fix: clear stale keyring before USB pairing to prevent reconnect flap…
BitHighlander Mar 25, 2026
5e9d610
fix: clear stale setup errors on device reconnect
BitHighlander Mar 25, 2026
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
5 changes: 5 additions & 0 deletions projects/keepkey-vault/src/bun/engine-controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,11 @@ export class EngineController extends EventEmitter {
let usbDetected = false
let lastError: string | null = null

// Clear stale keyring entries before attempting to pair — without this,
// a previous failed pairing leaves the transport in "opened" state and
// WebUSB rejects with "cannot connect an already-connected connection".
try { await this.keyring.removeAll() } catch (_) {}

// Try WebUSB first (modern firmware, PID 0x0002)
console.log('[Engine] Scanning for WebUSB device...')
try {
Expand Down
9 changes: 9 additions & 0 deletions projects/keepkey-vault/src/mainview/components/OobSetupWizard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,15 @@ export function OobSetupWizard({ onComplete, onSetupInProgress, onWordCountChang
return () => onSetupInProgress?.(false)
}, [onSetupInProgress])

// ── Clear stale setup errors on reconnect ─────────────────────────────
// LIBUSB_TRANSFER_ERROR etc. from a previous session should not persist
// once the device is back in a connected state with real features.
useEffect(() => {
if (deviceStatus.state === 'needs_init' || deviceStatus.state === 'ready') {
setSetupError(null)
}
}, [deviceStatus.state])

// ── Welcome → user clicks to advance ───────────────────────────────────
// Only enable "Get Started" when real device features are available.
// connected_unpaired has no features yet — routing from that state would
Expand Down
Loading