Reset matrix-js-sdk to develop branch, adopt new join/leave signatures

.oxlintrc.json

@@ -86,17 +86,6 @@
             ],
             "message": "Please use matrix-js-sdk instead"
           }
-        ],
-        "paths": [
-          {
-            "name": "matrix-js-sdk/lib/matrixrtc",
-            "importNames": [
-              "LivekitTransport",
-              "isLivekitTransport",
-              "isLivekitTransportConfig"
-            ],
-            "message": "Please use src/LivekitTransport.ts instead"
-          }
         ]
       }
     ],

package.json

@@ -103,7 +103,7 @@
     "livekit-client": "^2.18.1",
     "lodash-es": "^4.17.21",
     "loglevel": "^1.9.1",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#robin/remove-oldest-membership",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "matrix-widget-api": "^1.18.0",
     "node-stdlib-browser": "^1.3.1",
     "normalize.css": "^8.0.1",

pnpm-lock.yaml

@@ -191,8 +191,8 @@ importers:
         specifier: ^1.9.1
         version: 1.9.2
       matrix-js-sdk:
-        specifier: github:matrix-org/matrix-js-sdk#robin/remove-oldest-membership
-        version: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6defa47adae28feb7e3906dde25089e0dce42ece
+        specifier: github:matrix-org/matrix-js-sdk#develop
+        version: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/fa4772a4ddd335a5a8bfbf8bb21df49b70f7a999
       matrix-widget-api:
         specifier: ^1.18.0
         version: 1.19.0
@@ -4680,8 +4680,8 @@ packages:
   matrix-events-sdk@0.0.1:
     resolution: {integrity: sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==}
 
-  matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6defa47adae28feb7e3906dde25089e0dce42ece:
-    resolution: {gitHosted: true, integrity: sha512-jHFmI2C29HJnzs/FIrqdmQD6ytyunyy627onhrxI+xxTGSfYrWhcTUFstNiCAaMt3fc0nNi9aVvLPD3IIglF2A==, tarball: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6defa47adae28feb7e3906dde25089e0dce42ece}
+  matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/fa4772a4ddd335a5a8bfbf8bb21df49b70f7a999:
+    resolution: {gitHosted: true, integrity: sha512-qF8++74MX36KS1KEw6Lc8HHXgZ6nHD1oUU4yBZUj5vVPvZTIspk1lOGztkFmizE5vmLAHd5tdadL9Xu1Asy4bA==, tarball: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/fa4772a4ddd335a5a8bfbf8bb21df49b70f7a999}
     version: 42.3.0
     engines: {node: '>=22.0.0'}
 
@@ -10249,7 +10249,7 @@ snapshots:
 
   matrix-events-sdk@0.0.1: {}
 
-  matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6defa47adae28feb7e3906dde25089e0dce42ece:
+  matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/fa4772a4ddd335a5a8bfbf8bb21df49b70f7a999:
     dependencies:
       '@babel/runtime': 8.0.0
       '@matrix-org/matrix-sdk-crypto-wasm': 18.9.0

src/LivekitTransport.test.ts

