fix bug for e2ee. (#248)

* fix bug for e2ee.

* Set server injection frame trailer from joinResponse.

* nil check.

* fix log.

Author: cloudwebrtc

Sources/LiveKit/Core/Room+SignalClientDelegate.swift

@@ -45,6 +45,10 @@ extension Room: SignalClientDelegate {
 
         log("server version: \(joinResponse.serverVersion), region: \(joinResponse.serverRegion)", .info)
 
+        if self.e2eeManager != nil && !joinResponse.sifTrailer.isEmpty {
+            self.e2eeManager?.keyProvider().setSifTrailer(trailer: joinResponse.sifTrailer)
+        }
+
         _state.mutate {
             $0.sid = joinResponse.room.sid
             $0.name = joinResponse.room.name

Sources/LiveKit/E2EE/E2EEManager.swift

@@ -49,6 +49,10 @@ public class E2EEManager: NSObject, ObservableObject, Loggable {
                 self.log("E2EEManager::setup: local participant \(self.room!.localParticipant!.identity) track \(publication.sid) encryptionType is none, skip")
                 return
             }
+            if publication.track?.rtpSender == nil {
+                self.log("E2EEManager::setup: publication.track?.rtpSender is nil, skip to create FrameCryptor!")
+                return
+            }
             let fc = addRtpSender(sender: publication.track!.rtpSender!, participantId: self.room!.localParticipant!.identity, trackSid: publication.sid)
             trackPublications[fc] = publication
         })
@@ -59,6 +63,10 @@ public class E2EEManager: NSObject, ObservableObject, Loggable {
                     self.log("E2EEManager::setup: remote participant \(participant.identity) track \(publication.sid) encryptionType is none, skip")
                     return
                 }
+                if publication.track?.rtpReceiver == nil {
+                    self.log("E2EEManager::setup: publication.track?.rtpReceiver is nil, skip to create FrameCryptor!")
+                    return
+                }
                 let fc = addRtpReceiver(receiver: publication.track!.rtpReceiver!, participantId: participant.identity, trackSid: publication.sid)
                 trackPublications[fc] = publication
             })
@@ -112,7 +120,6 @@ extension E2EEManager: RTCFrameCryptorDelegate {
         if self.room == nil {
             self.log("frameCryptor didStateChangeWithParticipantId \(participantId) with state \(state.rawValue) room is nil")
             return
-
         }
         self.room?.delegates.notify { delegate in
             delegate.room?(self.room!, publication: publication!, didUpdateE2EEState: state.toLKType())
@@ -127,7 +134,11 @@ extension E2EEManager: RoomDelegate {
             self.log("E2EEManager::RoomDelegate: local participant \(localParticipant.identity) track \(publication.sid) encryptionType is none, skip")
             return
         }
-        let fc = addRtpSender(sender: localParticipant.rtpSender!, participantId: localParticipant.identity, trackSid: publication.sid)
+        if publication.track?.rtpSender == nil {
+            self.log("E2EEManager::RoomDelegate: publication.track?.rtpSender is nil, skip to create FrameCryptor!")
+            return
+        }
+        let fc = addRtpSender(sender: publication.track!.rtpSender!, participantId: localParticipant.identity, trackSid: publication.sid)
         trackPublications[fc] = publication
     }
 
@@ -150,7 +161,11 @@ extension E2EEManager: RoomDelegate {
             self.log("E2EEManager::RoomDelegate: remote participant \(participant.identity) track \(publication.sid) encryptionType is none, skip")
             return
         }
-        let fc = addRtpReceiver(receiver: participant.rtpReceiver!, participantId: participant.identity, trackSid: publication.sid)
+        if publication.track?.rtpReceiver == nil {
+            self.log("E2EEManager::RoomDelegate: publication.track?.rtpReceiver is nil, skip to create FrameCryptor!")
+            return
+        }
+        let fc = addRtpReceiver(receiver: publication.track!.rtpReceiver!, participantId: participant.identity, trackSid: publication.sid)
         trackPublications[fc] = publication
     }
 

Sources/LiveKit/E2EE/KeyProvider.swift

@@ -104,4 +104,8 @@ public class BaseKeyProvider: Loggable {
 
         return rtcKeyProvider?.exportKey(participantId!, with: index ?? 0)
     }
+
+    public func setSifTrailer(trailer: Data) {
+        rtcKeyProvider?.setSifTrailer(trailer)
+    }
 }

Sources/LiveKit/Participant/LocalParticipant.swift

@@ -34,8 +34,6 @@ public class LocalParticipant: Participant {
     private var allParticipantsAllowed: Bool = true
     private var trackPermissions: [ParticipantTrackPermission] = []
 
-    @objc var rtpSender: RTCRtpSender?
-
     internal convenience init(from info: Livekit_ParticipantInfo,
                               room: Room) {
 
@@ -148,7 +146,6 @@ public class LocalParticipant: Participant {
                                             }
         }.then(on: queue) { params -> Promise<(RTCRtpTransceiver, trackInfo: Livekit_TrackInfo)> in
             self.log("[publish] added transceiver: \(params.trackInfo)...")
-            self.rtpSender = params.transceiver.sender
             return track.onPublish().then(on: self.queue) { _ in params }
         }.then(on: queue) { (transceiver, trackInfo) -> LocalTrackPublication in
 

Sources/LiveKit/Participant/RemoteParticipant.swift

@@ -21,9 +21,6 @@ import Promises
 @objc
 public class RemoteParticipant: Participant {
 
-    @objc
-    public var rtpReceiver: RTCRtpReceiver?
-
     internal init(sid: Sid,
                   info: Livekit_ParticipantInfo?,
                   room: Room) {
@@ -124,8 +121,6 @@ public class RemoteParticipant: Participant {
             return Promise(error)
         }
 
-        self.rtpReceiver = rtpReceiver
-
         publication.set(track: track)
         publication.set(subscriptionAllowed: true)
         track._state.mutate { $0.sid = publication.sid }