ratchet update to latest livekit

Author: BillCarsonFr

src/matrixrtc/EncryptionManager.ts

@@ -5,7 +5,7 @@ import { decodeBase64, encodeUnpaddedBase64 } from "../base64.ts";
 import { safeGetRetryAfterMs } from "../http-api/errors.ts";
 import { type CallMembership } from "./CallMembership.ts";
 import { type KeyTransportEventListener, KeyTransportEvents, type IKeyTransport } from "./IKeyTransport.ts";
-import { isMyMembership, type Statistics } from "./types.ts";
+import {isMyMembership, ParticipantId, type Statistics} from "./types.ts";
 import { getParticipantId } from "./utils.ts";
 import {
     type EnabledTransports,
@@ -51,7 +51,7 @@ export interface IEncryptionManager {
      * the lower layer will emit the ratcheted key to the encryption manager.
      * This is called after the key a ratchet request has been performed.
      */
-    onOwnKeyRatcheted(key: ArrayBuffer, keyIndex: number | undefined): void;
+    onKeyRatcheted(key: ArrayBuffer, participantId: ParticipantId| undefined, keyIndex: number | undefined): void;
 }
 
 /**
@@ -107,7 +107,7 @@ export class EncryptionManager implements IEncryptionManager {
         this.logger = (parentLogger ?? rootLogger).getChild(`[EncryptionManager]`);
     }
 
-    public onOwnKeyRatcheted(key: ArrayBuffer, keyIndex: number | undefined): void {
+    public onKeyRatcheted(key: ArrayBuffer, participantId: ParticipantId| undefined, keyIndex: number | undefined): void {
         this.logger.warn("Ratcheting key is not implemented in EncryptionManager");
     }
 

src/matrixrtc/MatrixRTCSession.ts

@@ -533,8 +533,8 @@ export class MatrixRTCSession extends TypedEventEmitter<
         });
     }
 
-    public onOwnKeyRatcheted(material: ArrayBuffer, keyIndex?: number): void {
-        this.encryptionManager?.onOwnKeyRatcheted(material, keyIndex);
+    public onKeyRatcheted(material: ArrayBuffer,participantId?: ParticipantId, keyIndex?: number): void {
+        this.encryptionManager?.onKeyRatcheted(material, participantId, keyIndex);
     }
 
     /**

src/matrixrtc/RTCEncryptionManager.ts

@@ -356,9 +356,12 @@ export class RTCEncryptionManager implements IEncryptionManager {
         return key;
     }
 
-    public onOwnKeyRatcheted(key: ArrayBuffer, keyIndex: number | undefined): void {
-        this.logger.debug(`Own key ratcheted for key index:${keyIndex} key:${encodeBase64(new Uint8Array(key))}`);
+    public onKeyRatcheted(key: ArrayBuffer, participantId: ParticipantId | undefined, keyIndex: number | undefined): void {
+        if (participantId == getParticipantId(this.userId, this.deviceId)) {
+            // DO NOT COMMIT
+            this.logger.debug(`Own key ratcheted for key index:${keyIndex} key:${encodeBase64(new Uint8Array(key))}`);
 
-        this.currentRatchetRequest?.resolve({ key, keyIndex: keyIndex! });
+            this.currentRatchetRequest?.resolve({key, keyIndex: keyIndex!});
+        }
     }
 }