Skip to content

Fix concurrent calls on Realtime.connect() #483

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
jan-tennert merged 2 commits into from
Feb 19, 2024
Merged

Fix concurrent calls on Realtime.connect() #483

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f8bc66
Fix concurrent calls on Realtime.connect()
vinceglb Feb 19, 2024
cb19f77
Merge branch 'master' into concurrent-realtime-connect-calls
vinceglb Feb 19, 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
5 changes: 4 additions & 1 deletion 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 @@ -30,6 +30,8 @@ import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.isActive
import kotlinx.coroutines.job
import kotlinx.coroutines.launch
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import kotlinx.serialization.json.buildJsonObject

internal class RealtimeImpl(override val supabaseClient: SupabaseClient, override val config: Realtime.Config) : Realtime {
Expand All @@ -41,6 +43,7 @@ internal class RealtimeImpl(override val supabaseClient: SupabaseClient, overrid
override val subscriptions: Map<String, RealtimeChannel>
get() = _subscriptions.toMap()
private val scope = CoroutineScope(Dispatchers.Default + SupervisorJob())
private val mutex = Mutex()
var heartbeatJob: Job? = null
var messageJob: Job? = null
var ref by atomic(0)
Expand All @@ -56,7 +59,7 @@ internal class RealtimeImpl(override val supabaseClient: SupabaseClient, overrid

override suspend fun connect() = connect(false)

suspend fun connect(reconnect: Boolean) {
suspend fun connect(reconnect: Boolean): Unit = mutex.withLock {
if (reconnect) {
delay(config.reconnectDelay)
Logger.d("Realtime") { "Reconnecting..." }
Expand Down