Skip to content

fix: reconnect should use both reconnect and retry_initial for reconnection #99

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
keelerm84 merged 1 commit into from
Oct 7, 2025
Merged

fix: reconnect should use both reconnect and retry_initial for reconnection #99

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: 10 additions & 3 deletions eventsource-client/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,8 @@ pub struct ReconnectingRequest<C> {
redirect_count: u32,
event_parser: EventParser,
last_event_id: Option<String>,
#[pin]
initial_connection: bool,
}

impl<C> ReconnectingRequest<C> {
Expand Down Expand Up @@ -364,6 +366,7 @@ impl<C> ReconnectingRequest<C> {
current_url: url,
event_parser: EventParser::new(),
last_event_id,
initial_connection: true,
}
}

Expand Down Expand Up @@ -454,7 +457,11 @@ where
*self.as_mut().project().event_parser = EventParser::new();
match self.send_request() {
Ok(resp) => {
let retry = self.props.reconnect_opts.retry_initial;
let retry = if self.initial_connection {
self.props.reconnect_opts.retry_initial
} else {
self.props.reconnect_opts.reconnect
};
self.as_mut()
.project()
.state
Expand Down Expand Up @@ -483,6 +490,7 @@ where
.project()
.state
.set(State::Connected(resp.into_body()));
self.as_mut().project().initial_connection.set(false);

return Poll::Ready(Some(Ok(SSE::Connected(ConnectionDetails::new(
Response::new(status, headers),
Expand Down Expand Up @@ -518,8 +526,7 @@ where
))));
}
Err(e) => {
// This seems basically impossible. AFAIK we can only get this way if we
// poll after it was already ready
// This happens when the server is unreachable, e.g. connection refused.
warn!("request returned an error: {}", e);
if !*retry {
self.as_mut().project().state.set(State::New);
Expand Down