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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(electron) make detecting if the iframe was loaded more resilient #1055

Merged
merged 1 commit into from
Nov 30, 2023
Merged

fix(electron) make detecting if the iframe was loaded more resilient #1055

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions spot-client/src/spot-tv/ui/components/meeting-frame/JitsiMeetingFrame/JitsiMeetingFrame.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,15 @@ export class JitsiMeetingFrame extends AbstractMeetingFrame {
TOOLBAR_BUTTONS: []
},
jwt: this.props.jwt,
onload: this._onMeetingLoaded,
parentNode: this._meetingContainer,
roomName: meetingName
});

// Detect frame load more resiliently. Technically the `onload` option works
// in recent releases, but this works with older ones too.
this._jitsiApi.addListener('browserSupport', this._onMeetingLoaded);
this._jitsiApi.addListener('ready', this._onMeetingLoaded);

this._jitsiApi.addListener(
'audioMuteStatusChanged', this._onAudioMuteChange);
this._jitsiApi.addListener(
Expand Down Expand Up @@ -267,15 +271,6 @@ export class JitsiMeetingFrame extends AbstractMeetingFrame {
* @returns {void}
*/
_leaveIfErrorDetected() {
// TODO: implement smarter detection of iframe errors. Currently there
// is no hook within the jitsi iframe api to know if the meeting
// encountered an error. There may also be no definitive way to know if
// the user has proceeded to an erroneous, non-meeting page or if a page
// failed to load (404).
if (this._meetingLoaded && this._meetingJoined) {
return;
}

logger.error('error while loading meeting', {
iFrameLoaded: this._meetingLoaded,
meetingJoined: this._meetingJoined
Expand Down Expand Up @@ -422,6 +417,8 @@ export class JitsiMeetingFrame extends AbstractMeetingFrame {
* @returns {void}
*/
_onMeetingJoined() {
clearTimeout(this._assumeMeetingFailedTimeout);

this._meetingJoined = true;

this._enableApiHealthChecks(() => this._jitsiApi.isVideoMuted());
Expand Down Expand Up @@ -555,13 +552,16 @@ export class JitsiMeetingFrame extends AbstractMeetingFrame {

/**
* Sets the internal flag for the jitsi iframe api having loaded the page.
* This event fires no matter the state of the page load, for example on
* 404.
*
* @private
* @returns {void}
*/
_onMeetingLoaded() {
// We are adding 2 ways to detect loading so this might trigger twice.
if (this._meetingLoaded) {
return;
}

logger.log('meeting iframe loaded meeting page');

this._meetingLoaded = true;
Expand Down
Loading