@@ -45,15 +45,17 @@ type ParticipantInfo struct {
4545
4646type Room struct {
4747 log logger.Logger
48+ roomLog logger.Logger // deferred logger
4849 room * lksdk.Room
4950 mix * mixer.Mixer
5051 out * media.SwitchWriter
5152 outDtmf atomic.Pointer [dtmf.Writer ]
5253 p ParticipantInfo
53- ready atomic. Bool
54+ ready core. Fuse
5455 subscribe atomic.Bool
5556 subscribed core.Fuse
5657 stopped core.Fuse
58+ closed core.Fuse
5759}
5860
5961type ParticipantConfig struct {
@@ -75,6 +77,21 @@ type RoomConfig struct {
7577func NewRoom (log logger.Logger ) * Room {
7678 r := & Room {log : log , out : media .NewSwitchWriter (RoomSampleRate )}
7779 r .mix = mixer .NewMixer (r .out , rtp .DefFrameDur )
80+
81+ roomLog , resolve := log .WithDeferredValues ()
82+ r .roomLog = roomLog
83+
84+ go func () {
85+ select {
86+ case <- r .ready .Watch ():
87+ resolve ("room" , r .room .Name (), "roomID" , r .room .SID ())
88+ case <- r .stopped .Watch ():
89+ resolve ()
90+ case <- r .closed .Watch ():
91+ resolve ()
92+ }
93+ }()
94+
7895 return r
7996}
8097
@@ -100,7 +117,7 @@ func (r *Room) Room() *lksdk.Room {
100117}
101118
102119func (r * Room ) participantJoin (rp * lksdk.RemoteParticipant ) {
103- log := r .log .WithValues ("participant" , rp .Identity ())
120+ log := r .roomLog .WithValues ("participant" , rp .Identity (), "pID" , rp . SID ())
104121 log .Debugw ("participant joined" )
105122 switch rp .Kind () {
106123 case lksdk .ParticipantSIP :
@@ -112,8 +129,13 @@ func (r *Room) participantJoin(rp *lksdk.RemoteParticipant) {
112129 }
113130}
114131
132+ func (r * Room ) participantLeft (rp * lksdk.RemoteParticipant ) {
133+ log := r .roomLog .WithValues ("participant" , rp .Identity (), "pID" , rp .SID ())
134+ log .Debugw ("participant left" )
135+ }
136+
115137func (r * Room ) subscribeTo (pub * lksdk.RemoteTrackPublication , rp * lksdk.RemoteParticipant ) {
116- log := r .log .WithValues ("participant" , rp .Identity (), "track " , pub .SID (), "trackName" , pub .Name ())
138+ log := r .roomLog .WithValues ("participant" , rp .Identity (), "pID" , rp . SID (), "trackID "pub .SID (), "trackName" , pub .Name ())
117139 if pub .Kind () != lksdk .TrackKindAudio {
118140 log .Debugw ("skipping non-audio track" )
119141 return
@@ -138,25 +160,28 @@ func (r *Room) Connect(conf *config.Config, rconf RoomConfig) error {
138160 }
139161 roomCallback := & lksdk.RoomCallback {
140162 OnParticipantConnected : func (rp * lksdk.RemoteParticipant ) {
141- log := r .log .WithValues ("participant" , rp .Identity ())
163+ log := r .roomLog .WithValues ("participant" , rp .Identity (), "pID" , rp . SID ())
142164 if ! r .subscribe .Load () {
143165 log .Debugw ("skipping participant join event - subscribed flag not set" )
144166 return // will subscribe later
145167 }
146168 r .participantJoin (rp )
147169 },
170+ OnParticipantDisconnected : func (rp * lksdk.RemoteParticipant ) {
171+ r .participantLeft (rp )
172+ },
148173 ParticipantCallback : lksdk.ParticipantCallback {
149174 OnTrackPublished : func (pub * lksdk.RemoteTrackPublication , rp * lksdk.RemoteParticipant ) {
150- log := r .log .WithValues ("participant" , rp .Identity (), "track " , pub .SID (), "trackName" , pub .Name ())
175+ log := r .roomLog .WithValues ("participant" , rp .Identity (), "pID" , rp . SID (), "trackID "pub .SID (), "trackName" , pub .Name ())
151176 if ! r .subscribe .Load () {
152177 log .Debugw ("skipping track publish event - subscribed flag not set" )
153178 return // will subscribe later
154179 }
155180 r .subscribeTo (pub , rp )
156181 },
157182 OnTrackSubscribed : func (track * webrtc.TrackRemote , pub * lksdk.RemoteTrackPublication , rp * lksdk.RemoteParticipant ) {
158- log := r .log .WithValues ("participant" , rp .Identity (), "track " , track .ID (), "trackName" , pub .Name ())
159- if ! r .ready .Load () {
183+ log := r .roomLog .WithValues ("participant" , rp .Identity (), "pID" , rp . SID (), "trackID "track .ID (), "trackName" , pub .Name ())
184+ if ! r .ready .IsBroken () {
160185 log .Warnw ("ignoring track, room not ready" , nil )
161186 return
162187 }
@@ -236,7 +261,7 @@ func (r *Room) Connect(conf *config.Config, rconf RoomConfig) error {
236261 r .p .ID = r .room .LocalParticipant .SID ()
237262 r .p .Identity = r .room .LocalParticipant .Identity ()
238263 room .LocalParticipant .SetAttributes (partConf .Attributes )
239- r .ready .Store ( true )
264+ r .ready .Break ( )
240265 r .subscribe .Store (false ) // already false, but keep for visibility
241266
242267 // Not subscribing to any tracks just yet!
@@ -316,7 +341,8 @@ func (r *Room) CloseWithReason(reason livekit.DisconnectReason) error {
316341 if r == nil {
317342 return nil
318343 }
319- r .ready .Store (false )
344+
345+ r .closed .Break ()
320346 r .subscribe .Store (false )
321347 err := r .CloseOutput ()
322348 r .SetDTMFOutput (nil )
@@ -358,7 +384,7 @@ func (r *Room) NewParticipantTrack(sampleRate int) (media.WriteCloser[media.PCM1
358384}
359385
360386func (r * Room ) SendData (data lksdk.DataPacket , opts ... lksdk.DataPublishOption ) error {
361- if r == nil || ! r .ready .Load () {
387+ if r == nil || ! r .ready .IsBroken () || r . closed . IsBroken () {
362388 return nil
363389 }
364390 return r .room .LocalParticipant .PublishDataPacket (data , opts ... )
0 commit comments