Skip to content

fix(remote_participant): disconnect reason #805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anunaym14 merged 2 commits into from
Nov 12, 2025
Merged

fix(remote_participant): disconnect reason #805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7593360
fix(remote_participant): disconnect reason
anunaym14 Nov 12, 2025
4b3c1e7
fix: partially revert #804
anunaym14 Nov 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 22 additions & 27 deletions callback.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,18 +161,17 @@ func GetDisconnectionReason(reason livekit.DisconnectReason) DisconnectionReason
}

type RoomCallback struct {
OnDisconnected func()
OnDisconnectedWithReason func(reason DisconnectionReason)
OnParticipantConnected func(*RemoteParticipant)
OnParticipantDisconnected func(*RemoteParticipant)
OnParticipantDisconnectedWithReason func(*RemoteParticipant, livekit.DisconnectReason)
OnActiveSpeakersChanged func([]Participant)
OnRoomMetadataChanged func(metadata string)
OnRecordingStatusChanged func(isRecording bool)
OnRoomMoved func(roomName string, token string)
OnReconnecting func()
OnReconnected func()
OnLocalTrackSubscribed func(publication *LocalTrackPublication, lp *LocalParticipant)
OnDisconnected func()
OnDisconnectedWithReason func(reason DisconnectionReason)
OnParticipantConnected func(*RemoteParticipant)
OnParticipantDisconnected func(*RemoteParticipant)
OnActiveSpeakersChanged func([]Participant)
OnRoomMetadataChanged func(metadata string)
OnRecordingStatusChanged func(isRecording bool)
OnRoomMoved func(roomName string, token string)
OnReconnecting func()
OnReconnected func()
OnLocalTrackSubscribed func(publication *LocalTrackPublication, lp *LocalParticipant)

// participant events are sent to the room as well
ParticipantCallback
Expand All @@ -184,18 +183,17 @@ func NewRoomCallback() *RoomCallback {
return &RoomCallback{
ParticipantCallback: *pc,

OnDisconnected: func() {},
OnDisconnectedWithReason: func(reason DisconnectionReason) {},
OnParticipantConnected: func(participant *RemoteParticipant) {},
OnParticipantDisconnected: func(participant *RemoteParticipant) {},
OnParticipantDisconnectedWithReason: func(participant *RemoteParticipant, reason livekit.DisconnectReason) {},
OnActiveSpeakersChanged: func(participants []Participant) {},
OnRoomMetadataChanged: func(metadata string) {},
OnRecordingStatusChanged: func(isRecording bool) {},
OnRoomMoved: func(roomName string, token string) {},
OnReconnecting: func() {},
OnReconnected: func() {},
OnLocalTrackSubscribed: func(publication *LocalTrackPublication, lp *LocalParticipant) {},
OnDisconnected: func() {},
OnDisconnectedWithReason: func(reason DisconnectionReason) {},
OnParticipantConnected: func(participant *RemoteParticipant) {},
OnParticipantDisconnected: func(participant *RemoteParticipant) {},
OnActiveSpeakersChanged: func(participants []Participant) {},
OnRoomMetadataChanged: func(metadata string) {},
OnRecordingStatusChanged: func(isRecording bool) {},
OnRoomMoved: func(roomName string, token string) {},
OnReconnecting: func() {},
OnReconnected: func() {},
OnLocalTrackSubscribed: func(publication *LocalTrackPublication, lp *LocalParticipant) {},
}
}

Expand All @@ -217,9 +215,6 @@ func (cb *RoomCallback) Merge(other *RoomCallback) {
if other.OnParticipantDisconnected != nil {
cb.OnParticipantDisconnected = other.OnParticipantDisconnected
}
if other.OnParticipantDisconnectedWithReason != nil {
cb.OnParticipantDisconnectedWithReason = other.OnParticipantDisconnectedWithReason
}
if other.OnActiveSpeakersChanged != nil {
cb.OnActiveSpeakersChanged = other.OnActiveSpeakersChanged
}
Expand Down
5 changes: 3 additions & 2 deletions room.go
View file
Open in desktop
Copy link
Member Author

@anunaym14 anunaym14 Nov 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if unknown_reason is optimal for onRestarting

Original file line number Diff line number Diff line change
Expand Up @@ -920,8 +920,9 @@ func (r *Room) OnParticipantDisconnect(rp *RemoteParticipant, reason livekit.Dis

rp.unpublishAllTracks()
r.LocalParticipant.handleParticipantDisconnected(rp.Identity())

rp.info.DisconnectReason = reason
go r.callback.OnParticipantDisconnected(rp)
go r.callback.OnParticipantDisconnectedWithReason(rp, reason)
}

func (r *Room) OnSpeakersChanged(speakerUpdates []*livekit.SpeakerInfo) {
Expand Down Expand Up @@ -1003,7 +1004,7 @@ func (r *Room) OnRoomMoved(moved *livekit.RoomMovedResponse) {
r.OnRoomUpdate(moved.Room)

for _, rp := range r.GetRemoteParticipants() {
r.OnParticipantDisconnect(rp, livekit.DisconnectReason_ROOM_CLOSED)
r.OnParticipantDisconnect(rp, livekit.DisconnectReason_MIGRATION)
Comment on lines -1006 to +1007
Copy link
Member Author

@anunaym14 anunaym14 Nov 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Migration seems more optimal here? wdyt?

Copy link
Member

@davidzhao davidzhao Nov 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that makes sense.

}

go r.callback.OnRoomMoved(moved.Room.Name, moved.Token)
Expand Down
Loading