ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ov-components: improve disconnect handling and manage client-initiated disconnect events

master
Carlos Santos 2025-05-12 13:39:45 +02:00
parent cb8f11449f
commit d8ce736cc0
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
openvidu-components-angular/projects/openvidu-components-angular/src/lib/components/session/session.component.ts
View File

@ -104,6 +104,7 @@ export class SessionComponent implements OnInit, OnDestroy {
loading: boolean = true; loading: boolean = true;
private shouldDisconnectRoomWhenComponentIsDestroyed: boolean = true; private shouldDisconnectRoomWhenComponentIsDestroyed: boolean = true;
private shouldListenClientInitiatedDisconnectEvent: boolean = true;
private readonly SIDENAV_WIDTH_LIMIT_MODE = 790; private readonly SIDENAV_WIDTH_LIMIT_MODE = 790;
private menuSubscription: Subscription; private menuSubscription: Subscription;
private layoutWidthSubscription: Subscription; private layoutWidthSubscription: Subscription;
@ -243,6 +244,7 @@ export class SessionComponent implements OnInit, OnDestroy {
async disconnectRoom(reason: ParticipantLeftReason) { async disconnectRoom(reason: ParticipantLeftReason) {
// Mark session as disconnected for avoiding to do it again in ngOnDestroy // Mark session as disconnected for avoiding to do it again in ngOnDestroy
this.shouldDisconnectRoomWhenComponentIsDestroyed = false; this.shouldDisconnectRoomWhenComponentIsDestroyed = false;
this.shouldListenClientInitiatedDisconnectEvent = false;
await this.openviduService.disconnectRoom(() => { await this.openviduService.disconnectRoom(() => {
this.onParticipantLeft.emit({ this.onParticipantLeft.emit({
roomName: this.openviduService.getRoomName(), roomName: this.openviduService.getRoomName(),
@ -487,18 +489,20 @@ export class SessionComponent implements OnInit, OnDestroy {
}); });
this.room.on(RoomEvent.Disconnected, async (reason: DisconnectReason | undefined) => { this.room.on(RoomEvent.Disconnected, async (reason: DisconnectReason | undefined) => {
this.shouldDisconnectRoomWhenComponentIsDestroyed = false;
const participantLeftEvent: ParticipantLeftEvent = { const participantLeftEvent: ParticipantLeftEvent = {
roomName: this.openviduService.getRoomName(), roomName: this.openviduService.getRoomName(),
participantName: this.participantService.getLocalParticipant()?.identity || '', participantName: this.participantService.getLocalParticipant()?.identity || '',
reason: ParticipantLeftReason.NETWORK_DISCONNECT reason: ParticipantLeftReason.NETWORK_DISCONNECT
}; };
const messageErrorKey = 'ERRORS.DISCONNECT'; const messageErrorKey = 'ERRORS.DISCONNECT';
let descriptionErrorKey = 'ERRORS.NETWORK_DISCONNECT'; let descriptionErrorKey = '';
switch (reason) { switch (reason) {
case DisconnectReason.CLIENT_INITIATED: case DisconnectReason.CLIENT_INITIATED:
// Skip disconnect reason if the user has left the room // Skip disconnect reason if a default disconnect method has been called
return; if (!this.shouldListenClientInitiatedDisconnectEvent) return;
participantLeftEvent.reason = ParticipantLeftReason.LEAVE;
break;
case DisconnectReason.DUPLICATE_IDENTITY: case DisconnectReason.DUPLICATE_IDENTITY:
participantLeftEvent.reason = ParticipantLeftReason.DUPLICATE_IDENTITY; participantLeftEvent.reason = ParticipantLeftReason.DUPLICATE_IDENTITY;
descriptionErrorKey = 'ERRORS.DUPLICATE_IDENTITY'; descriptionErrorKey = 'ERRORS.DUPLICATE_IDENTITY';
@ -527,11 +531,12 @@ export class SessionComponent implements OnInit, OnDestroy {
this.log.e('Room Disconnected', participantLeftEvent.reason); this.log.e('Room Disconnected', participantLeftEvent.reason);
this.onParticipantLeft.emit(participantLeftEvent); this.onParticipantLeft.emit(participantLeftEvent);
this.onRoomDisconnected.emit(); this.onRoomDisconnected.emit();
if (descriptionErrorKey) {
this.actionService.openDialog( this.actionService.openDialog(
this.translateService.translate(messageErrorKey), this.translateService.translate(messageErrorKey),
this.translateService.translate(descriptionErrorKey) this.translateService.translate(descriptionErrorKey)
); );
// await this.disconnectRoom(); }
}); });
} }