Merge remote-tracking branch 'origin/lotus' into fix/audio-output-frame-ids

src/app/plugins/call/CallControl.ts

@@ -112,6 +112,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;

src/app/plugins/call/CallEmbed.ts

@@ -31,6 +31,7 @@ import { verifyDenoiseAssets } from './denoiseSmokeCheck';
 import { canDelegateCapability } from './utils';
 import { getCallPageUrl } from './callPageUrl';
 import { restrictWidgetMessages } from '../widgetTransport';
+import { isRingableRoom } from '../../utils/callRing';
 
 // Maximum time to wait for the embedded Element Call iframe to progress from
 // initial load to a ready/joined state. If it hasn't by then, we assume the
@@ -217,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',
@@ -251,8 +255,18 @@ export class CallEmbed {
       verifyDenoiseAssets(denoiseModel).catch(() => undefined);
     }
 
+    // [Gitea #295] Only ask Element Call to notify where a call can ring at all
+    // (DMs, invite-only groups outside a space). In a voice channel or space
+    // room the notification carries an @room mention, so every member got a
+    // highlighted ping (and phone push) whenever a moderator hopped in, and
+    // other clients showed it as a missed call.
+    // `none` needs element-call-embedded ≥ 0.25.0-lotus.23 (older builds ignore it).
     if (CallEmbed.startingCall(intent)) {
-      params.append('sendNotificationType', CallEmbed.dmCall(intent) ? 'ring' : 'notification');
+      let notify = 'none';
+      if (isRingableRoom(room, CallEmbed.dmCall(intent))) {
+        notify = CallEmbed.dmCall(intent) ? 'ring' : 'notification';
+      }
+      params.append('sendNotificationType', notify);
     }
 
     // [Gitea #43] On its own origin when config.json sets elementCallUrl.

src/app/plugins/call/CallWidgetDriver.ts

@@ -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> {