More logs

Author: pblazej

Sources/LiveKit/Core/Room+Engine.swift

@@ -318,7 +318,13 @@ extension Room {
 
             log("[Connect] Waiting for subscriber to connect...")
             // Wait for primary transport to connect (if not already)
-            try await primaryTransportConnectedCompleter.wait(timeout: _state.connectOptions.primaryTransportConnectTimeout)
+            do {
+                try await primaryTransportConnectedCompleter.wait(timeout: _state.connectOptions.primaryTransportConnectTimeout)
+                log("[Connect] Subscriber transport connected")
+            } catch {
+                log("[Connect] Subscriber transport failed to connect, error: \(error)", .error)
+                throw error
+            }
             try Task.checkCancellation()
 
             // send SyncState before offer
@@ -330,7 +336,13 @@ extension Room {
                 // Only if published, wait for publisher to connect...
                 log("[Connect] Waiting for publisher to connect...")
                 try await publisher.createAndSendOffer(iceRestart: true)
-                try await publisherTransportConnectedCompleter.wait(timeout: _state.connectOptions.publisherTransportConnectTimeout)
+                do {
+                    try await publisherTransportConnectedCompleter.wait(timeout: _state.connectOptions.publisherTransportConnectTimeout)
+                    log("[Connect] Publisher transport connected")
+                } catch {
+                    log("[Connect] Publisher transport failed to connect, error: \(error)", .error)
+                    throw error
+                }
             }
         }
 

Sources/LiveKit/Core/Room+SignalClientDelegate.swift

@@ -322,7 +322,7 @@ extension Room: SignalClientDelegate {
     }
 
     func signalClient(_: SignalClient, didReceiveAnswer answer: LKRTCSessionDescription, offerId: UInt32) async {
-        log("Received answer with offerId: \(offerId)")
+        log("Received answer for offerId: \(offerId)")
 
         do {
             let publisher = try requirePublisher()
@@ -346,7 +346,7 @@ extension Room: SignalClientDelegate {
             try await subscriber.set(localDescription: answer)
             try await signalClient.send(answer: answer, offerId: offerId)
         } catch {
-            log("Failed to send answer with offerId: \(offerId), error: \(error)", .error)
+            log("Failed to send answer for offerId: \(offerId), error: \(error)", .error)
         }
     }
 

Sources/LiveKit/Core/SignalClient.swift

@@ -126,13 +126,15 @@ actor SignalClient: Loggable {
                                      participantSid: participantSid,
                                      adaptiveStream: adaptiveStream)
 
-        if reconnectMode != nil {
-            log("[Connect] with url: \(url)")
+        let isReconnect = reconnectMode != nil
+
+        if isReconnect {
+            log("Reconnecting with url: \(url)")
         } else {
             log("Connecting with url: \(url)")
         }
 
-        _state.mutate { $0.connectionState = (reconnectMode != nil ? .reconnecting : .connecting) }
+        _state.mutate { $0.connectionState = (isReconnect ? .reconnecting : .connecting) }
 
         do {
             let socket = try await WebSocket(url: url,