Extract agent components (#21)

Author: pblazej

Package.swift

@@ -17,7 +17,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/livekit/client-sdk-swift.git", from: "2.0.17"),
+        .package(url: "https://github.com/livekit/client-sdk-swift.git", from: "2.6.0"),
         .package(url: "https://github.com/apple/swift-docc-plugin.git", from: "1.4.3"),
     ],
     targets: [

[email protected]

@@ -19,7 +19,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/livekit/client-sdk-swift.git", from: "2.0.17"),
+        .package(url: "https://github.com/livekit/client-sdk-swift.git", from: "2.6.0"),
         .package(url: "https://github.com/apple/swift-docc-plugin.git", from: "1.4.3"),
     ],
     targets: [

[email protected]

@@ -0,0 +1,42 @@
+// swift-tools-version:6.0
+// (Xcode16.0+)
+
+import PackageDescription
+
+let package = Package(
+    name: "LiveKitComponents",
+    platforms: [
+        .iOS(.v14),
+        .macOS(.v11),
+        .macCatalyst(.v14),
+        .tvOS(.v17),
+        .visionOS(.v1),
+    ],
+    products: [
+        .library(
+            name: "LiveKitComponents",
+            targets: ["LiveKitComponents"]
+        ),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/livekit/client-sdk-swift.git", from: "2.6.0"),
+        .package(url: "https://github.com/apple/swift-docc-plugin.git", from: "1.4.3"),
+    ],
+    targets: [
+        .target(
+            name: "LiveKitComponents",
+            dependencies: [
+                .product(name: "LiveKit", package: "client-sdk-swift"),
+            ],
+            path: "Sources"
+        ),
+        .testTarget(
+            name: "LiveKitComponentsTests",
+            dependencies: ["LiveKitComponents"]
+        ),
+    ],
+    swiftLanguageModes: [
+        .v5, // opt-out from dynamic actor isolation checks
+        .v6,
+    ]
+)

Sources/LiveKitComponents/Audio/AudioProcessor.swift

@@ -14,60 +14,62 @@
  * limitations under the License.
  */
 
-import AVFoundation
+@preconcurrency import AVFoundation
 import LiveKit
 
-public class AudioProcessor: ObservableObject, AudioRenderer {
+@MainActor
+public final class AudioProcessor: ObservableObject, AudioRenderer {
     public let isCentered: Bool
     public let smoothingFactor: Float
 
-    // Normalized to 0.0-1.0 range.
-    @Published public var bands: [Float]
+    /// Normalized to 0.0-1.0 range.
+    @Published public private(set) var bands: [Float]
 
-    private let _processor: AudioVisualizeProcessor
-    private weak var _track: AudioTrack?
+    private let processor: AudioVisualizeProcessor
+    private weak var track: AudioTrack?
 
     public init(track: AudioTrack?,
                 bandCount: Int,
                 isCentered: Bool = true,
-                smoothingFactor: Float = 0.3)
+                smoothingFactor: Float = 0.25)
     {
         self.isCentered = isCentered
         self.smoothingFactor = smoothingFactor
         bands = Array(repeating: 0.0, count: bandCount)
 
-        _processor = AudioVisualizeProcessor(bandsCount: bandCount)
-        _track = track
-        _track?.add(audioRenderer: self)
+        processor = AudioVisualizeProcessor(bandsCount: bandCount)
+
+        self.track = track
+        track?.add(audioRenderer: self)
     }
 
     deinit {
-        _track?.remove(audioRenderer: self)
+        track?.remove(audioRenderer: self)
     }
 
-    public func render(pcmBuffer: AVAudioPCMBuffer) {
-        let newBands = _processor.process(pcmBuffer: pcmBuffer)
-        guard var newBands else { return }
-
-        // If centering is enabled, rearrange the normalized bands
-        if isCentered {
-            newBands.sort(by: >)
-            newBands = centerBands(newBands)
-        }
+    public nonisolated func render(pcmBuffer: AVAudioPCMBuffer) {
+        Task {
+            let newBands = await processor.process(pcmBuffer: pcmBuffer)
+            guard var newBands else { return }
 
-        DispatchQueue.main.async { [weak self] in
-            guard let self else { return }
+            // If centering is enabled, rearrange the normalized bands
+            if isCentered {
+                newBands.sort(by: >)
+                newBands = Self.centerBands(newBands)
+            }
 
-            self.bands = zip(self.bands, newBands).map { old, new in
-                self._smoothTransition(from: old, to: new, factor: self.smoothingFactor)
+            await MainActor.run { [newBands] in
+                bands = zip(bands, newBands).map { old, new in
+                    Self.smoothTransition(from: old, to: new, factor: smoothingFactor)
+                }
             }
         }
     }
 
     // MARK: - Private
 
     /// Centers the sorted bands by placing higher values in the middle.
-    @inline(__always) private func centerBands(_ sortedBands: [Float]) -> [Float] {
+    @inline(__always) private nonisolated static func centerBands(_ sortedBands: [Float]) -> [Float] {
         var centeredBands = [Float](repeating: 0, count: sortedBands.count)
         var leftIndex = sortedBands.count / 2
         var rightIndex = leftIndex
@@ -88,17 +90,17 @@ public class AudioProcessor: ObservableObject, AudioRenderer {
     }
 
     /// Applies an easing function to smooth the transition.
-    @inline(__always) private func _smoothTransition(from oldValue: Float, to newValue: Float, factor: Float) -> Float {
+    @inline(__always) private nonisolated static func smoothTransition(from oldValue: Float, to newValue: Float, factor: Float) -> Float {
         // Calculate the delta change between the old and new value
         let delta = newValue - oldValue
         // Apply an ease-in-out cubic easing curve
-        let easedFactor = _easeInOutCubic(t: factor)
+        let easedFactor = easeInOutCubic(t: factor)
         // Calculate and return the smoothed value
         return oldValue + delta * easedFactor
     }
 
     /// Easing function: ease-in-out cubic
-    @inline(__always) private func _easeInOutCubic(t: Float) -> Float {
+    @inline(__always) private nonisolated static func easeInOutCubic(t: Float) -> Float {
         t < 0.5 ? 4 * t * t * t : 1 - pow(-2 * t + 2, 3) / 2
     }
 }

Sources/LiveKitComponents/Components.swift

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import LiveKit
-import SwiftUI
+@_exported import LiveKit
+@_exported import SwiftUI
 
 public let liveKitComponentsVersion = "0.1.2"
 

Sources/LiveKitComponents/Scopes/ComponentsScope.swift

@@ -17,6 +17,11 @@
 import LiveKit
 import SwiftUI
 
+#if compiler(>=6.0)
+public extension EnvironmentValues {
+    @Entry var liveKitUIOptions: UIOptions = .init()
+}
+#else
 private struct UIOptionsKey: EnvironmentKey {
     // This is the default value that SwiftUI will fallback to if you don't pass the object
     public static var defaultValue: UIOptions = .init()
@@ -28,6 +33,7 @@ public extension EnvironmentValues {
         set { self[UIOptionsKey.self] = newValue }
     }
 }
+#endif
 
 public struct ComponentsScope<Content: View>: View {
     private let _content: () -> Content

Sources/LiveKitComponents/Types/TrackReference.swift

@@ -17,7 +17,8 @@
 import LiveKit
 import SwiftUI
 
-public class TrackReference: ObservableObject {
+@MainActor
+public final class TrackReference: ObservableObject {
     public let participant: Participant
     public let publication: TrackPublication?
     public let name: String?

Sources/LiveKitComponents/Types/UIOptions.swift

@@ -18,7 +18,7 @@ import LiveKit
 import SwiftUI
 
 /// Subclass to customize default components UI.
-open class UIOptions: ObservableObject {
+open class UIOptions {
     // MARK: - Types
 
     public enum TextFieldType {
@@ -37,6 +37,13 @@ open class UIOptions: ObservableObject {
 
     public init() {}
 
+    /// Placeholder view when no track is enabled.
+    open func noTrackView() -> AnyView {
+        AnyView(
+            EmptyView()
+        )
+    }
+
     /// Placeholder view when the video is disabled or not available.
     open func videoDisabledView(geometry: GeometryProxy) -> AnyView {
         AnyView(

Sources/LiveKitComponents/UI/Participant/ParticipantView.swift

@@ -28,29 +28,29 @@ public struct ParticipantView: View {
     }
 
     public var body: some View {
-        GeometryReader { geometry in
-            ZStack(alignment: .topLeading) {
-                let cameraReference = TrackReference(participant: _participant, source: .camera)
-                let microphoneReference = TrackReference(participant: _participant, source: .microphone)
+        ZStack(alignment: .topLeading) {
+            let cameraReference = TrackReference(participant: _participant.avatarWorker ?? _participant, source: .camera)
+            let microphoneReference = TrackReference(participant: _participant.avatarWorker ?? _participant, source: .microphone)
 
-                if let cameraTrack = cameraReference.resolve(), !cameraTrack.isMuted {
-                    VideoTrackView(trackReference: cameraReference)
-                } else {
-                    if let microphoneTrack = microphoneReference.resolve(), !microphoneTrack.isMuted, let audioTrack = microphoneTrack.track as? AudioTrack {
-                        BarAudioVisualizer(audioTrack: audioTrack)
-                    } else {
-                        _ui.videoDisabledView(geometry: geometry)
-                    }
-                }
+            if let cameraTrack = cameraReference.resolve(), !cameraTrack.isMuted {
+                VideoTrackView(trackReference: cameraReference)
+            } else if let microphoneTrack = microphoneReference.resolve(), !microphoneTrack.isMuted,
+                      let audioTrack = microphoneTrack.track as? AudioTrack
+            {
+                BarAudioVisualizer(audioTrack: audioTrack, agentState: _participant.agentState).id(_participant.agentState)
+            } else {
+                _ui.noTrackView()
+            }
 
-                if _showInformation {
-                    ParticipantInformationView()
-                        .padding(5)
-                        .background(Color.black.opacity(0.5))
-                        .cornerRadius(7)
-                        .padding()
-                }
+            if _showInformation {
+                ParticipantInformationView()
+                    .padding(5)
+                    .background(Color.black.opacity(0.5))
+                    .cornerRadius(7)
+                    .padding()
             }
         }
+        .animation(.easeOut, value: _participant.trackPublications)
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
     }
 }