More abstract credentials

Author: pblazej

VoiceAgent/Agent/AgentSession+Types.swift

@@ -17,18 +17,4 @@ extension AgentSession {
 //            }
 //        }
     }
-
-    struct Options {
-        let room: Room
-
-        init(room: Room = .init()) {
-            self.room = room
-        }
-    }
-
-    enum Environment {
-        // .envfile?
-        case sandbox(id: String, room: String = "room-\(Int.random(in: 1000 ... 9999))", participant: String = "participant-\(Int.random(in: 1000 ... 9999))")
-        case cloud(server: String, token: String)
-    }
 }

VoiceAgent/Agent/AgentSession.swift

@@ -43,7 +43,7 @@ final class AgentSession: ObservableObject {
 
     // MARK: - Dependencies
 
-    private let environment: Environment
+    private let credentials: any CredentialsProvider
     private let room: Room
     private let senders: [any MessageSender]
     private let receivers: [any MessageReceiver]
@@ -54,9 +54,9 @@ final class AgentSession: ObservableObject {
 
     // MARK: - Init
 
-    init(environment: Environment, options: Options = .init(), senders: [any MessageSender]? = nil, receivers: [any MessageReceiver]? = nil) {
-        self.environment = environment
-        room = options.room
+    init(credentials: CredentialsProvider, room: Room = .init(), senders: [any MessageSender]? = nil, receivers: [any MessageReceiver]? = nil) {
+        self.credentials = credentials
+        self.room = room
 
         let textMessageSender = TextMessageSender(room: room)
         self.senders = senders ?? [textMessageSender]
@@ -113,20 +113,15 @@ final class AgentSession: ObservableObject {
             }
         }
 
-        let connection = { @Sendable in
-            let (server, token) = try await self.credentials()
-            try await self.room.connect(url: server, token: token, connectOptions: options, roomOptions: roomOptions)
-        }
-
         do {
             if preConnectAudio {
                 try await room.withPreConnectAudio(timeout: waitForAgent) {
                     await MainActor.run { self.isListening = true }
-                    try await connection()
+                    try await self.room.connect(credentialsProvider: self.credentials, connectOptions: options, roomOptions: roomOptions)
                     await MainActor.run { self.isListening = false }
                 }
             } else {
-                try await connection()
+                try await room.connect(credentialsProvider: credentials, connectOptions: options, roomOptions: roomOptions)
             }
         } catch {
             self.error = .failedToConnect(error)
@@ -198,16 +193,4 @@ final class AgentSession: ObservableObject {
             self.error = .mediaDevice(error)
         }
     }
-
-    // MARK: - Private
-
-    private func credentials() async throws -> (server: String, token: String) {
-        switch environment {
-        case let .sandbox(id, room, participant):
-            let sandboxConnection = try await Sandbox.getConnection(id: id, roomName: room, participantName: participant)
-            return (sandboxConnection.serverUrl, sandboxConnection.participantToken)
-        case let .cloud(server, token):
-            return (server, token)
-        }
-    }
 }

VoiceAgent/Auth/Sandbox.swift

@@ -1,32 +1,40 @@
 import Foundation
+import LiveKit
+
+public struct Credentials: Decodable {
+    let serverUrl: URL
+    let participantToken: String
+}
+
+public protocol CredentialsProvider: Sendable {
+    func credentials() async throws -> Credentials
+}
+
+public extension Room {
+    func connect(credentialsProvider: CredentialsProvider,
+                 connectOptions: ConnectOptions? = nil,
+                 roomOptions: RoomOptions? = nil) async throws
+    {
+        let credentials = try await credentialsProvider.credentials()
+        try await connect(url: credentials.serverUrl.absoluteString, token: credentials.participantToken, connectOptions: connectOptions, roomOptions: roomOptions)
+    }
+}
 
 /// A service for fetching LiveKit authentication tokens.
-/// See [docs](https://docs.livekit.io/home/get-started/authentication) for more information.
-enum Sandbox {
+/// See [docs](https://CredentialsProvider.livekit.io/home/get-started/authentication) for more information.
+public struct Sandbox: CredentialsProvider {
+    private static let url: URL = .init(string: "https://cloud-api.livekit.io/api/sandbox/connection-details")!
+
     enum Error: Swift.Error {
         case noResponse
         case unsuccessfulStatusCode(Int)
         case decoding(Swift.Error)
     }
 
-    struct Connection: Decodable {
-        let serverUrl: String
-        let participantToken: String
-        let roomName: String
-        let participantName: String
-    }
-
-    private static let url: String = "https://cloud-api.livekit.io/api/sandbox/connection-details"
-
-    // TODO: These are not respected anyway (names)
-    static func getConnection(id: String, roomName: String, participantName: String) async throws -> Connection {
-        var urlComponents = URLComponents(string: url)!
-        urlComponents.queryItems = [
-            URLQueryItem(name: "roomName", value: roomName),
-            URLQueryItem(name: "participantName", value: participantName),
-        ]
+    let id: String
 
-        var request = URLRequest(url: urlComponents.url!)
+    public func credentials() async throws -> Credentials {
+        var request = URLRequest(url: Self.url)
         request.httpMethod = "POST"
         request.addValue(id.trimmingCharacters(in: CharacterSet(charactersIn: "\"")), forHTTPHeaderField: "X-Sandbox-ID")
 
@@ -41,9 +49,15 @@ enum Sandbox {
         }
 
         do {
-            return try JSONDecoder().decode(Connection.self, from: data)
+            return try JSONDecoder().decode(Credentials.self, from: data)
         } catch {
             throw Error.decoding(error)
         }
     }
 }
+
+extension Credentials: CredentialsProvider {
+    public func credentials() async throws -> Credentials {
+        self
+    }
+}

VoiceAgent/VoiceAgentApp.swift

@@ -13,7 +13,7 @@ struct VoiceAgentApp: App {
         WindowGroup {
             AppView()
                 .environmentObject(DeviceSwitcher(room: room))
-                .environmentObject(AgentSession(environment: .sandbox(id: sandboxID), options: .init(room: room)))
+                .environmentObject(AgentSession(credentials: Sandbox(id: sandboxID), room: room))
         }
         #if os(macOS)
         .defaultSize(width: 900, height: 900)