Merge pull request #1061 from liveview-native/await-disconnect

Wait for disconnect to finish

Author: supernintendo

Sources/LiveViewNative/Coordinators/LiveSessionCoordinator.swift

@@ -83,7 +83,6 @@ public class LiveSessionCoordinator<R: RootRegistry>: ObservableObject {
                 let last = next.last ?? .init(url: self.url, coordinator: self.rootCoordinator)
                 if last.coordinator.url != last.url {
                     last.coordinator.url = last.url
-                    print("NAVIGATE BACK")
                     Task { @MainActor in
                         try await last.coordinator.connect(domValues: self.domValues, redirect: true)
                     }
@@ -166,10 +165,10 @@ public class LiveSessionCoordinator<R: RootRegistry>: ObservableObject {
         }
     }
 
-    private func disconnect() {
-        rootCoordinator.disconnect()
+    private func disconnect() async {
+        await rootCoordinator.disconnect()
         for entry in self.navigationPath {
-            entry.coordinator.disconnect()
+            await entry.coordinator.disconnect()
         }
         self.navigationPath.removeAll()
         self.socket?.disconnect()
@@ -183,7 +182,7 @@ public class LiveSessionCoordinator<R: RootRegistry>: ObservableObject {
     ///
     /// This can be used to force the LiveView to reset, for example after an unrecoverable error occurs.
     public func reconnect() async {
-        self.disconnect()
+        await self.disconnect()
         await self.connect()
     }
 
@@ -351,7 +350,7 @@ public class LiveSessionCoordinator<R: RootRegistry>: ObservableObject {
         case .replaceTop:
             let coordinator = (navigationPath.last?.coordinator ?? rootCoordinator)!
             coordinator.url = redirect.to
-            coordinator.disconnect()
+            await coordinator.disconnect()
             let entry = LiveNavigationEntry(url: redirect.to, coordinator: coordinator)
             switch redirect.kind {
             case .push:

Sources/LiveViewNative/Coordinators/LiveViewCoordinator.swift

@@ -207,8 +207,7 @@ public class LiveViewCoordinator<R: RootRegistry>: ObservableObject {
     }
 
     func connect(domValues: LiveSessionCoordinator<R>.DOMValues, redirect: Bool) async throws {
-        print("CONNECTING \(self.url)")
-        self.disconnect()
+        await self.disconnect()
 
         self.internalState = .connecting
 
@@ -264,11 +263,16 @@ public class LiveViewCoordinator<R: RootRegistry>: ObservableObject {
         self.internalState = .connected
     }
 
-    func disconnect() {
+    func disconnect() async {
         if let channel,
-           channel.isJoined
+           !channel.isClosed
         {
-            channel.leave()
+            await withCheckedContinuation { continuation in
+                channel.onClose { _ in
+                    continuation.resume()
+                }
+                channel.leave()
+            }
         }
         channel = nil
         self.internalState = .notConnected
@@ -300,27 +304,25 @@ public class LiveViewCoordinator<R: RootRegistry>: ObservableObject {
                     continuation.resume(returning: .rendered(renderedPayload))
                 }
                 .receive("error") { [weak self, weak channel] message in
-                    guard let channel else {
-                        continuation.resume(throwing: LiveConnectionError.viewCoordinatorReleased)
-                        return
-                    }
-                    // TODO: reconsider this behavior, web tries to automatically rejoin, and we do to when an error is encountered after a successful join
-                    // leave the channel, otherwise the it'll continue retrying indefinitely
-                    // we want to control the retry behavior ourselves, so just leave the channel
-                    if channel.isJoined {
-                        channel.leave()
-                    }
-                    
-                    guard let self = self else {
+                    guard channel != nil else {
                         continuation.resume(throwing: LiveConnectionError.viewCoordinatorReleased)
                         return
                     }
 
-                    if self.session.configuration.navigationMode.permitsRedirects,
-                       let redirect = (message.payload["live_redirect"] as? Payload).flatMap({ LiveRedirect(from: $0, relativeTo: self.url) }) {
-                        continuation.resume(returning: .redirect(redirect))
-                    } else {
-                        continuation.resume(throwing: LiveConnectionError.joinError(message))
+                    Task { [weak self] in
+                        guard let self else {
+                            continuation.resume(throwing: LiveConnectionError.viewCoordinatorReleased)
+                            return
+                        }
+                        
+                        await self.disconnect()
+                        
+                        if self.session.configuration.navigationMode.permitsRedirects,
+                           let redirect = (message.payload["live_redirect"] as? Payload).flatMap({ LiveRedirect(from: $0, relativeTo: self.url) }) {
+                            continuation.resume(returning: .redirect(redirect))
+                        } else {
+                            continuation.resume(throwing: LiveConnectionError.joinError(message))
+                        }
                     }
                 }
         }