Skip to content

[stable24] Use "all: true" for end meeting for everyone case #7385

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

Closed
backportbot-nextcloud wants to merge 5 commits into from
Closed

[stable24] Use "all: true" for end meeting for everyone case #7385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3121f9d
Use "all: true" for end meeting for everyone case
nickvergessen Mar 1, 2022
503454c
Handle "event.participants.update.all" in the web
nickvergessen Mar 22, 2022
3e514ad
Require new HPB version
nickvergessen Mar 23, 2022
7c3f431
fixup! Use "all: true" for end meeting for everyone case
nickvergessen May 17, 2022
04eef8a
Ignore call signaling messages when not in a call
danxuliu Aug 26, 2022
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
82 changes: 46 additions & 36 deletions lib/Signaling/BackendNotifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,60 +351,70 @@ public function participantsModified(Room $room, array $sessionIds): void {
* @param Room $room
* @param int $flags
* @param string[] $sessionIds
* @param bool $changeAll
* @throws \Exception
*/
public function roomInCallChanged(Room $room, int $flags, array $sessionIds): void {
$changed = [];
$users = [];
public function roomInCallChanged(Room $room, int $flags, array $sessionIds, bool $changeAll = false): void {
if ($changeAll) {
$data = [
'incall' => $flags,
'all' => true
];
} else {
$changed = [];
$users = [];

$participants = $this->participantService->getParticipantsForAllSessions($room);
foreach ($participants as $participant) {
$session = $participant->getSession();
if (!$session instanceof Session) {
continue;
}
$participants = $this->participantService->getParticipantsForAllSessions($room);
foreach ($participants as $participant) {
$session = $participant->getSession();
if (!$session instanceof Session) {
continue;
}

$attendee = $participant->getAttendee();
if ($attendee->getActorType() !== Attendee::ACTOR_USERS
&& $attendee->getActorType() !== Attendee::ACTOR_GUESTS) {
continue;
}
$attendee = $participant->getAttendee();
if ($attendee->getActorType() !== Attendee::ACTOR_USERS
&& $attendee->getActorType() !== Attendee::ACTOR_GUESTS) {
continue;
}

$data = [
'inCall' => $session->getInCall(),
'lastPing' => $session->getLastPing(),
'sessionId' => $session->getSessionId(),
'nextcloudSessionId' => $session->getSessionId(),
'participantType' => $attendee->getParticipantType(),
'participantPermissions' => $participant->getPermissions(),
];
if ($attendee->getActorType() === Attendee::ACTOR_USERS) {
$data['userId'] = $attendee->getActorId();
}
$data = [
'inCall' => $session->getInCall(),
'lastPing' => $session->getLastPing(),
'sessionId' => $session->getSessionId(),
'nextcloudSessionId' => $session->getSessionId(),
'participantType' => $attendee->getParticipantType(),
'participantPermissions' => $participant->getPermissions(),
];
if ($attendee->getActorType() === Attendee::ACTOR_USERS) {
$data['userId'] = $attendee->getActorId();
}

if ($session->getInCall() !== Participant::FLAG_DISCONNECTED) {
$users[] = $data;
}
if ($session->getInCall() !== Participant::FLAG_DISCONNECTED) {
$users[] = $data;
}

if (\in_array($session->getSessionId(), $sessionIds, true)) {
$changed[] = $data;
if (\in_array($session->getSessionId(), $sessionIds, true)) {
$changed[] = $data;
}
}

$data = [
'incall' => $flags,
'changed' => $changed,
'users' => $users,
];
}

$start = microtime(true);
$this->backendRequest($room, [
'type' => 'incall',
'incall' => [
'incall' => $flags,
'changed' => $changed,
'users' => $users
],
'incall' => $data,
]);
$duration = microtime(true) - $start;
$this->logger->debug('Room in-call status changed: {token} {flags} {users} ({duration})', [
'token' => $room->getToken(),
'flags' => $flags,
'users' => print_r($sessionIds, true),
'users' => $changeAll ? 'all' : print_r($sessionIds, true),
'duration' => sprintf('%.2f', $duration),
'app' => 'spreed-hpb',
]);
Expand Down
3 changes: 2 additions & 1 deletion lib/Signaling/Listener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,8 @@ protected static function registerExternalSignaling(IEventDispatcher $dispatcher
$notifier->roomInCallChanged(
$event->getRoom(),
$event->getNewValue(),
$sessionIds
[],
true
);
});

Expand Down
3 changes: 2 additions & 1 deletion lib/Signaling/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ public function isCompatibleSignalingServer(IResponse $response): bool {
$featureHeader = $response->getHeader(self::FEATURE_HEADER);
$features = explode(',', $featureHeader);
$features = array_map('trim', $features);
return in_array('audio-video-permissions', $features, true);
return in_array('audio-video-permissions', $features, true)
&& in_array('incall-all', $features, true);
}

public function getSignalingServerLinkForConversation(?Room $room): string {
Expand Down
14 changes: 12 additions & 2 deletions src/utils/signaling.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,7 +977,7 @@ Signaling.Standalone.prototype.helloResponseReceived = function(data) {
}
}

if (!this.hasFeature('audio-video-permissions')) {
if (!this.hasFeature('audio-video-permissions') || !this.hasFeature('incall-all')) {
showError(
t('spreed', 'The configured signaling server needs to be updated to be compatible with this version of Talk. Please contact your administrator.'),
{
Expand Down Expand Up @@ -1280,7 +1280,17 @@ Signaling.Standalone.prototype.processRoomListEvent = function(data) {
Signaling.Standalone.prototype.processRoomParticipantsEvent = function(data) {
switch (data.event.type) {
case 'update':
this._trigger('usersChanged', [data.event.update.users || []])
if (data.event.update.all) {
// With `"all": true`
if (data.event.update.incall === 0) {
this._trigger('allUsersChangedInCallToDisconnected')
} else {
console.error('Unknown room participant event', data)
}
} else {
// With updated user list
this._trigger('usersChanged', [data.event.update.users || []])
}
this._trigger('participantListChanged')
break
case 'flags':
Expand Down
9 changes: 9 additions & 0 deletions src/utils/webrtc/webrtc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,15 @@ export default function initWebRtc(signaling, _callParticipantCollection, _local
})
usersInCallChanged(signaling, usersInCallMapping)
})
signaling.on('allUsersChangedInCallToDisconnected', function() {
if (!localUserInCall) {
return
}

// "End meeting for all" was used, we don't have a user list but everyone disconnects from the call
usersInCallMapping = {}
usersInCallChanged(signaling, usersInCallMapping)
})
signaling.on('participantFlagsChanged', function(event) {
/**
* event {
Expand Down