From 08df63e68ae2e98bd8967a6437449b7588f3e1ae Mon Sep 17 00:00:00 2001 From: Valere Date: Tue, 13 May 2025 14:39:04 +0200 Subject: [PATCH] tmp: Debug show device id in display name if devtool --- src/room/InCallView.tsx | 11 ++++++++++- src/state/CallViewModel.test.ts | 1 + src/state/CallViewModel.ts | 8 +++++++- src/utils/test-viewmodel.ts | 1 + 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/room/InCallView.tsx b/src/room/InCallView.tsx index b434a1da..4b25a736 100644 --- a/src/room/InCallView.tsx +++ b/src/room/InCallView.tsx @@ -96,6 +96,7 @@ import { ReactionsOverlay } from "./ReactionsOverlay"; import { CallEventAudioRenderer } from "./CallEventAudioRenderer"; import { debugTileLayout as debugTileLayoutSetting, + developerMode, useExperimentalToDeviceTransportSetting, useSetting, } from "../settings/settings"; @@ -134,6 +135,7 @@ export const ActiveCall: FC = (props) => { }; // eslint-disable-next-line react-hooks/exhaustive-deps }, []); + const [showDeveloperModeDebugOptions] = useSetting(developerMode); useEffect(() => { if (livekitRoom !== undefined) { @@ -145,6 +147,7 @@ export const ActiveCall: FC = (props) => { connStateObservable$, reactionsReader.raisedHands$, reactionsReader.reactions$, + showDeveloperModeDebugOptions, ); setVm(vm); return (): void => { @@ -152,7 +155,13 @@ export const ActiveCall: FC = (props) => { reactionsReader.destroy(); }; } - }, [props.rtcSession, livekitRoom, props.e2eeSystem, connStateObservable$]); + }, [ + props.rtcSession, + livekitRoom, + props.e2eeSystem, + connStateObservable$, + showDeveloperModeDebugOptions, + ]); if (livekitRoom === undefined || vm === null) return null; diff --git a/src/state/CallViewModel.test.ts b/src/state/CallViewModel.test.ts index f0066476..f60dec44 100644 --- a/src/state/CallViewModel.test.ts +++ b/src/state/CallViewModel.test.ts @@ -268,6 +268,7 @@ function withCallViewModel( connectionState$, raisedHands$, new BehaviorSubject({}), + false, ); onTestFinished(() => { diff --git a/src/state/CallViewModel.ts b/src/state/CallViewModel.ts index 8fd6f819..34397eac 100644 --- a/src/state/CallViewModel.ts +++ b/src/state/CallViewModel.ts @@ -251,6 +251,7 @@ class UserMedia { public readonly speaker$: Observable; public readonly presenter$: Observable; + public constructor( public readonly id: string, member: RoomMember | undefined, @@ -487,7 +488,11 @@ export class CallViewModel extends ViewModel { const disambiguate = shouldDisambiguate(member, memberships, room); displaynameMap.set( matrixIdentifier, - calculateDisplayName(member, disambiguate), + this.showDeveloperModeDebugOptions + ? calculateDisplayName(member, disambiguate) + + " | " + + rtcMember.deviceId + : calculateDisplayName(member, disambiguate), ); } return displaynameMap; @@ -1344,6 +1349,7 @@ export class CallViewModel extends ViewModel { private readonly reactionsSubject$: Observable< Record >, + private readonly showDeveloperModeDebugOptions: boolean, ) { super(); } diff --git a/src/utils/test-viewmodel.ts b/src/utils/test-viewmodel.ts index c8a93c73..2c8be7aa 100644 --- a/src/utils/test-viewmodel.ts +++ b/src/utils/test-viewmodel.ts @@ -138,6 +138,7 @@ export function getBasicCallViewModelEnvironment( of(ConnectionState.Connected), handRaisedSubject$, reactionsSubject$, + false, ); return { vm,