@@ -1,28 +0,0 @@
-/*
-Copyright 2023 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import { test, expect } from "vitest";
-import { isLivekitTransport } from "./LivekitTransport";
-
-test("isLivekitTransport", () => {
-  expect(
-    isLivekitTransport({
-      type: "livekit",
-      livekit_service_url: "http://test.com",
-    }),
-  ).toBeTruthy();
-  expect(isLivekitTransport({ type: "livekit" })).toBeFalsy();
-  expect(
-    isLivekitTransport({
-      type: "not-livekit",
-      livekit_service_url: "http://test.com",
-    }),
-  ).toBeFalsy();
-  expect(
-    isLivekitTransport({ type: "livekit", other_service_url: "multi_sfu" }),
-  ).toBeFalsy();
-});

src/LivekitTransport.ts

@@ -1,20 +0,0 @@
-/*
-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 { type Transport } from "matrix-js-sdk/lib/matrixrtc";
-
-// TODO: Delete this module and return to using LivekitTransport from
-// matrix-js-sdk. This should only exist for a short time to facilitate merging
-// some breaking changes to LivekitTransport in matrix-js-sdk.
-
-export interface LivekitTransport extends Transport {
-  type: "livekit";
-  livekit_service_url: string;
-}
-
-export const isLivekitTransport = (object: any): object is LivekitTransport =>
-  object.type === "livekit" && "livekit_service_url" in object;

src/room/CallEventAudioRenderer.test.tsx

@@ -16,7 +16,10 @@ import {
 } from "vitest";
 import { act } from "react";
 import { type RoomMember } from "matrix-js-sdk";
-import { type CallMembership } from "matrix-js-sdk/lib/matrixrtc";
+import {
+  type LivekitTransport,
+  type CallMembership,
+} from "matrix-js-sdk/lib/matrixrtc";
 
 import {
   exampleTransport,
@@ -37,7 +40,6 @@ import {
 } from "../utils/test-fixtures";
 import { MAX_PARTICIPANT_COUNT_FOR_SOUND } from "../state/CallViewModel/CallViewModel";
 import { initializeWidget } from "../widget";
-import { type LivekitTransport } from "../LivekitTransport";
 initializeWidget();
 vitest.mock("livekit-client/e2ee-worker?worker");
 vitest.mock("../useAudioContext");

src/state/CallViewModel/CallViewModel.test.ts

@@ -31,6 +31,7 @@ import {
   type CallMembership,
   type IRTCNotificationContent,
   MatrixRTCSessionEvent,
+  type LivekitTransport,
 } from "matrix-js-sdk/lib/matrixrtc";
 import { deepCompare } from "matrix-js-sdk/lib/utils";
 
@@ -69,7 +70,6 @@ import { MatrixRTCMode } from "../../config/ConfigOptions.ts";
 import { initializeWidget } from "../../widget.ts";
 import { computeUrlParams } from "../../UrlParams.ts";
 import { callViewModelOptionsFromParams } from "./CallViewModel.ts";
-import { type LivekitTransport } from "../../LivekitTransport.ts";
 
 initializeWidget();
 

src/state/CallViewModel/CallViewModel.ts

@@ -43,6 +43,7 @@ import {
 import { type Logger, logger as rootLogger } from "matrix-js-sdk/lib/logger";
 import {
   MembershipManagerEvent,
+  type LivekitTransport,
   type MatrixRTCSession,
   type RTCCallIntent,
   type RTCNotificationType,
@@ -162,7 +163,6 @@ import {
   type RingingMediaViewModel,
 } from "../media/RingingMediaViewModel.ts";
 import { type GridTileViewModel } from "../TileViewModel.ts";
-import { type LivekitTransport } from "../../LivekitTransport.ts";
 
 //TODO
 // Larger rename

src/state/CallViewModel/localMember/LocalMember.test.ts

@@ -8,6 +8,7 @@ Please see LICENSE in the repository root for full details.
 
 import {
   Status as RTCMemberStatus,
+  type LivekitTransport,
   type MatrixRTCSession,
 } from "matrix-js-sdk/lib/matrixrtc";
 import {
@@ -59,7 +60,6 @@ import { initializeWidget } from "../../../widget";
 import { nullHostBridge } from "../../../HostBridge";
 import { type LocalTransport } from "./LocalTransport";
 import * as openIDSFU from "../../../livekit/openIDSFU";
-import { type LivekitTransport } from "../../../LivekitTransport";
 
 initializeWidget();
 
@@ -138,7 +138,7 @@ describe("enterRTCSession", () => {
       client: mockedClient,
     },
     memberships: [],
-    joinRTCSession: vi.fn(),
+    join: vi.fn(),
   }) as unknown as MatrixRTCSession;
 
   beforeEach(() =>
@@ -150,7 +150,7 @@ describe("enterRTCSession", () => {
   it("It joins the correct Session", () => {
     enterRTCSession(mockedSession, ownMemberMock, transport, options);
 
-    expect(mockedSession.joinRTCSession).toHaveBeenLastCalledWith(
+    expect(mockedSession.join).toHaveBeenLastCalledWith(
       {
         deviceId: "DEVICE",
         memberId: "@alice:example.org:DEVICE",
@@ -161,7 +161,7 @@ describe("enterRTCSession", () => {
     );
   });
 
-  it("passes keyRotationParticipantLimit from config to joinRTCSession", () => {
+  it("passes keyRotationParticipantLimit from config to join", () => {
     mockConfig({
       livekit: { livekit_service_url: "http://my-default-service-url.com" },
       matrix_rtc_session: {
@@ -174,7 +174,7 @@ describe("enterRTCSession", () => {
 
     enterRTCSession(mockedSession, ownMemberMock, transport, options);
 
-    expect(mockedSession.joinRTCSession).toHaveBeenLastCalledWith(
+    expect(mockedSession.join).toHaveBeenLastCalledWith(
       expect.any(Object),
       expect.any(Object),
       expect.objectContaining({
@@ -186,7 +186,7 @@ describe("enterRTCSession", () => {
   it("uses the specified delayed leave timings", () => {
     enterRTCSession(mockedSession, ownMemberMock, transport, options);
 
-    expect(mockedSession.joinRTCSession).toHaveBeenLastCalledWith(
+    expect(mockedSession.join).toHaveBeenLastCalledWith(
       expect.anything(),
       expect.anything(),
       expect.objectContaining({
@@ -206,7 +206,7 @@ describe("LocalMembership", () => {
     }),
     matrixRTCSession: {
       updateCallIntent: vi.fn().mockReturnValue(Promise.resolve()),
-      leaveRoomSession: vi.fn(),
+      leave: vi.fn(),
     } as unknown as MatrixRTCSession,
     muteStates: mockMuteStates(),
     trackProcessorState$: constant({
@@ -300,7 +300,7 @@ describe("LocalMembership", () => {
       ...defaultCreateLocalMemberValues,
       matrixRTCSession: {
         updateCallIntent: vi.fn().mockImplementation(reject),
-        leaveRoomSession: vi.fn(),
+        leave: vi.fn(),
       },
       connectionManager: mockConnectionManager,
       localTransport$: constant(mockTransport),

src/state/CallViewModel/localMember/LocalMember.ts

@@ -18,6 +18,7 @@ import { observeParticipantEvents } from "@livekit/components-core";
 import { type MatrixClient } from "matrix-js-sdk";
 import {
   Status as RTCSessionStatus,
+  type LivekitTransport,
   type MatrixRTCSession,
   type RTCCallIntent,
   type RTCNotificationType,
@@ -80,7 +81,6 @@ import {
 import { type HomeserverConnected } from "./HomeserverConnected.ts";
 import { type LocalTransport } from "./LocalTransport.ts";
 import { getSFUConfigWithOpenID } from "../../../livekit/openIDSFU.ts";
-import { type LivekitTransport } from "../../../LivekitTransport.ts";
 
 export enum TransportState {
   /** Not even a transport is available to the LocalMembership */
