Skip to content

sdk(local_relay): InnerLocalRelay::handle_connection take conn permit before handshake #1458

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
yukibtc merged 1 commit into from
Sep 19, 2026
Merged

sdk(local_relay): InnerLocalRelay::handle_connection take conn permit before handshake #1458

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
13 changes: 7 additions & 6 deletions nostr-sdk/src/local_relay/local/inner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ impl InnerLocalRelay {
self,
raw_stream: S,
addr: SocketAddr,
permit: OwnedSemaphorePermit,
handshake_permit: OwnedSemaphorePermit,
) -> Result<(), Error>
where
S: AsyncRead + AsyncWrite + Unpin,
Expand All @@ -312,6 +312,10 @@ impl InnerLocalRelay {
tokio::time::sleep(unresponsive_connection).await;
}

// Take the connection permit before doing the handshake
let conn_permit: OwnedSemaphorePermit =
self.connections_limit.clone().try_acquire_owned()?;

// Bound clients that open TCP but never complete the WebSocket handshake.
let ws_stream = tokio::time::timeout(
self.websocket_handshake_timeout,
Expand All @@ -324,12 +328,9 @@ impl InnerLocalRelay {
.map_err(Error::transport)?;

// The pre-handshake socket is no longer consuming admission resources.
drop(permit);

// An established connection only consumes a permit when explicitly configured.
let permit = self.connections_limit.clone().try_acquire_owned()?;
drop(handshake_permit);

self.handle_websocket(ws_stream, addr, permit).await?;
self.handle_websocket(ws_stream, addr, conn_permit).await?;

Ok(())
}
Expand Down
Loading