Simplify pre-connect state

Author: pblazej

Sources/LiveKit/Agent/Agent.swift

@@ -48,9 +48,9 @@ public struct Agent: Loggable {
 
     private enum State {
         case disconnected
-        case connecting
+        case connecting(buffering: Bool)
         case connected(agentState: AgentState, audioTrack: (any AudioTrack)?, avatarVideoTrack: (any VideoTrack)?)
-        case failed(Error)
+        case failed(error: Error)
     }
 
     private var state: State = .disconnected
@@ -63,32 +63,22 @@ public struct Agent: Loggable {
         state = .disconnected
     }
 
-    mutating func failed(_ error: Error) {
+    mutating func failed(error: Error) {
         log("Agent failed with error \(error) from \(state)")
         // From any state
-        state = .failed(error)
+        state = .failed(error: error)
     }
 
-    mutating func connecting() {
+    mutating func connecting(buffering: Bool) {
         log("Agent connecting from \(state)")
         switch state {
-        case .disconnected, .connecting, .connected: // pre-connect is listening (connected)
-            state = .connecting
+        case .disconnected, .connecting:
+            state = .connecting(buffering: buffering)
         default:
             log("Invalid transition from \(state) to connecting", .warning)
         }
     }
 
-    mutating func listening() {
-        log("Agent listening from \(state)")
-        switch state {
-        case .disconnected:
-            state = .connected(agentState: .listening, audioTrack: nil, avatarVideoTrack: nil)
-        default:
-            log("Invalid transition from \(state) to listening", .warning)
-        }
-    }
-
     mutating func connected(participant: Participant) {
         log("Agent connected to \(participant) from \(state)")
         switch state {

Sources/LiveKit/Agent/Session.swift

@@ -202,7 +202,7 @@ open class Session: ObservableObject {
         } else if let firstAgent = room.agentParticipants.values.first {
             agent.connected(participant: firstAgent)
         } else {
-            agent.connecting()
+            agent.connecting(buffering: options.preConnectAudio)
         }
     }
 
@@ -234,7 +234,7 @@ open class Session: ObservableObject {
                 try Task.checkCancellation()
                 guard let self else { return }
                 if isConnected, !agent.isConnected {
-                    self.agent.failed(.timeout)
+                    self.agent.failed(error: .timeout)
                 }
             }
         }
@@ -250,7 +250,7 @@ open class Session: ObservableObject {
                 try await room.withPreConnectAudio(timeout: timeout) {
                     await MainActor.run {
                         self.connectionState = .connecting
-                        self.agent.listening()
+                        self.agent.connecting(buffering: true)
                     }
                     try await connect()
                 }