matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-23 17:02:25 +03:00
Code Activity

more test fixes

Browse Source
This commit is contained in:
Half-Shot
2025-11-03 13:48:11 +00:00
parent 3e5c1ee6f5
commit addb9c0d2a
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spec/unit/matrixrtc/MatrixRTCSessionManager.spec.ts
View File

@@ -21,7 +21,7 @@ import { makeMockRoom, type MembershipData, sessionMembershipTemplate, mockRoomS
import { logger } from "../../../src/logger"; import { logger } from "../../../src/logger";
import { slotDescriptionToId } from "../../../src/matrixrtc"; import { slotDescriptionToId } from "../../../src/matrixrtc";
describe.each([{ eventKind: "sticky" }, /*{ eventKind: "memberState" }*/])( describe.each([{ eventKind: "sticky" }, { eventKind: "memberState" }])(
"MatrixRTCSessionManager ($eventKind)", "MatrixRTCSessionManager ($eventKind)",
({ eventKind }) => { ({ eventKind }) => {
let client: MatrixClient; let client: MatrixClient;
@@ -42,7 +42,7 @@ describe.each([{ eventKind: "sticky" }, /*{ eventKind: "memberState" }*/])(
beforeEach(() => { beforeEach(() => {
client = new MatrixClient({ baseUrl: "base_url" }); client = new MatrixClient({ baseUrl: "base_url" });
client.matrixRTC.start(); client.matrixRTC.start();
membershipTemplate = eventKind ? rtcMembershipTemplate : sessionMembershipTemplate; membershipTemplate = eventKind === "sticky" ? rtcMembershipTemplate : sessionMembershipTemplate;
}); });
afterEach(() => { afterEach(() => {

21
src/matrixrtc/CallMembership.ts
View File

@@ -22,6 +22,7 @@ import { slotDescriptionToId, slotIdToDescription } from "./utils.ts";
import { checkSessionsMembershipData, SessionMembershipData } from "./membership/legacy.ts"; import { checkSessionsMembershipData, SessionMembershipData } from "./membership/legacy.ts";
import { checkRtcMembershipData, RtcMembershipData } from "./membership/rtc.ts"; import { checkRtcMembershipData, RtcMembershipData } from "./membership/rtc.ts";
import { EventType } from "../matrix.ts"; import { EventType } from "../matrix.ts";
import { MatrixRTCMembershipParseError } from "./membership/common.ts";
/** /**
* The default duration in milliseconds that a membership is considered valid for. * The default duration in milliseconds that a membership is considered valid for.
@@ -70,13 +71,21 @@ export class CallMembership {
if (eventId === undefined) throw new Error("parentEvent is missing eventId field"); if (eventId === undefined) throw new Error("parentEvent is missing eventId field");
if (sender === undefined) throw new Error("parentEvent is missing sender field"); if (sender === undefined) throw new Error("parentEvent is missing sender field");
if (evType === EventType.RTCMembership && checkRtcMembershipData(data, sender)) { try {
this.membershipData = { kind: MembershipKind.RTC, data }; if (evType === EventType.RTCMembership && checkRtcMembershipData(data, sender)) {
} else if (evType === EventType.GroupCallMemberPrefix && checkSessionsMembershipData(data)) { this.membershipData = { kind: MembershipKind.RTC, data };
this.membershipData = { kind: MembershipKind.Session, data }; } else if (evType === EventType.GroupCallMemberPrefix && checkSessionsMembershipData(data)) {
} else { this.membershipData = { kind: MembershipKind.Session, data };
throw Error(`'${evType} is not a known call membership type`); } else {
throw Error(`'${evType} is not a known call membership type`);
}
} catch (ex) {
if (ex instanceof MatrixRTCMembershipParseError) {
logger.debug("CallMembership.MatrixRTCMembershipParseError provided data", data);
}
throw ex;
} }
this.matrixEventData = { eventId, sender }; this.matrixEventData = { eventId, sender };
} }