Skip to content

keep-nip46: disconnect client on connect_with setup-error path #832

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
kwsantiago merged 1 commit into from
Jul 16, 2026
+7 −1
Merged

keep-nip46: disconnect client on connect_with setup-error path #832

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
8 changes: 7 additions & 1 deletion keep-nip46/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,13 @@ impl Nip46Client {

match tokio::time::timeout(DEFAULT_REQUEST_TIMEOUT, setup).await {
Ok(Ok(())) => {}
Ok(Err(e)) => return Err(e),
Ok(Err(e)) => {
// Disconnect before propagating so the relay connections and the
// nostr-sdk background tasks they spawn are torn down instead of
// leaking (Drop does not disconnect), matching the timeout arm.
client.disconnect().await;
return Err(e);
}
Err(_) => {
client.disconnect().await;
return Err(NetworkError::timeout(
Expand Down