Fix ObjC annotations (#915)

I switched to `@objcMembers` globally, leveraging swiftlint
`redundant_objc_attribute` rule here, should solve this problem
forever...

Author: pblazej

.changes/missing-objc

@@ -0,0 +1 @@
+patch type="fixed" "Missing objc annotations for some objc class members"

.swiftlint.yml

@@ -27,3 +27,8 @@ custom_rules:
     regex: "(let|var)\\s+\\w+\\s*:\\s*Task<Void,"
     message: "Prefer AnyTaskCancellable over manually managing Task<Void, ...>. This allows for safer cleanup, similar to Combine's AnyCancellable."
     severity: warning
+  prefer_objc_members:
+    name: "Prefer @objcMembers for classes"
+    regex: "@objc(?![(\\[])\\s+(?:(?:public|open|final|internal|package)\\s+)*class\\b"
+    message: "Use @objcMembers instead of @objc for classes to implicitly expose members to Objective-C."
+    severity: warning

Sources/LiveKit/Core/PreConnectAudioBuffer.swift

@@ -18,7 +18,7 @@ import AVFAudio
 import Foundation
 
 /// A buffer that captures audio before connecting to the server.
-@objc
+@objcMembers
 public final class PreConnectAudioBuffer: NSObject, Sendable, Loggable {
     public typealias OnError = @Sendable (Error) -> Void
 
@@ -29,15 +29,12 @@ public final class PreConnectAudioBuffer: NSObject, Sendable, Loggable {
     }
 
     /// The default data topic used to send the audio buffer.
-    @objc
     public static let dataTopic = "lk.agent.pre-connect-audio-buffer"
 
     /// The room instance to send the audio buffer to.
-    @objc
     public var room: Room? { state.room }
 
     /// The audio recorder instance.
-    @objc
     public var recorder: LocalAudioTrackRecorder? { state.recorder }
 
     private let state = StateSync<State>(State())
@@ -54,7 +51,6 @@ public final class PreConnectAudioBuffer: NSObject, Sendable, Loggable {
     /// - Parameters:
     ///   - room: The room instance to send the audio buffer to.
     ///   - onError: The error handler to call when an error occurs while sending the audio buffer.
-    @objc
     public init(room: Room?, onError: OnError? = nil) {
         state.mutate {
             $0.room = room
@@ -67,7 +63,6 @@ public final class PreConnectAudioBuffer: NSObject, Sendable, Loggable {
         stopRecording()
     }
 
-    @objc
     public func setErrorHandler(_ onError: OnError?) {
         state.mutate { $0.onError = onError }
     }
@@ -78,7 +73,6 @@ public final class PreConnectAudioBuffer: NSObject, Sendable, Loggable {
     /// The room connection needs to be established and the remote participant needs to subscribe to the audio track
     /// before the timeout is reached. Otherwise, the audio stream will be flushed without sending.
     ///   - recorder: Optional custom recorder instance. If not provided, a new one will be created.
-    @objc
     public func startRecording(timeout: TimeInterval = Constants.timeout, recorder: LocalAudioTrackRecorder? = nil) async throws {
         room?.add(delegate: self)
 
@@ -109,7 +103,6 @@ public final class PreConnectAudioBuffer: NSObject, Sendable, Loggable {
     /// Stop capturing audio.
     /// - Parameters:
     ///   - flush: If `true`, the audio stream will be flushed immediately without sending.
-    @objc
     public func stopRecording(flush: Bool = false) {
         guard let recorder, recorder.isRecording else { return }
 
@@ -130,7 +123,6 @@ public final class PreConnectAudioBuffer: NSObject, Sendable, Loggable {
     ///   - room: The room instance to send the audio data.
     ///   - agents: The agents to send the audio data to.
     ///   - topic: The topic to send the audio data.
-    @objc
     public func sendAudioData(to room: Room, agents: [Participant.Identity], on topic: String = dataTopic) async throws {
         guard !agents.isEmpty else { return }
 

Sources/LiveKit/Core/Room.swift

@@ -23,7 +23,7 @@ import Foundation
 import Network
 #endif
 
-@objc
+@objcMembers
 // swiftlint:disable:next type_body_length
 public class Room: NSObject, @unchecked Sendable, ObservableObject, Loggable {
     // MARK: - MulticastDelegate
@@ -37,71 +37,52 @@ public class Room: NSObject, @unchecked Sendable, ObservableObject, Loggable {
     // MARK: - Public
 
     /// Server assigned id of the Room.
-    @objc
     public var sid: Sid? { _state.sid }
 
     /// Server assigned id of the Room. *async* version of ``Room/sid``.
-    @objc
     public func sid() async throws -> Sid {
         try await _sidCompleter.wait()
     }
 
-    @objc
     public var name: String? { _state.name }
 
     /// Room's metadata.
-    @objc
     public var metadata: String? { _state.metadata }
 
-    @objc
     public var serverVersion: String? { _state.serverInfo?.version.nilIfEmpty }
 
     /// Region code the client is currently connected to.
-    @objc
     public var serverRegion: String? { _state.serverInfo?.region.nilIfEmpty }
 
     /// Region code the client is currently connected to.
-    @objc
     public var serverNodeId: String? { _state.serverInfo?.nodeID.nilIfEmpty }
 
-    @objc
     public var remoteParticipants: [Participant.Identity: RemoteParticipant] { _state.remoteParticipants }
 
-    @objc
     public var activeSpeakers: [Participant] { _state.activeSpeakers }
 
-    @objc
     public var creationTime: Date? { _state.creationTime }
 
     /// If the current room has a participant with `recorder:true` in its JWT grant.
-    @objc
     public var isRecording: Bool { _state.isRecording }
 
-    @objc
     public var maxParticipants: Int { _state.maxParticipants }
 
-    @objc
     public var participantCount: Int { _state.numParticipants }
 
-    @objc
     public var publishersCount: Int { _state.numPublishers }
 
     /// User-provided URL.
-    @objc
     public var url: String? { _state.providedUrl?.absoluteString }
 
     /// Actual server URL used for the current connection (may include a regional URL).
-    @objc
     public var connectedUrl: String? { _state.connectedUrl?.absoluteString }
 
-    @objc
     public var token: String? { _state.token }
 
     /// Current ``ConnectionState`` of the ``Room``.
-    @objc
     public var connectionState: ConnectionState { _state.connectionState }
 
-    @objc
     public var disconnectError: LiveKitError? { _state.disconnectError }
 
     public var connectStopwatch: Stopwatch { _state.connectStopwatch }
@@ -110,7 +91,6 @@ public class Room: NSObject, @unchecked Sendable, ObservableObject, Loggable {
 
     public var e2eeManager: E2EEManager?
 
-    @objc
     public lazy var localParticipant: LocalParticipant = .init(room: self)
 
     let primaryTransportConnectedCompleter = AsyncCompleter<Void>(label: "Primary transport connect", defaultTimeout: .defaultTransportState)
@@ -219,14 +199,12 @@ public class Room: NSObject, @unchecked Sendable, ObservableObject, Loggable {
 
     // MARK: Objective-C Support
 
-    @objc
     override public convenience init() {
         self.init(delegate: nil,
                   connectOptions: ConnectOptions(),
                   roomOptions: RoomOptions())
     }
 
-    @objc
     // swiftlint:disable:next cyclomatic_complexity function_body_length
     public init(delegate: RoomDelegate? = nil,
                 connectOptions: ConnectOptions? = nil,
@@ -326,7 +304,6 @@ public class Room: NSObject, @unchecked Sendable, ObservableObject, Loggable {
         }
     }
 
-    @objc
     // swiftlint:disable:next cyclomatic_complexity function_body_length
     public func connect(url urlString: String,
                         token: String,
@@ -467,7 +444,6 @@ public class Room: NSObject, @unchecked Sendable, ObservableObject, Loggable {
         log("Connected to \(String(describing: self))", .info)
     }
 
-    @objc
     public func disconnect() async {
         let shouldDisconnect = _state.mutate {
             switch $0.connectionState {

Sources/LiveKit/DataStream/Incoming/ByteStreamReader.swift

@@ -17,10 +17,9 @@
 import Foundation
 
 /// An asynchronous sequence of chunks read from a byte data stream.
-@objc
+@objcMembers
 public final class ByteStreamReader: NSObject, AsyncSequence, Sendable {
     /// Information about the incoming byte stream.
-    @objc
     public let info: ByteStreamInfo
 
     let source: StreamReaderSource
@@ -36,7 +35,6 @@ public final class ByteStreamReader: NSObject, AsyncSequence, Sendable {
     /// - Returns: The data consisting of all concatenated chunks.
     /// - Throws: ``StreamError`` if an error occurs while reading the stream.
     ///
-    @objc
     public func readAll() async throws -> Data {
         try await source.collect()
     }
@@ -70,7 +68,6 @@ extension ByteStreamReader {
     /// - Returns: The URL of the written file on disk.
     /// - Throws: ``StreamError`` if an error occurs while reading the stream.
     ///
-    @objc
     public func writeToFile(
         in directory: URL = FileManager.default.temporaryDirectory,
         name nameOverride: String? = nil

Sources/LiveKit/DataStream/Incoming/TextStreamReader.swift

@@ -17,10 +17,9 @@
 import Foundation
 
 /// An asynchronous sequence of chunks read from a text data stream.
-@objc
+@objcMembers
 public final class TextStreamReader: NSObject, AsyncSequence, Sendable {
     /// Information about the incoming text stream.
-    @objc
     public let info: TextStreamInfo
 
     let source: StreamReaderSource
@@ -36,7 +35,6 @@ public final class TextStreamReader: NSObject, AsyncSequence, Sendable {
     /// - Returns: The string consisting of all concatenated chunks.
     /// - Throws: ``StreamError`` if an error occurs while reading the stream.
     ///
-    @objc
     public func readAll() async throws -> String {
         try await collect()
     }

Sources/LiveKit/DataStream/Outgoing/ByteStreamWriter.swift

@@ -17,10 +17,9 @@
 import Foundation
 
 /// Asynchronously write to an open byte stream.
-@objc
+@objcMembers
 public final class ByteStreamWriter: NSObject, Sendable {
     /// Information about the outgoing byte stream.
-    @objc
     public let info: ByteStreamInfo
 
     private let destination: StreamWriterDestination

Sources/LiveKit/DataStream/Outgoing/TextStreamWriter.swift

@@ -17,10 +17,9 @@
 import Foundation
 
 /// Asynchronously write to an open text stream.
-@objc
+@objcMembers
 public final class TextStreamWriter: NSObject, Sendable {
     /// Information about the outgoing text stream.
-    @objc
     public let info: TextStreamInfo
 
     private let destination: StreamWriterDestination

Sources/LiveKit/E2EE/E2EEManager.swift

@@ -19,7 +19,7 @@ import Foundation
 
 internal import LiveKitWebRTC
 
-@objc
+@objcMembers
 public class E2EEManager: NSObject, @unchecked Sendable, ObservableObject, Loggable {
     // Private delegate adapter to hide RTCFrameCryptorDelegate symbol
     private class DelegateAdapter: NSObject, LKRTCFrameCryptorDelegate {

Sources/LiveKit/E2EE/KeyProvider.swift

@@ -25,24 +25,18 @@ public let defaultRatchetWindowSize: Int32 = 0
 public let defaultFailureTolerance: Int32 = -1
 public let defaultKeyRingSize: Int32 = 16
 
-@objc
+@objcMembers
 public final class KeyProviderOptions: NSObject, Sendable {
-    @objc
     public let sharedKey: Bool
 
-    @objc
     public let ratchetSalt: Data
 
-    @objc
     public let ratchetWindowSize: Int32
 
-    @objc
     public let uncryptedMagicBytes: Data
 
-    @objc
     public let failureTolerance: Int32
 
-    @objc
     public let keyRingSize: Int32
 
     public init(sharedKey: Bool = true,
@@ -84,9 +78,8 @@ public final class KeyProviderOptions: NSObject, Sendable {
     }
 }
 
-@objc
+@objcMembers
 public final class BaseKeyProvider: NSObject, Loggable, Sendable {
-    @objc
     public let options: KeyProviderOptions
 
     // MARK: - Internal
@@ -182,12 +175,10 @@ public final class BaseKeyProvider: NSObject, Loggable, Sendable {
         rtcKeyProvider.setSifTrailer(trailer)
     }
 
-    @objc
     public func getCurrentKeyIndex() -> Int32 {
         _state.currentKeyIndex
     }
 
-    @objc
     public func setCurrentKeyIndex(_ index: Int32) {
         _state.mutate { $0.currentKeyIndex = index % options.keyRingSize }
     }