Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Send signaling messages when starting and stopping breakout rooms #8477

Merged
merged 9 commits into from
Feb 1, 2023
Merged

Send signaling messages when starting and stopping breakout rooms #8477

merged 9 commits into from
Feb 1, 2023

Commits on Jan 31, 2023

  1. Extract expected URL to its own variable 

    Signed-off-by: Daniel Calvi帽o S谩nchez <danxuliu@gmail.com>
    @danxuliu
    danxuliu committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    4970525 View commit details
    Browse the repository at this point in the history

  2. Ignore messages in other rooms when asserting that a message was sent 

    When asserting that a message was sent to the signaling server all the
requests were validated before looking for the expected one. As the
requests include the token of the room all the requests were expected to
be sent to the same room; otherwise any request sent to other room would
make the assert fail. Now the requests to other rooms than the room of
the actual message being asserted are ignored, which will make possible
to sent messages to different rooms in the same test.

Signed-off-by: Daniel Calvi帽o S谩nchez <danxuliu@gmail.com>
    @danxuliu
    danxuliu committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    ad21f03 View commit details
    Browse the repository at this point in the history

  3. Send signaling message when starting or stopping breakout rooms 

    When the breakout room status changes a "switchto" message is sent to
all the active sessions in either the parent or the breakout rooms
(depending on whether they are being started or stopped) with the token
of the room that they have to switch to.

When the breakout rooms are started the message is sent only to non
moderators, as moderators do not have a single breakout room assigned.
On the other hand, when the breakout rooms are stopped the message is
also sent to all moderators (who are in a breakout room and not already
in the parent room), as all participants need to switch to the parent
room.

Signed-off-by: Daniel Calvi帽o S谩nchez <danxuliu@gmail.com>
    @danxuliu
    danxuliu committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    62fd48d View commit details
    Browse the repository at this point in the history

  4. Do not send "switchto" messages for breakout rooms without sessions 

    Signed-off-by: Daniel Calvi帽o S谩nchez <danxuliu@gmail.com>
    @danxuliu
    danxuliu committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    cee13cb View commit details
    Browse the repository at this point in the history

  5. Handle "switchto" message in WebUI 

    When the client receives a message to switch to a different room the
WebUI joins that room. If the WebUI was already in a call it will
automatically join the call in the target room; in that case the call
view will be kept shown during the switch, rather than showing the chat
while leaving the previous call and joining the new room to then show
the call again when joining the call in the target room.

Signed-off-by: Daniel Calvi帽o S谩nchez <danxuliu@gmail.com>
    @danxuliu
    danxuliu committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    8479b8a View commit details
    Browse the repository at this point in the history

  6. Add "switchto" to the required signaling server features 

    Signed-off-by: Daniel Calvi帽o S谩nchez <danxuliu@gmail.com>
    @danxuliu
    danxuliu committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    0f0c0f5 View commit details
    Browse the repository at this point in the history

  7. Keep previous media state when switching to a call in another room 

    Signed-off-by: Daniel Calvi帽o S谩nchez <danxuliu@gmail.com>
    @danxuliu
    danxuliu committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    c58be9d View commit details
    Browse the repository at this point in the history

  8. Update room properties with data from "roomlist" update event 

    The external signaling server includes some room data in the "roomlist"
update event sent when a room is modified. That data is up to date, and
it will be the same received when fetching the room data again, so the
properties can be already updated in the store.

This prevents the lobby from being briefly shown when switching to a
breakout room due to the "switchto" message being handled before the
updated room data could be fetched from the server.

In order to keep the changes to a minimum note that this does was not
applied to guest users, as a different event seems to be sent in that
case, nor to the Talk sidebar, as the current properties provided in the
event should not be relevant to it.

Signed-off-by: Daniel Calvi帽o S谩nchez <danxuliu@gmail.com>
    @danxuliu
    danxuliu committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    afde0e0 View commit details
    Browse the repository at this point in the history

  9. Clean breakout room state after stopping them 

    When the breakout rooms are stopped the lobby is enabled again in them.
However, as it was first enabled and then the breakout rooms were
stopped if the participants updated the room data before switching back
to the parent room the lobby was briefly shown. To prevent that the
breakout rooms should be stopped and, then, the lobby should be enabled
again.

Signed-off-by: Daniel Calvi帽o S谩nchez <danxuliu@gmail.com>
    @danxuliu
    danxuliu committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    a46fa7e View commit details
    Browse the repository at this point in the history