Skip to content

Fix RTC reconnection and WebSocket connection notification issue #885

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

Open
CMzhizhe wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −4
Open

Fix RTC reconnection and WebSocket connection notification issue #885

Show file tree
Hide file tree
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: 12 additions & 1 deletion livekit-android-sdk/src/main/java/io/livekit/android/room/RTCEngine.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,10 @@ internal constructor(
ConnectionState.DISCONNECTED -> {
LKLog.d { "primary ICE disconnected" }
if (oldVal == ConnectionState.CONNECTED) {
LKLog.d { "ready call reconnect()" }
reconnect()
} else if (oldVal == ConnectionState.RESUMING || oldVal == ConnectionState.RECONNECTING) {
LKLog.d { "ICE disconnected during reconnect, retrying reconnect()" }
reconnect()
}
}
Expand Down Expand Up @@ -307,7 +311,14 @@ internal constructor(
if (newState.isConnected()) {
connectionState = ConnectionState.CONNECTED
} else if (newState.isDisconnected()) {
connectionState = ConnectionState.DISCONNECTED
// Only transition to DISCONNECTED when not already in a reconnection
// intermediate state (RESUMING/RECONNECTING). In those states the
// reconnect flow owns connectionState; overwriting it here would
// silently swallow the disconnect and prevent the app from being notified.
val current = connectionState
if (current != ConnectionState.RESUMING && current != ConnectionState.RECONNECTING) {
connectionState = ConnectionState.DISCONNECTED
}
}
}

Expand Down
9 changes: 6 additions & 3 deletions livekit-android-sdk/src/main/java/io/livekit/android/room/SignalClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,9 @@ constructor(
LKLog.e(e) { "failed to validate connection" }
}

val wasConnected = isConnected
val wasConnecting = joinContinuation != null

if (reason != null) {
LKLog.e(t) { "websocket failure: $reason" }
val error = Exception(reason)
Expand All @@ -361,11 +364,11 @@ constructor(
}
joinContinuation = null

val wasConnected = isConnected

if (wasConnected) {
if (wasConnected || wasConnecting) {
// onClosing/onClosed will not be called after onFailure.
// Handle websocket closure here.
// Also handle the case where failure occurs during a reconnect attempt (wasConnecting),
// where isConnected is already false but the upper layer still needs to be notified.
handleWebSocketClose(
reason = reason ?: response?.toString() ?: t.localizedMessage ?: "websocket failure",
code = response?.code ?: CLOSE_REASON_WEBSOCKET_FAILURE,
Expand Down
Loading