From 37b76f41b79ac560810922f1d9c791855ef0813b Mon Sep 17 00:00:00 2001
From: cnderrauber <zengjie9004@gmail.com>
Date: Wed, 16 Mar 2022 12:12:16 +0800
Subject: [PATCH] set participant to active after subscriber data channel
 opened (#518)

---
 pkg/rtc/participant.go | 16 +++++++++++++++-
 pkg/rtc/room.go        |  5 ++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/pkg/rtc/participant.go b/pkg/rtc/participant.go
index 522021a33..c0cdd53c3 100644
--- a/pkg/rtc/participant.go
+++ b/pkg/rtc/participant.go
@@ -36,6 +36,8 @@ const (
 
 	sdBatchSize       = 20
 	rttUpdateInterval = 5 * time.Second
+
+	stateActiveCond = 3 // reliableDCOpen,lossyDCOpen,PeerConnectionStateConnected
 )
 
 type pendingTrackInfo struct {
@@ -123,6 +125,8 @@ type ParticipantImpl struct {
 	pendingDataChannels []*livekit.DataChannelInfo
 	onClose             func(types.LocalParticipant, map[livekit.TrackID]livekit.ParticipantID)
 	onClaimsChanged     func(participant types.LocalParticipant)
+
+	activeCounter atomic.Int32
 }
 
 func NewParticipant(params ParticipantParams, perms *livekit.ParticipantPermission) (*ParticipantImpl, error) {
@@ -204,6 +208,7 @@ func NewParticipant(params ParticipantParams, perms *livekit.ParticipantPermissi
 		if err != nil {
 			return nil, err
 		}
+		p.reliableDCSub.OnOpen(p.incActiveCounter)
 		retransmits := uint16(0)
 		p.lossyDCSub, err = primaryPC.CreateDataChannel(LossyDataChannel, &webrtc.DataChannelInit{
 			Ordered:        &ordered,
@@ -212,6 +217,9 @@ func NewParticipant(params ParticipantParams, perms *livekit.ParticipantPermissi
 		if err != nil {
 			return nil, err
 		}
+		p.lossyDCSub.OnOpen(p.incActiveCounter)
+	} else {
+		p.activeCounter.Add(2)
 	}
 	primaryPC.OnConnectionStateChange(p.handlePrimaryStateChange)
 	p.publisher.pc.OnTrack(p.onMediaTrack)
@@ -1127,7 +1135,7 @@ func (p *ParticipantImpl) handlePrimaryStateChange(state webrtc.PeerConnectionSt
 		if !p.hasPendingMigratedTrack() && p.MigrateState() == types.MigrateStateSync {
 			p.SetMigrateState(types.MigrateStateComplete)
 		}
-		p.updateState(livekit.ParticipantInfo_ACTIVE)
+		p.incActiveCounter()
 	} else if state == webrtc.PeerConnectionStateFailed {
 		// only close when failed, to allow clients opportunity to reconnect
 		go func() {
@@ -1665,3 +1673,9 @@ func (p *ParticipantImpl) GetSubscribedTracks() []types.SubscribedTrack {
 	}
 	return tracks
 }
+
+func (p *ParticipantImpl) incActiveCounter() {
+	if p.activeCounter.Inc() == stateActiveCond {
+		p.updateState(livekit.ParticipantInfo_ACTIVE)
+	}
+}
diff --git a/pkg/rtc/room.go b/pkg/rtc/room.go
index 182ff0609..c74c8cc0c 100644
--- a/pkg/rtc/room.go
+++ b/pkg/rtc/room.go
@@ -659,7 +659,10 @@ func (r *Room) onDataPacket(source types.LocalParticipant, dp *livekit.DataPacke
 				continue
 			}
 		}
-		_ = op.SendDataPacket(dp)
+		err := op.SendDataPacket(dp)
+		if err != nil {
+			r.Logger.Infow("send datapacket error", "error", err, "participant", op.Identity())
+		}
 	}
 }