dandri/livekit
1
0
Fork 0
mirror of https://github.com/livekit/livekit.git synced 2026-03-30 22:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Temporary workaround for clients not able to handle combined updates (#777)

Browse Source 
See: https://github.com/livekit/client-sdk-js/pull/275
This commit is contained in:
David Zhao
2022-06-21 23:04:49 -07:00
committed by GitHub
parent 47b89c155f
commit 9d12147d97
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/rtc/room.go
View File

@@ -849,6 +849,7 @@ func (r *Room) pushAndDequeueUpdates(pi *livekit.ParticipantInfo, isImmediate bo
var updates []*livekit.ParticipantInfo
identity := livekit.ParticipantIdentity(pi.Identity)
existing := r.batchedUpdates[identity]
shouldSend := isImmediate || pi.IsPublisher
if existing != nil {
if pi.Sid != existing.Sid {
@@ -859,10 +860,12 @@ func (r *Room) pushAndDequeueUpdates(pi *livekit.ParticipantInfo, isImmediate bo
} else if pi.Version < existing.Version {
// out of order update
return nil
} else if shouldSend {
updates = append(updates, existing)
}
}
if isImmediate || pi.IsPublisher {
if shouldSend {
// include any queued update, and return
delete(r.batchedUpdates, identity)
updates = append(updates, pi)

2
pkg/rtc/room_test.go
View File

@@ -295,7 +295,7 @@ func TestPushAndDequeueUpdates(t *testing.T) {
name: "when switching to publisher, queue is cleared",
pi: publisher1v2,
existing: subscriber1v1,
expected: []*livekit.ParticipantInfo{publisher1v2},
expected: []*livekit.ParticipantInfo{subscriber1v1, publisher1v2},
validate: func(t *testing.T, rm *Room, updates []*livekit.ParticipantInfo) {
require.Empty(t, rm.batchedUpdates)
},