Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions src/app/plugins/call/CallWidgetDriver.roster.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import { describe, expect, it, vi } from 'vitest';
import type { Room } from '$types/matrix-sdk';
import { hydrateWidgetRoster } from './CallWidgetDriver';

type RoomStub = {
loadMembersIfNeeded: () => Promise<boolean>;
joinedInState?: number;
joinedCount?: number;
};

const makeRoom = ({ loadMembersIfNeeded, joinedInState = 4, joinedCount = 4 }: RoomStub): Room =>
({
roomId: '!room:example.org',
loadMembersIfNeeded,
getMembersWithMembership: () => Array.from({ length: joinedInState }, () => ({})),
getJoinedMemberCount: () => joinedCount,
}) as unknown as Room;

describe('hydrateWidgetRoster', () => {
it('fetches the roster before the widget reads member state', async () => {
const loadMembersIfNeeded = vi.fn<() => Promise<boolean>>().mockResolvedValue(true);

await hydrateWidgetRoster(makeRoom({ loadMembersIfNeeded }));

expect(loadMembersIfNeeded).toHaveBeenCalledOnce();
});

it('still serves state when the roster request fails', async () => {
const loadMembersIfNeeded = vi
.fn<() => Promise<boolean>>()
.mockRejectedValue(new Error('roster request failed'));

await expect(hydrateWidgetRoster(makeRoom({ loadMembersIfNeeded }))).resolves.toBeUndefined();
});

it('does not throw when the hydrated roster is still short', async () => {
const room = makeRoom({
loadMembersIfNeeded: () => Promise.resolve(false),
joinedInState: 2,
joinedCount: 7,
});

await expect(hydrateWidgetRoster(room)).resolves.toBeUndefined();
});
});
28 changes: 28 additions & 0 deletions src/app/plugins/call/CallWidgetDriver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ import type { MatrixClient } from '$types/matrix-sdk';
import {
EventType,
type IContent,
KnownMembership,
MatrixError,
type MatrixEvent,
type Room,
Direction,
type SendDelayedEventResponse,
type StateEvents,
Expand All @@ -29,6 +31,29 @@ import { createDebugLogger } from '../../utils/debugLogger';

const debugLog = createDebugLogger('CallWidgetDriver');

export const hydrateWidgetRoster = async (room: Room): Promise<void> => {
try {
await room.loadMembersIfNeeded();
} catch (error) {
// A partial roster still beats failing the read and stalling state sync.
debugLog.warn('call', 'Failed to load room members for the call widget', {
roomId: room.roomId,
error: error instanceof Error ? error.message : String(error),
});
return;
}

const joinedInState = room.getMembersWithMembership(KnownMembership.Join).length;
const joinedCount = room.getJoinedMemberCount();
if (joinedInState < joinedCount) {
debugLog.warn('call', 'Call widget roster is short of the joined member count', {
roomId: room.roomId,
joinedInState,
joinedCount,
});
}
};

export class CallWidgetDriver extends WidgetDriver {
private allowedCapabilities: Set<Capability>;

Expand Down Expand Up @@ -295,6 +320,9 @@ export class CallWidgetDriver extends WidgetDriver {
): Promise<IRoomEvent[]> {
const room = this.mx.getRoom(roomId);
if (room === null) return [];

if (eventType === (EventType.RoomMember as string)) await hydrateWidgetRoster(room);

const state = room.getLiveTimeline().getState(Direction.Forward);
if (state === undefined) return [];

Expand Down
Loading