From e751248fee3a549b684448ed304b75e2610d933e Mon Sep 17 00:00:00 2001 From: Robin Date: Tue, 22 Apr 2025 16:31:44 +0200 Subject: [PATCH 1/4] Revert livekit-client to 2.10.0 Closes https://github.com/element-hq/element-call/issues/3219. --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 7c2edc31..fdeda543 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "i18next-parser": "^9.1.0", "jsdom": "^26.0.0", "knip": "^5.27.2", - "livekit-client": "2.11.2", + "livekit-client": "2.10.0", "lodash-es": "^4.17.21", "loglevel": "^1.9.1", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#64e27f5d3cdab6aafeb7c22f1264416ffa72b83f", diff --git a/yarn.lock b/yarn.lock index 95137dbd..cbcea660 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6910,7 +6910,7 @@ __metadata: i18next-parser: "npm:^9.1.0" jsdom: "npm:^26.0.0" knip: "npm:^5.27.2" - livekit-client: "npm:2.11.2" + livekit-client: "npm:2.10.0" lodash-es: "npm:^4.17.21" loglevel: "npm:^1.9.1" matrix-js-sdk: "github:matrix-org/matrix-js-sdk#64e27f5d3cdab6aafeb7c22f1264416ffa72b83f" @@ -9280,9 +9280,9 @@ __metadata: languageName: node linkType: hard -"livekit-client@npm:2.11.2": - version: 2.11.2 - resolution: "livekit-client@npm:2.11.2" +"livekit-client@npm:2.10.0": + version: 2.10.0 + resolution: "livekit-client@npm:2.10.0" dependencies: "@livekit/mutex": "npm:1.1.1" "@livekit/protocol": "npm:1.36.1" @@ -9293,7 +9293,7 @@ __metadata: tslib: "npm:2.8.1" typed-emitter: "npm:^2.1.0" webrtc-adapter: "npm:^9.0.1" - checksum: 10c0/03a184f3a4f81beefb47a78adb37d3ba3b95a5d1f01e2ebbb83fb3769a120f6b8726ee8ccd96eb634164eeec508850cf05d40e2330fe7c1eda0e3d7f481561f7 + checksum: 10c0/bc5d1d1e08576da3356f567836090a58dfad9b2d9ca2280584acf31676949a88d9526940ab10a9b6cf79545a49f82678cb0665f65851628e6148a9d559cacc90 languageName: node linkType: hard From 78a41c09ded0ee4735d6e72cb89603f9cccf28d8 Mon Sep 17 00:00:00 2001 From: Timo <16718859+toger5@users.noreply.github.com> Date: Tue, 22 Apr 2025 21:24:09 +0200 Subject: [PATCH 2/4] Fix MatrixRTC js-sdk logs in rageshakes (#3226) --- package.json | 2 +- src/settings/rageshake.ts | 5 ----- yarn.lock | 14 +++++++------- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index fdeda543..07289035 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "livekit-client": "2.10.0", "lodash-es": "^4.17.21", "loglevel": "^1.9.1", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#64e27f5d3cdab6aafeb7c22f1264416ffa72b83f", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#19b1b901f575755d29d1fe03ca48cbf7c1cae05c", "matrix-widget-api": "1.11.0", "normalize.css": "^8.0.1", "observable-hooks": "^4.2.3", diff --git a/src/settings/rageshake.ts b/src/settings/rageshake.ts index 21ed5956..6c1a0f61 100644 --- a/src/settings/rageshake.ts +++ b/src/settings/rageshake.ts @@ -473,11 +473,6 @@ export async function init(): Promise { // configure loglevel based loggers: setLogExtension(logger, global.mx_rage_logger.log); - // these are the child/prefixed loggers we want to capture from js-sdk - // there doesn't seem to be an easy way to capture all children - ["MatrixRTCSession", "MatrixRTCSessionManager"].forEach((loggerName) => { - setLogExtension(logger.getChild(loggerName), global.mx_rage_logger.log); - }); // intercept console logging so that we can get matrix_sdk logs: // this is nasty, but no logging hooks are provided diff --git a/yarn.lock b/yarn.lock index cbcea660..4a41df01 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6913,7 +6913,7 @@ __metadata: livekit-client: "npm:2.10.0" lodash-es: "npm:^4.17.21" loglevel: "npm:^1.9.1" - matrix-js-sdk: "github:matrix-org/matrix-js-sdk#64e27f5d3cdab6aafeb7c22f1264416ffa72b83f" + matrix-js-sdk: "github:matrix-org/matrix-js-sdk#19b1b901f575755d29d1fe03ca48cbf7c1cae05c" matrix-widget-api: "npm:1.11.0" normalize.css: "npm:^8.0.1" observable-hooks: "npm:^4.2.3" @@ -9350,7 +9350,7 @@ __metadata: languageName: node linkType: hard -"loglevel@npm:^1.7.1, loglevel@npm:^1.9.1, loglevel@npm:^1.9.2": +"loglevel@npm:^1.9.1, loglevel@npm:^1.9.2": version: 1.9.2 resolution: "loglevel@npm:1.9.2" checksum: 10c0/1e317fa4648fe0b4a4cffef6de037340592cee8547b07d4ce97a487abe9153e704b98451100c799b032c72bb89c9366d71c9fb8192ada8703269263ae77acdc7 @@ -9504,9 +9504,9 @@ __metadata: languageName: node linkType: hard -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#64e27f5d3cdab6aafeb7c22f1264416ffa72b83f": - version: 37.3.0 - resolution: "matrix-js-sdk@https://github.com/matrix-org/matrix-js-sdk.git#commit=64e27f5d3cdab6aafeb7c22f1264416ffa72b83f" +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#19b1b901f575755d29d1fe03ca48cbf7c1cae05c": + version: 37.4.0 + resolution: "matrix-js-sdk@https://github.com/matrix-org/matrix-js-sdk.git#commit=19b1b901f575755d29d1fe03ca48cbf7c1cae05c" dependencies: "@babel/runtime": "npm:^7.12.5" "@matrix-org/matrix-sdk-crypto-wasm": "npm:^14.0.1" @@ -9515,7 +9515,7 @@ __metadata: bs58: "npm:^6.0.0" content-type: "npm:^1.0.4" jwt-decode: "npm:^4.0.0" - loglevel: "npm:^1.7.1" + loglevel: "npm:^1.9.2" matrix-events-sdk: "npm:0.0.1" matrix-widget-api: "npm:^1.10.0" oidc-client-ts: "npm:^3.0.1" @@ -9523,7 +9523,7 @@ __metadata: sdp-transform: "npm:^2.14.1" unhomoglyph: "npm:^1.0.6" uuid: "npm:11" - checksum: 10c0/716f89b4fffc67ae42fad55f47b96792a0c49bd6d741410758dfbe1d0e4673097627b4c8f8a77063702cb41a5e0f7f0c5ff96c109ed332d3b3bc973f4d31f555 + checksum: 10c0/68a30a113059ba052b2e66502abcd9805f9a18a1bfd1d209203d728b36508af257a57e6248fb237c7018c81bfbe1ec78fa17aea8968c8af0729ea935398dcf8b languageName: node linkType: hard From a1d6eef12a9ea3877cf942a0adb81fc6cf98037e Mon Sep 17 00:00:00 2001 From: Timo <16718859+toger5@users.noreply.github.com> Date: Wed, 23 Apr 2025 09:22:54 +0200 Subject: [PATCH 3/4] Set `ratchetWindowSize` to > 0 enable rachet compatibility. (#3224) --- src/e2ee/matrixKeyProvider.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/e2ee/matrixKeyProvider.ts b/src/e2ee/matrixKeyProvider.ts index c5f6c879..9b190ed8 100644 --- a/src/e2ee/matrixKeyProvider.ts +++ b/src/e2ee/matrixKeyProvider.ts @@ -16,7 +16,7 @@ export class MatrixKeyProvider extends BaseKeyProvider { private rtcSession?: MatrixRTCSession; public constructor() { - super({ ratchetWindowSize: 0, keyringSize: 256 }); + super({ ratchetWindowSize: 10, keyringSize: 256 }); } public setRTCSession(rtcSession: MatrixRTCSession): void { From a6696c2304cac57110c6a12039612b4c09feb429 Mon Sep 17 00:00:00 2001 From: Robin Date: Wed, 23 Apr 2025 11:59:13 +0200 Subject: [PATCH 4/4] Return to latest livekit-client version (2.11.3) This latest release of livekit-client fixes the regression observed in https://github.com/element-hq/element-call/issues/3219. --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 07289035..3730004b 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "i18next-parser": "^9.1.0", "jsdom": "^26.0.0", "knip": "^5.27.2", - "livekit-client": "2.10.0", + "livekit-client": "^2.11.3", "lodash-es": "^4.17.21", "loglevel": "^1.9.1", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#19b1b901f575755d29d1fe03ca48cbf7c1cae05c", diff --git a/yarn.lock b/yarn.lock index 4a41df01..70de0fc6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6910,7 +6910,7 @@ __metadata: i18next-parser: "npm:^9.1.0" jsdom: "npm:^26.0.0" knip: "npm:^5.27.2" - livekit-client: "npm:2.10.0" + livekit-client: "npm:^2.11.3" lodash-es: "npm:^4.17.21" loglevel: "npm:^1.9.1" matrix-js-sdk: "github:matrix-org/matrix-js-sdk#19b1b901f575755d29d1fe03ca48cbf7c1cae05c" @@ -9280,9 +9280,9 @@ __metadata: languageName: node linkType: hard -"livekit-client@npm:2.10.0": - version: 2.10.0 - resolution: "livekit-client@npm:2.10.0" +"livekit-client@npm:^2.11.3": + version: 2.11.3 + resolution: "livekit-client@npm:2.11.3" dependencies: "@livekit/mutex": "npm:1.1.1" "@livekit/protocol": "npm:1.36.1" @@ -9293,7 +9293,7 @@ __metadata: tslib: "npm:2.8.1" typed-emitter: "npm:^2.1.0" webrtc-adapter: "npm:^9.0.1" - checksum: 10c0/bc5d1d1e08576da3356f567836090a58dfad9b2d9ca2280584acf31676949a88d9526940ab10a9b6cf79545a49f82678cb0665f65851628e6148a9d559cacc90 + checksum: 10c0/d56444f31c107b46ccd5532038ac77bd21038042910619008267c17894f1d3f054262ae2354d89df6fe0ba325aba01909b0612ad4c290906487c40d91641f6e4 languageName: node linkType: hard