Safe RTCFrameCryptor initialization (#396)

Uses new WebRTC build with `RTCFrameCryptor` improvements.
livekit · Jun 5, 2024 · 2061e8a · 2061e8a
1 parent c8f72de
commit 2061e8a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 19 deletions.
diff --git a/Package.swift b/Package.swift
@@ -18,7 +18,7 @@ let package = Package(
     ],
     dependencies: [
         // LK-Prefixed Dynamic WebRTC XCFramework
-        .package(url: "https://github.com/livekit/webrtc-xcframework.git", exact: "114.5735.18"),
+        .package(url: "https://github.com/livekit/webrtc-xcframework.git", exact: "114.5735.19"),
         .package(url: "https://github.com/apple/swift-protobuf.git", from: "1.26.0"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.5.4"),
         // Only used for DocC generation

diff --git a/Sources/LiveKit/E2EE/E2EEManager.swift b/Sources/LiveKit/E2EE/E2EEManager.swift
@@ -109,17 +109,19 @@ public class E2EEManager: NSObject, ObservableObject, Loggable {
             return
         }
 
-        let frameCryptor = DispatchQueue.liveKitWebRTC.sync {
-            let result = LKRTCFrameCryptor(factory: Engine.peerConnectionFactory,
-                                           rtpSender: sender,
-                                           participantId: participantIdentity.stringValue,
-                                           algorithm: RTCCyrptorAlgorithm.aesGcm,
-                                           keyProvider: e2eeOptions.keyProvider.rtcKeyProvider)
-
-            result.delegate = delegateAdapter
-            return result
+        guard let frameCryptor = DispatchQueue.liveKitWebRTC.sync(execute: {
+            LKRTCFrameCryptor(factory: Engine.peerConnectionFactory,
+                              rtpSender: sender,
+                              participantId: participantIdentity.stringValue,
+                              algorithm: .aesGcm,
+                              keyProvider: e2eeOptions.keyProvider.rtcKeyProvider)
+        }) else {
+            log("frameCryptor is nil, skipping creating frame cryptor...", .warning)
+            return
         }
 
+        frameCryptor.delegate = delegateAdapter
+
         return _state.mutate {
             $0.frameCryptors[[participantIdentity: publication.sid]] = frameCryptor
             $0.trackPublications[frameCryptor] = publication
@@ -138,17 +140,19 @@ public class E2EEManager: NSObject, ObservableObject, Loggable {
             return
         }
 
-        let frameCryptor = DispatchQueue.liveKitWebRTC.sync {
-            let result = LKRTCFrameCryptor(factory: Engine.peerConnectionFactory,
-                                           rtpReceiver: receiver,
-                                           participantId: participantIdentity.stringValue,
-                                           algorithm: RTCCyrptorAlgorithm.aesGcm,
-                                           keyProvider: e2eeOptions.keyProvider.rtcKeyProvider)
-
-            result.delegate = delegateAdapter
-            return result
+        guard let frameCryptor = DispatchQueue.liveKitWebRTC.sync(execute: {
+            LKRTCFrameCryptor(factory: Engine.peerConnectionFactory,
+                              rtpReceiver: receiver,
+                              participantId: participantIdentity.stringValue,
+                              algorithm: .aesGcm,
+                              keyProvider: e2eeOptions.keyProvider.rtcKeyProvider)
+        }) else {
+            log("frameCryptor is nil, skipping creating frame cryptor...", .warning)
+            return
         }
 
+        frameCryptor.delegate = delegateAdapter
+
         return _state.mutate {
             $0.frameCryptors[[participantIdentity: publication.sid]] = frameCryptor
             $0.trackPublications[frameCryptor] = publication