Skip to content

Commit c25ce2d

Browse files
hiroshihoriehiroshihorie
committed
fix property name trackPublications
1 parent 5bf6799 commit c25ce2d

File tree

8 files changed

+27
-27
lines changed

8 files changed

+27
-27
lines changed

‎Sources/LiveKit/Core/Engine.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ extension Engine {
495495

496496
let autoSubscribe = _state.connectOptions.autoSubscribe
497497
let trackSids = room._state.remoteParticipants.values.flatMap { participant in
498-
participant._state.tracks.values
498+
participant._state.trackPublications.values
499499
.filter { $0.subscribed != autoSubscribe }
500500
.map(\.sid)
501501
}

‎Sources/LiveKit/Core/Room+EngineDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ extension Room: EngineDelegate {
161161

162162
func engine(_: Engine, didRemove track: LKRTCMediaStreamTrack) {
163163
// find the publication
164-
guard let publication = _state.remoteParticipants.values.map(\._state.tracks.values).joined()
164+
guard let publication = _state.remoteParticipants.values.map(\._state.trackPublications.values).joined()
165165
.first(where: { $0.sid == track.trackId }) else { return }
166166
publication.set(track: nil)
167167
}

‎Sources/LiveKit/Core/Room+SignalClientDelegate.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ extension Room: SignalClientDelegate {
152152
func signalClient(_: SignalClient, didUpdateRemoteMute trackSid: String, muted: Bool) {
153153
log("trackSid: \(trackSid) muted: \(muted)")
154154

155-
guard let publication = localParticipant._state.tracks[trackSid] as? LocalTrackPublication else {
155+
guard let publication = localParticipant._state.trackPublications[trackSid] as? LocalTrackPublication else {
156156
// publication was not found but the delegate was handled
157157
return
158158
}
@@ -185,7 +185,7 @@ extension Room: SignalClientDelegate {
185185
// Try to find RemoteParticipant
186186
guard let participant = _state.remoteParticipants[update.participantSid] else { continue }
187187
// Try to find RemoteTrackPublication
188-
guard let trackPublication = participant._state.tracks[update.trackSid] as? RemoteTrackPublication else { continue }
188+
guard let trackPublication = participant._state.trackPublications[update.trackSid] as? RemoteTrackPublication else { continue }
189189
// Update streamState (and notify)
190190
trackPublication._state.mutate { $0.streamState = update.state.toLKType() }
191191
}
@@ -240,7 +240,7 @@ extension Room: SignalClientDelegate {
240240
func signalClient(_: SignalClient, didUnpublishLocalTrack localTrack: Livekit_TrackUnpublishedResponse) {
241241
log()
242242

243-
guard let publication = localParticipant._state.tracks[localTrack.trackSid] as? LocalTrackPublication else {
243+
guard let publication = localParticipant._state.trackPublications[localTrack.trackSid] as? LocalTrackPublication else {
244244
log("track publication not found", .warning)
245245
return
246246
}

‎Sources/LiveKit/Core/Room.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ extension Room {
338338

339339
// create an array of RemoteTrackPublication
340340
let remoteTrackPublications = _state.remoteParticipants.values.map {
341-
$0._state.tracks.values.compactMap { $0 as? RemoteTrackPublication }
341+
$0._state.trackPublications.values.compactMap { $0 as? RemoteTrackPublication }
342342
}.joined()
343343

344344
// reset track settings for all RemoteTrackPublication

‎Sources/LiveKit/E2EE/E2EEManager.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public class E2EEManager: NSObject, ObservableObject, Loggable {
6363
}
6464
self.room = room
6565
self.room?.delegates.add(delegate: self)
66-
self.room?.localParticipant.tracksPublications.values.forEach { (publication: TrackPublication) in
66+
self.room?.localParticipant.trackPublications.values.forEach { (publication: TrackPublication) in
6767
if publication.encryptionType == EncryptionType.none {
6868
self.log("E2EEManager::setup: local participant \(self.room!.localParticipant.sid) track \(publication.sid) encryptionType is none, skip")
6969
return
@@ -77,7 +77,7 @@ public class E2EEManager: NSObject, ObservableObject, Loggable {
7777
}
7878

7979
self.room?.remoteParticipants.values.forEach { (participant: RemoteParticipant) in
80-
participant.tracksPublications.values.forEach { (publication: TrackPublication) in
80+
participant.trackPublications.values.forEach { (publication: TrackPublication) in
8181
if publication.encryptionType == EncryptionType.none {
8282
self.log("E2EEManager::setup: remote participant \(participant.sid) track \(publication.sid) encryptionType is none, skip")
8383
return

‎Sources/LiveKit/Participant/LocalParticipant.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class LocalParticipant: Participant {
3838
}
3939

4040
func getTrackPublication(sid: Sid) -> LocalTrackPublication? {
41-
_state.tracks[sid] as? LocalTrackPublication
41+
_state.trackPublications[sid] as? LocalTrackPublication
4242
}
4343

4444
@objc
@@ -50,7 +50,7 @@ public class LocalParticipant: Participant {
5050
throw EngineError.state(message: "Publisher is nil")
5151
}
5252

53-
guard _state.tracks.values.first(where: { $0.track === track }) == nil else {
53+
guard _state.trackPublications.values.first(where: { $0.track === track }) == nil else {
5454
throw TrackError.publish(message: "This track has already been published.")
5555
}
5656

@@ -240,7 +240,7 @@ public class LocalParticipant: Participant {
240240
@objc
241241
override public func unpublishAll(notify _notify: Bool = true) async {
242242
// Build a list of Publications
243-
let publications = _state.tracks.values.compactMap { $0 as? LocalTrackPublication }
243+
let publications = _state.trackPublications.values.compactMap { $0 as? LocalTrackPublication }
244244
for publication in publications {
245245
do {
246246
try await unpublish(publication: publication, notify: _notify)
@@ -267,7 +267,7 @@ public class LocalParticipant: Participant {
267267
let engine = room.engine
268268

269269
// Remove the publication
270-
_state.mutate { $0.tracks.removeValue(forKey: publication.sid) }
270+
_state.mutate { $0.trackPublications.removeValue(forKey: publication.sid) }
271271

272272
// If track is nil, only notify unpublish and return
273273
guard let track = publication.track as? LocalTrack else {
@@ -416,7 +416,7 @@ public class LocalParticipant: Participant {
416416

417417
extension LocalParticipant {
418418
func publishedTracksInfo() -> [Livekit_TrackPublishedResponse] {
419-
_state.tracks.values.filter { $0.track != nil }
419+
_state.trackPublications.values.filter { $0.track != nil }
420420
.map { publication in
421421
Livekit_TrackPublishedResponse.with {
422422
$0.cid = publication.track!.mediaTrack.trackId
@@ -428,7 +428,7 @@ extension LocalParticipant {
428428
}
429429

430430
func republishTracks() async throws {
431-
let mediaTracks = _state.tracks.values.map { $0.track as? LocalTrack }.compactMap { $0 }
431+
let mediaTracks = _state.trackPublications.values.map { $0.track as? LocalTrack }.compactMap { $0 }
432432

433433
await unpublishAll()
434434

‎Sources/LiveKit/Participant/Participant.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,16 @@ public class Participant: NSObject, ObservableObject, Loggable {
5353
public var joinedAt: Date? { _state.joinedAt }
5454

5555
@objc
56-
public var tracksPublications: [Sid: TrackPublication] { _state.tracks }
56+
public var trackPublications: [Sid: TrackPublication] { _state.trackPublications }
5757

5858
@objc
5959
public var audioTracks: [TrackPublication] {
60-
_state.tracks.values.filter { $0.kind == .audio }
60+
_state.trackPublications.values.filter { $0.kind == .audio }
6161
}
6262

6363
@objc
6464
public var videoTracks: [TrackPublication] {
65-
_state.tracks.values.filter { $0.kind == .video }
65+
_state.trackPublications.values.filter { $0.kind == .video }
6666
}
6767

6868
var info: Livekit_ParticipantInfo?
@@ -82,7 +82,7 @@ public class Participant: NSObject, ObservableObject, Loggable {
8282
var joinedAt: Date?
8383
var connectionQuality: ConnectionQuality = .unknown
8484
var permissions = ParticipantPermissions()
85-
var tracks = [String: TrackPublication]()
85+
var trackPublications = [Sid: TrackPublication]()
8686
}
8787

8888
var _state: StateSync<State>
@@ -161,7 +161,7 @@ public class Participant: NSObject, ObservableObject, Loggable {
161161
}
162162

163163
func add(publication: TrackPublication) {
164-
_state.mutate { $0.tracks[publication.sid] = publication }
164+
_state.mutate { $0.trackPublications[publication.sid] = publication }
165165
publication.track?._state.mutate { $0.sid = publication.sid }
166166
}
167167

@@ -207,19 +207,19 @@ public extension Participant {
207207
}
208208

209209
internal func getTrackPublication(name: String) -> TrackPublication? {
210-
_state.tracks.values.first(where: { $0.name == name })
210+
_state.trackPublications.values.first(where: { $0.name == name })
211211
}
212212

213213
/// find the first publication matching `source` or any compatible.
214214
internal func getTrackPublication(source: Track.Source) -> TrackPublication? {
215215
// if source is unknown return nil
216216
guard source != .unknown else { return nil }
217217
// try to find a Publication with matching source
218-
if let result = _state.tracks.values.first(where: { $0.source == source }) {
218+
if let result = _state.trackPublications.values.first(where: { $0.source == source }) {
219219
return result
220220
}
221221
// try to find a compatible Publication
222-
if let result = _state.tracks.values.filter({ $0.source == .unknown }).first(where: {
222+
if let result = _state.trackPublications.values.filter({ $0.source == .unknown }).first(where: {
223223
(source == .microphone && $0.kind == .audio) ||
224224
(source == .camera && $0.kind == .video && $0.name != Track.screenShareVideoName) ||
225225
(source == .screenShareVideo && $0.kind == .video && $0.name == Track.screenShareVideoName) ||

‎Sources/LiveKit/Participant/RemoteParticipant.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class RemoteParticipant: Participant {
3333
}
3434

3535
func getTrackPublication(sid: Sid) -> RemoteTrackPublication? {
36-
_state.tracks[sid] as? RemoteTrackPublication
36+
_state.trackPublications[sid] as? RemoteTrackPublication
3737
}
3838

3939
override func updateFromInfo(info: Livekit_ParticipantInfo) {
@@ -67,7 +67,7 @@ public class RemoteParticipant: Participant {
6767
}
6868
}
6969

70-
let unpublishRemoteTrackPublications = _state.tracks.values
70+
let unpublishRemoteTrackPublications = _state.trackPublications.values
7171
.filter { validTrackPublications[$0.sid] == nil }
7272
.compactMap { $0 as? RemoteTrackPublication }
7373

@@ -86,7 +86,7 @@ public class RemoteParticipant: Participant {
8686
let track: Track
8787

8888
guard let publication = getTrackPublication(sid: sid) else {
89-
log("Could not subscribe to mediaTrack \(sid), unable to locate track publication. existing sids: (\(_state.tracks.keys.joined(separator: ", ")))", .error)
89+
log("Could not subscribe to mediaTrack \(sid), unable to locate track publication. existing sids: (\(_state.trackPublications.keys.joined(separator: ", ")))", .error)
9090
let error = TrackError.state(message: "Could not find published track with sid: \(sid)")
9191
delegates.notify(label: { "participant.didFailToSubscribe trackSid: \(sid)" }) {
9292
$0.participant?(self, didFailToSubscribe: sid, error: error)
@@ -149,7 +149,7 @@ public class RemoteParticipant: Participant {
149149

150150
override public func unpublishAll(notify _notify: Bool = true) async {
151151
// Build a list of Publications
152-
let publications = _state.tracks.values.compactMap { $0 as? RemoteTrackPublication }
152+
let publications = _state.trackPublications.values.compactMap { $0 as? RemoteTrackPublication }
153153
for publication in publications {
154154
do {
155155
try await unpublish(publication: publication, notify: _notify)
@@ -171,7 +171,7 @@ public class RemoteParticipant: Participant {
171171
}
172172

173173
// Remove the publication
174-
_state.mutate { $0.tracks.removeValue(forKey: publication.sid) }
174+
_state.mutate { $0.trackPublications.removeValue(forKey: publication.sid) }
175175

176176
// Continue if the publication has a track
177177
guard let track = publication.track else {

0 commit comments

Comments
 (0)