Wip ratchet update

Author: BillCarsonFr

src/e2ee/matrixKeyProvider.ts

@@ -5,7 +5,12 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import { BaseKeyProvider, createKeyMaterialFromBuffer, importKey, KeyProviderEvent } from "livekit-client";
+import {
+  BaseKeyProvider,
+  importKey,
+  KeyProviderEvent,
+  RatchetResult
+} from "livekit-client";
 import { logger } from "matrix-js-sdk/lib/logger";
 import {
   type MatrixRTCSession,
@@ -15,22 +20,17 @@ import {
 export class MatrixKeyProvider extends BaseKeyProvider {
   private rtcSession?: MatrixRTCSession;
 
-  private readonly onKeyRatchetComplete: (material: ArrayBuffer, keyIndex?: number) => void;
+  private readonly onKeyRatchetComplete: (ratchetResult: RatchetResult, participantIdentity?: string,  keyIndex?: number) => void;
 
   public constructor() {
     super({ ratchetWindowSize: 10, keyringSize: 10 });
 
-    this.onKeyRatchetComplete = (material: ArrayBuffer, keyIndex?: number): void => {
-      logger.debug(`key ratcheted event received for index `, keyIndex );
-      this.rtcSession?.onOwnKeyRatcheted(material, keyIndex).catch((e) => {
-        logger.error(
-          `Failed to ratchet key for livekit room=${this.rtcSession?.room.roomId} keyIndex=${keyIndex}`,
-          e,
-        );
-      });
+    this.onKeyRatchetComplete = (ratchetResult: RatchetResult, participantIdentity?: string, keyIndex?: number): void => {
+      logger.debug(`key ratcheted event received for ${participantId} at index ${keyIndex}`);
+      this.rtcSession?.onKeyRatcheted(ratchetResult.chainKey, keyIndex);
     };
 
-    this.on(KeyProviderEvent.RatchetRequestCompleted, this.onKeyRatchetComplete);
+    this.on(KeyProviderEvent.KeyRatcheted, this.onKeyRatchetComplete);
   }
 
   public setRTCSession(rtcSession: MatrixRTCSession): void {

yarn.lock

@@ -6980,10 +6980,10 @@ __metadata:
     i18next-parser: "npm:^9.1.0"
     jsdom: "npm:^26.0.0"
     knip: "npm:^5.27.2"
-    livekit-client: "npm:^2.11.3"
+    livekit-client: "github:BillCarsonFr/client-sdk-js#4ac197085ee063f66b48d8ec24c88b2321fcbf9e"
     lodash-es: "npm:^4.17.21"
     loglevel: "npm:^1.9.1"
-    matrix-js-sdk: "github:matrix-org/matrix-js-sdk#19b1b901f575755d29d1fe03ca48cbf7c1cae05c"
+    matrix-js-sdk: "github:matrix-org/matrix-js-sdk#44d1a860a1c56a0d4193aa7dcd09e10822398a4d"
     matrix-widget-api: "npm:1.11.0"
     normalize.css: "npm:^8.0.1"
     observable-hooks: "npm:^4.2.3"
@@ -9350,9 +9350,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"livekit-client@npm:^2.11.3":
-  version: 2.11.3
-  resolution: "livekit-client@npm:2.11.3"
+"livekit-client@portal:/Users/valere/Documents/Dev/matrix/other/livekit-client::locator=element-call%40workspace%3A.":
+  version: 0.0.0-use.local
+  resolution: "livekit-client@portal:/Users/valere/Documents/Dev/matrix/other/livekit-client::locator=element-call%40workspace%3A."
   dependencies:
     "@livekit/mutex": "npm:1.1.1"
     "@livekit/protocol": "npm:1.36.1"
@@ -9363,9 +9363,8 @@ __metadata:
     tslib: "npm:2.8.1"
     typed-emitter: "npm:^2.1.0"
     webrtc-adapter: "npm:^9.0.1"
-  checksum: 10c0/d56444f31c107b46ccd5532038ac77bd21038042910619008267c17894f1d3f054262ae2354d89df6fe0ba325aba01909b0612ad4c290906487c40d91641f6e4
   languageName: node
-  linkType: hard
+  linkType: soft
 
 "locate-path@npm:^5.0.0":
   version: 5.0.0
@@ -9574,9 +9573,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"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"
+"matrix-js-sdk@portal:/Users/valere/Documents/Dev/matrix/matrix-git-root/matrix-js-sdk::locator=element-call%40workspace%3A.":
+  version: 0.0.0-use.local
+  resolution: "matrix-js-sdk@portal:/Users/valere/Documents/Dev/matrix/matrix-git-root/matrix-js-sdk::locator=element-call%40workspace%3A."
   dependencies:
     "@babel/runtime": "npm:^7.12.5"
     "@matrix-org/matrix-sdk-crypto-wasm": "npm:^14.0.1"
@@ -9593,9 +9592,8 @@ __metadata:
     sdp-transform: "npm:^2.14.1"
     unhomoglyph: "npm:^1.0.6"
     uuid: "npm:11"
-  checksum: 10c0/68a30a113059ba052b2e66502abcd9805f9a18a1bfd1d209203d728b36508af257a57e6248fb237c7018c81bfbe1ec78fa17aea8968c8af0729ea935398dcf8b
   languageName: node
-  linkType: hard
+  linkType: soft
 
 "matrix-widget-api@npm:1.11.0":
   version: 1.11.0