Skip to content

Commit f37bbd2

Browse files
hiroshihoriehiroshihorie
authored
Update code formatting (#741)
Re-apply `swiftformat .`
1 parent 8de0f65 commit f37bbd2

24 files changed

+85
-84
lines changed

‎.swiftformat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
--exclude Sources/LiveKit/Protos
22
--header "/*\n * Copyright {year} LiveKit\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */"
33
--ifdef no-indent
4+
--disable modifiersOnSameLine

‎Sources/LiveKit/Broadcast/Support/DarwinNotificationCenter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ enum DarwinNotification: String {
2424
}
2525

2626
final class DarwinNotificationCenter: @unchecked Sendable {
27-
public static let shared = DarwinNotificationCenter()
27+
static let shared = DarwinNotificationCenter()
2828
private let notificationCenter = CFNotificationCenterGetDarwinNotifyCenter()
2929

3030
func postNotification(_ name: DarwinNotification) {

‎Sources/LiveKit/Broadcast/Support/OSLogHandler.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ import OSLog
2121
internal import Logging
2222

2323
struct OSLogHandler: LogHandler {
24-
public var logLevel: Logging.Logger.Level = .debug
24+
var logLevel: Logging.Logger.Level = .debug
2525
private let oslogger: OSLog
2626

2727
init(_ oslogger: OSLog) {
2828
self.oslogger = oslogger
2929
}
3030

31-
public func log(
31+
func log(
3232
level _: Logging.Logger.Level,
3333
message: Logging.Logger.Message,
3434
metadata: Logging.Logger.Metadata?,
@@ -54,7 +54,7 @@ struct OSLogHandler: LogHandler {
5454
}
5555

5656
private var prettyMetadata: String?
57-
public var metadata = Logger.Metadata() {
57+
var metadata = Logger.Metadata() {
5858
didSet {
5959
prettyMetadata = prettify(metadata)
6060
}
@@ -63,7 +63,7 @@ struct OSLogHandler: LogHandler {
6363
/// Add, remove, or change the logging metadata.
6464
/// - parameters:
6565
/// - metadataKey: the key for the metadata item.
66-
public subscript(metadataKey metadataKey: String) -> Logging.Logger.Metadata.Value? {
66+
subscript(metadataKey metadataKey: String) -> Logging.Logger.Metadata.Value? {
6767
get {
6868
metadata[metadataKey]
6969
}

‎Sources/LiveKit/Core/DataChannelPair.swift

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ protocol DataChannelDelegate: Sendable {
2828
class DataChannelPair: NSObject, @unchecked Sendable, Loggable {
2929
// MARK: - Public
3030

31-
public let delegates = MulticastDelegate<DataChannelDelegate>(label: "DataChannelDelegate")
31+
let delegates = MulticastDelegate<DataChannelDelegate>(label: "DataChannelDelegate")
3232

33-
public let openCompleter = AsyncCompleter<Void>(label: "Data channel open", defaultTimeout: .defaultPublisherDataChannelOpen)
33+
let openCompleter = AsyncCompleter<Void>(label: "Data channel open", defaultTimeout: .defaultPublisherDataChannelOpen)
3434

35-
public var isOpen: Bool { _state.isOpen }
35+
var isOpen: Bool { _state.isOpen }
3636

3737
// MARK: - Private
3838

@@ -157,9 +157,9 @@ class DataChannelPair: NSObject, @unchecked Sendable, Loggable {
157157
state.amount -= newAmount
158158
}
159159

160-
public init(delegate: DataChannelDelegate? = nil,
161-
lossyChannel: LKRTCDataChannel? = nil,
162-
reliableChannel: LKRTCDataChannel? = nil)
160+
init(delegate: DataChannelDelegate? = nil,
161+
lossyChannel: LKRTCDataChannel? = nil,
162+
reliableChannel: LKRTCDataChannel? = nil)
163163
{
164164
_state = StateSync(State(lossy: lossyChannel,
165165
reliable: reliableChannel))
@@ -177,7 +177,7 @@ class DataChannelPair: NSObject, @unchecked Sendable, Loggable {
177177
}
178178
}
179179

180-
public func set(reliable channel: LKRTCDataChannel?) {
180+
func set(reliable channel: LKRTCDataChannel?) {
181181
let isOpen = _state.mutate {
182182
$0.reliable = channel
183183
return $0.isOpen
@@ -190,7 +190,7 @@ class DataChannelPair: NSObject, @unchecked Sendable, Loggable {
190190
}
191191
}
192192

193-
public func set(lossy channel: LKRTCDataChannel?) {
193+
func set(lossy channel: LKRTCDataChannel?) {
194194
let isOpen = _state.mutate {
195195
$0.lossy = channel
196196
return $0.isOpen
@@ -203,7 +203,7 @@ class DataChannelPair: NSObject, @unchecked Sendable, Loggable {
203203
}
204204
}
205205

206-
public func reset() {
206+
func reset() {
207207
let (lossy, reliable) = _state.mutate {
208208
let result = ($0.lossy, $0.reliable)
209209
$0.reliable = nil
@@ -217,14 +217,14 @@ class DataChannelPair: NSObject, @unchecked Sendable, Loggable {
217217
openCompleter.reset()
218218
}
219219

220-
public func send(userPacket: Livekit_UserPacket, kind: Livekit_DataPacket.Kind) async throws {
220+
func send(userPacket: Livekit_UserPacket, kind: Livekit_DataPacket.Kind) async throws {
221221
try await send(dataPacket: .with {
222222
$0.kind = kind // TODO: field is deprecated
223223
$0.user = userPacket
224224
})
225225
}
226226

227-
public func send(dataPacket packet: Livekit_DataPacket) async throws {
227+
func send(dataPacket packet: Livekit_DataPacket) async throws {
228228
let serializedData = try packet.serializedData()
229229
let rtcData = RTC.createDataBuffer(data: serializedData)
230230

@@ -241,7 +241,7 @@ class DataChannelPair: NSObject, @unchecked Sendable, Loggable {
241241
}
242242
}
243243

244-
public func infos() -> [Livekit_DataChannelInfo] {
244+
func infos() -> [Livekit_DataChannelInfo] {
245245
_state.read { [$0.lossy, $0.reliable] }
246246
.compactMap { $0 }
247247
.map { $0.toLKInfoType() }

‎Sources/LiveKit/Core/PreConnectAudioBuffer.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public final class PreConnectAudioBuffer: NSObject, Sendable, Loggable {
4747
var audioStream: LocalAudioTrackRecorder.Stream?
4848
var timeoutTask: Task<Void, Error>?
4949
var sent: Bool = false
50-
var onError: OnError? = nil
50+
var onError: OnError?
5151
}
5252

5353
/// Initialize the audio buffer with a room instance.

‎Sources/LiveKit/Core/SignalClient.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@ actor SignalClient: Loggable {
2323

2424
typealias AddTrackRequestPopulator = @Sendable (inout Livekit_AddTrackRequest) throws -> Void
2525

26-
public enum ConnectResponse: Sendable {
26+
enum ConnectResponse: Sendable {
2727
case join(Livekit_JoinResponse)
2828
case reconnect(Livekit_ReconnectResponse)
2929

30-
public var rtcIceServers: [LKRTCIceServer] {
30+
var rtcIceServers: [LKRTCIceServer] {
3131
switch self {
3232
case let .join(response): response.iceServers.map { $0.toRTCType() }
3333
case let .reconnect(response): response.iceServers.map { $0.toRTCType() }
3434
}
3535
}
3636

37-
public var clientConfiguration: Livekit_ClientConfiguration {
37+
var clientConfiguration: Livekit_ClientConfiguration {
3838
switch self {
3939
case let .join(response): response.clientConfiguration
4040
case let .reconnect(response): response.clientConfiguration
@@ -44,9 +44,9 @@ actor SignalClient: Loggable {
4444

4545
// MARK: - Public
4646

47-
public var connectionState: ConnectionState { _state.connectionState }
47+
var connectionState: ConnectionState { _state.connectionState }
4848

49-
public var disconnectError: LiveKitError? { _state.disconnectError }
49+
var disconnectError: LiveKitError? { _state.disconnectError }
5050

5151
// MARK: - Private
5252

‎Sources/LiveKit/Protocols/AudioCustomProcessingDelegate.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public protocol AudioCustomProcessingDelegate: Sendable {
4646
class AudioCustomProcessingDelegateAdapter: MulticastDelegate<AudioRenderer>, @unchecked Sendable, LKRTCAudioCustomProcessingDelegate {
4747
// MARK: - Public
4848

49-
public var target: AudioCustomProcessingDelegate? { _state.target }
49+
var target: AudioCustomProcessingDelegate? { _state.target }
5050

5151
// MARK: - Private
5252

@@ -56,7 +56,7 @@ class AudioCustomProcessingDelegateAdapter: MulticastDelegate<AudioRenderer>, @u
5656

5757
private var _state = StateSync(State())
5858

59-
public func set(target: AudioCustomProcessingDelegate?) {
59+
func set(target: AudioCustomProcessingDelegate?) {
6060
_state.mutate { $0.target = target }
6161
}
6262

‎Sources/LiveKit/Support/AsyncCompleter.swift

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@ import Foundation
2020
actor CompleterMapActor<T: Sendable> {
2121
// MARK: - Public
2222

23-
public nonisolated let label: String
23+
nonisolated let label: String
2424

2525
// MARK: - Private
2626

2727
private let _defaultTimeout: TimeInterval
2828
private var _completerMap = [String: AsyncCompleter<T>]()
2929

30-
public init(label: String, defaultTimeout: TimeInterval) {
30+
init(label: String, defaultTimeout: TimeInterval) {
3131
self.label = label
3232
_defaultTimeout = defaultTimeout
3333
}
3434

35-
public func completer(for key: String) -> AsyncCompleter<T> {
35+
func completer(for key: String) -> AsyncCompleter<T> {
3636
// Return completer if already exists...
3737
if let element = _completerMap[key] {
3838
return element
@@ -43,17 +43,17 @@ actor CompleterMapActor<T: Sendable> {
4343
return newCompleter
4444
}
4545

46-
public func resume(returning value: T, for key: String) {
46+
func resume(returning value: T, for key: String) {
4747
let completer = completer(for: key)
4848
completer.resume(returning: value)
4949
}
5050

51-
public func resume(throwing error: any Error, for key: String) {
51+
func resume(throwing error: any Error, for key: String) {
5252
let completer = completer(for: key)
5353
completer.resume(throwing: error)
5454
}
5555

56-
public func reset() {
56+
func reset() {
5757
// Reset call completers...
5858
for (_, value) in _completerMap {
5959
value.reset()
@@ -85,7 +85,7 @@ final class AsyncCompleter<T: Sendable>: @unchecked Sendable, Loggable {
8585
}
8686
}
8787

88-
public let label: String
88+
let label: String
8989

9090
private let _timerQueue = DispatchQueue(label: "LiveKitSDK.AsyncCompleter", qos: .background)
9191

@@ -96,7 +96,7 @@ final class AsyncCompleter<T: Sendable>: @unchecked Sendable, Loggable {
9696

9797
private let _lock: some Lock = createLock()
9898

99-
public init(label: String, defaultTimeout: TimeInterval) {
99+
init(label: String, defaultTimeout: TimeInterval) {
100100
self.label = label
101101
_defaultTimeout = defaultTimeout.toDispatchTimeInterval
102102
}
@@ -105,13 +105,13 @@ final class AsyncCompleter<T: Sendable>: @unchecked Sendable, Loggable {
105105
reset()
106106
}
107107

108-
public func set(defaultTimeout: TimeInterval) {
108+
func set(defaultTimeout: TimeInterval) {
109109
_lock.sync {
110110
_defaultTimeout = defaultTimeout.toDispatchTimeInterval
111111
}
112112
}
113113

114-
public func reset() {
114+
func reset() {
115115
_lock.sync {
116116
for entry in _entries.values {
117117
entry.cancel()
@@ -121,7 +121,7 @@ final class AsyncCompleter<T: Sendable>: @unchecked Sendable, Loggable {
121121
}
122122
}
123123

124-
public func resume(with result: Result<T, Error>) {
124+
func resume(with result: Result<T, Error>) {
125125
_lock.sync {
126126
for entry in _entries.values {
127127
entry.resume(with: result)
@@ -131,17 +131,17 @@ final class AsyncCompleter<T: Sendable>: @unchecked Sendable, Loggable {
131131
}
132132
}
133133

134-
public func resume(returning value: T) {
134+
func resume(returning value: T) {
135135
log("\(label)", .trace)
136136
resume(with: .success(value))
137137
}
138138

139-
public func resume(throwing error: Error) {
139+
func resume(throwing error: Error) {
140140
log("\(label)", .error)
141141
resume(with: .failure(error))
142142
}
143143

144-
public func wait(timeout: TimeInterval? = nil) async throws -> T {
144+
func wait(timeout: TimeInterval? = nil) async throws -> T {
145145
// Read value
146146
if let result = _lock.sync({ _result }) {
147147
// Already resolved...

‎Sources/LiveKit/Support/AsyncSerialDelegate.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ final class AsyncSerialDelegate<T: Sendable>: Sendable {
2424
private let _state = StateSync(State())
2525
private let _serialRunner = SerialRunnerActor<Void>()
2626

27-
public func set(delegate: T) {
27+
func set(delegate: T) {
2828
_state.mutate { $0.delegate = delegate as AnyObject }
2929
}
3030

31-
public func notifyAsync(_ fnc: @Sendable @escaping (T) async -> Void) async throws {
31+
func notifyAsync(_ fnc: @Sendable @escaping (T) async -> Void) async throws {
3232
guard let delegate = _state.read({ $0.delegate }) as? T else { return }
3333
try await _serialRunner.run {
3434
await fnc(delegate)
3535
}
3636
}
3737

38-
public func notifyDetached(_ fnc: @Sendable @escaping (T) async -> Void) {
38+
func notifyDetached(_ fnc: @Sendable @escaping (T) async -> Void) {
3939
Task.detached {
4040
try await self.notifyAsync(fnc)
4141
}

‎Sources/LiveKit/Support/ConnectivityListener.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ extension ConnectivityListenerDelegate {
3131
class ConnectivityListener: MulticastDelegate<ConnectivityListenerDelegate>, @unchecked Sendable {
3232
static let shared = ConnectivityListener()
3333

34-
public private(set) var hasConnectivity: Bool? {
34+
private(set) var hasConnectivity: Bool? {
3535
didSet {
3636
guard let newValue = hasConnectivity, oldValue != newValue else { return }
3737
notify { $0.connectivityListener(self, didUpdate: newValue) }
3838
}
3939
}
4040

41-
public private(set) var ipv4: String?
42-
public private(set) var path: NWPath?
41+
private(set) var ipv4: String?
42+
private(set) var path: NWPath?
4343

4444
private let queue = DispatchQueue(label: "LiveKitSDK.connectivityListener", qos: .default)
4545

0 commit comments

Comments
 (0)