Skip to content

[FIX] Jitsi integration sending random "join now" messages #22277

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
pierre-lehnen-rc merged 5 commits into from
Jun 15, 2021
Merged

[FIX] Jitsi integration sending random "join now" messages #22277

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
44467db
[FIX] Jitsi integration sending random "join now" messages
pierre-lehnen-rc Jun 8, 2021
cffb645
Merge branch 'develop' into fix.jitsi-integration-messages
pierre-lehnen-rc Jun 8, 2021
2bca60c
Changed the new param to be true by default
pierre-lehnen-rc Jun 10, 2021
4f60fa4
Merge branch 'fix.jitsi-integration-messages' of github.com:RocketCha…
pierre-lehnen-rc Jun 10, 2021
059e028
Merge branch 'develop' into fix.jitsi-integration-messages
pierre-lehnen-rc Jun 15, 2021
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
4 changes: 2 additions & 2 deletions app/api/server/v1/video-conference.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { API } from '../api';

API.v1.addRoute('video-conference/jitsi.update-timeout', { authRequired: true }, {
post() {
const { roomId } = this.bodyParams;
const { roomId, joiningNow = true } = this.bodyParams;
if (!roomId) {
return API.v1.failure('The "roomId" parameter is required!');
}
Expand All @@ -15,7 +15,7 @@ API.v1.addRoute('video-conference/jitsi.update-timeout', { authRequired: true },
return API.v1.failure('Room does not exist!');
}

const jitsiTimeout = Meteor.runAsUser(this.userId, () => Meteor.call('jitsi:updateTimeout', roomId));
const jitsiTimeout = Meteor.runAsUser(this.userId, () => Meteor.call('jitsi:updateTimeout', roomId, Boolean(joiningNow)));

return API.v1.success({ jitsiTimeout });
},
Expand Down
4 changes: 2 additions & 2 deletions app/videobridge/server/methods/jitsiSetTimeout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { canSendMessage } from '../../../authorization/server';
import { SystemLogger } from '../../../logger/server';

Meteor.methods({
'jitsi:updateTimeout': (rid) => {
'jitsi:updateTimeout': (rid, joiningNow = true) => {
if (!Meteor.userId()) {
throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'jitsi:updateTimeout' });
}
Expand All @@ -36,7 +36,7 @@ Meteor.methods({
Rooms.setJitsiTimeout(rid, nextTimeOut);
}

if (!jitsiTimeout || currentTime > jitsiTimeout) {
if (joiningNow && (!jitsiTimeout || currentTime > jitsiTimeout)) {
metrics.messagesSent.inc(); // TODO This line needs to be moved to it's proper place. See the comments on: https://github.com/RocketChat/Rocket.Chat/pull/5736

const message = Messages.createWithTypeRoomIdMessageAndUser('jitsi_call_started', rid, '', Meteor.user(), {
Expand Down
17 changes: 13 additions & 4 deletions client/views/room/contextualBar/Call/Jitsi/CallJitsWithData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,24 +124,28 @@ const CallJitsWithData = ({ rid }) => {
if (jitsi.window?.closed) {
return jitsi.dispose();
}
return updateTimeout(rid);
return updateTimeout(rid, false);
}
if (new Date() - new Date(room.jitsiTimeout) > TIMEOUT) {
return jitsi.dispose();
}

if (new Date() - new Date(room.jitsiTimeout) + TIMEOUT > DEBOUNCE) {
return updateTimeout(rid);
return updateTimeout(rid, false);
}
});

useEffect(() => {
if (!accepted || !jitsi) {
return;
}
jitsi.start(ref.current);

updateTimeout(rid);
if (jitsi.needsStart) {
jitsi.start(ref.current);
updateTimeout(rid, true);
} else {
updateTimeout(rid, false);
}

jitsi.on('HEARTBEAT', testAndHandleTimeout);
const none = () => {};
Expand All @@ -154,7 +158,12 @@ const CallJitsWithData = ({ rid }) => {
}, [accepted, jitsi, rid, testAndHandleTimeout, updateTimeout]);

const handleYes = useMutableCallback(() => {
if (jitsi) {
jitsi.needsStart = true;
}

setAccepted(true);

if (openNewWindow) {
handleClose();
}
Expand Down
8 changes: 8 additions & 0 deletions client/views/room/contextualBar/Call/Jitsi/lib/JitsiBridge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,16 @@ export class JitsiBridge extends Emitter {
this.name = name;
this.heartbeat = heartbeat;
this.window = undefined;
this.needsStart = false;
}

start(domTarget) {
if (!this.needsStart) {
return;
}

this.needsStart = false;

const heartbeatTimer = setInterval(() => this.emit('HEARTBEAT', true), this.heartbeat);
this.once('dispose', () => clearTimeout(heartbeatTimer));

Expand Down Expand Up @@ -66,6 +73,7 @@ export class JitsiBridge extends Emitter {

const width = 'auto';
const height = 500;

const api = new JitsiMeetExternalAPI(
domain,
jitsiRoomName,
Expand Down