Merge pull request #495 from supabase-community/fix-status

Fix missing UNSUBSCRIBED status after unsubscribing
supabase-community · Mar 3, 2024 · cadbcba · cadbcba
2 parents b4a7b53 + ae5c74f
commit cadbcba
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeChannelImpl.kt b/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeChannelImpl.kt
@@ -94,6 +94,13 @@ internal class RealtimeChannelImpl(
                 Realtime.logger.d { "Subscribed to channel ${message.topic}" }
                 _status.value = RealtimeChannel.Status.SUBSCRIBED
             }
+            RealtimeMessage.EventType.SYSTEM_REPLY -> {
+                Realtime.logger.d { "Received system reply: ${message.payload}." }
+                if(status.value == RealtimeChannel.Status.UNSUBSCRIBING) {
+                    _status.value = RealtimeChannel.Status.UNSUBSCRIBED
+                    Realtime.logger.d { "Unsubscribed from channel ${message.topic}" }
+                }
+            }
             RealtimeMessage.EventType.POSTGRES_SERVER_CHANGES -> { //check if the server postgres_changes match with the client's and add the given id to the postgres change objects (to identify them later in the events)
                 val serverPostgresChanges = message.payload["response"]?.jsonObject?.get("postgres_changes")?.jsonArray?.let { Json.decodeFromJsonElement<List<PostgresJoinConfig>>(it) } ?: listOf() //server postgres changes
                 callbackManager.setServerChanges(serverPostgresChanges)

diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeMessage.kt b/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeMessage.kt
@@ -18,6 +18,7 @@ data class RealtimeMessage(val topic: String, val event: String, val payload: Js
     val eventType: EventType? = when {
         event == RealtimeChannel.CHANNEL_EVENT_SYSTEM && payload["status"]?.jsonPrimitive?.content == "ok" -> EventType.SYSTEM
         event == RealtimeChannel.CHANNEL_EVENT_REPLY && payload["response"]?.jsonObject?.containsKey(RealtimeChannel.CHANNEL_EVENT_POSTGRES_CHANGES) ?: false -> EventType.POSTGRES_SERVER_CHANGES
+        event == RealtimeChannel.CHANNEL_EVENT_REPLY && payload["status"]?.jsonPrimitive?.content == "ok" -> EventType.SYSTEM_REPLY
         event == RealtimeChannel.CHANNEL_EVENT_POSTGRES_CHANGES -> EventType.POSTGRES_CHANGES
         event == RealtimeChannel.CHANNEL_EVENT_BROADCAST -> EventType.BROADCAST
         event == RealtimeChannel.CHANNEL_EVENT_CLOSE -> EventType.CLOSE
@@ -29,7 +30,7 @@ data class RealtimeMessage(val topic: String, val event: String, val payload: Js
     }
 
     enum class EventType {
-        SYSTEM, POSTGRES_SERVER_CHANGES, POSTGRES_CHANGES, BROADCAST, CLOSE, ERROR, PRESENCE_DIFF, PRESENCE_STATE, TOKEN_EXPIRED
+        SYSTEM, SYSTEM_REPLY, POSTGRES_SERVER_CHANGES, POSTGRES_CHANGES, BROADCAST, CLOSE, ERROR, PRESENCE_DIFF, PRESENCE_STATE, TOKEN_EXPIRED
     }
 
 }