Skip to content

Fix realtime reconnecting suspending indefinitely #505

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
merged 3 commits into from
Mar 7, 2024
Merged

Fix realtime reconnecting suspending indefinitely #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b13c1c3
Fix realtime reconnecting
jan-tennert Mar 7, 2024
267ed2a
collect session status in init block
jan-tennert Mar 7, 2024
dde3823
Update version
jan-tennert Mar 7, 2024
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
42 changes: 23 additions & 19 deletions Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,23 +70,6 @@ internal class RealtimeImpl(override val supabaseClient: SupabaseClient, overrid
if (reconnect) {
delay(config.reconnectDelay)
Realtime.logger.d { "Reconnecting..." }
} else {
scope.launch {
supabaseClient.pluginManager.getPluginOrNull(Auth)?.sessionStatus?.collect {
if(status.value == Realtime.Status.CONNECTED) {
when(it) {
is SessionStatus.Authenticated -> updateJwt(it.session.accessToken)
is SessionStatus.NotAuthenticated -> {
if(config.disconnectOnSessionLoss) {
Realtime.logger.w { "No auth session found, disconnecting from realtime websocket"}
disconnect()
}
}
else -> {}
}
}
}
}
}
if (status.value == Realtime.Status.CONNECTED) return
_status.value = Realtime.Status.CONNECTING
Expand All @@ -105,8 +88,29 @@ internal class RealtimeImpl(override val supabaseClient: SupabaseClient, overrid
Error while trying to connect to realtime websocket. Trying again in ${config.reconnectDelay}
URL: $realtimeUrl
""".trimIndent() }
disconnect()
connect(true)
scope.launch {
disconnect()
connect(true)
}
}
}

override fun init() {
scope.launch {
supabaseClient.pluginManager.getPluginOrNull(Auth)?.sessionStatus?.collect {
if(status.value == Realtime.Status.CONNECTED) {
when(it) {
is SessionStatus.Authenticated -> updateJwt(it.session.accessToken)
is SessionStatus.NotAuthenticated -> {
if(config.disconnectOnSessionLoss) {
Realtime.logger.w { "No auth session found, disconnecting from realtime websocket"}
disconnect()
}
}
else -> {}
}
}
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ kotlin.experimental.tryK2=false
org.jetbrains.compose.experimental.uikit.enabled=true
org.jetbrains.compose.experimental.jscanvas.enabled=true

supabase-version = 2.2.0
supabase-version = 2.2.1