tests first batch

src/state/CallViewModel/CallViewModel.test.ts

@@ -311,11 +311,14 @@ export function withCallViewModel(
       public getDeviceId(): string {
         return localRtcMember.deviceId;
       }
+      public getDomain(): string {
+        return "example.com";
+      }
       public getSyncState(): SyncState {
         return syncState;
       }
     })() as Partial<MatrixClient> as MatrixClient,
-    getMember: (userId) => roomMembers.get(userId) ?? null,
+    getMembers: () => Array.from(roomMembers.values()),
   });
   const rtcSession = new MockRTCSession(room, []).withMemberships(rtcMembers$);
   const participantsSpy = vi

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

@@ -367,21 +367,18 @@ describe("Start connection states", () => {
   });
 });
 
-function fakeRemoteLivekitParticipant(id: string): RemoteParticipant {
+function fakeRemoteLivekitParticipant(
+  id: string,
+  publications: number = 1,
+): RemoteParticipant {
   return {
     identity: id,
+    getTrackPublications: () => Array(publications),
   } as unknown as RemoteParticipant;
 }
 
-function fakeRtcMemberShip(userId: string, deviceId: string): CallMembership {
-  return {
-    userId,
-    deviceId,
-  } as unknown as CallMembership;
-}
-
 describe("Publishing participants observations", () => {
-  it("should emit the list of publishing participants", async () => {
+  it("should emit the list of publishing participants", () => {
     setupTest();
 
     const connection = setupRemoteConnection();
@@ -406,107 +403,36 @@ describe("Publishing participants observations", () => {
     // on this connection.
 
     let participants: RemoteParticipant[] = [
-      fakeRemoteLivekitParticipant("@alice:example.org:DEV000"),
-      fakeRemoteLivekitParticipant("@bob:example.org:DEV111"),
-      fakeRemoteLivekitParticipant("@carol:example.org:DEV222"),
-      fakeRemoteLivekitParticipant("@dan:example.org:DEV333"),
+      fakeRemoteLivekitParticipant("@alice:example.org:DEV000", 0),
+      fakeRemoteLivekitParticipant("@bob:example.org:DEV111", 0),
+      fakeRemoteLivekitParticipant("@carol:example.org:DEV222", 0),
+      fakeRemoteLivekitParticipant("@dan:example.org:DEV333", 0),
     ];
 
     // Let's simulate 3 members on the livekitRoom
-    vi.spyOn(fakeLivekitRoom, "remoteParticipants", "get").mockReturnValue(
-      new Map(participants.map((p) => [p.identity, p])),
+    vi.spyOn(fakeLivekitRoom, "remoteParticipants", "get").mockImplementation(
+      () => new Map(participants.map((p) => [p.identity, p])),
     );
 
-    for (const participant of participants) {
-      fakeRoomEventEmiter.emit(RoomEvent.ParticipantConnected, participant);
-    }
+    participants.forEach((p) =>
+      fakeRoomEventEmiter.emit(RoomEvent.ParticipantConnected, p),
+    );
 
     // At this point there should be no publishers
     expect(observedPublishers.pop()!.length).toEqual(0);
 
-    const otherFocus: LivekitTransport = {
-      livekit_alias: "!roomID:example.org",
-      livekit_service_url: "https://other-matrix-rtc.example.org/livekit/jwt",
-      type: "livekit",
-    };
-
-    const rtcMemberships = [
-      // Say bob is on the same focus
-      {
-        membership: fakeRtcMemberShip("@bob:example.org", "DEV111"),
-        transport: livekitFocus,
-      },
-      // Alice and carol is on a different focus
-      {
-        membership: fakeRtcMemberShip("@alice:example.org", "DEV000"),
-        transport: otherFocus,
-      },
-      {
-        membership: fakeRtcMemberShip("@carol:example.org", "DEV222"),
-        transport: otherFocus,
-      },
-      // NO DAVE YET
+    participants = [
+      fakeRemoteLivekitParticipant("@alice:example.org:DEV000", 1),
+      fakeRemoteLivekitParticipant("@bob:example.org:DEV111", 1),
+      fakeRemoteLivekitParticipant("@carol:example.org:DEV222", 1),
+      fakeRemoteLivekitParticipant("@dan:example.org:DEV333", 2),
     ];
-    // signal this change in rtc memberships
-    fakeMembershipsFocusMap$.next(rtcMemberships);
-
-    // We should have bob has a publisher now
-    await bobIsAPublisher.promise;
-    const publishers = observedPublishers.pop();
-    expect(publishers?.length).toEqual(1);
-    expect(publishers?.[0].identity).toEqual("@bob:example.org:DEV111");
-
-    // Now let's make dan join the rtc memberships
-    rtcMemberships.push({
-      membership: fakeRtcMemberShip("@dan:example.org", "DEV333"),
-      transport: livekitFocus,
-    });
-    fakeMembershipsFocusMap$.next(rtcMemberships);
-
-    // We should have bob and dan has publishers now
-    await danIsAPublisher.promise;
-    const twoPublishers = observedPublishers.pop();
-    expect(twoPublishers?.length).toEqual(2);
-    expect(
-      twoPublishers?.some((p) => p.identity === "@bob:example.org:DEV111"),
-    ).toBeTruthy();
-    expect(
-      twoPublishers?.some((p) => p.identity === "@dan:example.org:DEV333"),
-    ).toBeTruthy();
-
-    // Now let's make bob leave the livekit room
-    participants = participants.filter(
-      (p) => p.identity !== "@bob:example.org:DEV111",
-    );
-    vi.spyOn(fakeLivekitRoom, "remoteParticipants", "get").mockReturnValue(
-      new Map(participants.map((p) => [p.identity, p])),
-    );
-    fakeRoomEventEmiter.emit(
-      RoomEvent.ParticipantDisconnected,
-      fakeRemoteLivekitParticipant("@bob:example.org:DEV111"),
+    participants.forEach((p) =>
+      fakeRoomEventEmiter.emit(RoomEvent.ParticipantConnected, p),
     );
 
-    // TODO: evaluate this test. It looks like this is not the task of the Connection anymore. Valere?
-    // const updatedPublishers = observedPublishers.pop();
-    // // Bob is not connected to the room but he is still in the rtc memberships declaring that
-    // // he is using that focus to publish, so he should still appear as a publisher
-    // expect(updatedPublishers?.length).toEqual(2);
-    // const pp = updatedPublishers?.find((p) =>
-    //   p.identity.startsWith("@bob:example.org"),
-    // );
-    // expect(pp).toBeDefined();
-    // expect(pp!).not.toBeDefined();
-    // expect(
-    //   updatedPublishers?.some(
-    //     (p) => p.participant?.identity === "@dan:example.org:DEV333",
-    //   ),
-    // ).toBeTruthy();
-    // // Now if bob is not in the rtc memberships, he should disappear
-    // const noBob = rtcMemberships.filter(
-    //   ({ membership }) => membership.userId !== "@bob:example.org",
-    // );
-    // fakeMembershipsFocusMap$.next(noBob);
-    // expect(observedPublishers.pop()?.length).toEqual(1);
+    // At this point there should be no publishers
+    expect(observedPublishers.pop()!.length).toEqual(4);
   });
 
   it("should be scoped to parent scope", (): void => {
@@ -523,12 +449,12 @@ describe("Publishing participants observations", () => {
     onTestFinished(() => s.unsubscribe());
 
     let participants: RemoteParticipant[] = [
-      fakeRemoteLivekitParticipant("@bob:example.org:DEV111"),
+      fakeRemoteLivekitParticipant("@bob:example.org:DEV111", 0),
     ];
 
     // Let's simulate 3 members on the livekitRoom
-    vi.spyOn(fakeLivekitRoom, "remoteParticipants", "get").mockReturnValue(
-      new Map(participants.map((p) => [p.identity, p])),
+    vi.spyOn(fakeLivekitRoom, "remoteParticipants", "get").mockImplementation(
+      () => new Map(participants.map((p) => [p.identity, p])),
     );
 
     for (const participant of participants) {
@@ -538,15 +464,11 @@ describe("Publishing participants observations", () => {
     // At this point there should be no publishers
     expect(observedPublishers.pop()!.length).toEqual(0);
 
-    const rtcMemberships = [
-      // Say bob is on the same focus
-      {
-        membership: fakeRtcMemberShip("@bob:example.org", "DEV111"),
-        transport: livekitFocus,
-      },
-    ];
-    // signal this change in rtc memberships
-    fakeMembershipsFocusMap$.next(rtcMemberships);
+    participants = [fakeRemoteLivekitParticipant("@bob:example.org:DEV111", 1)];
+
+    for (const participant of participants) {
+      fakeRoomEventEmiter.emit(RoomEvent.ParticipantConnected, participant);
+    }
 
     // We should have bob has a publisher now
     const publishers = observedPublishers.pop();
@@ -561,9 +483,7 @@ describe("Publishing participants observations", () => {
     participants = participants.filter(
       (p) => p.identity !== "@bob:example.org:DEV111",
     );
-    vi.spyOn(fakeLivekitRoom, "remoteParticipants", "get").mockReturnValue(
-      new Map(participants.map((p) => [p.identity, p])),
-    );
+
     fakeRoomEventEmiter.emit(
       RoomEvent.ParticipantDisconnected,
       fakeRemoteLivekitParticipant("@bob:example.org:DEV111"),

src/state/CallViewModel/remoteMembers/Connection.ts

@@ -223,9 +223,10 @@ export class Connection {
         ],
       }).pipe(
         map((participants) => {
-          return participants.filter(
+          const partsFiltered = participants.filter(
             (participant) => participant.getTrackPublications().length > 0,
           );
+          return partsFiltered;
         }),
       ),
       [],

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

@@ -51,7 +51,7 @@ beforeEach(() => {
       (transport: LivekitTransport, scope: ObservableScope) => {
         const mockConnection = {
           transport,
-          participantsWithTrack$: new BehaviorSubject([]),
+          remoteParticipantsWithTracks$: new BehaviorSubject([]),
         } as unknown as Connection;
         vi.mocked(mockConnection).start = vi.fn();
         vi.mocked(mockConnection).stop = vi.fn();
@@ -190,7 +190,7 @@ describe("connections$ stream", () => {
 });
 
 describe("connectionManagerData$ stream", () => {
-  // Used in test to control fake connections' participantsWithTrack$ streams
+  // Used in test to control fake connections' remoteParticipantsWithTracks$ streams
   let fakePublishingParticipantsStreams: Map<
     string,
     Behavior<LivekitParticipant[]>
@@ -222,7 +222,8 @@ describe("connectionManagerData$ stream", () => {
           >([]);
           const mockConnection = {
             transport,
-            participantsWithTrack$: getPublishingParticipantsFor(transport),
+            remoteParticipantsWithTracks$:
+              getPublishingParticipantsFor(transport),
           } as unknown as Connection;
           vi.mocked(mockConnection).start = vi.fn();
           vi.mocked(mockConnection).stop = vi.fn();

src/state/ObservableScope.test.ts

@@ -6,7 +6,7 @@ Please see LICENSE in the repository root for full details.
 */
 
 import { describe, expect, it } from "vitest";
-import { BehaviorSubject, combineLatest, timer } from "rxjs";
+import { BehaviorSubject, combineLatest, of, Subject } from "rxjs";
 import { logger } from "matrix-js-sdk/lib/logger";
 
 import {
@@ -60,19 +60,6 @@ describe("Epoch", () => {
       });
     });
   });
-  it("obs", () => {
-    const nothing = Symbol("nothing");
-    const scope = new ObservableScope();
-    const sb$ = new BehaviorSubject("initial");
-    const su$ = new BehaviorSubject(undefined);
-    expect(sb$.value).toBe("initial");
-    expect(su$.value).toBe(undefined);
-    expect(su$.value === nothing).toBe(false);
-
-    const a$ = timer(10);
-
-    scope.behavior(a$, undefined);
-  });
 
   it("diamonds emits in a predictable order", () => {
     const sb$ = new BehaviorSubject("initial");
@@ -97,4 +84,21 @@ describe("Epoch", () => {
     sb$.next("updated");
     sb$.next("ANOTERUPDATE");
   });
+
+  it("behavior test", () => {
+    const scope = new ObservableScope();
+    const s$ = new Subject();
+    const behavior$ = scope.behavior(s$, 0);
+    behavior$.subscribe((value) => {
+      logger.log(`Received value: ${value}`);
+    });
+    s$.next(1);
+    s$.next(2);
+    s$.next(3);
+    s$.next(3);
+    s$.next(3);
+    s$.next(3);
+    s$.next(3);
+    s$.complete();
+  });
 });

src/state/ObservableScope.ts

@@ -21,6 +21,7 @@ import {
 } from "rxjs";
 
 import { type Behavior } from "./Behavior";
+import { logger } from "matrix-js-sdk/lib/logger";
 
 type MonoTypeOperator = <T>(o: Observable<T>) => Observable<T>;
 
@@ -73,14 +74,22 @@ export class ObservableScope {
     // they will no longer re-emit their current value upon subscription. We want
     // to support Observables that complete (for example `of({})`), so we have to
     // take care to not propagate the completion event.
-    setValue$.pipe(this.bind(), distinctUntilChanged()).subscribe({
-      next(value) {
-        subject$.next(value);
-      },
-      error(err: unknown) {
-        subject$.error(err);
-      },
-    });
+    setValue$
+      .pipe(
+        this.bind(),
+        distinctUntilChanged((a, b) => {
+          logger.log("distinctUntilChanged", a, b);
+          return a === b;
+        }),
+      )
+      .subscribe({
+        next(value) {
+          subject$.next(value);
+        },
+        error(err: unknown) {
+          subject$.error(err);
+        },
+      });
     if (subject$.value === nothing)
       throw new Error("Behavior failed to synchronously emit an initial value");
     return subject$ as Behavior<T>;