mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 18:21:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Tell widgets to terminate gracefully in AppTile:_endWidgetActions

Browse source 
If the widget fails to terminate in two seconds, proceed with disposing
the iframe nevertheless.

This allows e.g. Jitsi to hangup the conference when minimizing the
widget, instead of abrupt disconnect that can leave ghost users behind.

Signed-off-by: Pauli Virtanen <pav@iki.fi>
This commit is contained in:
Pauli Virtanen 2020-04-18 14:53:48 +03:00
parent 1f2bf0485e
commit 4fac781051
1 changed files with 43 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
src/components/views/elements/AppTile.js
View file

@ -340,23 +340,30 @@ export default class AppTile extends React.Component {
/** /**
* Ends all widget interaction, such as cancelling calls and disabling webcams. * Ends all widget interaction, such as cancelling calls and disabling webcams.
* @private * @private
* @returns {Promise<*>} Resolves when the widget is terminated, or timeout passed.
*/ */
_endWidgetActions() { _endWidgetActions() {
// HACK: This is a really dirty way to ensure that Jitsi cleans up const timeout = 2000;
// its hold on the webcam. Without this, the widget holds a media const timeoutPromise = new Promise(resolve => setTimeout(resolve, timeout));
// stream open, even after death. See https://github.com/vector-im/riot-web/issues/7351 const messaging = ActiveWidgetStore.getWidgetMessaging(this.props.app.id);
if (this._appFrame.current) {
// In practice we could just do `+= ''` to trick the browser
// into thinking the URL changed, however I can foresee this
// being optimized out by a browser. Instead, we'll just point
// the iframe at a page that is reasonably safe to use in the
// event the iframe doesn't wink away.
// This is relative to where the Riot instance is located.
this._appFrame.current.src = 'about:blank';
}
// Delete the widget from the persisted store for good measure. return Promise.race([messaging.terminate(), timeoutPromise]).finally(() => {
PersistedElement.destroyElement(this._persistKey); // HACK: This is a really dirty way to ensure that Jitsi cleans up
// its hold on the webcam. Without this, the widget holds a media
// stream open, even after death. See https://github.com/vector-im/riot-web/issues/7351
if (this._appFrame.current) {
// In practice we could just do `+= ''` to trick the browser
// into thinking the URL changed, however I can foresee this
// being optimized out by a browser. Instead, we'll just point
// the iframe at a page that is reasonably safe to use in the
// event the iframe doesn't wink away.
// This is relative to where the Riot instance is located.
this._appFrame.current.src = 'about:blank';
}
// Delete the widget from the persisted store for good measure.
PersistedElement.destroyElement(this._persistKey);
});
} }
/* If user has permission to modify widgets, delete the widget, /* If user has permission to modify widgets, delete the widget,
@ -380,21 +387,21 @@ export default class AppTile extends React.Component {
} }
this.setState({deleting: true}); this.setState({deleting: true});
this._endWidgetActions(); this._endWidgetActions().then(() => {
WidgetUtils.setRoomWidget(
this.props.room.roomId,
this.props.app.id,
).catch((e) => {
console.error('Failed to delete widget', e);
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
WidgetUtils.setRoomWidget( Modal.createTrackedDialog('Failed to remove widget', '', ErrorDialog, {
this.props.room.roomId, title: _t('Failed to remove widget'),
this.props.app.id, description: _t('An error ocurred whilst trying to remove the widget from the room'),
).catch((e) => { });
console.error('Failed to delete widget', e); }).finally(() => {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); this.setState({deleting: false});
Modal.createTrackedDialog('Failed to remove widget', '', ErrorDialog, {
title: _t('Failed to remove widget'),
description: _t('An error ocurred whilst trying to remove the widget from the room'),
}); });
}).finally(() => {
this.setState({deleting: false});
}); });
}, },
}); });
@ -545,13 +552,18 @@ export default class AppTile extends React.Component {
if (this.props.userWidget) { if (this.props.userWidget) {
this._onMinimiseClick(); this._onMinimiseClick();
} else { } else {
let promise;
if (this.props.show) { if (this.props.show) {
// if we were being shown, end the widget as we're about to be minimized. // if we were being shown, end the widget as we're about to be minimized.
this._endWidgetActions(); promise = this._endWidgetActions();
} else {
promise = Promise.resolve();
} }
dis.dispatch({ promise.then(() => {
action: 'appsDrawer', dis.dispatch({
show: !this.props.show, action: 'appsDrawer',
show: !this.props.show,
});
}); });
} }
} }