Make use of the new jwt service endpoint (with delayed event delegation)

This also does all the compatibility work. When to use which endpoint to
authenticate agains a jwt service.

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

@@ -27,7 +27,6 @@ import EventEmitter from "events";
 import { type IOpenIDToken } from "matrix-js-sdk";
 import { logger } from "matrix-js-sdk/lib/logger";
 
-import type { LivekitTransport } from "matrix-js-sdk/lib/matrixrtc";
 import {
   Connection,
   ConnectionState,
@@ -39,7 +38,8 @@ import {
   ElementCallError,
   FailToGetOpenIdToken,
 } from "../../../utils/errors.ts";
-import { mockRemoteParticipant } from "../../../utils/test.ts";
+import { mockRemoteParticipant, ownMemberMock } from "../../../utils/test.ts";
+import { type LivekitTransportWithVersion } from "./ConnectionManager.ts";
 
 let testScope: ObservableScope;
 
@@ -50,10 +50,11 @@ let fakeLivekitRoom: MockedObject<LivekitRoom>;
 let localParticipantEventEmiter: EventEmitter;
 let fakeLocalParticipant: MockedObject<LocalParticipant>;
 
-const livekitFocus: LivekitTransport = {
+const livekitFocus: LivekitTransportWithVersion = {
   livekit_alias: "!roomID:example.org",
   livekit_service_url: "https://matrix-rtc.example.org/livekit/jwt",
   type: "livekit",
+  useMatrix2: false,
 };
 
 function setupTest(): void {
@@ -137,7 +138,7 @@ function setupRemoteConnection(): Connection {
     return Promise.resolve();
   });
 
-  return new Connection(opts, logger);
+  return new Connection(opts, logger, ownMemberMock);
 }
 
 afterEach(() => {
@@ -156,7 +157,7 @@ describe("Start connection states", () => {
       scope: testScope,
       livekitRoomFactory: () => fakeLivekitRoom,
     };
-    const connection = new Connection(opts, logger);
+    const connection = new Connection(opts, logger, ownMemberMock);
 
     expect(connection.state$.getValue()).toEqual("Initialized");
   });
@@ -172,7 +173,7 @@ describe("Start connection states", () => {
       livekitRoomFactory: () => fakeLivekitRoom,
     };
 
-    const connection = new Connection(opts, logger);
+    const connection = new Connection(opts, logger, ownMemberMock);
 
     const capturedStates: (ConnectionState | Error)[] = [];
     const s = connection.state$.subscribe((value) => {
@@ -222,7 +223,7 @@ describe("Start connection states", () => {
       livekitRoomFactory: () => fakeLivekitRoom,
     };
 
-    const connection = new Connection(opts, logger);
+    const connection = new Connection(opts, logger, ownMemberMock);
 
     const capturedStates: (ConnectionState | Error)[] = [];
     const s = connection.state$.subscribe((value) => {
@@ -279,7 +280,7 @@ describe("Start connection states", () => {
       livekitRoomFactory: () => fakeLivekitRoom,
     };
 
-    const connection = new Connection(opts, logger);
+    const connection = new Connection(opts, logger, ownMemberMock);
 
     const capturedStates: (ConnectionState | Error)[] = [];
     const s = connection.state$.subscribe((value) => {

src/state/CallViewModel/remoteMembers/Connection.ts

@@ -18,6 +18,7 @@ import {
 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";
 
 import {
   getSFUConfigWithOpenID,
@@ -35,7 +36,7 @@ import {
 
 export interface ConnectionOpts {
   /** The media transport to connect to. */
-  transport: LivekitTransport;
+  transport: LivekitTransport & { useMatrix2: boolean };
   /** The Matrix client to use for OpenID and SFU config requests. */
   client: OpenIDClientParts;
   /** The observable scope to use for this connection. */
@@ -88,7 +89,7 @@ export class Connection {
   /**
    * The media transport to connect to.
    */
-  public readonly transport: LivekitTransport;
+  public readonly transport: LivekitTransport & { useMatrix2: boolean };
 
   public readonly livekitRoom: LivekitRoom;
 
@@ -189,9 +190,18 @@ export class Connection {
   protected async getSFUConfigWithOpenID(): Promise<SFUConfig> {
     return await getSFUConfigWithOpenID(
       this.client,
+      this.ownMembershipIdentity,
       this.transport.livekit_service_url,
       this.transport.livekit_alias,
+      this.transport.useMatrix2,
     );
+    // client: OpenIDClientParts,
+    // membership: CallMembershipIdentityParts,
+    // serviceUrl: string,
+    // livekitRoomAlias: string,
+    // matrix2jwt: boolean,
+    // delayEndpointBaseUrl?: string,
+    // delayId?: string,
   }
 
   /**
@@ -220,7 +230,11 @@ export class Connection {
    *
    * @param logger
    */
-  public constructor(opts: ConnectionOpts, logger: Logger) {
+  public constructor(
+    opts: ConnectionOpts,
+    logger: Logger,
+    private ownMembershipIdentity: CallMembershipIdentityParts,
+  ) {
     this.logger = logger.getChild("[Connection]");
     this.logger.info(
       `[Connection] Creating new connection to ${opts.transport.livekit_service_url} ${opts.transport.livekit_alias}`,

src/state/CallViewModel/remoteMembers/ConnectionFactory.ts

@@ -5,7 +5,6 @@ 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 {
   Room as LivekitRoom,
   type RoomOptions,
@@ -15,6 +14,7 @@ import {
 } from "livekit-client";
 import { type Logger } from "matrix-js-sdk/lib/logger";
 import E2EEWorker from "livekit-client/e2ee-worker?worker";
+import { type CallMembershipIdentityParts } from "matrix-js-sdk/lib/matrixrtc/EncryptionManager";
 
 import { type ObservableScope } from "../../ObservableScope.ts";
 import { Connection } from "./Connection.ts";
@@ -23,13 +23,15 @@ import type { MediaDevices } from "../../MediaDevices.ts";
 import type { Behavior } from "../../Behavior.ts";
 import type { ProcessorState } from "../../../livekit/TrackProcessorContext.tsx";
 import { defaultLiveKitOptions } from "../../../livekit/options.ts";
+import { type LivekitTransportWithVersion } from "./ConnectionManager.ts";
 
 // TODO evaluate if this should be done like the Publisher Factory
 export interface ConnectionFactory {
   createConnection(
-    transport: LivekitTransport,
+    transport: LivekitTransportWithVersion,
     scope: ObservableScope,
     logger: Logger,
+    ownMembershipIdentity: CallMembershipIdentityParts,
   ): Connection;
 }
 
@@ -77,10 +79,19 @@ export class ECConnectionFactory implements ConnectionFactory {
     this.livekitRoomFactory = livekitRoomFactory ?? defaultFactory;
   }
 
+  /**
+   *
+   * @param transport
+   * @param scope
+   * @param logger
+   * @param ownMembershipIdentity required to connect (using the jwt service) with the SFU.
+   * @returns
+   */
   public createConnection(
-    transport: LivekitTransport,
+    transport: LivekitTransportWithVersion,
     scope: ObservableScope,
     logger: Logger,
+    ownMembershipIdentity: CallMembershipIdentityParts,
   ): Connection {
     return new Connection(
       {
@@ -90,6 +101,7 @@ export class ECConnectionFactory implements ConnectionFactory {
         livekitRoomFactory: this.livekitRoomFactory,
       },
       logger,
+      ownMembershipIdentity,
     );
   }
 }

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

@@ -14,26 +14,29 @@ import { logger } from "matrix-js-sdk/lib/logger";
 import { Epoch, mapEpoch, ObservableScope } from "../../ObservableScope.ts";
 import {
   createConnectionManager$,
+  type LivekitTransportWithVersion,
   type ConnectionManagerData,
 } from "./ConnectionManager.ts";
 import { type ConnectionFactory } from "./ConnectionFactory.ts";
 import { type Connection } from "./Connection.ts";
-import { withTestScheduler } from "../../../utils/test.ts";
+import { ownMemberMock, withTestScheduler } from "../../../utils/test.ts";
 import { areLivekitTransportsEqual } from "./MatrixLivekitMembers.ts";
 import { type Behavior } from "../../Behavior.ts";
 
 // Some test constants
 
-const TRANSPORT_1: LivekitTransport = {
+const TRANSPORT_1: LivekitTransportWithVersion = {
   type: "livekit",
   livekit_service_url: "https://lk.example.org",
   livekit_alias: "!alias:example.org",
+  useMatrix2: false,
 };
 
-const TRANSPORT_2: LivekitTransport = {
+const TRANSPORT_2: LivekitTransportWithVersion = {
   type: "livekit",
   livekit_service_url: "https://lk.sample.com",
   livekit_alias: "!alias:sample.com",
+  useMatrix2: false,
 };
 
 let fakeConnectionFactory: ConnectionFactory;
@@ -80,6 +83,7 @@ describe("connections$ stream", () => {
           a: new Epoch([TRANSPORT_1, TRANSPORT_2], 0),
         }),
         logger: logger,
+        ownMembershipIdentity: ownMemberMock,
       });
 
       expectObservable(
@@ -124,6 +128,7 @@ describe("connections$ stream", () => {
           f: new Epoch([TRANSPORT_1, TRANSPORT_2], 5),
         }),
         logger: logger,
+        ownMembershipIdentity: ownMemberMock,
       });
 
       expectObservable(
@@ -166,6 +171,7 @@ describe("connections$ stream", () => {
           c: new Epoch([TRANSPORT_1], 2),
         }),
         logger: logger,
+        ownMembershipIdentity: ownMemberMock,
       });
 
       expectObservable(
@@ -279,6 +285,7 @@ describe("connectionManagerData$ stream", () => {
           a: new Epoch([TRANSPORT_1, TRANSPORT_2], 0),
         }),
         logger,
+        ownMembershipIdentity: ownMemberMock,
       });
 
       expectObservable(connectionManagerData$).toBe("abcd", {

src/state/CallViewModel/remoteMembers/ConnectionManager.ts

@@ -10,6 +10,7 @@ import { type LivekitTransport } from "matrix-js-sdk/lib/matrixrtc";
 import { combineLatest, map, of, switchMap, tap } from "rxjs";
 import { type Logger } from "matrix-js-sdk/lib/logger";
 import { type RemoteParticipant } from "livekit-client";
+import { type CallMembershipIdentityParts } from "matrix-js-sdk/lib/matrixrtc/EncryptionManager";
 
 import { type Behavior } from "../../Behavior.ts";
 import { type Connection } from "./Connection.ts";
@@ -18,6 +19,10 @@ import { generateItemsWithEpoch } from "../../../utils/observable.ts";
 import { areLivekitTransportsEqual } from "./MatrixLivekitMembers.ts";
 import { type ConnectionFactory } from "./ConnectionFactory.ts";
 
+export type LivekitTransportWithVersion = LivekitTransport & {
+  useMatrix2: boolean;
+};
+
 export class ConnectionManagerData {
   private readonly store: Map<string, [Connection, RemoteParticipant[]]> =
     new Map();
@@ -59,8 +64,9 @@ export class ConnectionManagerData {
 interface Props {
   scope: ObservableScope;
   connectionFactory: ConnectionFactory;
-  inputTransports$: Behavior<Epoch<LivekitTransport[]>>;
+  inputTransports$: Behavior<Epoch<LivekitTransportWithVersion[]>>;
   logger: Logger;
+  ownMembershipIdentity: CallMembershipIdentityParts;
 }
 
 // TODO - write test for scopes (do we really need to bind scope)
@@ -87,6 +93,7 @@ export function createConnectionManager$({
   connectionFactory,
   inputTransports$,
   logger: parentLogger,
+  ownMembershipIdentity,
 }: Props): IConnectionManager {
   const logger = parentLogger.getChild("[ConnectionManager]");
   // TODO logger: only construct one logger from the client and make it compatible via a EC specific sing
@@ -119,20 +126,26 @@ export function createConnectionManager$({
         function* (transports) {
           for (const transport of transports)
             yield {
-              keys: [transport.livekit_service_url, transport.livekit_alias],
+              keys: [
+                transport.livekit_service_url,
+                transport.livekit_alias,
+                transport.useMatrix2,
+              ],
               data: undefined,
             };
         },
-        (scope, _data$, serviceUrl, alias) => {
+        (scope, _data$, serviceUrl, alias, useMatrix2) => {
           logger.debug(`Creating connection to ${serviceUrl} (${alias})`);
           const connection = connectionFactory.createConnection(
             {
               type: "livekit",
               livekit_service_url: serviceUrl,
               livekit_alias: alias,
+              useMatrix2,
             },
             scope,
             logger,
+            ownMembershipIdentity,
           );
           // Start the connection immediately
           // Use connection state to track connection progress
@@ -187,12 +200,12 @@ export function createConnectionManager$({
   return { connectionManagerData$ };
 }
 
-function removeDuplicateTransports(
-  transports: LivekitTransport[],
-): LivekitTransport[] {
+function removeDuplicateTransports<T extends LivekitTransport>(
+  transports: T[],
+): T[] {
   return transports.reduce((acc, transport) => {
     if (!acc.some((t) => areLivekitTransportsEqual(t, transport)))
       acc.push(transport);
     return acc;
-  }, [] as LivekitTransport[]);
+  }, [] as T[]);
 }

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

@@ -15,7 +15,11 @@ import EventEmitter from "events";
 import { ObservableScope } from "../../ObservableScope.ts";
 import { ECConnectionFactory } from "./ConnectionFactory.ts";
 import type { OpenIDClientParts } from "../../../livekit/openIDSFU.ts";
-import { exampleTransport, mockMediaDevices } from "../../../utils/test.ts";
+import {
+  exampleTransport,
+  mockMediaDevices,
+  ownMemberMock,
+} from "../../../utils/test.ts";
 import type { ProcessorState } from "../../../livekit/TrackProcessorContext.tsx";
 import { constant } from "../../Behavior";
 
@@ -72,7 +76,12 @@ describe("ECConnectionFactory - Audio inputs options", () => {
         echo,
         noise,
       );
-      ecConnectionFactory.createConnection(exampleTransport, testScope, logger);
+      ecConnectionFactory.createConnection(
+        exampleTransport,
+        testScope,
+        logger,
+        ownMemberMock,
+      );
 
       // Check if Room was constructed with expected options
       expect(RoomConstructor).toHaveBeenCalledWith(
@@ -113,7 +122,12 @@ describe("ECConnectionFactory - ControlledAudioDevice", () => {
         false,
         false,
       );
-      ecConnectionFactory.createConnection(exampleTransport, testScope, logger);
+      ecConnectionFactory.createConnection(
+        exampleTransport,
+        testScope,
+        logger,
+        ownMemberMock,
+      );
 
       // Check if Room was constructed with expected options
       expect(RoomConstructor).toHaveBeenCalledWith(

src/state/CallViewModel/remoteMembers/MatrixLivekitMembers.ts

@@ -176,9 +176,9 @@ export function createMatrixLivekitMembers$({
 // TODO add back in the callviewmodel pauseWhen(this.pretendToBeDisconnected$)
 
 // TODO add this to the JS-SDK
-export function areLivekitTransportsEqual(
-  t1: LivekitTransport | null,
-  t2: LivekitTransport | null,
+export function areLivekitTransportsEqual<T extends LivekitTransport>(
+  t1: T | null,
+  t2: T | null,
 ): boolean {
   if (t1 && t2) return t1.livekit_service_url === t2.livekit_service_url;
   // In case we have different lk rooms in the same SFU (depends on the livekit authorization service)

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

@@ -24,6 +24,7 @@ import {
   mockCallMembership,
   mockComputeLivekitParticipantIdentity$,
   mockMediaDevices,
+  ownMemberMock,
   withTestScheduler,
 } from "../../../utils/test.ts";
 import { type ProcessorState } from "../../../livekit/TrackProcessorContext.tsx";
@@ -128,6 +129,7 @@ test("bob, carl, then bob joining no tracks yet", () => {
       connectionFactory: ecConnectionFactory,
       inputTransports$: membershipsAndTransports.transports$,
       logger: logger,
+      ownMembershipIdentity: ownMemberMock,
     });
 
     const matrixLivekitItems$ = createMatrixLivekitMembers$({