Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Disconnect from video rooms when leaving #8500

Merged
merged 3 commits into from
May 4, 2022
Merged

Disconnect from video rooms when leaving #8500

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc07b69
Disconnect from video rooms when leaving
robintown May 4, 2022
3201bbe
Listen on the specific room
robintown May 4, 2022
54b00bf
Fix lints
robintown May 4, 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
12 changes: 11 additions & 1 deletion src/stores/VideoChannelStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ limitations under the License.
*/

import EventEmitter from "events";
import { Room, RoomEvent } from "matrix-js-sdk/src/models/room";
import { ClientWidgetApi, IWidgetApiRequest } from "matrix-widget-api";

import defaultDispatcher from "../dispatcher/dispatcher";
Expand Down Expand Up @@ -193,6 +194,7 @@ export default class VideoChannelStore extends AsyncStoreWithClient<null> {

this.connected = true;
messaging.once(`action:${ElementWidgetActions.HangupCall}`, this.onHangup);
this.matrixClient.getRoom(roomId).on(RoomEvent.MyMembership, this.onMyMembership);
window.addEventListener("beforeunload", this.setDisconnected);

this.emit(VideoChannelEvent.Connect, roomId);
Expand All @@ -214,11 +216,13 @@ export default class VideoChannelStore extends AsyncStoreWithClient<null> {
};

public setDisconnected = async () => {
const roomId = this.roomId;

this.activeChannel.off(`action:${ElementWidgetActions.HangupCall}`, this.onHangup);
this.activeChannel.off(`action:${ElementWidgetActions.CallParticipants}`, this.onParticipants);
this.matrixClient.getRoom(roomId).off(RoomEvent.MyMembership, this.onMyMembership);
window.removeEventListener("beforeunload", this.setDisconnected);

const roomId = this.roomId;
this.activeChannel = null;
this.roomId = null;
this.connected = false;
Expand All @@ -242,6 +246,8 @@ export default class VideoChannelStore extends AsyncStoreWithClient<null> {

private updateDevices = async (roomId: string, fn: (devices: string[]) => string[]) => {
const room = this.matrixClient.getRoom(roomId);
if (room.getMyMembership() !== "join") return;

const devicesState = room.currentState.getStateEvents(VIDEO_CHANNEL_MEMBER, this.matrixClient.getUserId());
const devices = devicesState?.getContent<IVideoChannelMemberContent>()?.devices ?? [];

Expand Down Expand Up @@ -280,4 +286,8 @@ export default class VideoChannelStore extends AsyncStoreWithClient<null> {
this.videoMuted = false;
this.ack(ev);
};

private onMyMembership = (room: Room, membership: string) => {
if (membership !== "join") this.setDisconnected();
};
}