fix parsing of tokenExpired event type

Author: Guilherme Souza

Package.swift

@@ -120,6 +120,7 @@ let package = Package(
       name: "Realtime",
       dependencies: [
         .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
+        .product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
         "Helpers",
       ]
     ),

Sources/Realtime/V2/CallbackManager.swift

@@ -1,10 +1,3 @@
-//
-//  CallbackManager.swift
-//
-//
-//  Created by Guilherme Souza on 24/12/23.
-//
-
 import ConcurrencyExtras
 import Foundation
 import Helpers
@@ -26,6 +19,10 @@ final class CallbackManager: Sendable {
     mutableState.callbacks
   }
 
+  deinit {
+    reset()
+  }
+
   @discardableResult
   func addBroadcastCallback(
     event: String,

Sources/Realtime/V2/PushV2.swift

@@ -27,25 +27,31 @@ actor PushV2 {
   }
 
   func send() async -> PushStatus {
-    await channel?.socket.push(message)
-
-    if channel?.config.broadcast.acknowledgeBroadcasts == true {
-      do {
-        return try await withTimeout(interval: channel?.socket.options().timeoutInterval ?? 10) {
-          await withCheckedContinuation {
-            self.receivedContinuation = $0
-          }
+    guard let channel = channel else {
+      return .error
+    }
+
+    await channel.socket.push(message)
+
+    if !channel.config.broadcast.acknowledgeBroadcasts {
+      // channel was configured with `ack = false`,
+      // don't wait for a response and return `ok`.
+      return .ok
+    }
+
+    do {
+      return try await withTimeout(interval: channel.socket.options().timeoutInterval) {
+        await withCheckedContinuation { continuation in
+          self.receivedContinuation = continuation
         }
-      } catch is TimeoutError {
-        channel?.logger?.debug("Push timed out.")
-        return .timeout
-      } catch {
-        channel?.logger?.error("Error sending push: \(error)")
-        return .error
       }
+    } catch is TimeoutError {
+      channel.logger?.debug("Push timed out.")
+      return .timeout
+    } catch {
+      channel.logger?.error("Error sending push: \(error.localizedDescription)")
+      return .error
     }
-
-    return .ok
   }
 
   func didReceive(status: PushStatus) {

Sources/Realtime/V2/RealtimeChannelV2.swift

@@ -1,14 +1,8 @@
-//
-//  RealtimeChannelV2.swift
-//
-//
-//  Created by Guilherme Souza on 26/12/23.
-//
-
 import ConcurrencyExtras
 import Foundation
 import HTTPTypes
 import Helpers
+import IssueReporting
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
@@ -123,9 +117,10 @@ public final class RealtimeChannelV2: Sendable {
   public func subscribe() async {
     if socket.status() != .connected {
       if socket.options().connectOnSubscribe != true {
-        fatalError(
+        reportIssue(
           "You can't subscribe to a channel while the realtime client is not connected. Did you forget to call `realtime.connect()`?"
         )
+        return
       }
       await socket.connect()
     }
@@ -261,15 +256,21 @@ public final class RealtimeChannelV2: Sendable {
     }
   }
 
+  /// Tracks the given state in the channel.
+  /// - Parameter state: The state to be tracked, conforming to `Codable`.
+  /// - Throws: An error if the tracking fails.
   public func track(_ state: some Codable) async throws {
     try await track(state: JSONObject(state))
   }
 
+  /// Tracks the given state in the channel.
+  /// - Parameter state: The state to be tracked as a `JSONObject`.
   public func track(state: JSONObject) async {
-    assert(
-      status == .subscribed,
-      "You can only track your presence after subscribing to the channel. Did you forget to call `channel.subscribe()`?"
-    )
+    if status != .subscribed {
+      reportIssue(
+        "You can only track your presence after subscribing to the channel. Did you forget to call `channel.subscribe()`?"
+      )
+    }
 
     await push(
       ChannelEvent.presence,
@@ -281,6 +282,7 @@ public final class RealtimeChannelV2: Sendable {
     )
   }
 
+  /// Stops tracking the current state in the channel.
   public func untrack() async {
     await push(
       ChannelEvent.presence,
@@ -508,10 +510,12 @@ public final class RealtimeChannelV2: Sendable {
     filter: String?,
     callback: @escaping @Sendable (AnyAction) -> Void
   ) -> RealtimeSubscription {
-    precondition(
-      status != .subscribed,
-      "You cannot call postgresChange after joining the channel"
-    )
+    guard status == .subscribed else {
+      reportIssue(
+        "You cannot call postgresChange after joining the channel, this won't work as expected."
+      )
+      return RealtimeSubscription {}
+    }
 
     let config = PostgresJoinConfig(
       event: event,

Sources/Realtime/V2/RealtimeMessageV2.swift

@@ -1,10 +1,3 @@
-//
-//  RealtimeMessageV2.swift
-//
-//
-//  Created by Guilherme Souza on 11/01/24.
-//
-
 import Foundation
 import Helpers
 
@@ -45,7 +38,7 @@ public struct RealtimeMessageV2: Hashable, Codable, Sendable {
     case ChannelEvent.presenceState:
       .presenceState
     case ChannelEvent.system
-      where payload["message"]?.stringValue?.contains("access token has expired") == true:
+    where payload["message"]?.stringValue?.lowercased().contains("access token has expired") == true:
       .tokenExpired
     case ChannelEvent.reply:
       .reply