fix(calls): one delayed-event restart in flight per id, with a timeout (#318)

During a homeserver stall Element Call retries update_delayed_event every
2 s, and the host opened a new HTTP request each time: 12 pending in a
60 s stall, all landing together on recovery (404 x5, 429 x7). Share the
in-flight restart per delay id and abort it after 5 s.

Refs #318

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017PCb59uY3UKqDqt7B6hzd5

package-lock.json

@@ -81,7 +81,7 @@
       },
       "devDependencies": {
         "@axe-core/playwright": "4.13.0",
-        "@lotusguild/element-call-embedded": "0.25.0-lotus.23",
+        "@lotusguild/element-call-embedded": "0.25.0-lotus.22",
         "@playwright/test": "1.63.0",
         "@rollup/plugin-inject": "5.0.5",
         "@rollup/plugin-wasm": "6.2.2",
@@ -2695,9 +2695,9 @@
       "integrity": "sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA=="
     },
     "node_modules/@lotusguild/element-call-embedded": {
-      "version": "0.25.0-lotus.23",
+      "version": "0.25.0-lotus.22",
-      "resolved": "https://code.lotusguild.org/api/packages/LotusGuild/npm/%40lotusguild%2Felement-call-embedded/-/0.25.0-lotus.23/element-call-embedded-0.25.0-lotus.23.tgz",
+      "resolved": "https://code.lotusguild.org/api/packages/LotusGuild/npm/%40lotusguild%2Felement-call-embedded/-/0.25.0-lotus.22/element-call-embedded-0.25.0-lotus.22.tgz",
-      "integrity": "sha512-vRmcWeJcU0Accyl2x3mqNEzrIe8djE5BekyYbYOSCsMflC98rZgD1mO7KOe7bA1cX7gparRf6sAt1fotHoU+bA==",
+      "integrity": "sha512-AimDKZA4xUKEEyl2XUFUSUDl03tBKFv88T/3igKyH2VqNSPMGnqcQJC5HXIkHLTWrOmg8kLcJ//FFbqlUZiLcA==",
       "dev": true
     },
     "node_modules/@matrix-org/matrix-sdk-crypto-wasm": {

package.json

@@ -108,7 +108,7 @@
   },
   "devDependencies": {
     "@axe-core/playwright": "4.13.0",
-    "@lotusguild/element-call-embedded": "0.25.0-lotus.23",
+    "@lotusguild/element-call-embedded": "0.25.0-lotus.22",
     "@playwright/test": "1.63.0",
     "@rollup/plugin-inject": "5.0.5",
     "@rollup/plugin-wasm": "6.2.2",

src/app/components/AccountDataEditor.tsx

@@ -297,7 +297,7 @@ export function AccountDataEditor({
             </Chip>
           </Box>
           <Box shrink="No">
-            <IconButton type="button" onClick={requestClose} variant="Surface" aria-label="Close">
+            <IconButton onClick={requestClose} variant="Surface" aria-label="Close">
               <Icon src={Icons.Cross} />
             </IconButton>
           </Box>

src/app/components/DeviceVerificationSetup.tsx

@@ -315,7 +315,7 @@ export const DeviceVerificationSetup = forwardRef<HTMLDivElement, DeviceVerifica
               Setup Device Verification
             </Text>
           </Box>
-          <IconButton type="button" size="300" radii="300" onClick={onCancel} aria-label="Cancel">
+          <IconButton size="300" radii="300" onClick={onCancel} aria-label="Cancel">
             <Icon src={Icons.Cross} />
           </IconButton>
         </Header>
@@ -361,7 +361,7 @@ export const DeviceVerificationReset = forwardRef<HTMLDivElement, DeviceVerifica
               Reset Device Verification
             </Text>
           </Box>
-          <IconButton type="button" size="300" radii="300" onClick={onCancel} aria-label="Cancel">
+          <IconButton size="300" radii="300" onClick={onCancel} aria-label="Cancel">
             <Icon src={Icons.Cross} />
           </IconButton>
         </Header>

src/app/components/create-room/utils.ts

@@ -139,11 +139,8 @@ export const createRoom = async (mx: MatrixClient, data: CreateRoomData): Promis
       data.allowFederation,
       data.additionalCreators,
     ),
-    // [Gitea #328] Every non-space room gets call.member at user level, not just
+    power_level_content_override:
-    // voice rooms: the call button is shown in private group rooms too, and with
+      data.type === RoomType.Call ? createVoiceRoomPowerLevelsOverride() : undefined,
-    // Synapse's state_default (50) only admins could start or join a call there
-    // ("You don't have permission to join!").
-    power_level_content_override: createVoiceRoomPowerLevelsOverride(),
     initial_state: initialState,
   };
 

src/app/features/common-settings/developer-tools/StateEventEditor.tsx

@@ -275,7 +275,7 @@ export function StateEventEditor({ type, stateKey, requestClose }: StateEventEdi
             </Chip>
           </Box>
           <Box shrink="No">
-            <IconButton type="button" onClick={requestClose} variant="Surface" aria-label="Close">
+            <IconButton onClick={requestClose} variant="Surface" aria-label="Close">
               <Icon src={Icons.Cross} />
             </IconButton>
           </Box>

src/app/features/room/PollCreator.tsx

@@ -143,7 +143,7 @@ export function PollCreator({ roomId, threadRootId, onClose }: PollCreatorProps)
                   Create Poll
                 </Text>
               </Box>
-              <IconButton type="button" size="300" radii="300" onClick={onClose} aria-label="Close">
+              <IconButton size="300" radii="300" onClick={onClose} aria-label="Close">
                 <Icon src={Icons.Cross} />
               </IconButton>
             </Header>

src/app/features/room/ReportRoomModal.tsx

@@ -118,7 +118,7 @@ export function ReportRoomModal({ roomId, onClose }: ReportRoomModalProps) {
                   Report Room
                 </Text>
               </Box>
-              <IconButton type="button" size="300" onClick={onClose} radii="300" aria-label="Close">
+              <IconButton size="300" onClick={onClose} radii="300" aria-label="Close">
                 <Icon src={Icons.Cross} />
               </IconButton>
             </Header>

src/app/features/room/ReportUserModal.tsx

@@ -124,7 +124,7 @@ export function ReportUserModal({ userId, onClose }: ReportUserModalProps) {
                   Report User
                 </Text>
               </Box>
-              <IconButton type="button" size="300" onClick={onClose} radii="300" aria-label="Close">
+              <IconButton size="300" onClick={onClose} radii="300" aria-label="Close">
                 <Icon src={Icons.Cross} />
               </IconButton>
             </Header>

src/app/features/room/ScheduleMessageModal.tsx

@@ -202,7 +202,7 @@ export function ScheduleMessageModal({
                   {title}
                 </Text>
               </Box>
-              <IconButton type="button" size="300" radii="300" onClick={onClose} aria-label="Close">
+              <IconButton size="300" radii="300" onClick={onClose} aria-label="Close">
                 <Icon src={Icons.Cross} />
               </IconButton>
             </Header>

src/app/features/room/message/Message.tsx

@@ -725,13 +725,7 @@ export const MessageDeleteItem = as<
                     Delete Message
                   </Text>
                 </Box>
-                <IconButton
+                <IconButton size="300" onClick={handleClose} radii="300" aria-label="Close">
-                  type="button"
-                  size="300"
-                  onClick={handleClose}
-                  radii="300"
-                  aria-label="Close"
-                >
                   <Icon src={Icons.Cross} />
                 </IconButton>
               </Header>
@@ -871,13 +865,7 @@ export const MessageReportItem = as<
                     Report Message
                   </Text>
                 </Box>
-                <IconButton
+                <IconButton size="300" onClick={handleClose} radii="300" aria-label="Close">
-                  type="button"
-                  size="300"
-                  onClick={handleClose}
-                  radii="300"
-                  aria-label="Close"
-                >
                   <Icon src={Icons.Cross} />
                 </IconButton>
               </Header>

src/app/features/room/message/Reactions.tsx

@@ -69,15 +69,8 @@ export const Reactions = as<'div', ReactionsProps>(
     const measure = useCallback(() => {
       const container = containerRef.current;
       if (!container) return;
-      // [Gitea #305] The width the chips actually get (content box). The border
+      const rowWidth = container.getBoundingClientRect().width;
-      // box grows by 4 px while collapsed (margin -2 / padding 2), and measuring
+      const gap = parseFloat(getComputedStyle(container).columnGap) || 8;
-      // it made a row within 4 px of fitting flip collapsed↔expanded every frame.
-      const cs = getComputedStyle(container);
-      const rowWidth =
-        container.clientWidth -
-        (parseFloat(cs.paddingLeft) || 0) -
-        (parseFloat(cs.paddingRight) || 0);
-      const gap = parseFloat(cs.columnGap) || 8;
       const chips = keys ? keys.split('\u0000').map((k) => chipRefs.current.get(k)) : [];
       const widths = chips.map((el) => el?.getBoundingClientRect().width ?? 0);
       const moreWidth = moreRef.current?.getBoundingClientRect().width ?? 48;
@@ -117,21 +110,8 @@ export const Reactions = as<'div', ReactionsProps>(
         style={{
           ...props.style,
           ...(collapsed && rowHeight
-            ? // 2px breathing room so row-1 focus outlines are not clipped. Longhand
+            ? // 2px breathing room so row-1 focus outlines are not clipped.
-              // margins so the timeline's marginTop survives (Gitea #305: the
+              { maxHeight: rowHeight + 4, overflow: 'hidden', padding: 2, margin: -2 }
-              // `margin` shorthand overrode it and, once removed, cleared it).
-              {
-                maxHeight: rowHeight + 4,
-                overflow: 'hidden',
-                padding: 2,
-                marginLeft: -2,
-                marginRight: -2,
-                marginBottom: -2,
-                marginTop:
-                  props.style?.marginTop !== undefined
-                    ? `calc(${typeof props.style.marginTop === 'number' ? `${props.style.marginTop}px` : props.style.marginTop} - 2px)`
-                    : -2,
-              }
             : {}),
         }}
         ref={(el) => {

src/app/features/shortcuts/KeyboardShortcutsDialog.tsx

@@ -25,9 +25,6 @@ import { settingsAtom } from '../../state/settings';
 import { isMacOS } from '../../utils/user-agent';
 import { KeySymbol } from '../../utils/key-symbol';
 import * as css from './KeyboardShortcutsDialog.css';
-import { BLOCK_HOTKEYS, INLINE_HOTKEYS } from '../../components/editor/keyboard';
-import { MarkType } from '../../components/editor/types';
-import { BLOCK_LABELS, MARK_LABELS, hotkeyKeys, keyCodeLabel } from './shortcutLabels';
 
 /** Global open-state for the keyboard shortcuts help dialog. */
 export const keyboardShortcutsDialogAtom = atom<boolean>(false);
@@ -101,9 +98,6 @@ export function KeyboardShortcutsDialog() {
   const { open, closeDialog } = useKeyboardShortcutsDialog();
   const modalStyle = useModalStyle(480);
   const [enterForNewline] = useSetting(settingsAtom, 'enterForNewline');
-  const [pttMode] = useSetting(settingsAtom, 'pttMode');
-  const [pttKey] = useSetting(settingsAtom, 'pttKey');
-  const [deafenKey] = useSetting(settingsAtom, 'deafenKey');
 
   const modKey = isMacOS() ? KeySymbol.Command : 'Ctrl';
 
@@ -115,8 +109,6 @@ export function KeyboardShortcutsDialog() {
       rows: [
         { description: 'Show keyboard shortcuts', keys: ['?'] },
         { description: 'Close open panel, otherwise mark room as read', keys: [KeySymbol.Escape] },
-        // [Gitea #334] the quick switcher / search was missing
-        { description: 'Quick switcher: jump to a room or person', keys: [modKey, 'K'] },
       ],
     },
     {
@@ -132,26 +124,6 @@ export function KeyboardShortcutsDialog() {
           keys: enterForNewline ? ['Enter'] : [KeySymbol.Shift, 'Enter'],
         },
         { description: 'Send message (always)', keys: [modKey, 'Enter'] },
-        { description: 'Edit your last message (empty composer)', keys: ['↑'] },
-      ],
-    },
-    {
-      // [Gitea #334] generated from the editor's own bindings so they can't drift
-      title: 'Composer formatting',
-      rows: [
-        ...Object.entries(INLINE_HOTKEYS).map(([hotkey, mark]) => ({
-          description:
-            mark === MarkType.StrikeThrough
-              ? `${MARK_LABELS[mark]} (not the browser's Save)`
-              : MARK_LABELS[mark],
-          keys: hotkeyKeys(hotkey, modKey),
-        })),
-        { description: 'Heading 1 / 2 / 3', keys: [modKey, '1 / 2 / 3'] },
-        ...Object.entries(BLOCK_HOTKEYS).map(([hotkey, block]) => ({
-          description: BLOCK_LABELS[block] ?? block,
-          keys: hotkeyKeys(hotkey, modKey),
-        })),
-        { description: 'Clear formatting', keys: [modKey, 'E'] },
       ],
     },
     {
@@ -160,19 +132,6 @@ export function KeyboardShortcutsDialog() {
         { description: 'Reveal message actions (react, reply, more)', keys: ['Hover / focus'] },
       ],
     },
-    {
-      // [Gitea #334] the user's own bindings (Settings → Calls)
-      title: 'Calls',
-      rows: [
-        {
-          description: pttMode
-            ? 'Push to talk (hold)'
-            : 'Push to talk (hold; turn on in Settings → Calls)',
-          keys: [keyCodeLabel(pttKey)],
-        },
-        { description: 'Deafen / undeafen', keys: [keyCodeLabel(deafenKey)] },
-      ],
-    },
   ];
 
   return (

src/app/features/shortcuts/shortcutLabels.test.ts

@@ -1,16 +0,0 @@
-import { test } from 'node:test';
-import assert from 'node:assert/strict';
-import { hotkeyKeys, keyCodeLabel } from './shortcutLabels';
-
-test('hotkeyKeys (#334)', () => {
-  assert.deepEqual(hotkeyKeys('mod+b', 'Ctrl'), ['Ctrl', 'B']);
-  assert.deepEqual(hotkeyKeys("mod+'", '⌘'), ['⌘', "'"]);
-  assert.deepEqual(hotkeyKeys('mod+[', 'Ctrl'), ['Ctrl', '[']);
-});
-
-test('keyCodeLabel (#334)', () => {
-  assert.equal(keyCodeLabel('KeyM'), 'M');
-  assert.equal(keyCodeLabel('Digit1'), '1');
-  assert.equal(keyCodeLabel('Space'), 'Space');
-  assert.equal(keyCodeLabel(''), 'Not set');
-});

src/app/features/shortcuts/shortcutLabels.ts

@@ -1,29 +0,0 @@
-import { BlockType, MarkType } from '../../components/editor/types';
-
-/** Pure: an is-hotkey string ('mod+b', "mod+'") as keycap labels. */
-export const hotkeyKeys = (hotkey: string, modKey: string): string[] =>
-  hotkey.split('+').map((k) => (k === 'mod' ? modKey : k.length === 1 ? k.toUpperCase() : k));
-
-/** Pure: a KeyboardEvent.code ('KeyM', 'Digit1', 'Space') as a keycap label. */
-export const keyCodeLabel = (code: string | undefined): string => {
-  if (!code) return 'Not set';
-  if (/^Key[A-Z]$/.test(code)) return code.slice(3);
-  if (/^Digit\d$/.test(code)) return code.slice(5);
-  return code;
-};
-
-export const MARK_LABELS: Record<MarkType, string> = {
-  [MarkType.Bold]: 'Bold',
-  [MarkType.Italic]: 'Italic',
-  [MarkType.Underline]: 'Underline',
-  [MarkType.StrikeThrough]: 'Strikethrough',
-  [MarkType.Code]: 'Inline code',
-  [MarkType.Spoiler]: 'Spoiler',
-};
-
-export const BLOCK_LABELS: Partial<Record<BlockType, string>> = {
-  [BlockType.OrderedList]: 'Numbered list',
-  [BlockType.UnorderedList]: 'Bulleted list',
-  [BlockType.BlockQuote]: 'Quote',
-  [BlockType.CodeBlock]: 'Code block',
-};

src/app/plugins/call/CallEmbed.ts

@@ -31,7 +31,6 @@ 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
@@ -252,18 +251,8 @@ 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)) {
-      let notify = 'none';
+      params.append('sendNotificationType', CallEmbed.dmCall(intent) ? 'ring' : 'notification');
-      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> {

src/app/utils/inFlight.test.ts

@@ -0,0 +1,32 @@
+import { test } from 'node:test';
+import assert from 'node:assert/strict';
+import { dedupeInFlight } from './inFlight';
+
+test('dedupeInFlight: one request per key while pending, a new one after (#318)', async () => {
+  const once = dedupeInFlight<number>();
+  let calls = 0;
+  let release!: () => void;
+  const gate = new Promise<void>((r) => {
+    release = r;
+  });
+  const run = async () => {
+    calls += 1;
+    await gate;
+    return calls;
+  };
+  const a = once('d1', run);
+  const b = once('d1', run);
+  const c = once('d2', run);
+  assert.equal(a, b);
+  release();
+  assert.deepEqual(await Promise.all([a, b, c]), [2, 2, 2]);
+  assert.equal(calls, 2);
+  await once('d1', run);
+  assert.equal(calls, 3, 'settled requests are not reused');
+});
+
+test('dedupeInFlight: a rejection clears the key', async () => {
+  const once = dedupeInFlight<void>();
+  await assert.rejects(once('k', () => Promise.reject(new Error('boom'))));
+  await once('k', () => Promise.resolve());
+});

src/app/utils/inFlight.ts

@@ -0,0 +1,14 @@
+/**
+ * Share one in-flight promise per key: callers that ask again while a request
+ * for the same key is still pending get that request instead of a new one.
+ */
+export function dedupeInFlight<T>(): (key: string, run: () => Promise<T>) => Promise<T> {
+  const pending = new Map<string, Promise<T>>();
+  return (key, run) => {
+    const existing = pending.get(key);
+    if (existing) return existing;
+    const p = run().finally(() => pending.delete(key));
+    pending.set(key, p);
+    return p;
+  };
+}