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
209 lines
7.4 KiB
TypeScript
209 lines
7.4 KiB
TypeScript
/*
|
|
Copyright 2025 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 {
|
|
Room as LivekitRoom,
|
|
type RoomOptions,
|
|
type BaseKeyProvider,
|
|
type E2EEManagerOptions,
|
|
type BaseE2EEManager,
|
|
} from "livekit-client";
|
|
import { logger, type Logger } from "matrix-js-sdk/lib/logger";
|
|
// imported as inline to support worker when loaded from a cdn (cross domain)
|
|
import E2EEWorker from "livekit-client/e2ee-worker?worker&inline";
|
|
import { type CallMembershipIdentityParts } from "matrix-js-sdk/lib/matrixrtc/EncryptionManager";
|
|
import { type LivekitTransportConfig } from "matrix-js-sdk/lib/matrixrtc";
|
|
|
|
import { type ObservableScope } from "../../ObservableScope.ts";
|
|
import { Connection } from "./Connection.ts";
|
|
import type {
|
|
OpenIDClientParts,
|
|
SFUConfig,
|
|
} from "../../../livekit/openIDSFU.ts";
|
|
import type { MediaDevices } from "../../MediaDevices.ts";
|
|
import type { Behavior } from "../../Behavior.ts";
|
|
import type { ProcessorState } from "../../../livekit/TrackProcessorContext.tsx";
|
|
import { getLiveKitOptions } from "../../../livekit/options.ts";
|
|
import {
|
|
advancedCamera,
|
|
cameraResolution,
|
|
cameraFramerate,
|
|
cameraBitrate,
|
|
cameraCodec,
|
|
parseResolution,
|
|
echoCancellationSetting,
|
|
noiseSuppressionSetting,
|
|
autoGainControlSetting,
|
|
} from "../../../settings/settings.ts";
|
|
// [lotus] Upstream v0.25.0 moved the audio-capture constraints from URL params
|
|
// to persisted Settings. The Lotus host (cinny) still drives them per-call via
|
|
// URL params (it turns browser noiseSuppression/AGC OFF when the in-source ML
|
|
// denoiser is active, so the model gets a raw mic). Re-wire: a constraint is
|
|
// enabled only if BOTH the Setting and the URL param allow it. The params
|
|
// default to true, so with no params this is byte-for-byte upstream behaviour;
|
|
// `?autoGainControl=false` forces AGC off regardless of the stored Setting.
|
|
import { getUrlParams } from "../../../UrlParams.ts";
|
|
|
|
// TODO evaluate if this should be done like the Publisher Factory
|
|
export interface ConnectionFactory {
|
|
createConnection(
|
|
scope: ObservableScope,
|
|
transport: LivekitTransportConfig,
|
|
ownMembershipIdentity: CallMembershipIdentityParts,
|
|
logger: Logger,
|
|
sfuConfig?: SFUConfig,
|
|
): Connection;
|
|
}
|
|
|
|
export class ECConnectionFactory implements ConnectionFactory {
|
|
private readonly livekitRoomFactory: () => LivekitRoom;
|
|
|
|
/**
|
|
* Creates a ConnectionFactory for LiveKit connections.
|
|
*
|
|
* @param client - The OpenID client parts for authentication, needed to get openID and JWT tokens.
|
|
* @param roomId - The current room ID.
|
|
* @param devices - Used for video/audio out/in capture options.
|
|
* @param processorState$ - Effects like background blur (only for publishing connection?)
|
|
* @param livekitKeyProvider - Optional key provider for end-to-end encryption.
|
|
* @param controlledAudioDevices - Option to indicate whether audio output device is controlled externally (native mobile app).
|
|
* @param livekitRoomFactory - Optional factory function (for testing) to create LivekitRoom instances. If not provided, a default factory is used.
|
|
*/
|
|
public constructor(
|
|
private client: OpenIDClientParts,
|
|
private readonly roomId: string,
|
|
private devices: MediaDevices,
|
|
private processorState$: Behavior<ProcessorState>,
|
|
livekitKeyProvider: BaseKeyProvider | undefined,
|
|
private controlledAudioDevices: boolean,
|
|
livekitRoomFactory?: () => LivekitRoom,
|
|
) {
|
|
const defaultFactory = (): LivekitRoom => {
|
|
const roomOptions = generateRoomOption({
|
|
devices: this.devices,
|
|
processorState: this.processorState$.value,
|
|
e2eeLivekitOptions: livekitKeyProvider && {
|
|
keyProvider: livekitKeyProvider,
|
|
// It's important that every room use a separate E2EE worker.
|
|
// They get confused if given streams from multiple rooms.
|
|
worker: new E2EEWorker(),
|
|
},
|
|
controlledAudioDevices: this.controlledAudioDevices,
|
|
});
|
|
logger.info("[ECConnectionFactory] livekit room options: ", roomOptions);
|
|
return new LivekitRoom(roomOptions);
|
|
};
|
|
this.livekitRoomFactory = livekitRoomFactory ?? defaultFactory;
|
|
}
|
|
|
|
/**
|
|
*
|
|
* @param scope The observable scope (used for clean-up)
|
|
* @param transport The transport to use for this connection.
|
|
* @param ownMembershipIdentity required to connect (using the jwt service) with the SFU.
|
|
* @param logger The logger instance to use for this connection.
|
|
* @param sfuConfig optional config in case we already have a token for this connection.
|
|
* @returns
|
|
*/
|
|
public createConnection(
|
|
scope: ObservableScope,
|
|
transport: LivekitTransportConfig,
|
|
ownMembershipIdentity: CallMembershipIdentityParts,
|
|
logger: Logger,
|
|
sfuConfig?: SFUConfig,
|
|
): Connection {
|
|
return new Connection(
|
|
{
|
|
existingSFUConfig: sfuConfig,
|
|
roomId: this.roomId,
|
|
transport,
|
|
client: this.client,
|
|
scope: scope,
|
|
livekitRoomFactory: this.livekitRoomFactory,
|
|
ownMembershipIdentity,
|
|
},
|
|
logger,
|
|
);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Generate the initial LiveKit RoomOptions based on the current media devices and processor state.
|
|
* Reads audio processing and camera quality settings directly from Settings.
|
|
*/
|
|
function generateRoomOption({
|
|
devices,
|
|
processorState,
|
|
e2eeLivekitOptions,
|
|
controlledAudioDevices,
|
|
}: {
|
|
devices: MediaDevices;
|
|
processorState: ProcessorState;
|
|
e2eeLivekitOptions:
|
|
| E2EEManagerOptions
|
|
| { e2eeManager: BaseE2EEManager }
|
|
| undefined;
|
|
controlledAudioDevices: boolean;
|
|
}): RoomOptions {
|
|
const liveKitOptions = getLiveKitOptions();
|
|
|
|
// Apply advanced camera settings if enabled
|
|
let videoCaptureDefaults = {
|
|
...liveKitOptions.videoCaptureDefaults,
|
|
deviceId: devices.videoInput.selected$.value?.id,
|
|
processor: processorState.processor,
|
|
};
|
|
let publishDefaults = liveKitOptions.publishDefaults;
|
|
|
|
if (advancedCamera.getValue()) {
|
|
const { width, height } = parseResolution(cameraResolution.getValue());
|
|
const fps = cameraFramerate.getValue();
|
|
const bps = cameraBitrate.getValue();
|
|
const codec = cameraCodec.getValue();
|
|
|
|
videoCaptureDefaults = {
|
|
...videoCaptureDefaults,
|
|
resolution: { width, height, frameRate: fps },
|
|
};
|
|
publishDefaults = {
|
|
...publishDefaults,
|
|
videoEncoding: { maxBitrate: bps, maxFramerate: fps },
|
|
videoCodec: codec,
|
|
};
|
|
}
|
|
|
|
return {
|
|
...liveKitOptions,
|
|
videoCaptureDefaults,
|
|
publishDefaults,
|
|
audioCaptureDefaults: {
|
|
...liveKitOptions.audioCaptureDefaults,
|
|
deviceId: devices.audioInput.selected$.value?.id,
|
|
echoCancellation:
|
|
echoCancellationSetting.getValue() &&
|
|
getUrlParams().echoCancellation !== false,
|
|
noiseSuppression:
|
|
noiseSuppressionSetting.getValue() &&
|
|
getUrlParams().noiseSuppression !== false,
|
|
autoGainControl:
|
|
autoGainControlSetting.getValue() &&
|
|
getUrlParams().autoGainControl !== false,
|
|
},
|
|
audioOutput: {
|
|
// When using controlled audio devices, we don't want to set the
|
|
// deviceId here, because it will be set by the native app.
|
|
// (also the id does not need to match a browser device id)
|
|
deviceId: controlledAudioDevices
|
|
? undefined
|
|
: devices.audioOutput.selected$.value?.id,
|
|
},
|
|
e2ee: e2eeLivekitOptions,
|
|
// TODO test and consider this:
|
|
// webAudioMix: true,
|
|
};
|
|
}
|