* Improve accessibility and testability of Tooltip Adding a role to Tooltip was motivated by React Testing Library's reliance on accessibility-related attributes to locate elements. * Make the ReadyWatchingStore constructor safer The ReadyWatchingStore constructor previously had a chance to immediately call onReady, which was dangerous because it was potentially calling the derived class's onReady at a point when the derived class hadn't even finished construction yet. In normal usage, I guess this never was a problem, but it was causing some of the tests I was writing to crash. This is solved by separating out the onReady call into a start method. * Rename 1:1 call components to 'LegacyCall' to reflect the fact that they're slated for removal, and to not clash with the new Call code. * Refactor VideoChannelStore into Call and CallStore Call is an abstract class that currently only has a Jitsi implementation, but this will make it easy to later add an Element Call implementation. * Remove WidgetReady, ClientReady, and ForceHangupCall hacks These are no longer used by the new Jitsi call implementation, and can be removed. * yarn i18n * Delete call map entries instead of inserting nulls * Allow multiple active calls and consolidate call listeners * Fix a race condition when creating a video room * Un-hardcode the media device fallback labels * Apply misc code review fixes * yarn i18n * Disconnect from calls more politely on logout * Fix some strict mode errors * Fix another updateRoom race condition
96 lines
3.3 KiB
TypeScript
96 lines
3.3 KiB
TypeScript
/*
|
|
* Copyright 2021 - 2022 The Matrix.org Foundation C.I.C.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
import { MatrixClient } from "matrix-js-sdk/src/client";
|
|
import { SyncState } from "matrix-js-sdk/src/sync";
|
|
import { Dispatcher } from "flux";
|
|
import { EventEmitter } from "events";
|
|
|
|
import { MatrixClientPeg } from "../MatrixClientPeg";
|
|
import { ActionPayload } from "../dispatcher/payloads";
|
|
import { IDestroyable } from "../utils/IDestroyable";
|
|
import { Action } from "../dispatcher/actions";
|
|
|
|
export abstract class ReadyWatchingStore extends EventEmitter implements IDestroyable {
|
|
protected matrixClient: MatrixClient;
|
|
private dispatcherRef: string | null = null;
|
|
|
|
constructor(protected readonly dispatcher: Dispatcher<ActionPayload>) {
|
|
super();
|
|
}
|
|
|
|
public async start(): Promise<void> {
|
|
this.dispatcherRef = this.dispatcher.register(this.onAction);
|
|
|
|
const matrixClient = MatrixClientPeg.get();
|
|
if (matrixClient) {
|
|
this.matrixClient = matrixClient;
|
|
await this.onReady();
|
|
}
|
|
}
|
|
|
|
public get mxClient(): MatrixClient {
|
|
return this.matrixClient; // for external readonly access
|
|
}
|
|
|
|
public useUnitTestClient(cli: MatrixClient) {
|
|
this.matrixClient = cli;
|
|
}
|
|
|
|
public destroy() {
|
|
if (this.dispatcherRef !== null) this.dispatcher.unregister(this.dispatcherRef);
|
|
}
|
|
|
|
protected async onReady() {
|
|
// Default implementation is to do nothing.
|
|
}
|
|
|
|
protected async onNotReady() {
|
|
// Default implementation is to do nothing.
|
|
}
|
|
|
|
protected onDispatcherAction(payload: ActionPayload) {
|
|
// Default implementation is to do nothing.
|
|
}
|
|
|
|
private onAction = async (payload: ActionPayload) => {
|
|
this.onDispatcherAction(payload);
|
|
|
|
if (payload.action === 'MatrixActions.sync') {
|
|
// Only set the client on the transition into the PREPARED state.
|
|
// Everything after this is unnecessary (we only need to know once we have a client)
|
|
// and we intentionally don't set the client before this point to avoid stores
|
|
// updating for every event emitted during the cached sync.
|
|
if (
|
|
payload.prevState !== SyncState.Prepared
|
|
&& payload.state === SyncState.Prepared
|
|
&& this.matrixClient !== payload.matrixClient
|
|
) {
|
|
if (this.matrixClient) {
|
|
await this.onNotReady();
|
|
}
|
|
this.matrixClient = payload.matrixClient;
|
|
await this.onReady();
|
|
}
|
|
} else if (payload.action === 'on_client_not_viable' || payload.action === Action.OnLoggedOut) {
|
|
if (this.matrixClient) {
|
|
await this.onNotReady();
|
|
this.matrixClient = null;
|
|
}
|
|
}
|
|
};
|
|
}
|