Fix leaving room as a self joined user with several sessions #8722
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Self-joined users are just temporary participants and they need to be removed when they leave a conversation. However, this needs to be done once they have no more sessions in that conversation; otherwise the remaining sessions would be kicked out from the conversation as soon as one leaves it. Signed-off-by: Daniel Calviño Sánchez <[email protected]>
Member
Author
|
/backport to stable25 |
Member
Author
|
/backport to stable24 |
| $this->dispatcher->dispatchTyped($attendeeEvent); | ||
| } | ||
| if ($participant->getAttendee()->getParticipantType() === Participant::USER_SELF_JOINED | ||
| && empty($this->sessionMapper->findByAttendeeId($participant->getAttendee()->getId()))) { |
Member
There was a problem hiding this comment.
Optional: Can skip this query when we did the deleteByAttendeeId above, but might not have a big impact
nickvergessen
approved these changes
Feb 8, 2023
Member
|
Unit tests are not happy. On that note, integration tests would be awesome, but I know they don't work at the moment with multiple sessions, so something to be raised again later. |
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
If the external signaling server is used, when a participant is disinvited it is expected that the client leaves the conversation if still in it. Therefore, self-joined users should not be disinvited when they disconnect from a conversation, as they can still have other sessions in it. To ensure that self-joined users will be disinvited when their last session leaves the conversation now a USER_REMOVE event is explicitly triggered when that last session leaves and the user is, in fact, removed from the conversation. Note that this does not cause the system message about the participant leaving to be sent, as it is explicitly guarded against self-joined users leaving the conversation. However, this change will cause other handlers to be called now, like those to invalidate resources, but it is very likely that they should have been called and that this change is actually a fix too in that regard. Signed-off-by: Daniel Calviño Sánchez <[email protected]>
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
This should not make any difference in the behaviour, but it looks more correct to first disconnect and then remove than the other way around. Signed-off-by: Daniel Calviño Sánchez <[email protected]>
danxuliu
force-pushed
the
fix-leaving-room-as-a-self-joined-user-with-several-sessions
branch
from
e7d0842 to
b82cc23
Compare
Member
Author
Fixed. |
vitormattos
reviewed
Feb 9, 2023
Contributor
vitormattos
left a comment
vitormattos
left a comment
There was a problem hiding this comment.
Will be necessary backport?
nickvergessen
deleted the
fix-leaving-room-as-a-self-joined-user-with-several-sessions
branch
This was referenced Feb 9, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #8626
Self-joined users are just temporary participants and they need to be removed when they leave a conversation. However, this needs to be done once they have no more sessions in that conversation; otherwise the remaining sessions would be kicked out from the conversation as soon as one leaves it.
Moreover, if the external signaling server is used, when a participant is disinvited it is expected that the client leaves the conversation if still in it. Therefore, self-joined users should not be disinvited when
they disconnect from a conversation, as they can still have other sessions in it.
To ensure that self-joined users will be disinvited when their last session leaves the conversation now a USER_REMOVE event is explicitly triggered when that last session leaves and the user is, in fact, removed from the conversation.
Note that this does not cause the system message about the participant leaving to be sent, as it is explicitly guarded against self-joined users leaving the conversation. However, this change will cause other handlers to be called now, like those to invalidate resources, but it is very likely that they should have been called and that this change is actually a fix too in that regard.
It would be great to add integration tests to explicitly check this, but I do not if it is possible to simulate different sessions for the same participant in the integration tests.