Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 29 additions & 5 deletions livekit-api/src/signal_client/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ pub enum SignalError {
SendError,
#[error("failed to retrieve region info: {0}")]
RegionError(String),
#[error("server sent leave during reconnect: reason={reason:?}, action={action:?}")]
LeaveRequest { reason: proto::DisconnectReason, action: proto::leave_request::Action },
}

#[derive(Debug, Clone)]
Expand Down Expand Up @@ -531,11 +533,33 @@ get_async_message!(
proto::JoinResponse
);

get_async_message!(
get_reconnect_response,
proto::signal_response::Message::Reconnect(msg) => msg,
proto::ReconnectResponse
);
async fn get_reconnect_response(
receiver: &mut mpsc::UnboundedReceiver<Box<proto::signal_response::Message>>,
) -> SignalResult<proto::ReconnectResponse> {
let join = async {
while let Some(event) = receiver.recv().await {
match *event {
proto::signal_response::Message::Reconnect(msg) => return Ok(msg),
proto::signal_response::Message::Leave(leave) => {
return Err(SignalError::LeaveRequest {
reason: leave.reason(),
action: leave.action(),
});
}
_ => {}
}
}

Err(WsError::ConnectionClosed)?
};

livekit_runtime::timeout(JOIN_RESPONSE_TIMEOUT, join).await.map_err(|_| {
SignalError::Timeout(format!(
"failed to receive {}",
std::any::type_name::<proto::ReconnectResponse>()
))
})?
}

#[cfg(test)]
mod tests {
Expand Down
7 changes: 6 additions & 1 deletion livekit/src/rtc_engine/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,12 @@ impl EngineInner {
// If we're already reconnecting just update the interval to restart a new attempt
// ASAP

running_handle.full_reconnect = full_reconnect;
// Only escalate to full reconnect, never downgrade. Stale signal-close
// events (which request resume) must not override a full reconnect decision
// made by the reconnect loop after a failed resume attempt.
if full_reconnect {
running_handle.full_reconnect = true;
}

if retry_now {
let inner = self.clone();
Expand Down