@@ -151,10 +151,7 @@ interface Props {
   ownMembershipIdentity: CallMembershipIdentityParts;
   localTransport$: Observable<LocalTransport>;
   client: Pick<MatrixClient, "getDeviceId" | "getOpenIdToken">;
-  matrixRTCSession: Pick<
-    MatrixRTCSession,
-    "updateCallIntent" | "leaveRoomSession"
-  >;
+  matrixRTCSession: Pick<MatrixRTCSession, "updateCallIntent" | "leave">;
   /** Whether to hide the screen-sharing button. */
   hideScreensharing: boolean;
   /** The application hosting Element Call, to be kept informed of join/leave. */
@@ -682,7 +679,7 @@ export const createLocalMembership$ = ({
       return Promise.resolve(async (): Promise<void> => {
         try {
           // TODO Update matrixRTCSession to allow udpating the transport without leaving the session!
-          await matrixRTCSession.leaveRoomSession(1000);
+          await matrixRTCSession.leave(1000);
         } catch (e) {
           logger.error("Error leaving RTC session", e);
         }
@@ -998,7 +995,7 @@ export function enterRTCSession(
   // Multi-sfu does not need a preferred foci list. just the focus that is actually used.
   // TODO where/how do we track errors originating from the ongoing rtcSession?
 
-  rtcSession.joinRTCSession(ownMembershipIdentity, [transport], {
+  rtcSession.join(ownMembershipIdentity, [transport], {
     notificationType,
     callIntent,
     manageMediaKeys: encryptMedia,

src/state/CallViewModel/localMember/LocalTransport.ts

@@ -5,6 +5,7 @@ SPDX-License-IdFentifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
+import { type LivekitTransport } from "matrix-js-sdk/lib/matrixrtc";
 import { type MatrixClient } from "matrix-js-sdk";
 import { logger as rootLogger, type Logger } from "matrix-js-sdk/lib/logger";
 import { type CallMembershipIdentityParts } from "matrix-js-sdk/lib/matrixrtc/EncryptionManager";
@@ -23,7 +24,6 @@ import {
 import { customLivekitUrl } from "../../../settings/settings.ts";
 import { RtcTransportAutoDiscovery } from "./RtcTransportAutoDiscovery.ts";
 import { type MatrixRTCMode } from "../../../config/ConfigOptions.ts";
-import { type LivekitTransport } from "../../../LivekitTransport.ts";
 
 interface Props {
   ownMembershipIdentity: CallMembershipIdentityParts;

src/state/CallViewModel/localMember/RtcTransportAutoDiscovery.test.ts

@@ -15,14 +15,16 @@ import {
 } from "vitest";
 import { MatrixError } from "matrix-js-sdk";
 import { logger as rootLogger } from "matrix-js-sdk/lib/logger";
-import { type Transport } from "matrix-js-sdk/lib/matrixrtc";
+import {
+  type LivekitTransport,
+  type Transport,
+} from "matrix-js-sdk/lib/matrixrtc";
 
 import type { ResolvedConfigOptions } from "../../../config/ConfigOptions.ts";
 import {
   RtcTransportAutoDiscovery,
   type RtcTransportAutoDiscoveryProps,
 } from "./RtcTransportAutoDiscovery.ts";
-import { type LivekitTransport } from "../../../LivekitTransport.ts";
 
 type DiscoveryClient = RtcTransportAutoDiscoveryProps["client"];
 

src/state/CallViewModel/localMember/RtcTransportAutoDiscovery.ts

@@ -4,15 +4,15 @@ Copyright 2026 Element Creations Ltd.
 SPDX-License-IdFentifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
+import {
+  isLivekitTransport,
+  type LivekitTransport,
+} from "matrix-js-sdk/lib/matrixrtc";
 import { type MatrixClient } from "matrix-js-sdk";
 import { type Logger } from "matrix-js-sdk/lib/logger";
 
 import type { ResolvedConfigOptions } from "../../../config/ConfigOptions.ts";
 import { doNetworkOperationWithRetry } from "../../../utils/matrix.ts";
-import {
-  isLivekitTransport,
-  type LivekitTransport,
-} from "../../../LivekitTransport.ts";
 
 type TransportDiscoveryClient = Pick<
   MatrixClient,

src/state/CallViewModel/remoteMembers/Connection.test.ts

@@ -30,6 +30,7 @@ import fetchMock from "fetch-mock";
 import EventEmitter from "events";
 import { type IOpenIDToken } from "matrix-js-sdk";
 import { logger, type Logger } from "matrix-js-sdk/lib/logger";
+import { type LivekitTransport } from "matrix-js-sdk/lib/matrixrtc";
 
 import {
   Connection,
@@ -44,7 +45,6 @@ import {
 } from "../../../utils/errors.ts";
 import { testJWTToken } from "../../../utils/test-fixtures.ts";
 import { mockRemoteParticipant, ownMemberMock } from "../../../utils/test.ts";
-import { type LivekitTransport } from "../../../LivekitTransport.ts";
 
 let testScope: ObservableScope;
 

src/state/CallViewModel/remoteMembers/Connection.ts

@@ -22,6 +22,7 @@ import {
   type Track,
   type TrackPublication,
 } from "livekit-client";
+import { type LivekitTransport } from "matrix-js-sdk/lib/matrixrtc";
 import { BehaviorSubject, map } from "rxjs";
 import { type Logger } from "matrix-js-sdk/lib/logger";
 import { type CallMembershipIdentityParts } from "matrix-js-sdk/lib/matrixrtc/EncryptionManager";
@@ -41,7 +42,6 @@ import {
   SFURoomCreationRestrictedError,
   UnknownCallError,
 } from "../../../utils/errors.ts";
-import { type LivekitTransport } from "../../../LivekitTransport.ts";
 
 export interface ConnectionOpts {
   /**

src/state/CallViewModel/remoteMembers/ConnectionFactory.ts

@@ -16,6 +16,7 @@ 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 LivekitTransport } from "matrix-js-sdk/lib/matrixrtc";
 
 import { type ObservableScope } from "../../ObservableScope.ts";
 import { Connection } from "./Connection.ts";
@@ -38,7 +39,6 @@ import {
   noiseSuppressionSetting,
   autoGainControlSetting,
 } from "../../../settings/settings.ts";
-import { type LivekitTransport } from "../../../LivekitTransport.ts";
 
 // TODO evaluate if this should be done like the Publisher Factory
 export interface ConnectionFactory {

src/state/CallViewModel/remoteMembers/ConnectionManager.test.ts

@@ -7,6 +7,7 @@ Please see LICENSE in the repository root for full details.
 
 import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
 import { BehaviorSubject, NEVER } from "rxjs";
+import { type LivekitTransport } from "matrix-js-sdk/lib/matrixrtc";
 import { type RemoteParticipant } from "livekit-client";
 import { logger } from "matrix-js-sdk/lib/logger";
 
@@ -20,7 +21,6 @@ import { type Connection } from "./Connection.ts";
 import { ownMemberMock, withTestScheduler } from "../../../utils/test.ts";
 import { areLivekitTransportsEqual } from "./MatrixLivekitMembers.ts";
 import { type Behavior } from "../../Behavior.ts";
-import { type LivekitTransport } from "../../../LivekitTransport.ts";
 
 // Some test constants
 

src/state/CallViewModel/remoteMembers/ConnectionManager.ts

@@ -6,6 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
+import { type LivekitTransport } from "matrix-js-sdk/lib/matrixrtc";
 import {
   combineLatest,
   map,
@@ -31,7 +32,6 @@ import {
   type LocalTransport,
 } from "../localMember/LocalTransport.ts";
 import { type SFUConfig } from "../../../livekit/openIDSFU.ts";
-import { type LivekitTransport } from "../../../LivekitTransport.ts";
 
 export class ConnectionManagerData {
   private readonly store: Map<

src/state/CallViewModel/remoteMembers/MatrixLivekitMembers.test.ts

@@ -7,7 +7,10 @@ Please see LICENSE in the repository root for full details.
 
 import { describe, test, expect, beforeEach, afterEach, vi } from "vitest";
 import { logger } from "matrix-js-sdk/lib/logger";
-import { type CallMembership } from "matrix-js-sdk/lib/matrixrtc";
+import {
+  type CallMembership,
+  type LivekitTransport,
+} from "matrix-js-sdk/lib/matrixrtc";
 import { BehaviorSubject, combineLatest, map, type Observable } from "rxjs";
 
 import { type IConnectionManager } from "./ConnectionManager.ts";
@@ -30,7 +33,6 @@ import {
 import { type Connection } from "./Connection.ts";
 import { constant } from "../../Behavior.ts";
 import { localRtcMember } from "../../../utils/test-fixtures.ts";
-import { type LivekitTransport } from "../../../LivekitTransport.ts";
 
 let testScope: ObservableScope;
 

src/state/CallViewModel/remoteMembers/MatrixLivekitMembers.ts

@@ -6,7 +6,10 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { type LocalParticipant, type RemoteParticipant } from "livekit-client";
-import { type CallMembership } from "matrix-js-sdk/lib/matrixrtc";
+import {
+  type CallMembership,
+  type LivekitTransport,
+} from "matrix-js-sdk/lib/matrixrtc";
 import { combineLatest, filter, map } from "rxjs";
 import { logger } from "matrix-js-sdk/lib/logger";
 
@@ -15,7 +18,6 @@ import { type IConnectionManager } from "./ConnectionManager";
 import { Epoch, type ObservableScope } from "../../ObservableScope";
 import { type Connection } from "./Connection";
 import { generateItemsWithEpoch } from "../../../utils/observable";
-import { type LivekitTransport } from "../../../LivekitTransport";
 
 interface LocalTaggedParticipant {
   type: "local";

src/state/CallViewModel/remoteMembers/integration.test.ts

@@ -10,6 +10,7 @@ import { BehaviorSubject, NEVER } from "rxjs";
 import { type Room as LivekitRoom } from "livekit-client";
 import EventEmitter from "events";
 import fetchMock from "fetch-mock";
+import { type LivekitTransport } from "matrix-js-sdk/lib/matrixrtc";
 import { logger } from "matrix-js-sdk/lib/logger";
 
 import {
@@ -34,7 +35,6 @@ import {
 import { createConnectionManager$ } from "./ConnectionManager.ts";
 import { membershipsAndTransports$ } from "../../SessionBehaviors.ts";
 import { localRtcMember, testJWTToken } from "../../../utils/test-fixtures.ts";
-import { type LivekitTransport } from "../../../LivekitTransport.ts";
 
 // Test the integration of ConnectionManager and MatrixLivekitMerger
 

src/state/SessionBehaviors.ts

@@ -7,8 +7,10 @@ Please see LICENSE in the repository root for full details.
 
 import {
   type CallMembership,
+  type LivekitTransport,
   type MatrixRTCSession,
   MatrixRTCSessionEvent,
+  isLivekitTransport,
 } from "matrix-js-sdk/lib/matrixrtc";
 import { fromEvent } from "rxjs";
 
@@ -19,7 +21,6 @@ import {
   type ObservableScope,
 } from "./ObservableScope";
 import { type Behavior } from "./Behavior";
-import { isLivekitTransport, type LivekitTransport } from "../LivekitTransport";
 
 /**
  * Tracks the transports used by ourselves, plus all other MatrixRTC session

src/utils/test.ts

@@ -25,6 +25,8 @@ import {
 } from "matrix-js-sdk";
 import {
   CallMembership,
+  type LivekitFocusSelection,
+  type LivekitTransport,
   type MatrixRTCSession,
   MatrixRTCSessionEvent,
   type MatrixRTCSessionEventHandlerMap,
@@ -77,7 +79,6 @@ import {
 } from "../state/media/RemoteScreenShareViewModel";
 import { Connection } from "../state/CallViewModel/remoteMembers/Connection";
 import { type SFUConfig } from "../livekit/openIDSFU";
-import { type LivekitTransport } from "../LivekitTransport";
 
 export function withFakeTimers(continuation: () => void): void {
   vi.useFakeTimers();
@@ -227,6 +228,7 @@ export function mockRtcMembership(
     rtcBackendIdentity?: string;
     callId?: string;
     fociPreferred?: Transport[];
+    focusActive?: LivekitFocusSelection;
     membership?: Partial<SessionMembershipData>;
   },
 ): CallMembership {
@@ -470,7 +472,7 @@ export class MockRTCSession extends TypedEventEmitter<
     counters: {},
   };
 
-  public leaveRoomSession: ReturnType<typeof vitest.fn> = vitest
+  public leave: ReturnType<typeof vitest.fn> = vitest
     .fn()
     .mockResolvedValue(undefined);
 
@@ -529,7 +531,7 @@ export class MockRTCSession extends TypedEventEmitter<
     if (value !== prev) this.emit(MembershipManagerEvent.ProbablyLeft, value);
   }
 
-  public async joinRTCSession(): Promise<void> {
+  public async join(): Promise<void> {
     return Promise.resolve();
   }
 }