Fix inconsistencies

Author: pblazej

Sources/LiveKit/Agent/Agent.swift

@@ -15,7 +15,6 @@
  */
 
 import Foundation
-import LiveKit
 
 @MainActor
 open class Agent: ObservableObject {
@@ -33,7 +32,7 @@ open class Agent: ObservableObject {
 
     private func observe(_ participant: Participant) {
         Task { [weak self] in
-            for await _ in participant.changes {
+            for try await _ in participant.changes {
                 guard let self else { return }
 
                 state = participant.agentState
@@ -47,3 +46,9 @@ open class Agent: ObservableObject {
         avatarVideoTrack = participant.avatarWorker?.firstCameraVideoTrack
     }
 }
+
+extension AgentState: CustomStringConvertible {
+    public var description: String {
+        rawValue.capitalized
+    }
+}

Sources/LiveKit/Agent/AgentState+.swift

@@ -15,7 +15,6 @@
  */
 
 import Foundation
-import LiveKit
 
 /// An actor that receives transcription messages from the room and yields them as messages.
 ///

Sources/LiveKit/Agent/Chat/Receive/TranscriptionDelegateReceiver.swift

@@ -15,7 +15,6 @@
  */
 
 import Foundation
-import LiveKit
 
 /// An actor that converts raw text streams from the LiveKit `Room` into `Message` objects.
 /// - Note: Streams are supported by `livekit-agents` >= 1.0.0.

Sources/LiveKit/Agent/Chat/Receive/TranscriptionStreamReceiver.swift

@@ -15,7 +15,6 @@
  */
 
 import Foundation
-import LiveKit
 
 /// An actor that sends local messages to the agent.
 /// Currently, it only supports sending text messages.

Sources/LiveKit/Agent/Chat/Send/TextMessageSender.swift

@@ -16,43 +16,60 @@
 
 import SwiftUI
 
-extension EnvironmentValues {
+#if swift(>=6.0)
+public extension EnvironmentValues {
     @Entry var agentName: String? = nil
 }
+#else
+public struct AgentNameKey: EnvironmentKey {
+    public static let defaultValue: String? = nil
+}
+
+public extension EnvironmentValues {
+    var agentName: String? {
+        get { self[AgentNameKey.self] }
+        set { self[AgentNameKey.self] = newValue }
+    }
+}
+#endif
 
 @MainActor
 @propertyWrapper
-struct LKConversation: DynamicProperty {
+public struct LKConversation: DynamicProperty {
     @EnvironmentObject private var conversation: Conversation
 
-    var wrappedValue: Conversation {
+    public init() {}
+
+    public var wrappedValue: Conversation {
         conversation
     }
 }
 
 @MainActor
 @propertyWrapper
-struct LKLocalMedia: DynamicProperty {
+public struct LKLocalMedia: DynamicProperty {
     @EnvironmentObject private var localMedia: LocalMedia
 
-    var wrappedValue: LocalMedia {
+    public init() {}
+
+    public var wrappedValue: LocalMedia {
         localMedia
     }
 }
 
 @MainActor
 @propertyWrapper
-struct LKAgent: DynamicProperty {
+public struct LKAgent: DynamicProperty {
     @EnvironmentObject private var conversation: Conversation
     @Environment(\.agentName) private var environmentName
 
     let agentName: String?
 
-    init(named agentName: String? = nil) {
+    public init(named agentName: String? = nil) {
         self.agentName = agentName
     }
 
-    var wrappedValue: Agent? {
+    public var wrappedValue: Agent? {
         if let agentName {
             return conversation.agent(named: agentName)
         } else if let environmentName {

Sources/LiveKit/Agent/Conversation+Environment.swift

@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-import Collections
 import Foundation
-import LiveKit
+import OrderedCollections
 
 @MainActor
 open class Conversation: ObservableObject {
@@ -86,7 +85,7 @@ open class Conversation: ObservableObject {
 
     private func observe(room: Room, agentName _: String?) {
         Task { [weak self] in
-            for await _ in room.changes {
+            for try await _ in room.changes {
                 guard let self else { return }
 
                 connectionState = room.connectionState
@@ -143,7 +142,7 @@ open class Conversation: ObservableObject {
 
         defer {
             waitForAgentTask = Task {
-                try await Task.sleep(for: .seconds(waitForAgent))
+                try await Task.sleep(nanoseconds: UInt64(TimeInterval(NSEC_PER_SEC) * waitForAgent))
                 try Task.checkCancellation()
                 if connectionState == .connected, agents.isEmpty {
                     await end()

Sources/LiveKit/Agent/Conversation.swift

@@ -15,7 +15,6 @@
  */
 
 @preconcurrency import AVFoundation
-import LiveKit
 
 @MainActor
 open class LocalMedia: ObservableObject {
@@ -64,7 +63,7 @@ open class LocalMedia: ObservableObject {
 
     private func observe(room: Room) {
         Task { [weak self] in
-            for await _ in room.changes {
+            for try await _ in room.changes {
                 guard let self else { return }
 
                 microphoneTrack = room.localParticipant.firstAudioTrack

Sources/LiveKit/Agent/LocalMedia.swift

@@ -14,21 +14,24 @@
  * limitations under the License.
  */
 
-import Combine
+@preconcurrency import Combine
 
-@available(iOS 15, *)
 extension ObservableObject {
-    typealias BufferedObjectWillChangePublisher = Publishers.Buffer<ObjectWillChangePublisher>
-
-    // This is necessary due to ObservableObjectPublisher not respecting the demand.
-    // See: https://forums.swift.org/t/asyncpublisher-causes-crash-in-rather-simple-situation
-    private var bufferedObjectWillChange: BufferedObjectWillChangePublisher {
-        objectWillChange
-            .buffer(size: 1, prefetch: .byRequest, whenFull: .dropOldest)
-    }
-
-    /// A publisher that emits the `objectWillChange` events.
-    var changes: AsyncPublisher<BufferedObjectWillChangePublisher> {
-        bufferedObjectWillChange.values
+    /// An async sequence that emits the `objectWillChange` events.
+    var changes: any AsyncSequence {
+        if #available(macOS 12.0, iOS 15.0, tvOS 15.0, *) {
+            // This is necessary due to ObservableObjectPublisher not respecting the demand.
+            // See: https://forums.swift.org/t/asyncpublisher-causes-crash-in-rather-simple-situation
+            objectWillChange.buffer(size: 1, prefetch: .byRequest, whenFull: .dropOldest).values
+        } else {
+            AsyncStream { continuation in
+                let cancellable = objectWillChange.sink { _ in
+                    continuation.yield()
+                }
+                continuation.onTermination = { _ in
+                    cancellable.cancel()
+                }
+            }
+        }
     }
 }

Sources/LiveKit/Support/ObservableObject+.swift

@@ -69,3 +69,11 @@ extension VideoTrack {
         return missingCodecs
     }
 }
+
+public extension VideoTrack {
+    /// The aspect ratio of the video track or 1 if the dimensions are not available.
+    var aspectRatio: CGFloat {
+        guard let dimensions else { return 1 }
+        return CGFloat(dimensions.width) / CGFloat(dimensions.height)
+    }
+}