dispatch reconnection

supabase · Nov 28, 2024 · ac34b47 · ac34b47
1 parent 73e255a
commit ac34b47
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/Sources/Realtime/V2/RealtimeChannelV2.swift b/Sources/Realtime/V2/RealtimeChannelV2.swift
@@ -120,10 +120,10 @@ public actor RealtimeChannelV2 {
       }
     } catch {
       if error is TimeoutError {
-        logger?.debug("Subscribe timed out.")
+        logger?.debug("channel timeout \(topic)")
         await subscribe()
       } else {
-        logger?.error("Subscribe failed: \(error)")
+        logger?.error("channel error \(topic) \(error.localizedDescription)")
       }
     }
   }
@@ -362,9 +362,9 @@ public actor RealtimeChannelV2 {
         callbackManager.triggerBroadcast(event: event, json: payload)
 
       case .close:
-        await socket._remove(self)
-        logger?.debug("Unsubscribed from channel \(message.topic)")
         status = .unsubscribed
+        logger?.debug("channel close \(message.topic) \(joinRef ?? "<no joinRef>")")
+        await socket._remove(self)
 
       case .error:
         logger?.debug(

diff --git a/Sources/Realtime/V2/RealtimeClientV2.swift b/Sources/Realtime/V2/RealtimeClientV2.swift
@@ -131,7 +131,10 @@ public actor RealtimeClientV2 {
   }
 
   func connect(reconnect: Bool) async {
-    if let connectionTask { await connectionTask.value; return }
+    if let connectionTask {
+      await connectionTask.value
+      return
+    }
 
     connectionTask = Task {
       guard ws == nil else {
@@ -164,25 +167,24 @@ public actor RealtimeClientV2 {
         startHeartbeating()
 
         if reconnect {
-          await rejoinChannels()
+          Task {
+            await rejoinChannels()
+          }
         }
 
         flushSendBuffer()
       } catch {
         options.logger?.verbose("error \(error.localizedDescription)")
-        disconnect()
-        await connect(reconnect: true)
+        Task {
+          disconnect()
+          await connect(reconnect: true)
+        }
       }
     }
 
     await connectionTask?.value
   }
 
-  private func reconnect() async {
-    disconnect()
-    await connect(reconnect: true)
-  }
-
   /// Creates a new channel and bind it to this client.
   /// - Parameters:
   ///   - topic: Channel's topic.
@@ -295,7 +297,10 @@ public actor RealtimeClientV2 {
     if pendingHeartbeatRef != nil {
       pendingHeartbeatRef = nil
       options.logger?.verbose("heartbeat timeout")
-      await reconnect()
+      Task {
+        disconnect()
+        await connect(reconnect: true)
+      }
     }
 
     let ref = makeRef()