Merge upstream element-hq/element-call tag v0.25.0 into the Lotus fork (previous base: v0.20.1; actual merge-base v0.20.1-rc.1). Every Lotus feature and all six io.lotus.* widget actions are preserved. Version bumped to 0.25.0-lotus.1. Conflict files and how each Lotus hunk was re-expressed: * src/state/CallViewModel/remoteMembers/ConnectionFactory.ts Upstream moved echoCancellation/noiseSuppression/autoGainControl from constructor params (fed by URL params) to persisted Settings (settings.ts) with a developer-settings UI. The cinny host still drives these per call via URL params (noiseSuppression=false / autoGainControl=false when the in-source ML denoiser is active, so the model gets a raw mic) - taking upstream verbatim would silently break the ML denoise tier. Re-wired as AND semantics in generateRoomOption(): a constraint is enabled only if BOTH the Setting and the URL param allow it. Params default to true, so with no params this is byte-for-byte upstream behaviour. Upstream's own echoCancellation / noiseSuppression URL params (still parsed but dead in v0.25.0) work again as a side effect. Lotus autoGainControl URL param kept in UrlParams.ts (auto-merged, unchanged). * src/state/CallViewModel/remoteMembers/ECConnectionFactory.test.ts Took upstream (tests now drive via Settings). The lost Lotus coverage is restored in a NEW colocated file src/lotus/lotusAudioConstraints.test.ts (3 tests) so the upstream test file stays pristine. Verified the new test fails against pure-upstream ConnectionFactory and passes with the re-wiring. * src/state/CallViewModel/CallViewModel.ts Three small hunks: kept both the Lotus `userMedia$` interface member and upstream's new `keyRotationSuppressed$`; dropped the three Lotus audio constructor args (mechanism removed upstream, see above); kept both in the returned object. The [lotus #4] overrideSpotlight$ routing, manualSpotlightUserId$ and setManualSpotlight auto-merged; verified against upstream's changed ringingMedia$ (now single-or-null instead of array) - the merge correctly took upstream's outer branch and the inner screenShares$/spotlightSpeaker$ logic that lotusSpotlight.ts mirrors is unchanged upstream. * src/index.css Kept both: Lotus lotus-transparent / lotus-theme blocks and upstream's new body[data-background="gradient"]::before full-viewport gradient. The naive merge swallowed the closing brace of body.lotus-theme - restored. Added a rule hiding the new gradient pseudo-element under body.lotus-transparent, since it would otherwise paint over the transparent body and hide the host wallpaper. * src/components/CallFooterViewModel.tsx, src/components/CallFooter.stories.tsx No Lotus content - pure upstream-vs-upstream conflicts caused by the merge base being v0.20.1-rc.1. Took upstream (layoutMode -> layoutSwitchVm; setLayoutMode removed). No Lotus code uses setGridMode/layoutMode. Non-conflicting but reviewed: * src/widget.ts auto-merged cleanly. Upstream's removal of .well-known transport advertisement and the new RTC-transport capability request did not touch the action registration loop the LOTUS_TO_WIDGET_ACTIONS spread and widget.lazyActions ride on - nothing to re-wire. * src/room/InCallView.tsx, src/useAudioContext.tsx, src/useTheme.ts, src/tile/MediaView.tsx(+.module.css), src/UrlParams.ts(+test), all *.module.css and .gitea/workflows/ci.yml auto-merged; each diff against v0.25.0 was checked to equal the original Lotus hunk. * src/button/Button.module.css: the merge appended an exact duplicate of upstream's `.rotate`/`@keyframes spin` block (rc.1 merge-base artefact) - reset to upstream verbatim. * src/grid/OneOnOnePortraitLayout.module.css was renamed upstream to OneOnOneMobileLayout.module.css; git followed the rename and the Lotus safe-area PiP inset fix applies there (the --content-inset-* vars it uses still exist upstream). Tooling changes inherited from upstream that affect the fork: * eslint + prettier were replaced by oxlint + oxfmt (`pnpm lint:oxlint`, `pnpm format:check`). oxlint flagged 10 issues, all in src/lotus/*: 8x no-meaningless-void-operator (dropped the `void` before void-typed widget transport.reply / callbacks - no behaviour change), 1x consistent-type-imports (lotusWidget.ts: `import type`), and 2x unicorn/no-useless-spread in lotusAudioInject.ts which are FALSE POSITIVES - `[...activeClips]` is a required defensive copy because abort() deletes from the Set during iteration; suppressed with an explanatory eslint-disable-next-line. oxfmt reformatted 7 Lotus touched files (whitespace only). * packageManager bumped by upstream to pnpm@11.21.0, which requires Node >= 22.13 (uses node:sqlite). Node 20 cannot run it; pnpm 10.33 cannot read the new lockfile either (matrix-js-sdk is now a git dependency on develop, using a version-union pnpm 10 rejects). Fork CI already uses Node 24 (.node-version), so CI is unaffected. * matrix-js-sdk is now github:matrix-org/matrix-js-sdk#develop (pinned by commit in pnpm-lock.yaml). Lotus behaviour NOT preserved: none found. Verification (Node 24.11.1, pnpm 11.21.0): pnpm install --frozen-lockfile OK (lockfile taken from upstream unchanged, no regeneration needed); tsc clean; oxlint clean; oxfmt --check clean; knip exit 0 (2 config hints in upstream knip.ts only); vitest unit 84 files / 627 passed / 9 skipped; build:embedded OK, staged to embedded/web/dist (44M), all six io.lotus.* action strings present in the bundle. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PPmy3tPq869XDW4njjVaKA
236 lines
7.7 KiB
TypeScript
236 lines
7.7 KiB
TypeScript
/*
|
|
Copyright 2024 New Vector Ltd.
|
|
|
|
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
|
Please see LICENSE in the repository root for full details.
|
|
*/
|
|
|
|
import { logger } from "matrix-js-sdk/lib/logger";
|
|
import { useState, useEffect } from "react";
|
|
import { useObservableEagerState } from "observable-hooks";
|
|
|
|
import {
|
|
soundEffectVolume as soundEffectVolumeSetting,
|
|
useSetting,
|
|
} from "./settings/settings";
|
|
import { useEarpieceAudioConfig, useMediaDevices } from "./MediaDevicesContext";
|
|
import { type PrefetchedSounds } from "./soundUtils";
|
|
import { useUrlParams } from "./UrlParams";
|
|
import * as controls from "./controls";
|
|
|
|
/**
|
|
* Play a sound though a given AudioContext. Will take
|
|
* care of connecting the correct buffer and gating
|
|
* through gain.
|
|
* @param ctx The context to play through.
|
|
* @param buffer The buffer to play.
|
|
* @param volume The volume to play at.
|
|
* @param stereoPan The stereo pan to apply.
|
|
* @param delayS Delay in seconds before starting playing.
|
|
* @param abort Optional AbortController that can be used to stop playback.
|
|
* @returns A promise that resolves when the sound has finished playing.
|
|
*/
|
|
async function playSound(
|
|
ctx: AudioContext,
|
|
buffer: AudioBuffer,
|
|
volume: number,
|
|
stereoPan: number,
|
|
delayS = 0,
|
|
abort?: AbortController,
|
|
): Promise<void> {
|
|
const gain = ctx.createGain();
|
|
gain.gain.setValueAtTime(volume, 0);
|
|
const pan = ctx.createStereoPanner();
|
|
pan.pan.setValueAtTime(stereoPan, 0);
|
|
const src = ctx.createBufferSource();
|
|
src.buffer = buffer;
|
|
abort?.signal.addEventListener("abort", () => {
|
|
src.disconnect();
|
|
});
|
|
const p = new Promise<void>((r) => src.addEventListener("ended", () => r()));
|
|
src.connect(gain).connect(pan).connect(ctx.destination);
|
|
controls.setPlaybackStarted();
|
|
src.start(ctx.currentTime + delayS);
|
|
return p;
|
|
}
|
|
|
|
/**
|
|
* Play a sound though a given AudioContext, looping until stopped. Will take
|
|
* care of connecting the correct buffer and gating
|
|
* through gain.
|
|
* @param ctx The context to play through.
|
|
* @param buffer The buffer to play.
|
|
* @param volume The volume to play at.
|
|
* @param stereoPan The stereo pan to apply.
|
|
* @param delayS Delay in seconds between each loop.
|
|
* @returns A function used to end the sound. This function will return a promise when the sound has stopped.
|
|
*/
|
|
function playSoundLooping(
|
|
ctx: AudioContext,
|
|
buffer: AudioBuffer,
|
|
volume: number,
|
|
stereoPan: number,
|
|
delayS?: number,
|
|
): () => Promise<void> {
|
|
if (delayS === 0) {
|
|
throw Error("Looping sounds must have a delay");
|
|
}
|
|
|
|
// Our audio loop
|
|
let lastSoundPromise: Promise<void>;
|
|
let nextSoundPromise: Promise<void>;
|
|
let ac: AbortController | undefined;
|
|
void (async (): Promise<void> => {
|
|
ac = new AbortController();
|
|
// Play a sound immediately
|
|
lastSoundPromise = Promise.resolve();
|
|
do {
|
|
// Queue up the next sound.
|
|
nextSoundPromise = playSound(ctx, buffer, volume, stereoPan, delayS, ac);
|
|
// Await the previous sound.
|
|
await lastSoundPromise;
|
|
// Swap the promises over, and loop round to play the next sound.
|
|
lastSoundPromise = nextSoundPromise;
|
|
} while (!ac.signal.aborted);
|
|
})();
|
|
|
|
return async () => {
|
|
ac?.abort();
|
|
// Wait for sounds to finish.
|
|
await lastSoundPromise;
|
|
await nextSoundPromise;
|
|
};
|
|
}
|
|
|
|
interface Props<S extends string> {
|
|
/**
|
|
* The sounds to play. If no sounds should be played then
|
|
* this can be set to null, which will prevent the audio
|
|
* context from being created.
|
|
*/
|
|
sounds: PrefetchedSounds<S> | null;
|
|
latencyHint: AudioContextLatencyCategory;
|
|
muted?: boolean;
|
|
}
|
|
|
|
export interface UseAudioContext<S extends string> {
|
|
playSound(soundName: S, volumeOverwrite?: number): Promise<void>;
|
|
playSoundLooping(soundName: S, delayS?: number): () => Promise<void>;
|
|
/**
|
|
* Map of sound name to duration in seconds.
|
|
*/
|
|
soundDuration: Record<string, number>;
|
|
}
|
|
|
|
/**
|
|
* Add an audio context which can be used to play
|
|
* a set of preloaded sounds.
|
|
* @param props The properties for the audio context.
|
|
* @returns Either an instance that can be used to play sounds, or null if not ready.
|
|
*/
|
|
export function useAudioContext<S extends string>(
|
|
props: Props<S>,
|
|
): UseAudioContext<S> | null {
|
|
const [soundEffectVolume] = useSetting(soundEffectVolumeSetting);
|
|
const [audioContext, setAudioContext] = useState<AudioContext>();
|
|
const [audioBuffers, setAudioBuffers] = useState<Record<S, AudioBuffer>>();
|
|
|
|
useEffect(() => {
|
|
const sounds = props.sounds;
|
|
if (!sounds) {
|
|
return;
|
|
}
|
|
const ctx = new AudioContext({
|
|
// We want low latency for these effects.
|
|
latencyHint: props.latencyHint,
|
|
});
|
|
|
|
// We want to clone the content of our preloaded
|
|
// sound buffers into this context. The context may
|
|
// close during this process, so it's okay if it throws.
|
|
(async (): Promise<void> => {
|
|
const buffers: Record<string, AudioBuffer> = {};
|
|
for (const [name, buffer] of Object.entries<ArrayBuffer>(await sounds)) {
|
|
const audioBuffer = await ctx.decodeAudioData(buffer.slice(0));
|
|
buffers[name] = audioBuffer;
|
|
}
|
|
setAudioBuffers(buffers as Record<S, AudioBuffer>);
|
|
})().catch((ex) => {
|
|
logger.debug("Failed to setup audio context", ex);
|
|
});
|
|
|
|
setAudioContext(ctx);
|
|
return (): void => {
|
|
void ctx.close().catch((ex) => {
|
|
logger.debug("Failed to close audio engine", ex);
|
|
});
|
|
setAudioContext(undefined);
|
|
};
|
|
}, [props.sounds, props.latencyHint]);
|
|
|
|
const audioOutputId = useObservableEagerState(
|
|
useMediaDevices().audioOutput.selected$,
|
|
)?.id;
|
|
const { controlledAudioDevices } = useUrlParams();
|
|
|
|
// Update the sink ID whenever we change devices.
|
|
useEffect(() => {
|
|
if (
|
|
audioContext &&
|
|
"setSinkId" in audioContext &&
|
|
!controlledAudioDevices &&
|
|
// Skip until a device is actually selected. audioOutputId is undefined
|
|
// before MediaDevices resolves (e.g. on the Tauri desktop webview, where
|
|
// the selected$ observable emits undefined first); setSinkId(undefined)
|
|
// throws "The provided value is not of type 'AudioSinkOptions'". The
|
|
// default device is represented by the empty string, which is still valid.
|
|
typeof audioOutputId === "string"
|
|
) {
|
|
// https://developer.mozilla.org/en-US/docs/Web/API/AudioContext/setSinkId
|
|
// @ts-expect-error - setSinkId doesn't exist yet in types, maybe because it's not supported everywhere.
|
|
audioContext.setSinkId(audioOutputId).catch((ex) => {
|
|
logger.warn("Unable to change sink for audio context", ex);
|
|
});
|
|
}
|
|
}, [audioContext, audioOutputId, controlledAudioDevices]);
|
|
const { pan: earpiecePan, volume: earpieceVolume } = useEarpieceAudioConfig();
|
|
|
|
// Don't return a function until we're ready.
|
|
if (!audioContext || !audioBuffers || props.muted) {
|
|
return null;
|
|
}
|
|
|
|
return {
|
|
playSound: async (name, volumeOverwrite?: number): Promise<void> => {
|
|
if (!audioBuffers[name]) {
|
|
logger.debug(`Tried to play a sound that wasn't buffered (${name})`);
|
|
return;
|
|
}
|
|
return playSound(
|
|
audioContext,
|
|
audioBuffers[name],
|
|
volumeOverwrite ?? soundEffectVolume * earpieceVolume,
|
|
earpiecePan,
|
|
);
|
|
},
|
|
playSoundLooping: (name, delayS: number): (() => Promise<void>) => {
|
|
if (!audioBuffers[name]) {
|
|
throw Error(`Tried to play a sound that wasn't buffered (${name})`);
|
|
}
|
|
return playSoundLooping(
|
|
audioContext,
|
|
audioBuffers[name],
|
|
soundEffectVolume * earpieceVolume,
|
|
earpiecePan,
|
|
delayS,
|
|
);
|
|
},
|
|
soundDuration: Object.fromEntries(
|
|
Object.entries(audioBuffers).map(([k, v]) => [
|
|
k,
|
|
(v as AudioBuffer).duration,
|
|
]),
|
|
),
|
|
};
|
|
}
|