react-native-altibbi 0.1.9 → 0.3.0

package/ios/OTSessionManager.swift

@@ -10,11 +10,11 @@ import Foundation
 
 @objc(OTSessionManager)
 class OTSessionManager: RCTEventEmitter {
-    
+
     var jsEvents: [String] = [];
     var componentEvents: [String] = [];
     var logLevel: Bool = false;
-    
+
     deinit {
         OTRN.sharedState.subscriberStreams.removeAll();
         OTRN.sharedState.sessions.removeAll();
@@ -28,16 +28,16 @@ class OTSessionManager: RCTEventEmitter {
         OTRN.sharedState.streamObservers.removeAll();
         OTRN.sharedState.connections.removeAll();
     }
-    
+
     override static func requiresMainQueueSetup() -> Bool {
         return true;
     }
-    
+
     @objc override func supportedEvents() -> [String] {
         let allEvents = EventUtils.getSupportedEvents();
         return allEvents + jsEvents
     }
-    
+
     @objc func initSession(_ apiKey: String, sessionId: String, sessionOptions: Dictionary<String, Any>) -> Void {
         let enableStereoOutput: Bool = Utils.sanitizeBooleanProperty(sessionOptions["enableStereoOutput"] as Any);
         if enableStereoOutput == true {
@@ -54,7 +54,7 @@ class OTSessionManager: RCTEventEmitter {
         settings.iceConfig = Utils.sanitizeIceServer(sessionOptions["customServers"] as Any, sessionOptions["transportPolicy"] as Any, sessionOptions["includeServers"] as Any);
         OTRN.sharedState.sessions.updateValue(OTSession(apiKey: apiKey, sessionId: sessionId, delegate: self, settings: settings)!, forKey: sessionId);
     }
-    
+
     @objc func connect(_ sessionId: String, token: String, callback: @escaping RCTResponseSenderBlock) -> Void {
         var error: OTError?
         guard let session = OTRN.sharedState.sessions[sessionId] else {
@@ -69,7 +69,7 @@ class OTSessionManager: RCTEventEmitter {
             OTRN.sharedState.sessionConnectCallbacks[sessionId] = callback;
         }
     }
-    
+
     @objc func initPublisher(_ publisherId: String, properties: Dictionary<String, Any>, callback: @escaping RCTResponseSenderBlock) -> Void {
         DispatchQueue.main.async {
             let publisherProperties = OTPublisherSettings()
@@ -82,6 +82,8 @@ class OTSessionManager: RCTEventEmitter {
             publisherProperties.cameraResolution = Utils.sanitizeCameraResolution(properties["resolution"] as Any);
             publisherProperties.enableOpusDtx = Utils.sanitizeBooleanProperty(properties["enableDtx"] as Any);
             publisherProperties.name = properties["name"] as? String;
+            publisherProperties.publisherAudioFallbackEnabled = Utils.sanitizeBooleanProperty(properties["publisherAudioFallback"] as Any);
+            publisherProperties.subscriberAudioFallbackEnabled = Utils.sanitizeBooleanProperty(properties["subscriberAudioFallback"] as Any);
             publisherProperties.videoCapture?.videoContentHint = Utils.convertVideoContentHint(properties["videoContentHint"] as Any)
             OTRN.sharedState.publishers.updateValue(OTPublisher(delegate: self, settings: publisherProperties)!, forKey: publisherId);
             guard let publisher = OTRN.sharedState.publishers[publisherId] else {
@@ -108,11 +110,12 @@ class OTSessionManager: RCTEventEmitter {
             publisher.publishVideo = Utils.sanitizeBooleanProperty(properties["publishVideo"] as Any);
             publisher.publishCaptions = Utils.sanitizeBooleanProperty(properties["publishCaptions"] as Any);
             publisher.audioLevelDelegate = self;
+            publisher.networkStatsDelegate = self;
             publisher.rtcStatsReportDelegate = self;
             callback([NSNull()]);
         }
     }
-    
+
     @objc func publish(_ sessionId: String, publisherId: String, callback: RCTResponseSenderBlock) -> Void {
         var error: OTError?
         guard let publisher = OTRN.sharedState.publishers[publisherId] else {
@@ -132,7 +135,7 @@ class OTSessionManager: RCTEventEmitter {
             callback([NSNull()])
         }
     }
-    
+
     @objc func subscribeToStream(_ streamId: String, sessionId: String, properties: Dictionary<String, Any>, callback: @escaping RCTResponseSenderBlock) -> Void {
         var error: OTError?
         DispatchQueue.main.async {
@@ -165,6 +168,7 @@ class OTSessionManager: RCTEventEmitter {
               subscriber.audioVolume = audioVolume;
             }
             subscriber.rtcStatsReportDelegate = self;
+            subscriber.captionsDelegate = self;
             if let err = error {
                 self.dispatchErrorViaCallback(callback, error: err)
             } else {
@@ -172,7 +176,7 @@ class OTSessionManager: RCTEventEmitter {
             }
         }
     }
-    
+
     @objc func removeSubscriber(_ streamId: String, callback: @escaping RCTResponseSenderBlock) -> Void {
         DispatchQueue.main.async {
             OTRN.sharedState.streamObservers.removeValue(forKey: streamId);
@@ -186,9 +190,9 @@ class OTSessionManager: RCTEventEmitter {
             self.removeStream(streamId)
             callback([NSNull()])
         }
-        
+
     }
-    
+
     @objc func disconnectSession(_ sessionId: String, callback: @escaping RCTResponseSenderBlock) -> Void {
         var error: OTError?
         guard let session = OTRN.sharedState.sessions[sessionId] else {
@@ -203,67 +207,73 @@ class OTSessionManager: RCTEventEmitter {
             OTRN.sharedState.sessionDisconnectCallbacks[sessionId] = callback;
         }
     }
-    
+
     @objc func publishAudio(_ publisherId: String, pubAudio: Bool) -> Void {
         guard let publisher = OTRN.sharedState.publishers[publisherId] else { return }
         publisher.publishAudio = pubAudio;
     }
-    
+
     @objc func publishVideo(_ publisherId: String, pubVideo: Bool) -> Void {
         guard let publisher = OTRN.sharedState.publishers[publisherId] else { return }
         publisher.publishVideo = pubVideo;
     }
 
+    @objc func publishCaptions(_ publisherId: String, pubCaptions: Bool) -> Void {
+        guard let publisher = OTRN.sharedState.publishers[publisherId] else { return }
+        publisher.publishCaptions = pubCaptions;
+    }
+
     @objc func getRtcStatsReport(_ publisherId: String) -> Void {
         guard let publisher = OTRN.sharedState.publishers[publisherId] else { return }
         publisher.getRtcStatsReport()
     }
-    
+
     @objc func subscribeToAudio(_ streamId: String, subAudio: Bool) -> Void {
         guard let subscriber = OTRN.sharedState.subscribers[streamId] else { return }
         subscriber.subscribeToAudio = subAudio;
     }
-    
+
     @objc func subscribeToVideo(_ streamId: String, subVideo: Bool) -> Void {
         guard let subscriber = OTRN.sharedState.subscribers[streamId] else { return }
         subscriber.subscribeToVideo = subVideo;
     }
-    
+
     @objc func subscribeToCaptions(_ streamId: String, subCaptions: Bool) -> Void {
         guard let subscriber = OTRN.sharedState.subscribers[streamId] else { return }
         subscriber.subscribeToCaptions = subCaptions;
     }
-    
+
     @objc func setPreferredResolution(_ streamId: String, resolution: NSDictionary) -> Void {
         guard let subscriber = OTRN.sharedState.subscribers[streamId] else { return }
         subscriber.preferredResolution = Utils.sanitizePreferredResolution(resolution);
     }
-    
+
     @objc func setPreferredFrameRate(_ streamId: String, frameRate: Float) -> Void {
         guard let subscriber = OTRN.sharedState.subscribers[streamId] else { return }
         subscriber.preferredFrameRate = Utils.sanitizePreferredFrameRate(frameRate);
     }
-    
+
     @objc func setAudioVolume(_ streamId: String, audioVolume: Double) -> Void {
         guard let subscriber = OTRN.sharedState.subscribers[streamId] else { return }
         subscriber.audioVolume = audioVolume;
     }
-    
-    @objc func getSubscriberRtcStatsReport(_ streamId: String) -> Void {
-        guard let subscriber = OTRN.sharedState.subscribers[streamId] else { return }
-        subscriber.getRtcStatsReport()
+
+    @objc func getSubscriberRtcStatsReport() -> Void {
+        for subscriber in OTRN.sharedState.subscribers {
+            subscriber.value.getRtcStatsReport()
+        }
     }
-    
+
     @objc func changeCameraPosition(_ publisherId: String, cameraPosition: String) -> Void {
         guard let publisher = OTRN.sharedState.publishers[publisherId] else { return }
         publisher.cameraPosition = cameraPosition == "front" ? .front : .back;
     }
-    
+
     @objc func changeVideoContentHint(_ publisherId: String, videoContentHint: String) -> Void {
         guard let publisher = OTRN.sharedState.publishers[publisherId] else { return }
         publisher.videoCapture?.videoContentHint = Utils.convertVideoContentHint(videoContentHint);
     }
-    
+
     @objc func setNativeEvents(_ events: Array<String>) -> Void {
         for event in events {
             if (!self.jsEvents.contains(event)) {
@@ -271,13 +281,13 @@ class OTSessionManager: RCTEventEmitter {
             }
         }
     }
-    
+
     @objc func setJSComponentEvents(_ events: Array<String>) -> Void {
         for event in events {
             self.componentEvents.append(event);
         }
     }
-    
+
     @objc func removeJSComponentEvents(_ events: Array<String>) -> Void {
         for event in events {
             if let i = self.componentEvents.index(of: event) {
@@ -285,7 +295,7 @@ class OTSessionManager: RCTEventEmitter {
             }
         }
     }
-    
+
     @objc func sendSignal(_ sessionId: String, signal: Dictionary<String, String>, callback: RCTResponseSenderBlock ) -> Void {
         var error: OTError?
         guard let session = OTRN.sharedState.sessions[sessionId] else {
@@ -306,7 +316,22 @@ class OTSessionManager: RCTEventEmitter {
             callback([NSNull()])
         }
     }
-    
+
+    @objc func setEncryptionSecret(_ sessionId: String, secret: String, callback: @escaping RCTResponseSenderBlock) -> Void {
+        var error: OTError?
+        guard let session = OTRN.sharedState.sessions[sessionId] else {
+            let errorInfo = EventUtils.createErrorMessage("Error setting encryption secret. Could not find native session instance.")
+            callback([errorInfo])
+            return
+        }
+        session.setEncryptionSecret(secret, error: &error)
+        if let err = error {
+            dispatchErrorViaCallback(callback, error: err)
+        } else {
+            callback([NSNull()])
+        }
+    }
+
     @objc func destroyPublisher(_ publisherId: String, callback: @escaping RCTResponseSenderBlock) -> Void {
         DispatchQueue.main.async {
             guard let publisher = OTRN.sharedState.publishers[publisherId] else { callback([NSNull()]); return }
@@ -332,7 +357,7 @@ class OTSessionManager: RCTEventEmitter {
             self.dispatchErrorViaCallback(callback, error: err)
         }
     }
-    
+
     @objc func setVideoTransformers(_ publisherId: String, videoTransformers: Array<Any>) -> Void {
         guard let publisher = OTRN.sharedState.publishers[publisherId] else {
             return // To do -- handle error
@@ -356,7 +381,7 @@ class OTSessionManager: RCTEventEmitter {
         }
         publisher.videoTransformers = nativeTransformers
     }
-    
+
     @objc func removeNativeEvents(_ events: Array<String>) -> Void {
         for event in events {
             if let i = self.jsEvents.index(of: event) {
@@ -364,14 +389,14 @@ class OTSessionManager: RCTEventEmitter {
             }
         }
     }
-    
+
     @objc func getSessionInfo(_ sessionId: String, callback: RCTResponseSenderBlock) -> Void {
         guard let session = OTRN.sharedState.sessions[sessionId] else { callback([NSNull()]); return }
         var sessionInfo: Dictionary<String, Any> = EventUtils.prepareJSSessionEventData(session);
         sessionInfo["connectionStatus"] = session.sessionConnectionStatus.rawValue;
         callback([sessionInfo]);
     }
-    
+
     @objc func getSessionCapabilities(_ sessionId: String, callback: RCTResponseSenderBlock) -> Void{
         guard let session = OTRN.sharedState.sessions[sessionId] else { callback([NSNull()]); return }
         var sessionCapabilities: Dictionary<String, Any> = [:];
@@ -381,14 +406,14 @@ class OTSessionManager: RCTEventEmitter {
         sessionCapabilities["canForceMute"] = session.capabilities?.canForceMute;
         callback([sessionCapabilities]);
     }
-    
+
     @objc func reportIssue(_ sessionId: String, callback: RCTResponseSenderBlock) -> Void{
         guard let session = OTRN.sharedState.sessions[sessionId] else { callback([NSNull()]); return }
         var issueId:NSString? = ""
         session.reportIssue(&issueId)
         callback([issueId! as NSString])
     }
-    
+
     // The OpenTok iOS SDK does not implement a getVideoCodecs method, because iOS
     // supported all supported codecs. But we will implement it here so that the
     // OT.getVideoCodecs() method can be called cross-platform.
@@ -398,17 +423,30 @@ class OTSessionManager: RCTEventEmitter {
         supportedCodecs["videoEncoderCodecs"] = ["H.264", "VP8"];
         resolve(supportedCodecs)
     }
-    
-    @objc func forceMuteAll(_ sessionId: String, excludedStreamIds: NSArray, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void{
+
+    @objc func forceMuteAll(_ sessionId: String, excludedStreamIds: Array<String>, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void{
         guard let session = OTRN.sharedState.sessions[sessionId] else {
             reject("event_failure", "Session ID not found", nil)
             return
         }
-        return resolve(true);
+        var excludedStreams:[OTStream] = []
+        for streamId in excludedStreamIds {
+            guard let stream = OTRN.sharedState.subscriberStreams[streamId] ?? OTRN.sharedState.publisherStreams[streamId] else {
+                continue // Ignore bogus stream IDs
+            }
+            excludedStreams.append(stream)
+        }
+        var error: OTError?
+        session.forceMuteAll(excludedStreams, error: &error)
+        if let error = error {
+          reject("event_failure", error.localizedDescription, nil)
+          return
+        }
+        return resolve(true)
     }
 
     @objc func forceMuteStream(_ sessionId: String, streamId: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void{
-        guard let session = OTRN.sharedState.sessions[sessionId] else { 
+        guard let session = OTRN.sharedState.sessions[sessionId] else {
             reject("event_failure", "Session ID not found", nil);
             return
         }
@@ -438,39 +476,39 @@ class OTSessionManager: RCTEventEmitter {
         }
         resolve(true);
     }
-    
+
     @objc func enableLogs(_ logLevel: Bool) -> Void {
         self.logLevel = logLevel;
     }
-    
+
     func resetPublisher(_ publisherId: String, publisher: OTPublisher) -> Void {
         publisher.view?.removeFromSuperview()
         OTRN.sharedState.isPublishing[publisherId] = false;
     }
-    
+
     func removeStream(_ streamId: String) -> Void {
         OTRN.sharedState.subscribers.removeValue(forKey: streamId)
         OTRN.sharedState.subscriberStreams.removeValue(forKey: streamId)
     }
-    
+
     func emitEvent(_ event: String, data: Any) -> Void {
         if (self.bridge != nil && (self.jsEvents.contains(event) || self.componentEvents.contains(event))) {
            self.sendEvent(withName: event, body: data);
         }
     }
-    
+
     func checkAndEmitStreamPropertyChangeEvent(_ streamId: String, changedProperty: String, oldValue: Any, newValue: Any, isPublisherStream: Bool) {
         guard let stream = isPublisherStream ? OTRN.sharedState.publisherStreams[streamId] : OTRN.sharedState.subscriberStreams[streamId] else { return }
         let streamInfo: Dictionary<String, Any> = EventUtils.prepareJSStreamEventData(stream);
         let eventData: Dictionary<String, Any> = EventUtils.prepareStreamPropertyChangedEventData(changedProperty, oldValue: oldValue, newValue: newValue, stream: streamInfo);
         self.emitEvent("\(stream.session.sessionId):\(EventUtils.sessionPreface)streamPropertyChanged", data: eventData)
     }
-    
+
     func dispatchErrorViaCallback(_ callback: RCTResponseSenderBlock, error: OTError) {
         let errorInfo = EventUtils.prepareJSErrorEventData(error);
         callback([errorInfo]);
     }
-    
+
     func setStreamObservers(stream: OTStream, isPublisherStream: Bool) {
         let hasVideoObservation: NSKeyValueObservation = stream.observe(\.hasVideo, options: [.old, .new]) { object, change in
             guard let oldValue = change.oldValue else { return }
@@ -494,7 +532,7 @@ class OTSessionManager: RCTEventEmitter {
         }
         OTRN.sharedState.streamObservers.updateValue([hasAudioObservation, hasVideoObservation, videoDimensionsObservation, videoTypeObservation], forKey: stream.streamId)
     }
-    
+
     func printLogs(_ message: String) {
         if (logLevel) {
             print(message)
@@ -510,7 +548,7 @@ extension OTSessionManager: OTSessionDelegate {
         self.emitEvent("\(session.sessionId):\(EventUtils.sessionPreface)sessionDidConnect", data: sessionInfo);
         printLogs("OTRN: Session connected")
     }
-    
+
     func sessionDidDisconnect(_ session: OTSession) {
         let sessionInfo = EventUtils.prepareJSSessionEventData(session);
         self.emitEvent("\(session.sessionId):\(EventUtils.sessionPreface)sessionDidDisconnect", data: sessionInfo);
@@ -522,7 +560,7 @@ extension OTSessionManager: OTSessionDelegate {
         OTRN.sharedState.sessionConnectCallbacks.removeValue(forKey: session.sessionId);
         printLogs("OTRN: Session disconnected")
     }
-    
+
     func session(_ session: OTSession, connectionCreated connection: OTConnection) {
         OTRN.sharedState.connections.updateValue(connection, forKey: connection.connectionId)
         var connectionInfo = EventUtils.prepareJSConnectionEventData(connection);
@@ -537,7 +575,7 @@ extension OTSessionManager: OTSessionDelegate {
         self.emitEvent("\(session.sessionId):\(EventUtils.sessionPreface)connectionDestroyed", data: connectionInfo)
         printLogs("OTRN Session: A connection was destroyed")
     }
-    
+
     func session(_ session: OTSession, archiveStartedWithId archiveId: String, name: String?) {
         var archiveInfo: Dictionary<String, String> = [:];
         archiveInfo["archiveId"] = archiveId;
@@ -546,7 +584,7 @@ extension OTSessionManager: OTSessionDelegate {
         self.emitEvent("\(session.sessionId):\(EventUtils.sessionPreface)archiveStartedWithId", data: archiveInfo)
         printLogs("OTRN Session: Archive started with \(archiveId)")
     }
-    
+
     func session(_ session: OTSession, archiveStoppedWithId archiveId: String) {
         var archiveInfo: Dictionary<String, String> = [:];
         archiveInfo["archiveId"] = archiveId;
@@ -555,19 +593,19 @@ extension OTSessionManager: OTSessionDelegate {
         self.emitEvent("\(session.sessionId):\(EventUtils.sessionPreface)archiveStoppedWithId", data: archiveInfo);
         printLogs("OTRN Session: Archive stopped with \(archiveId)")
     }
-    
+
     func sessionDidBeginReconnecting(_ session: OTSession) {
         let sessionInfo = EventUtils.prepareJSSessionEventData(session);
         self.emitEvent("\(session.sessionId):\(EventUtils.sessionPreface)sessionDidBeginReconnecting", data: sessionInfo)
         printLogs("OTRN Session: Session did begin reconnecting")
     }
-    
+
     func sessionDidReconnect(_ session: OTSession) {
         let sessionInfo = EventUtils.prepareJSSessionEventData(session);
         self.emitEvent("\(session.sessionId):\(EventUtils.sessionPreface)sessionDidReconnect", data: sessionInfo)
         printLogs("OTRN Session: Session reconnected")
     }
-    
+
     func session(_ session: OTSession, streamCreated stream: OTStream) {
         OTRN.sharedState.subscriberStreams.updateValue(stream, forKey: stream.streamId)
         let streamInfo: Dictionary<String, Any> = EventUtils.prepareJSStreamEventData(stream)
@@ -575,19 +613,19 @@ extension OTSessionManager: OTSessionDelegate {
         setStreamObservers(stream: stream, isPublisherStream: false)
         printLogs("OTRN: Session streamCreated \(stream.streamId)")
     }
-    
+
     func session(_ session: OTSession, streamDestroyed stream: OTStream) {
         let streamInfo: Dictionary<String, Any> = EventUtils.prepareJSStreamEventData(stream);
         self.emitEvent("\(session.sessionId):\(EventUtils.sessionPreface)streamDestroyed", data: streamInfo)
         printLogs("OTRN: Session streamDestroyed: \(stream.streamId)")
     }
-    
+
     func session(_ session: OTSession, didFailWithError error: OTError) {
         let errorInfo: Dictionary<String, Any> = EventUtils.prepareJSErrorEventData(error);
         self.emitEvent("\(session.sessionId):\(EventUtils.sessionPreface)didFailWithError", data: errorInfo)
         printLogs("OTRN: Session Failed to connect: \(error.localizedDescription)")
     }
-    
+
     func session(_ session: OTSession, receivedSignalType type: String?, from connection: OTConnection?, with string: String?) {
         var signalData: Dictionary<String, Any> = [:];
         signalData["type"] = type;
@@ -601,7 +639,7 @@ extension OTSessionManager: OTSessionDelegate {
     func session(_ session: OTSession, info muteForced: OTMuteForcedInfo) {
         var muteForcedInfo: Dictionary<String, Any> = [:];
         muteForcedInfo["active"] = muteForced.active;
-        self.emitEvent("\(session.sessionId):\(EventUtils.sessionPreface)muteFoced", data: muteForcedInfo)
+        self.emitEvent("\(session.sessionId):\(EventUtils.sessionPreface)muteForced", data: muteForcedInfo)
         printLogs("OTRN Session: Session muteForced - active:  \(muteForced.active)")
     }
 }
@@ -613,13 +651,14 @@ extension OTSessionManager: OTPublisherDelegate {
         let publisherId = Utils.getPublisherId(publisher as! OTPublisher);
         if (publisherId.count > 0) {
             OTRN.sharedState.isPublishing[publisherId] = true;
-            let streamInfo: Dictionary<String, Any> = EventUtils.prepareJSStreamEventData(stream);
-            self.emitEvent("\(publisherId):\(EventUtils.publisherPreface)streamCreated", data: streamInfo);
+            var streamInfo: Dictionary<String, Any> = EventUtils.prepareJSStreamEventData(stream);
+            streamInfo["publisherId"] = publisherId;
+            self.emitEvent("publisherStreamCreated", data: streamInfo);
             setStreamObservers(stream: stream, isPublisherStream: true)
         }
         printLogs("OTRN: Publisher Stream created")
     }
-    
+
     func publisher(_ publisher: OTPublisherKit, streamDestroyed stream: OTStream) {
         OTRN.sharedState.streamObservers.removeValue(forKey: stream.streamId)
         OTRN.sharedState.publisherStreams.removeValue(forKey: stream.streamId)
@@ -628,8 +667,9 @@ extension OTSessionManager: OTPublisherDelegate {
         OTRN.sharedState.isPublishing[publisherId] = false;
         if (publisherId.count > 0) {
             OTRN.sharedState.isPublishing[publisherId] = false;
-            let streamInfo: Dictionary<String, Any> = EventUtils.prepareJSStreamEventData(stream);
-            self.emitEvent("\(publisherId):\(EventUtils.publisherPreface)streamDestroyed", data: streamInfo);
+            var streamInfo: Dictionary<String, Any> = EventUtils.prepareJSStreamEventData(stream);
+            streamInfo["publisherId"] = publisherId;
+            self.emitEvent("publisherStreamDestroyed", data: streamInfo);
         }
         OTRN.sharedState.publishers[publisherId] = nil;
         OTRN.sharedState.isPublishing[publisherId] = nil;
@@ -640,7 +680,7 @@ extension OTSessionManager: OTPublisherDelegate {
         callback([NSNull()]);
         printLogs("OTRN: Publisher Stream destroyed")
     }
-    
+
     func publisher(_ publisher: OTPublisherKit, didFailWithError error: OTError) {
         let publisherId = Utils.getPublisherId(publisher as! OTPublisher);
         if (publisherId.count > 0) {
@@ -657,6 +697,42 @@ extension OTSessionManager: OTPublisherDelegate {
         }
         printLogs("OTRN: Publisher mute forced")
     }
+
+    func videoDisableWarning(_ publisher: OTPublisherKit) {
+        let publisherId = Utils.getPublisherId(publisher as! OTPublisher)
+        if (publisherId.count > 0) {
+            self.emitEvent("\(publisherId):\(EventUtils.publisherPreface)videoDisableWarning", data: [NSNull()])
+        }
+        printLogs("OTRN: Publisher videoDisableWarning")
+    }
+
+    func videoDisableWarningLifted(_ publisher: OTPublisherKit) {
+        let publisherId = Utils.getPublisherId(publisher as! OTPublisher);
+        if (publisherId.count > 0) {
+            self.emitEvent("\(publisherId):\(EventUtils.publisherPreface)videoDisableWarningLifted", data: [NSNull()])
+        }
+        printLogs("OTRN: Publisher videoDisableWarningLifted")
+    }
+
+    func videoDisabled(_ publisher: OTPublisherKit, reason: OTPublisherVideoEventReason) {
+        var publisherInfo: Dictionary<String, Any> = [:]
+        publisherInfo["reason"] = Utils.convertOTPublisherVideoEventReasonToString(reason)
+        let publisherId = Utils.getPublisherId(publisher as! OTPublisher)
+        if (publisherId.count > 0) {
+            self.emitEvent("\(publisherId):\(EventUtils.publisherPreface)videoDisabled", data: publisherInfo)
+        }
+        printLogs("OTRN: Publisher videoDisabled")
+    }
+
+    func videoEnabled(_ publisher: OTPublisherKit, reason: OTPublisherVideoEventReason) {
+        var publisherInfo: Dictionary<String, Any> = [:]
+        publisherInfo["reason"] = Utils.convertOTPublisherVideoEventReasonToString(reason)
+        let publisherId = Utils.getPublisherId(publisher as! OTPublisher)
+        if (publisherId.count > 0) {
+            self.emitEvent("\(publisherId):\(EventUtils.publisherPreface)videoEnabled", data: publisherInfo)
+        }
+        printLogs("OTRN: Publisher videoEnabled")
+    }
 }
 
 extension OTSessionManager: OTPublisherKitAudioLevelDelegate {
@@ -683,7 +759,7 @@ extension OTSessionManager: OTPublisherKitNetworkStatsDelegate {
         let publisherId = Utils.getPublisherId(publisher as! OTPublisher);
         if (publisherId.count > 0) {
             let statsArray: [Dictionary<String, Any>] = EventUtils.preparePublisherAudioNetworkStats(stats);
-            self.emitEvent("\(publisherId):\(EventUtils.publisherPreface)audioNetworkStats", data: statsArray)
+            self.emitEvent("\(publisherId):\(EventUtils.publisherPreface)audioNetworkStatsUpdated", data: statsArray)
         }
     }
 
@@ -691,7 +767,7 @@ extension OTSessionManager: OTPublisherKitNetworkStatsDelegate {
         let publisherId = Utils.getPublisherId(publisher as! OTPublisher);
         if (publisherId.count > 0) {
             let statsArray: [Dictionary<String, Any>] = EventUtils.preparePublisherVideoNetworkStats(stats);
-            self.emitEvent("\(publisherId):\(EventUtils.publisherPreface)videoNetworkStats", data: statsArray)
+            self.emitEvent("\(publisherId):\(EventUtils.publisherPreface)videoNetworkStatsUpdated", data: statsArray)
         }
     }
 }
@@ -706,7 +782,7 @@ extension OTSessionManager: OTSubscriberDelegate {
         }
         printLogs("OTRN: Subscriber connected")
     }
-    
+
     func subscriber(_ subscriber: OTSubscriberKit, didFailWithError error: OTError) {
         var subscriberInfo: Dictionary<String, Any> = [:];
         subscriberInfo["error"] = EventUtils.prepareJSErrorEventData(error);
@@ -731,7 +807,7 @@ extension OTSessionManager: OTSubscriberKitNetworkStatsDelegate {
         subscriberInfo["stream"] = EventUtils.prepareJSStreamEventData(stream);
         self.emitEvent("\(EventUtils.subscriberPreface)videoNetworkStatsUpdated", data: subscriberInfo);
     }
-    
+
     func subscriber(_ subscriber: OTSubscriberKit, audioNetworkStatsUpdated stats: OTSubscriberKitAudioNetworkStats) {
         var subscriberInfo: Dictionary<String, Any> = [:];
         subscriberInfo["audioStats"] = EventUtils.prepareSubscriberAudioNetworkStatsEventData(stats);
@@ -742,7 +818,7 @@ extension OTSessionManager: OTSubscriberKitNetworkStatsDelegate {
         subscriberInfo["stream"] = EventUtils.prepareJSStreamEventData(stream);
         self.emitEvent("\(EventUtils.subscriberPreface)audioNetworkStatsUpdated", data: subscriberInfo);
     }
-    
+
     func subscriberVideoEnabled(_ subscriber: OTSubscriberKit, reason: OTSubscriberVideoEventReason) {
         var subscriberInfo: Dictionary<String, Any> = [:];
         subscriberInfo["reason"] = Utils.convertOTSubscriberVideoEventReasonToString(reason);
@@ -754,7 +830,7 @@ extension OTSessionManager: OTSubscriberKitNetworkStatsDelegate {
         self.emitEvent("\(EventUtils.subscriberPreface)subscriberVideoEnabled", data: subscriberInfo);
         printLogs("OTRN: subscriberVideoEnabled")
     }
-    
+
     func subscriberVideoDisabled(_ subscriber: OTSubscriberKit, reason: OTSubscriberVideoEventReason) {
         var subscriberInfo: Dictionary<String, Any> = [:];
         subscriberInfo["reason"] = Utils.convertOTSubscriberVideoEventReasonToString(reason);
@@ -766,7 +842,7 @@ extension OTSessionManager: OTSubscriberKitNetworkStatsDelegate {
         self.emitEvent("\(EventUtils.subscriberPreface)subscriberVideoDisabled", data: subscriberInfo);
         printLogs("OTRN: subscriberVideoDisabled")
     }
-    
+
     func subscriberVideoDisableWarning(_ subscriber: OTSubscriberKit) {
         var subscriberInfo: Dictionary<String, Any> = [:];
         guard let stream = subscriber.stream else {
@@ -777,7 +853,7 @@ extension OTSessionManager: OTSubscriberKitNetworkStatsDelegate {
         self.emitEvent("\(EventUtils.subscriberPreface)subscriberVideoDisableWarning", data: subscriberInfo);
         printLogs("OTRN: subscriberVideoDisableWarning")
     }
-    
+
     func subscriberVideoDisableWarningLifted(_ subscriber: OTSubscriberKit) {
         var subscriberInfo: Dictionary<String, Any> = [:];
         guard let stream = subscriber.stream else {
@@ -788,7 +864,7 @@ extension OTSessionManager: OTSubscriberKitNetworkStatsDelegate {
         self.emitEvent("\(EventUtils.subscriberPreface)subscriberVideoDisableWarningLifted", data: subscriberInfo);
         printLogs("OTRN: subscriberVideoDisableWarningLifted")
     }
-    
+
     func subscriberVideoDataReceived(_ subscriber: OTSubscriber) {
         var subscriberInfo: Dictionary<String, Any> = [:];
         guard let stream = subscriber.stream else {
@@ -798,7 +874,7 @@ extension OTSessionManager: OTSubscriberKitNetworkStatsDelegate {
         subscriberInfo["stream"] = EventUtils.prepareJSStreamEventData(stream);
         self.emitEvent("\(EventUtils.subscriberPreface)subscriberVideoDataReceived", data: subscriberInfo);
     }
-    
+
     func subscriberDidReconnect(toStream subscriber: OTSubscriberKit) {
         var subscriberInfo: Dictionary<String, Any> = [:];
         guard let stream = subscriber.stream else {
@@ -810,7 +886,7 @@ extension OTSessionManager: OTSubscriberKitNetworkStatsDelegate {
         self.emitEvent("\(EventUtils.subscriberPreface)subscriberDidReconnect", data: subscriberInfo);
         printLogs("OTRN: subscriberDidReconnect")
     }
-    
+
     func subscriberDidDisconnect(fromStream subscriberKit: OTSubscriberKit) {
         var subscriberInfo: Dictionary<String, Any> = [:];
         guard let stream = subscriberKit.stream else {
@@ -822,7 +898,7 @@ extension OTSessionManager: OTSubscriberKitNetworkStatsDelegate {
         self.emitEvent("\(EventUtils.subscriberPreface)subscriberDidDisconnect", data: subscriberInfo);
         printLogs("OTRN: Subscriber disconnected")
     }
-    
+
 }
 
 extension OTSessionManager: OTSubscriberKitAudioLevelDelegate {
@@ -857,10 +933,10 @@ extension OTSessionManager: OTSubscriberKitCaptionsDelegate {
         subscriberInfo["text"] = text;
         subscriberInfo["isFinal"] = isFinal;
         guard let stream = subscriber.stream else {
-            self.emitEvent("\(EventUtils.subscriberPreface)subscriberDidConnect", data: subscriberInfo);
+            self.emitEvent("\(EventUtils.subscriberPreface)subscriberCaptionReceived", data: subscriberInfo);
             return;
         }
         subscriberInfo["stream"] = EventUtils.prepareJSStreamEventData(stream);
-        self.emitEvent("\(EventUtils.subscriberPreface)subscriberDidConnect", data: subscriberInfo);
+        self.emitEvent("\(EventUtils.subscriberPreface)subscriberCaptionReceived", data: subscriberInfo);
     }
 }