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
443 lines
12 KiB
TypeScript
443 lines
12 KiB
TypeScript
/*
|
|
Copyright 2023, 2024 New Vector Ltd.
|
|
Copyright 2026 Element Creations Ltd.
|
|
|
|
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
|
Please see LICENSE in the repository root for full details.
|
|
*/
|
|
|
|
import { describe, expect, it, onTestFinished, vi } from "vitest";
|
|
import { logger } from "matrix-js-sdk/lib/logger";
|
|
|
|
import * as PlatformMod from "../src/Platform";
|
|
import {
|
|
getRoomIdentifierFromUrl,
|
|
computeUrlParams,
|
|
HeaderStyle,
|
|
getUrlParams,
|
|
} from "../src/UrlParams";
|
|
import { mockConfig } from "./utils/test";
|
|
|
|
const ROOM_NAME = "roomNameHere";
|
|
const ROOM_ID = "!d45f138fsd";
|
|
const ORIGIN = "https://call.element.io";
|
|
const HOMESERVER = "localhost";
|
|
|
|
mockConfig();
|
|
|
|
describe("UrlParams", () => {
|
|
describe("handles URL with /room/", () => {
|
|
it("and nothing else", () => {
|
|
expect(
|
|
getRoomIdentifierFromUrl(`/room/${ROOM_NAME}`, "", "").roomAlias,
|
|
).toBe(`#${ROOM_NAME}:${HOMESERVER}`);
|
|
});
|
|
|
|
it("and #", () => {
|
|
expect(
|
|
getRoomIdentifierFromUrl("", `${ORIGIN}/room/`, `#${ROOM_NAME}`)
|
|
.roomAlias,
|
|
).toBe(`#${ROOM_NAME}:${HOMESERVER}`);
|
|
});
|
|
|
|
it("and # and server part", () => {
|
|
expect(
|
|
getRoomIdentifierFromUrl("", `/room/`, `#${ROOM_NAME}:${HOMESERVER}`)
|
|
.roomAlias,
|
|
).toBe(`#${ROOM_NAME}:${HOMESERVER}`);
|
|
});
|
|
|
|
it("and server part", () => {
|
|
expect(
|
|
getRoomIdentifierFromUrl(`/room/${ROOM_NAME}:${HOMESERVER}`, "", "")
|
|
.roomAlias,
|
|
).toBe(`#${ROOM_NAME}:${HOMESERVER}`);
|
|
});
|
|
});
|
|
|
|
describe("handles URL without /room/", () => {
|
|
it("and nothing else", () => {
|
|
expect(getRoomIdentifierFromUrl(`/${ROOM_NAME}`, "", "").roomAlias).toBe(
|
|
`#${ROOM_NAME}:${HOMESERVER}`,
|
|
);
|
|
});
|
|
|
|
it("and with #", () => {
|
|
expect(getRoomIdentifierFromUrl("", "", `#${ROOM_NAME}`).roomAlias).toBe(
|
|
`#${ROOM_NAME}:${HOMESERVER}`,
|
|
);
|
|
});
|
|
|
|
it("and with # and server part", () => {
|
|
expect(
|
|
getRoomIdentifierFromUrl("", "", `#${ROOM_NAME}:${HOMESERVER}`)
|
|
.roomAlias,
|
|
).toBe(`#${ROOM_NAME}:${HOMESERVER}`);
|
|
});
|
|
|
|
it("and with server part", () => {
|
|
expect(
|
|
getRoomIdentifierFromUrl(`/${ROOM_NAME}:${HOMESERVER}`, "", "")
|
|
.roomAlias,
|
|
).toBe(`#${ROOM_NAME}:${HOMESERVER}`);
|
|
});
|
|
});
|
|
|
|
describe("handles search params", () => {
|
|
it("(roomId)", () => {
|
|
expect(
|
|
getRoomIdentifierFromUrl("", `?roomId=${ROOM_ID}`, "").roomId,
|
|
).toBe(ROOM_ID);
|
|
});
|
|
it("(roomId with unprintable characters)", () => {
|
|
const invisibleChar = "\u2066";
|
|
expect(
|
|
getRoomIdentifierFromUrl(
|
|
"",
|
|
`?roomId=${invisibleChar}${ROOM_ID}${invisibleChar}`,
|
|
"",
|
|
).roomId,
|
|
).toBe(ROOM_ID);
|
|
});
|
|
});
|
|
|
|
it("ignores room alias", () => {
|
|
expect(
|
|
getRoomIdentifierFromUrl("", `/room/${ROOM_NAME}:${HOMESERVER}`, "")
|
|
.roomAlias,
|
|
).toBeFalsy();
|
|
});
|
|
|
|
describe("preload", () => {
|
|
it("defaults to false", () => {
|
|
expect(computeUrlParams().preload).toBe(false);
|
|
});
|
|
|
|
it("ignored in SPA mode", () => {
|
|
expect(computeUrlParams("?preload=true").preload).toBe(false);
|
|
});
|
|
|
|
it("respected in widget mode", () => {
|
|
expect(
|
|
computeUrlParams(
|
|
"?preload=true&widgetId=12345&parentUrl=https%3A%2F%2Flocalhost%2Ffoo",
|
|
).preload,
|
|
).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe("returnToLobby", () => {
|
|
it("is false in SPA mode", () => {
|
|
expect(computeUrlParams("?returnToLobby=true").returnToLobby).toBe(false);
|
|
});
|
|
|
|
it("defaults to false in widget mode", () => {
|
|
expect(
|
|
computeUrlParams(
|
|
"?widgetId=12345&parentUrl=https%3A%2F%2Flocalhost%2Ffoo",
|
|
).returnToLobby,
|
|
).toBe(false);
|
|
});
|
|
|
|
it("respected in widget mode", () => {
|
|
expect(
|
|
computeUrlParams(
|
|
"?returnToLobby=true&widgetId=12345&parentUrl=https%3A%2F%2Flocalhost%2Ffoo",
|
|
).returnToLobby,
|
|
).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe("userId", () => {
|
|
it("is ignored in SPA mode", () => {
|
|
expect(computeUrlParams("?userId=asd").userId).toBe(null);
|
|
});
|
|
|
|
it("is parsed in widget mode", () => {
|
|
expect(
|
|
computeUrlParams(
|
|
"?userId=asd&widgetId=12345&parentUrl=https%3A%2F%2Flocalhost%2Ffoo",
|
|
).userId,
|
|
).toBe("asd");
|
|
});
|
|
});
|
|
|
|
describe("deviceId", () => {
|
|
it("is ignored in SPA mode", () => {
|
|
expect(computeUrlParams("?deviceId=asd").deviceId).toBe(null);
|
|
});
|
|
|
|
it("is parsed in widget mode", () => {
|
|
expect(
|
|
computeUrlParams(
|
|
"?deviceId=asd&widgetId=12345&parentUrl=https%3A%2F%2Flocalhost%2Ffoo",
|
|
).deviceId,
|
|
).toBe("asd");
|
|
});
|
|
});
|
|
|
|
describe("baseUrl", () => {
|
|
it("is ignored in SPA mode", () => {
|
|
expect(computeUrlParams("?baseUrl=asd").baseUrl).toBe(null);
|
|
});
|
|
|
|
it("is parsed in widget mode", () => {
|
|
expect(
|
|
computeUrlParams(
|
|
"?baseUrl=asd&widgetId=12345&parentUrl=https%3A%2F%2Flocalhost%2Ffoo",
|
|
).baseUrl,
|
|
).toBe("asd");
|
|
});
|
|
});
|
|
|
|
describe("viaServers", () => {
|
|
it("is ignored in widget mode", () => {
|
|
expect(
|
|
computeUrlParams(
|
|
"?viaServers=asd&widgetId=12345&parentUrl=https%3A%2F%2Flocalhost%2Ffoo",
|
|
).viaServers,
|
|
).toBe(null);
|
|
});
|
|
|
|
it("is parsed in SPA mode", () => {
|
|
expect(computeUrlParams("?viaServers=asd").viaServers).toBe("asd");
|
|
});
|
|
});
|
|
|
|
describe("homeserver", () => {
|
|
it("is ignored in widget mode", () => {
|
|
expect(
|
|
computeUrlParams(
|
|
"?homeserver=asd&widgetId=12345&parentUrl=https%3A%2F%2Flocalhost%2Ffoo",
|
|
).homeserver,
|
|
).toBe(null);
|
|
});
|
|
|
|
it("is parsed in SPA mode", () => {
|
|
expect(computeUrlParams("?homeserver=asd").homeserver).toBe("asd");
|
|
});
|
|
});
|
|
|
|
describe("intent", () => {
|
|
const noIntentDefaults = {
|
|
confineToRoom: false,
|
|
preload: false,
|
|
header: HeaderStyle.Standard,
|
|
showControls: true,
|
|
hideScreensharing: false,
|
|
allowIceFallback: false,
|
|
perParticipantE2EE: false,
|
|
controlledAudioDevices: false,
|
|
skipLobby: false,
|
|
returnToLobby: false,
|
|
sendNotificationType: undefined,
|
|
};
|
|
const startNewCallDefaults = (platform: string): object => ({
|
|
confineToRoom: true,
|
|
preload: false,
|
|
header: platform === "desktop" ? HeaderStyle.None : HeaderStyle.AppBar,
|
|
showControls: true,
|
|
hideScreensharing: false,
|
|
allowIceFallback: true,
|
|
perParticipantE2EE: true,
|
|
controlledAudioDevices: platform === "desktop" ? false : true,
|
|
skipLobby: true,
|
|
returnToLobby: false,
|
|
sendNotificationType: platform === "desktop" ? "notification" : "ring",
|
|
});
|
|
const joinExistingCallDefaults = (platform: string): object => ({
|
|
confineToRoom: true,
|
|
preload: false,
|
|
header: platform === "desktop" ? HeaderStyle.None : HeaderStyle.AppBar,
|
|
showControls: true,
|
|
hideScreensharing: false,
|
|
allowIceFallback: true,
|
|
perParticipantE2EE: true,
|
|
controlledAudioDevices: platform === "desktop" ? false : true,
|
|
skipLobby: false,
|
|
returnToLobby: false,
|
|
sendNotificationType: "notification",
|
|
});
|
|
it("use no-intent-defaults with unknown intent", () => {
|
|
expect(computeUrlParams()).toMatchObject(noIntentDefaults);
|
|
});
|
|
|
|
it("ignores intent if it is not a valid value", () => {
|
|
expect(computeUrlParams("?intent=foo")).toMatchObject(noIntentDefaults);
|
|
});
|
|
|
|
it("accepts start_call", () => {
|
|
expect(
|
|
computeUrlParams(
|
|
"?intent=start_call&widgetId=1234&parentUrl=parent.org",
|
|
),
|
|
).toMatchObject({
|
|
...startNewCallDefaults("desktop"),
|
|
skipLobby: false,
|
|
callIntent: "video",
|
|
});
|
|
});
|
|
|
|
it("accepts start_call_dm mobile", () => {
|
|
vi.spyOn(PlatformMod, "platform", "get").mockReturnValue("android");
|
|
onTestFinished(() => {
|
|
vi.spyOn(PlatformMod, "platform", "get").mockReturnValue("desktop");
|
|
});
|
|
expect(
|
|
computeUrlParams(
|
|
"?intent=start_call_dm&widgetId=1234&parentUrl=parent.org",
|
|
),
|
|
).toMatchObject(startNewCallDefaults("android"));
|
|
});
|
|
|
|
it("accepts start_call_dm mobile and prioritizes overwritten params", () => {
|
|
vi.spyOn(PlatformMod, "platform", "get").mockReturnValue("android");
|
|
onTestFinished(() => {
|
|
vi.spyOn(PlatformMod, "platform", "get").mockReturnValue("desktop");
|
|
});
|
|
expect(
|
|
computeUrlParams(
|
|
"?intent=start_call_dm&widgetId=1234&parentUrl=parent.org&sendNotificationType=notification",
|
|
),
|
|
).toMatchObject({
|
|
...startNewCallDefaults("android"),
|
|
sendNotificationType: "notification",
|
|
});
|
|
});
|
|
|
|
it("accepts join_existing", () => {
|
|
expect(
|
|
computeUrlParams(
|
|
"?intent=join_existing&widgetId=1234&parentUrl=parent.org",
|
|
),
|
|
).toMatchObject(joinExistingCallDefaults("desktop"));
|
|
});
|
|
|
|
it("accepts start_call_voice", () => {
|
|
expect(
|
|
computeUrlParams(
|
|
"?intent=start_call_voice&widgetId=1234&parentUrl=parent.org",
|
|
),
|
|
).toMatchObject({
|
|
...startNewCallDefaults("desktop"),
|
|
skipLobby: false,
|
|
callIntent: "audio",
|
|
});
|
|
});
|
|
|
|
it("accepts join_existing_voice", () => {
|
|
expect(
|
|
computeUrlParams(
|
|
"?intent=join_existing_voice&widgetId=1234&parentUrl=parent.org",
|
|
),
|
|
).toMatchObject({
|
|
...joinExistingCallDefaults("desktop"),
|
|
callIntent: "audio",
|
|
});
|
|
});
|
|
});
|
|
|
|
describe("skipLobby", () => {
|
|
it("defaults to false", () => {
|
|
expect(computeUrlParams().skipLobby).toBe(false);
|
|
});
|
|
|
|
it("defaults to false if intent is start_call in SPA mode", () => {
|
|
expect(computeUrlParams("?intent=start_call").skipLobby).toBe(false);
|
|
});
|
|
|
|
it("defaults to false if intent is start_call in widget mode", () => {
|
|
expect(
|
|
computeUrlParams(
|
|
"?intent=start_call&widgetId=12345&parentUrl=https%3A%2F%2Flocalhost%2Ffoo",
|
|
).skipLobby,
|
|
).toBe(false);
|
|
});
|
|
|
|
it("default to false if intent is join_existing", () => {
|
|
expect(computeUrlParams("?intent=join_existing").skipLobby).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe("noiseSuppression", () => {
|
|
it("defaults to true", () => {
|
|
expect(computeUrlParams().noiseSuppression).toBe(true);
|
|
});
|
|
|
|
it("is parsed", () => {
|
|
expect(
|
|
computeUrlParams("?intent=start_call&noiseSuppression=true")
|
|
.noiseSuppression,
|
|
).toBe(true);
|
|
expect(
|
|
computeUrlParams("?intent=start_call&noiseSuppression&bar=foo")
|
|
.noiseSuppression,
|
|
).toBe(true);
|
|
expect(computeUrlParams("?noiseSuppression=false").noiseSuppression).toBe(
|
|
false,
|
|
);
|
|
});
|
|
});
|
|
|
|
describe("echoCancellation", () => {
|
|
it("defaults to true", () => {
|
|
expect(computeUrlParams().echoCancellation).toBe(true);
|
|
});
|
|
|
|
it("is parsed", () => {
|
|
expect(computeUrlParams("?echoCancellation=true").echoCancellation).toBe(
|
|
true,
|
|
);
|
|
expect(computeUrlParams("?echoCancellation=false").echoCancellation).toBe(
|
|
false,
|
|
);
|
|
});
|
|
});
|
|
|
|
describe("autoGainControl", () => {
|
|
it("defaults to true", () => {
|
|
expect(computeUrlParams().autoGainControl).toBe(true);
|
|
});
|
|
|
|
it("is parsed", () => {
|
|
expect(computeUrlParams("?autoGainControl=true").autoGainControl).toBe(
|
|
true,
|
|
);
|
|
expect(computeUrlParams("?autoGainControl=false").autoGainControl).toBe(
|
|
false,
|
|
);
|
|
});
|
|
});
|
|
|
|
describe("header", () => {
|
|
it("uses header if provided", () => {
|
|
expect(computeUrlParams("?header=app_bar&hideHeader=true").header).toBe(
|
|
"app_bar",
|
|
);
|
|
expect(computeUrlParams("?header=none&hideHeader=false").header).toBe(
|
|
"none",
|
|
);
|
|
});
|
|
});
|
|
describe("getUrlParams", () => {
|
|
it("uses cached values", () => {
|
|
const spy = vi.spyOn(logger, "info");
|
|
// call get once
|
|
const params = getUrlParams("?header=app_bar&hideHeader=true", "");
|
|
// call get twice
|
|
expect(getUrlParams("?header=app_bar&hideHeader=true", "")).toBe(params);
|
|
// expect compute to only be called once
|
|
// it will only log when it is computing the values
|
|
expect(spy).toHaveBeenCalledExactlyOnceWith(
|
|
"UrlParams: final set of url params\n",
|
|
"intent:",
|
|
"unknown",
|
|
"\nproperties:",
|
|
expect.any(Object),
|
|
"configuration:",
|
|
expect.any(Object),
|
|
);
|
|
});
|
|
});
|
|
});
|