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
131 lines
4.0 KiB
TypeScript
131 lines
4.0 KiB
TypeScript
/*
|
|
Copyright 2026 Lotus Guild
|
|
|
|
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
|
Please see LICENSE in the repository root for full details.
|
|
*/
|
|
|
|
import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
|
|
import { Room as LivekitRoom } from "livekit-client";
|
|
import { BehaviorSubject } from "rxjs";
|
|
import { logger } from "matrix-js-sdk/lib/logger";
|
|
import EventEmitter from "events";
|
|
|
|
import { ObservableScope } from "../state/ObservableScope.ts";
|
|
import { ECConnectionFactory } from "../state/CallViewModel/remoteMembers/ConnectionFactory.ts";
|
|
import type { OpenIDClientParts } from "../livekit/openIDSFU.ts";
|
|
import {
|
|
exampleTransport,
|
|
mockMediaDevices,
|
|
ownMemberMock,
|
|
} from "../utils/test.ts";
|
|
import type { ProcessorState } from "../livekit/TrackProcessorContext.tsx";
|
|
import {
|
|
autoGainControlSetting,
|
|
echoCancellationSetting,
|
|
noiseSuppressionSetting,
|
|
} from "../settings/settings.ts";
|
|
|
|
// [lotus] Upstream v0.25.0 moved the audio-capture constraints to Settings.
|
|
// The Lotus host still drives them per-call via URL params (it turns browser
|
|
// noiseSuppression/AGC OFF for the in-source ML denoise tier), so
|
|
// ConnectionFactory ANDs the Setting with the URL param. These tests pin that
|
|
// contract.
|
|
|
|
const { getUrlParams } = vi.hoisted(() => ({ getUrlParams: vi.fn() }));
|
|
vi.mock("../UrlParams", () => ({ getUrlParams }));
|
|
|
|
vi.mock("livekit-client", async (importOriginal) => ({
|
|
...(await importOriginal()),
|
|
Room: vi.fn().mockImplementation(function (this: LivekitRoom) {
|
|
const emitter = new EventEmitter();
|
|
return {
|
|
on: emitter.on.bind(emitter),
|
|
off: emitter.off.bind(emitter),
|
|
emit: emitter.emit.bind(emitter),
|
|
disconnect: vi.fn(),
|
|
remoteParticipants: new Map(),
|
|
} as unknown as LivekitRoom;
|
|
}),
|
|
}));
|
|
|
|
let testScope: ObservableScope;
|
|
const mockClient: OpenIDClientParts = {
|
|
getOpenIdToken: vi.fn().mockReturnValue(""),
|
|
getDeviceId: vi.fn().mockReturnValue("DEV000"),
|
|
};
|
|
|
|
function createRoom(): void {
|
|
new ECConnectionFactory(
|
|
mockClient,
|
|
"!roomid:example.org",
|
|
mockMediaDevices({}),
|
|
new BehaviorSubject<ProcessorState>({
|
|
supported: true,
|
|
processor: undefined,
|
|
}),
|
|
undefined,
|
|
false,
|
|
).createConnection(testScope, exampleTransport, ownMemberMock, logger);
|
|
}
|
|
|
|
function capturedAudioDefaults(): Record<string, unknown> {
|
|
const RoomConstructor = vi.mocked(LivekitRoom);
|
|
const options = RoomConstructor.mock.calls.at(-1)?.[0];
|
|
return (options?.audioCaptureDefaults ?? {}) as Record<string, unknown>;
|
|
}
|
|
|
|
beforeEach(() => {
|
|
testScope = new ObservableScope();
|
|
echoCancellationSetting.setValue(true);
|
|
noiseSuppressionSetting.setValue(true);
|
|
autoGainControlSetting.setValue(true);
|
|
});
|
|
|
|
afterEach(() => {
|
|
testScope.end();
|
|
vi.mocked(LivekitRoom).mockClear();
|
|
});
|
|
|
|
describe("[lotus] audio-capture URL param overrides", () => {
|
|
test("with params defaulted to true, the Settings govern (upstream behaviour)", () => {
|
|
getUrlParams.mockReturnValue({
|
|
echoCancellation: true,
|
|
noiseSuppression: true,
|
|
autoGainControl: true,
|
|
});
|
|
autoGainControlSetting.setValue(false);
|
|
createRoom();
|
|
expect(capturedAudioDefaults()).toMatchObject({
|
|
echoCancellation: true,
|
|
noiseSuppression: true,
|
|
autoGainControl: false,
|
|
});
|
|
});
|
|
|
|
test("host-passed noiseSuppression=false / autoGainControl=false force OFF regardless of Settings", () => {
|
|
getUrlParams.mockReturnValue({
|
|
echoCancellation: true,
|
|
noiseSuppression: false,
|
|
autoGainControl: false,
|
|
});
|
|
createRoom();
|
|
expect(capturedAudioDefaults()).toMatchObject({
|
|
echoCancellation: true,
|
|
noiseSuppression: false,
|
|
autoGainControl: false,
|
|
});
|
|
});
|
|
|
|
test("a URL param cannot force a constraint ON when the Setting is off", () => {
|
|
getUrlParams.mockReturnValue({
|
|
echoCancellation: true,
|
|
noiseSuppression: true,
|
|
autoGainControl: true,
|
|
});
|
|
echoCancellationSetting.setValue(false);
|
|
createRoom();
|
|
expect(capturedAudioDefaults()).toMatchObject({ echoCancellation: false });
|
|
});
|
|
});
|