Merge remote-tracking branch 'origin/lotus' into fix/call-disconnected-bar
# Conflicts: # src/app/components/CallEmbedProvider.tsx
This commit is contained in:
@@ -94,6 +94,13 @@ export class CallControl extends EventEmitter implements CallControlState {
|
||||
|
||||
constructor(state: CallControlState, call: ClientWidgetApi, iframe: HTMLIFrameElement) {
|
||||
super();
|
||||
// [Gitea #316] More than 10 call features subscribe to state_update at once
|
||||
// (call bar, controls, hotkeys, AFK, muted-talk, join/leave sounds,
|
||||
// announcements, rejoin, policy toast, glance, desktop thumbbar/SMTC …).
|
||||
// Hitting the default limit logged a MaxListenersExceededWarning, and the
|
||||
// console then kept this CallControl — and through it the whole Element Call
|
||||
// document — alive: ~11 MB leaked per call. These are not leaks, so lift it.
|
||||
this.setMaxListeners(100);
|
||||
|
||||
this.state = state;
|
||||
this.call = call;
|
||||
|
||||
@@ -218,6 +218,9 @@ export class CallEmbed {
|
||||
// - transparent background so the room wallpaper shows through natively
|
||||
lotusCallState: 'true',
|
||||
lotusTransparent: 'true',
|
||||
// [Gitea #293] the fork applies the theme with transparency anyway, and
|
||||
// warned in every call that lotusTheme wasn't set
|
||||
lotusTheme: 'true',
|
||||
// [Gitea #43] The fork hides its own footer (we draw the call bar) and
|
||||
// sets its root color-scheme from the theme, instead of us injecting CSS.
|
||||
lotusHostControls: 'true',
|
||||
|
||||
@@ -28,7 +28,10 @@ import {
|
||||
} from 'matrix-js-sdk';
|
||||
import { getCallCapabilities } from './utils';
|
||||
import { downloadMedia, mxcUrlToHttp } from '../../utils/matrix';
|
||||
import { dedupeInFlight } from '../../utils/inFlight';
|
||||
|
||||
/** A little longer than Element Call's own 2 s timeout for a restart. */
|
||||
const RESTART_TIMEOUT_MS = 5000;
|
||||
export class CallWidgetDriver extends WidgetDriver {
|
||||
private allowedCapabilities: Set<Capability>;
|
||||
|
||||
@@ -129,8 +132,18 @@ export class CallWidgetDriver extends WidgetDriver {
|
||||
await this.mx._unstable_cancelScheduledDelayedEvent(delayId);
|
||||
}
|
||||
|
||||
// [Gitea #318] While the homeserver is stalled, Element Call times out each
|
||||
// restart locally after 2 s and asks again, so requests for the same delay
|
||||
// id piled up and hit the server together on recovery (404s, then 429s).
|
||||
// Share one in-flight restart per id, and give it a timeout of its own.
|
||||
private readonly restartOnce = dedupeInFlight<unknown>();
|
||||
|
||||
public async restartScheduledDelayedEvent(delayId: string): Promise<void> {
|
||||
await this.mx._unstable_restartScheduledDelayedEvent(delayId);
|
||||
await this.restartOnce(delayId, () =>
|
||||
this.mx._unstable_restartScheduledDelayedEvent(delayId, {
|
||||
localTimeoutMs: RESTART_TIMEOUT_MS,
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
public async sendScheduledDelayedEvent(delayId: string): Promise<void> {
|
||||
|
||||
Reference in New Issue
Block a user