From a6921e2bfbb641d5406be5be2f9f4fb397163c69 Mon Sep 17 00:00:00 2001 From: "Timo K." Date: Tue, 7 Jul 2026 19:12:11 +0200 Subject: [PATCH] all the other logs --- src/room/InCallView.tsx | 5 +++-- .../CallViewModel/CallNotificationLifecycle.ts | 3 +-- .../localMember/HomeserverConnected.ts | 6 +----- .../CallViewModel/localMember/LocalTransport.ts | 16 ++++++++++++---- .../remoteMembers/MatrixMemberMetadata.ts | 3 +-- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/room/InCallView.tsx b/src/room/InCallView.tsx index 5872cfb44..8982226ab 100644 --- a/src/room/InCallView.tsx +++ b/src/room/InCallView.tsx @@ -94,7 +94,7 @@ declare module "react" { } } -const logger = rootLogger.getChild("[InCallView]"); + export interface ActiveCallProps extends Omit< InCallViewProps, @@ -116,7 +116,7 @@ export const ActiveCall: FC = (props) => { const mediaDevices = useMediaDevices(); const trackProcessorState$ = useTrackProcessorObservable$(); useEffect(() => { - logger.info("START CALL VIEW SCOPE"); + rootLogger.info("START CALL VIEW SCOPE"); const scope = new ObservableScope(); const reactionsReader = new ReactionsReader(scope, props.rtcSession); const { autoLeaveWhenOthersLeft, waitForCallPickup, sendNotificationType } = @@ -218,6 +218,7 @@ export const InCallView: FC = ({ muteStates, onShareClick, }) => { + const logger = rootLogger.getChild("[InCallView]"); const { t } = useTranslation(); const { sendReaction, toggleRaisedHand } = useReactionsSender(); diff --git a/src/state/CallViewModel/CallNotificationLifecycle.ts b/src/state/CallViewModel/CallNotificationLifecycle.ts index 4d7007b9e..59930fd64 100644 --- a/src/state/CallViewModel/CallNotificationLifecycle.ts +++ b/src/state/CallViewModel/CallNotificationLifecycle.ts @@ -39,8 +39,6 @@ import { type Behavior } from "../Behavior"; import { type Epoch, type ObservableScope } from "../ObservableScope"; import { type RoomMemberMap } from "./remoteMembers/MatrixMemberMetadata"; -const logger = rootLogger.getChild("[CallNotificationLifecycle]"); - export type AutoLeaveReason = "allOthersLeft" | "timeout" | "decline"; export interface RingAttempt { @@ -114,6 +112,7 @@ export function createCallNotificationLifecycle$({ */ autoLeave$: Observable; } { + const logger = rootLogger.getChild("[CallNotificationLifecycle]"); let ringAttempts$: Observable = NEVER; if (options.waitForCallPickup) ringAttempts$ = sentCallNotification$.pipe( diff --git a/src/state/CallViewModel/localMember/HomeserverConnected.ts b/src/state/CallViewModel/localMember/HomeserverConnected.ts index 227c21c31..45e9f6cbb 100644 --- a/src/state/CallViewModel/localMember/HomeserverConnected.ts +++ b/src/state/CallViewModel/localMember/HomeserverConnected.ts @@ -31,11 +31,6 @@ import { type ObservableScope } from "../../ObservableScope"; import { type Behavior } from "../../Behavior"; import { type NodeStyleEventEmitter } from "../../../utils/test"; -/** - * Logger instance (scoped child) for homeserver connection updates. - */ -const logger = rootLogger.getChild("[HomeserverConnected]"); - export type HomeserverDisconnectReason = "sync" | "membership" | "probablyLeft"; export interface HomeserverConnected { @@ -70,6 +65,7 @@ export function createHomeserverConnected$( Pick, gracePeriodMs?: number, ): HomeserverConnected { + const logger = rootLogger.getChild("[HomeserverConnected]"); // Get grace period from parameter or config (default 10000ms) const graceMs = gracePeriodMs ?? Config.get().sync_disconnect_grace_period_ms; diff --git a/src/state/CallViewModel/localMember/LocalTransport.ts b/src/state/CallViewModel/localMember/LocalTransport.ts index 10ea79c44..7eebbd4c9 100644 --- a/src/state/CallViewModel/localMember/LocalTransport.ts +++ b/src/state/CallViewModel/localMember/LocalTransport.ts @@ -25,7 +25,7 @@ import { switchMap, tap, } from "rxjs"; -import { logger as rootLogger } from "matrix-js-sdk/lib/logger"; +import { logger as rootLogger, type Logger } from "matrix-js-sdk/lib/logger"; import { AutoDiscovery } from "matrix-js-sdk/lib/autodiscovery"; import { type CallMembershipIdentityParts } from "matrix-js-sdk/lib/matrixrtc/EncryptionManager"; @@ -46,8 +46,6 @@ import { areLivekitTransportsEqual } from "../remoteMembers/MatrixLivekitMembers import { customLivekitUrl } from "../../../settings/settings.ts"; import { RtcTransportAutoDiscovery } from "./RtcTransportAutoDiscovery.ts"; -const logger = rootLogger.getChild("[LocalTransport]"); - /* * It figures out “which LiveKit focus URL/alias the local user should use,” * optionally aligning with the oldest member, and ensures the SFU path is primed @@ -140,9 +138,14 @@ export const createLocalTransport$ = ({ forceJwtEndpoint, delayId$, }: Props): LocalTransport => { + const logger = rootLogger.getChild("[LocalTransport]"); // The LiveKit transport in use by the oldest RTC membership. `null` when the // oldest member has no such transport. - const oldestMemberTransport$ = observerOldestMembership$(scope, memberships$); + const oldestMemberTransport$ = observerOldestMembership$( + scope, + memberships$, + logger, + ); const transportDiscovery = new RtcTransportAutoDiscovery({ client: client, @@ -209,6 +212,7 @@ export const createLocalTransport$ = ({ client, ownMembershipIdentity, roomId, + logger, ); } @@ -248,6 +252,7 @@ export const createLocalTransport$ = ({ function observerOldestMembership$( scope: ObservableScope, memberships$: Behavior>, + logger: Logger, ): Behavior { return scope.behavior( memberships$.pipe( @@ -307,6 +312,7 @@ async function doOpenIdAndJWTFromUrl( > & OpenIDClientParts, delayId?: string, + logger: Logger, ): Promise { const sfuConfig = await getSFUConfigWithOpenID( client, @@ -337,6 +343,7 @@ function observeLocalTransportForOldestMembership( OpenIDClientParts, ownMembershipIdentity: CallMembershipIdentityParts, roomId: string, + logger: Logger, ): LocalTransport { // Ensure we can authenticate with the SFU. const authenticatedOldestMemberTransport$ = oldestMemberTransport$.pipe( @@ -355,6 +362,7 @@ function observeLocalTransportForOldestMembership( roomId, client, undefined, + logger, ), ).pipe( catchError((e: unknown) => { diff --git a/src/state/CallViewModel/remoteMembers/MatrixMemberMetadata.ts b/src/state/CallViewModel/remoteMembers/MatrixMemberMetadata.ts index 19c6fdcd5..6a448128c 100644 --- a/src/state/CallViewModel/remoteMembers/MatrixMemberMetadata.ts +++ b/src/state/CallViewModel/remoteMembers/MatrixMemberMetadata.ts @@ -22,8 +22,6 @@ import { } from "../../../utils/displayname"; import { type Behavior } from "../../Behavior"; -const logger = rootLogger.getChild("[MatrixMemberMetadata]"); - export type RoomMemberMap = Map< string, Pick @@ -67,6 +65,7 @@ export const memberDisplaynames$ = ( memberships$: Behavior[]>, roomMembers$: Behavior, ): Behavior> => { + const logger = rootLogger.getChild("[MatrixMemberMetadata]"); // This map tracks userIds that at some point needed disambiguation. // This is a memory leak bound to the number of participants. // A call application will always increase the memory if there have been more members in a call.