Matrix/element-call-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-call.git synced 2026-08-08 20:09:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4066 from element-hq/toger5/matrixRTCMode-compatibility

Browse Source 
Default to compatibilty mode (multi sfu) - non breaking, as multi-sfu is compatible with all versions younger 6 month
This commit is contained in:
Timo
2026-06-29 19:41:23 +08:00
committed by GitHub
parent cca69b8108 8028a6aa24
commit 8fe7bb5329
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.sample.json
View File

@@ -12,7 +12,7 @@
"feature_use_device_session_member_events": true "feature_use_device_session_member_events": true
}, },
"ssla": "https://static.element.io/legal/element-software-and-services-license-agreement-uk-1.pdf", "ssla": "https://static.element.io/legal/element-software-and-services-license-agreement-uk-1.pdf",
"matrix_rtc_mode": "legacy", "matrix_rtc_mode": "compatibility",
"matrix_rtc_session": { "matrix_rtc_session": {
"wait_for_key_rotation_ms": 3000, "wait_for_key_rotation_ms": 3000,
"membership_event_expiry_ms": 180000000, "membership_event_expiry_ms": 180000000,

9
playwright/sfu-reconnect-bug.spec.ts
View File

@@ -88,15 +88,18 @@ test("When creator left, avoid reconnect to the same SFU", async ({
await guestCPage.getByRole("radio", { name: "Spotlight" }).check(); await guestCPage.getByRole("radio", { name: "Spotlight" }).check();
await guestCPage.waitForTimeout(1000); await guestCPage.waitForTimeout(1000);
if (wsConnectionCount === 2) {
console.warn("wsConnectionCount is 2, expecting 1 after join");
}
const wsConnectionCountBeforeLeave = wsConnectionCount;
// ======== // ========
// the creator leaves the call // the creator leaves the call
await creatorPage.getByTestId("incall_leave").click(); await creatorPage.getByTestId("incall_leave").click();
// https://github.com/element-hq/element-call/issues/3344 // https://github.com/element-hq/element-call/issues/3344
// The app used to request a new jwt token then to reconnect to the SFU // The app used to request a new jwt token then to reconnect to the SFU
expect(wsConnectionCount).toBe(1); expect(wsConnectionCount).toBe(wsConnectionCountBeforeLeave);
// Wait a bit to be sure that if there was a reconnect, it would have happened by now // Wait a bit to be sure that if there was a reconnect, it would have happened by now
await guestCPage.waitForTimeout(6000); await guestCPage.waitForTimeout(6000);
expect(wsConnectionCount).toBe(1); expect(wsConnectionCount).toBe(wsConnectionCountBeforeLeave);
}); });

2
src/settings/__snapshots__/DeveloperSettingsTab.test.tsx.snap
View File

@@ -274,7 +274,6 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
> >
<input <input
aria-describedby="radix-_r_a_ radix-_r_c_ radix-_r_e_" aria-describedby="radix-_r_a_ radix-_r_c_ radix-_r_e_"
checked=""
class="_input_1ug7n_18" class="_input_1ug7n_18"
id="radix-_r_9_" id="radix-_r_9_"
name="_r_0_" name="_r_0_"
@@ -315,6 +314,7 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
> >
<input <input
aria-describedby="radix-_r_a_ radix-_r_c_ radix-_r_e_" aria-describedby="radix-_r_a_ radix-_r_c_ radix-_r_e_"
checked=""
class="_input_1ug7n_18" class="_input_1ug7n_18"
id="radix-_r_b_" id="radix-_r_b_"
name="_r_0_" name="_r_0_"

2
src/settings/settings.ts
View File

@@ -137,7 +137,7 @@ export const enableExtendedLivekitLogs = new Setting<boolean>(
export const matrixRTCMode = new Setting<MatrixRTCMode>( export const matrixRTCMode = new Setting<MatrixRTCMode>(
"matrix-rtc-mode", "matrix-rtc-mode",
MatrixRTCMode.Legacy, MatrixRTCMode.Compatibility,
); );
export const customLivekitUrl = new Setting<string | null>( export const customLivekitUrl = new Setting<string | null>(