mirror of
https://github.com/vector-im/element-call.git
synced 2026-03-04 05:37:22 +00:00
* add sticky event support - use new js-sdk - use custom synapse - don't filter rooms by existing call state events Signed-off-by: Timo K <toger5@hotmail.de> * enable sticky events in the joinSessionConfig Signed-off-by: Timo K <toger5@hotmail.de> * Remove unused useNewMembershipmanager setting * Add prefer sticky setting] * Fixup call detection logic to allow sticky events * lint * update docker image * More tidy * update checksum * bump js-sdk fix sticky events type Signed-off-by: Timo K <toger5@hotmail.de> * fix demo Signed-off-by: Timo K <toger5@hotmail.de> * always use multi sfu if we are using sticky events. Signed-off-by: Timo K <toger5@hotmail.de> * review Signed-off-by: Timo K <toger5@hotmail.de> * lint Signed-off-by: Timo K <toger5@hotmail.de> * Always consider multi-SFU mode enabled when using sticky events CallViewModel would pass the wrong transport to enterRtcSession when the user enabled sticky events but didn't manually enable multi-SFU mode as well. This likely would've added some confusion to our attempts to test these modes. * Fix test type errors * add todo comment Signed-off-by: Timo K <toger5@hotmail.de> --------- Signed-off-by: Timo K <toger5@hotmail.de> Co-authored-by: Half-Shot <will@half-shot.uk> Co-authored-by: Robin <robin@robin.town>
204 lines
5.7 KiB
TypeScript
204 lines
5.7 KiB
TypeScript
/*
|
|
Copyright 2024 New Vector Ltd.
|
|
|
|
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
|
Please see LICENSE in the repository root for full details.
|
|
*/
|
|
|
|
import { type MatrixRTCSession } from "matrix-js-sdk/lib/matrixrtc";
|
|
import { expect, onTestFinished, test, vi } from "vitest";
|
|
import { AutoDiscovery } from "matrix-js-sdk/lib/autodiscovery";
|
|
import EventEmitter from "events";
|
|
|
|
import { enterRTCSession, leaveRTCSession } from "../src/rtcSessionHelpers";
|
|
import { mockConfig } from "./utils/test";
|
|
import { ElementWidgetActions, widget } from "./widget";
|
|
|
|
const USE_MUTI_SFU = false;
|
|
const getUrlParams = vi.hoisted(() => vi.fn(() => ({})));
|
|
vi.mock("./UrlParams", () => ({ getUrlParams }));
|
|
|
|
const actualWidget = await vi.hoisted(async () => vi.importActual("./widget"));
|
|
vi.mock("./widget", () => ({
|
|
...actualWidget,
|
|
widget: {
|
|
api: {
|
|
setAlwaysOnScreen: (): void => {},
|
|
transport: { send: vi.fn(), reply: vi.fn(), stop: vi.fn() },
|
|
},
|
|
lazyActions: new EventEmitter(),
|
|
},
|
|
}));
|
|
|
|
test("It joins the correct Session", async () => {
|
|
const focusFromOlderMembership = {
|
|
type: "livekit",
|
|
livekit_service_url: "http://my-oldest-member-service-url.com",
|
|
livekit_alias: "my-oldest-member-service-alias",
|
|
};
|
|
|
|
const focusConfigFromWellKnown = {
|
|
type: "livekit",
|
|
livekit_service_url: "http://my-well-known-service-url.com",
|
|
};
|
|
const focusConfigFromWellKnown2 = {
|
|
type: "livekit",
|
|
livekit_service_url: "http://my-well-known-service-url2.com",
|
|
};
|
|
const clientWellKnown = {
|
|
"org.matrix.msc4143.rtc_foci": [
|
|
focusConfigFromWellKnown,
|
|
focusConfigFromWellKnown2,
|
|
],
|
|
};
|
|
|
|
mockConfig({
|
|
livekit: { livekit_service_url: "http://my-default-service-url.com" },
|
|
});
|
|
|
|
vi.spyOn(AutoDiscovery, "getRawClientConfig").mockImplementation(
|
|
async (domain) => {
|
|
if (domain === "example.org") {
|
|
return Promise.resolve(clientWellKnown);
|
|
}
|
|
return Promise.resolve({});
|
|
},
|
|
);
|
|
|
|
const mockedSession = vi.mocked({
|
|
room: {
|
|
roomId: "roomId",
|
|
client: {
|
|
getDomain: vi.fn().mockReturnValue("example.org"),
|
|
getOpenIdToken: vi.fn().mockResolvedValue({
|
|
access_token: "ACCCESS_TOKEN",
|
|
token_type: "Bearer",
|
|
matrix_server_name: "localhost",
|
|
expires_in: 10000,
|
|
}),
|
|
},
|
|
},
|
|
memberships: [],
|
|
getFocusInUse: vi.fn().mockReturnValue(focusFromOlderMembership),
|
|
getOldestMembership: vi.fn().mockReturnValue({
|
|
getPreferredFoci: vi.fn().mockReturnValue([focusFromOlderMembership]),
|
|
}),
|
|
joinRoomSession: vi.fn(),
|
|
}) as unknown as MatrixRTCSession;
|
|
|
|
await enterRTCSession(
|
|
mockedSession,
|
|
{
|
|
livekit_alias: "roomId",
|
|
livekit_service_url: "http://my-well-known-service-url.com",
|
|
type: "livekit",
|
|
},
|
|
{
|
|
encryptMedia: true,
|
|
useMultiSfu: USE_MUTI_SFU,
|
|
preferStickyEvents: false,
|
|
},
|
|
);
|
|
|
|
expect(mockedSession.joinRoomSession).toHaveBeenLastCalledWith(
|
|
[
|
|
{
|
|
livekit_alias: "roomId",
|
|
livekit_service_url: "http://my-well-known-service-url.com",
|
|
type: "livekit",
|
|
},
|
|
],
|
|
undefined,
|
|
expect.objectContaining({
|
|
manageMediaKeys: true,
|
|
useLegacyMemberEvents: false,
|
|
useExperimentalToDeviceTransport: false,
|
|
}),
|
|
);
|
|
});
|
|
|
|
async function testLeaveRTCSession(
|
|
cause: "user" | "error",
|
|
expectClose: boolean,
|
|
): Promise<void> {
|
|
vi.clearAllMocks();
|
|
const session = { leaveRoomSession: vi.fn() } as unknown as MatrixRTCSession;
|
|
await leaveRTCSession(session, cause);
|
|
expect(session.leaveRoomSession).toHaveBeenCalled();
|
|
expect(widget!.api.transport.send).toHaveBeenCalledWith(
|
|
ElementWidgetActions.HangupCall,
|
|
expect.anything(),
|
|
);
|
|
if (expectClose) {
|
|
expect(widget!.api.transport.send).toHaveBeenCalledWith(
|
|
ElementWidgetActions.Close,
|
|
expect.anything(),
|
|
);
|
|
expect(widget!.api.transport.stop).toHaveBeenCalled();
|
|
} else {
|
|
expect(widget!.api.transport.send).not.toHaveBeenCalledWith(
|
|
ElementWidgetActions.Close,
|
|
expect.anything(),
|
|
);
|
|
expect(widget!.api.transport.stop).not.toHaveBeenCalled();
|
|
}
|
|
}
|
|
|
|
test("leaveRTCSession closes the widget on a normal hangup", async () => {
|
|
await testLeaveRTCSession("user", true);
|
|
});
|
|
|
|
test("leaveRTCSession doesn't close the widget on a fatal error", async () => {
|
|
await testLeaveRTCSession("error", false);
|
|
});
|
|
|
|
test("leaveRTCSession doesn't close the widget when returning to lobby", async () => {
|
|
getUrlParams.mockReturnValue({ returnToLobby: true });
|
|
onTestFinished(() => void getUrlParams.mockReset());
|
|
await testLeaveRTCSession("user", false);
|
|
});
|
|
|
|
test("It should not fail with configuration error if homeserver config has livekit url but not fallback", async () => {
|
|
mockConfig({});
|
|
vi.spyOn(AutoDiscovery, "getRawClientConfig").mockResolvedValue({
|
|
"org.matrix.msc4143.rtc_foci": [
|
|
{
|
|
type: "livekit",
|
|
livekit_service_url: "http://my-well-known-service-url.com",
|
|
},
|
|
],
|
|
});
|
|
|
|
const mockedSession = vi.mocked({
|
|
room: {
|
|
roomId: "roomId",
|
|
client: {
|
|
getDomain: vi.fn().mockReturnValue("example.org"),
|
|
getOpenIdToken: vi.fn().mockResolvedValue({
|
|
access_token: "ACCCESS_TOKEN",
|
|
token_type: "Bearer",
|
|
matrix_server_name: "localhost",
|
|
expires_in: 10000,
|
|
}),
|
|
},
|
|
},
|
|
memberships: [],
|
|
getFocusInUse: vi.fn(),
|
|
joinRoomSession: vi.fn(),
|
|
}) as unknown as MatrixRTCSession;
|
|
|
|
await enterRTCSession(
|
|
mockedSession,
|
|
{
|
|
livekit_alias: "roomId",
|
|
livekit_service_url: "http://my-well-known-service-url.com",
|
|
type: "livekit",
|
|
},
|
|
{
|
|
encryptMedia: true,
|
|
useMultiSfu: USE_MUTI_SFU,
|
|
preferStickyEvents: false,
|
|
},
|
|
);
|
|
});
|