livekit-client 1.12.0 → 1.12.1

package/dist/livekit-client.e2ee.worker.mjs

@@ -1,3 +1,30 @@
+/******************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+/* global Reflect, Promise */
+
+
+function __awaiter(thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+}
+
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
 function getDefaultExportFromCjs (x) {
@@ -364,33 +391,6 @@ class CryptorError extends LivekitError {
   }
 }
 
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-/* global Reflect, Promise */
-
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-}
-
 var eventemitter3 = {exports: {}};
 
 (function (module) {
@@ -818,7 +818,6 @@ class FrameCryptor extends BaseFrameCryptor {
   constructor(opts) {
     var _a;
     super();
-    this.isKeyInvalid = false;
     this.sendCounts = new Map();
     this.keys = opts.keys;
     this.participantId = opts.participantId;
@@ -963,19 +962,18 @@ class FrameCryptor extends BaseFrameCryptor {
       }
       const data = new Uint8Array(encodedFrame.data);
       const keyIndex = data[encodedFrame.data.byteLength - 1];
-      if (this.keys.getKeySet(keyIndex)) {
+      if (this.keys.getKeySet(keyIndex) && this.keys.hasValidKey) {
         try {
           const decodedFrame = yield this.decryptFrame(encodedFrame, keyIndex);
           if (decodedFrame) {
             return controller.enqueue(decodedFrame);
           }
-          this.isKeyInvalid = false;
         } catch (error) {
           if (error instanceof CryptorError && error.reason === CryptorErrorReason.InvalidKey) {
-            if (!this.isKeyInvalid) {
+            if (this.keys.hasValidKey) {
               workerLogger.warn('invalid key');
               this.emit(CryptorEvent.Error, new CryptorError("invalid key for participant ".concat(this.participantId), CryptorErrorReason.InvalidKey));
-              this.isKeyInvalid = true;
+              this.keys.hasValidKey = false;
             }
           } else {
             workerLogger.warn('decoding frame failed', {
@@ -983,8 +981,6 @@ class FrameCryptor extends BaseFrameCryptor {
             });
           }
         }
-      } else {
-        this.emit(CryptorEvent.Error, new CryptorError("key missing for participant ".concat(this.participantId), CryptorErrorReason.MissingKey));
       }
       return controller.enqueue(encodedFrame);
     });
@@ -1058,7 +1054,9 @@ class FrameCryptor extends BaseFrameCryptor {
               workerLogger.debug('resetting to initial material');
               this.keys.setKeyFromMaterial(initialMaterial.material, keyIndex);
             }
+            this.keys.hasValidKey = false;
             workerLogger.warn('maximum ratchet attempts exceeded, resetting key');
+            this.emit(CryptorEvent.Error, new CryptorError("valid key missing for participant ".concat(this.participantId), CryptorErrorReason.MissingKey));
           }
         } else {
           throw new CryptorError('Decryption failed, most likely because of an invalid key', CryptorErrorReason.InvalidKey);
@@ -1253,6 +1251,7 @@ class ParticipantKeyHandler extends EventEmitter {
     this.keyProviderOptions = keyProviderOptions;
     this.ratchetPromiseMap = new Map();
     this.participantId = participantId;
+    this.hasValidKey = false;
   }
   setEnabled(enabled) {
     this.enabled = enabled;
@@ -1289,6 +1288,19 @@ class ParticipantKeyHandler extends EventEmitter {
     this.ratchetPromiseMap.set(currentKeyIndex, ratchetPromise);
     return ratchetPromise;
   }
+  /**
+   * takes in a key material with `deriveBits` and `deriveKey` set as key usages
+   * and derives encryption keys from the material and sets it on the key ring buffer
+   * together with the material
+   * also resets the valid key property and updates the currentKeyIndex
+   */
+  setKey(material) {
+    let keyIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+    return __awaiter(this, void 0, void 0, function* () {
+      yield this.setKeyFromMaterial(material, keyIndex);
+      this.hasValidKey = true;
+    });
+  }
   /**
    * takes in a key material with `deriveBits` and `deriveKey` set as key usages
    * and derives encryption keys from the material and sets it on the key ring buffer
@@ -1319,6 +1331,7 @@ class ParticipantKeyHandler extends EventEmitter {
   setCurrentKeyIndex(index) {
     return __awaiter(this, void 0, void 0, function* () {
       this.currentKeyIndex = index % this.cryptoKeyRing.length;
+      this.hasValidKey = true;
     });
   }
   isEnabled() {
@@ -1386,7 +1399,7 @@ onmessage = ev => {
         workerLogger.debug('set shared key');
         setSharedKey(data.key, data.keyIndex);
       } else if (data.participantId) {
-        getParticipantKeyHandler(data.participantId).setKeyFromMaterial(data.key, data.keyIndex);
+        getParticipantKeyHandler(data.participantId).setKey(data.key, data.keyIndex);
       } else {
         workerLogger.error('no participant Id was provided and shared key usage is disabled');
       }
@@ -1403,9 +1416,16 @@ onmessage = ev => {
       });
       break;
     case 'ratchetRequest':
-      getParticipantKeyHandler(data.participantId).ratchetKey(data.keyIndex);
+      handleRatchetRequest(data);
   }
 };
+function handleRatchetRequest(data) {
+  return __awaiter(this, void 0, void 0, function* () {
+    const keyHandler = getParticipantKeyHandler(data.participantId);
+    yield keyHandler.ratchetKey(data.keyIndex);
+    keyHandler.hasValidKey = true;
+  });
+}
 function getTrackCryptor(participantId, trackId) {
   let cryptor = participantCryptors.find(c => c.getTrackId() === trackId);
   if (!cryptor) {
@@ -1436,7 +1456,7 @@ function getParticipantKeyHandler(participantId) {
   if (!keys) {
     keys = new ParticipantKeyHandler(participantId, true, keyProviderOptions);
     if (sharedKey) {
-      keys.setKeyFromMaterial(sharedKey);
+      keys.setKey(sharedKey);
     }
     participantKeys.set(participantId, keys);
   }
@@ -1473,9 +1493,9 @@ function setEncryptionEnabled(enable, participantId) {
 function setSharedKey(key, index) {
   workerLogger.debug('setting shared key');
   sharedKey = key;
-  publisherKeys === null || publisherKeys === void 0 ? void 0 : publisherKeys.setKeyFromMaterial(key, index);
+  publisherKeys === null || publisherKeys === void 0 ? void 0 : publisherKeys.setKey(key, index);
   for (const [, keyHandler] of participantKeys) {
-    keyHandler.setKeyFromMaterial(key, index);
+    keyHandler.setKey(key, index);
   }
 }
 function setupCryptorErrorEvents(cryptor) {