Matrix/element-call-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-call.git synced 2026-10-16 23:45:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce ConnectionManager to a ConnectionMap

Browse Source 
createConnectionMap$ now returns the behavior of connections and their
participants directly and takes an already resolved local transport
instead of an observable of it. The CallViewModel wraps it with mapScoped
so that a new map is built, in a fresh scope, whenever the local transport
changes, and swallows local transport errors there since the local member
already surfaces them in the UI.
This commit is contained in:
Robin
2026-10-12 10:26:54 +02:00
committed by Johannes Marbach
parent 24b6a632dd
commit d5bbb43e3a
13 changed files with 370 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/state/CallViewModel/remoteMembers/MatrixLivekitMembers.test.ts
+21 -39
View File
@@ -13,7 +13,6 @@ import {
} from "matrix-js-sdk/lib/matrixrtc";
import { BehaviorSubject, combineLatest, map, type Observable } from "rxjs";
import { type IConnectionManager } from "./ConnectionManager.ts";
import {
type RemoteMatrixLivekitMember,
createRemoteMatrixLivekitMembers$,
@@ -24,7 +23,7 @@ import {
ObservableScope,
trackEpoch,
} from "../../ObservableScope.ts";
import { ConnectionManagerData } from "./ConnectionManager.ts";
import { ConnectionMap } from "./ConnectionMap.ts";
import {
flushPromises,
mockRtcMembership,
@@ -78,23 +77,18 @@ function epochMeWith$<T, U>(
test("should signal participant not yet connected to livekit", async () => {
const info = vi.spyOn(logger, "info");
const mockedMemberships$ = new BehaviorSubject([bobMembership]);
const mockConnectionManagerData$ = new BehaviorSubject(
new ConnectionManagerData(),
);
const mockConnectionMap$ = new BehaviorSubject(new ConnectionMap());
const { memberships$, membershipsWithTransport$ } =
createEpochedMemberships$(mockedMemberships$);
const connectionManagerData$ = epochMeWith$(
memberships$,
mockConnectionManagerData$,
const connectionMap$ = testScope.behavior(
epochMeWith$(memberships$, mockConnectionMap$),
);
const remoteMatrixLivekitMembers$ = createRemoteMatrixLivekitMembers$({
scope: testScope,
membershipsWithTransport$: testScope.behavior(membershipsWithTransport$),
connectionManager: {
connectionManagerData$: connectionManagerData$,
} as unknown as IConnectionManager,
connectionMap$,
localUser: localRtcMember,
});
@@ -152,22 +146,19 @@ test("should signal participant on a connection that is publishing", async () =>
const connection = {
transport: bobMembership.getTransport(),
} as unknown as Connection;
const dataWithPublisher = new ConnectionManagerData();
const dataWithPublisher = new ConnectionMap();
dataWithPublisher.add(connection, [
mockRemoteParticipant({ identity: bobParticipantId }),
]);
const connectionManagerData$ = epochMeWith$(
memberships$,
constant(dataWithPublisher),
const connectionMap$ = testScope.behavior(
epochMeWith$(memberships$, constant(dataWithPublisher)),
);
const remoteMatrixLivekitMembers$ = createRemoteMatrixLivekitMembers$({
scope: testScope,
membershipsWithTransport$: testScope.behavior(membershipsWithTransport$),
connectionManager: {
connectionManagerData$: connectionManagerData$,
} as unknown as IConnectionManager,
connectionMap$,
localUser: localRtcMember,
});
@@ -195,20 +186,17 @@ test("should signal participant on a connection that is not publishing", async (
const connection = {
transport: bobMembership.getTransport(),
} as unknown as Connection;
const dataWithPublisher = new ConnectionManagerData();
const dataWithPublisher = new ConnectionMap();
dataWithPublisher.add(connection, []);
const connectionManagerData$ = epochMeWith$(
memberships$,
constant(dataWithPublisher),
const connectionMap$ = testScope.behavior(
epochMeWith$(memberships$, constant(dataWithPublisher)),
);
const remoteMatrixLivekitMembers$ = createRemoteMatrixLivekitMembers$({
scope: testScope,
membershipsWithTransport$: testScope.behavior(membershipsWithTransport$),
connectionManager: {
connectionManagerData$: connectionManagerData$,
} as unknown as IConnectionManager,
connectionMap$,
localUser: localRtcMember,
});
await flushPromises();
@@ -228,7 +216,7 @@ describe("Publication edge case", () => {
const { memberships$, membershipsWithTransport$ } =
createEpochedMemberships$(constant([bobMembership, carlMembership]));
const connectionWithPublisher = new ConnectionManagerData();
const connectionWithPublisher = new ConnectionMap();
const bobParticipantId = fallbackMemberId(
bobMembership.userId,
bobMembership.deviceId,
@@ -247,17 +235,14 @@ describe("Publication edge case", () => {
mockRemoteParticipant({ identity: bobParticipantId }),
]);
const connectionManagerData$ = epochMeWith$(
memberships$,
constant(connectionWithPublisher),
const connectionMap$ = testScope.behavior(
epochMeWith$(memberships$, constant(connectionWithPublisher)),
);
const remoteMatrixLivekitMembers$ = createRemoteMatrixLivekitMembers$({
scope: testScope,
membershipsWithTransport$: testScope.behavior(membershipsWithTransport$),
connectionManager: {
connectionManagerData$: connectionManagerData$,
} as unknown as IConnectionManager,
connectionMap$,
localUser: localRtcMember,
});
await flushPromises();
@@ -287,7 +272,7 @@ test("bob is publishing in the wrong connection", async () => {
const { memberships$, membershipsWithTransport$ } =
createEpochedMemberships$(mockedMemberships$);
const connectionWithPublisher = new ConnectionManagerData();
const connectionWithPublisher = new ConnectionMap();
const bobParticipantId = fallbackMemberId(
bobMembership.userId,
@@ -306,17 +291,14 @@ test("bob is publishing in the wrong connection", async () => {
const connectionsWithPublisher$ = new BehaviorSubject(
connectionWithPublisher,
);
const connectionManagerData$ = epochMeWith$(
memberships$,
connectionsWithPublisher$,
const connectionMap$ = testScope.behavior(
epochMeWith$(memberships$, connectionsWithPublisher$),
);
const remoteMatrixLivekitMembers$ = createRemoteMatrixLivekitMembers$({
scope: testScope,
membershipsWithTransport$: testScope.behavior(membershipsWithTransport$),
connectionManager: {
connectionManagerData$: connectionManagerData$,
} as unknown as IConnectionManager,
connectionMap$,
localUser: localRtcMember,
});