@100mslive/react-native-hms 1.6.1 → 1.7.0

package/ios/HMSHLSPlayerManager.swift

@@ -0,0 +1,368 @@
+import HMSSDK
+import HMSHLSPlayerSDK
+import AVKit.AVPlayerViewController
+
+typealias HmsHlsPlayer = HMSHLSPlayerSDK.HMSHLSPlayer
+
+@objc(HMSHLSPlayerManager)
+class HMSHLSPlayerManager: RCTViewManager {
+    override func view() -> (HMSHLSPlayer) {
+        let view = HMSHLSPlayer()
+        let hms = getHmsFromBridge()
+
+        view.setHms(hms)
+
+        return view
+    }
+
+    func getHmsFromBridge() -> [String: HMSRNSDK] {
+        let collection = (bridge.module(for: HMSManager.classForCoder()) as? HMSManager)?.hmsCollection ?? [String: HMSRNSDK]()
+        return collection
+    }
+
+    override class func requiresMainQueueSetup() -> Bool {
+        true
+    }
+
+    @objc func play(_ node: NSNumber, url: String? = nil) {
+        DispatchQueue.main.async {
+            if let component = self.bridge.uiManager.view(forReactTag: node) as? HMSHLSPlayer {
+                component.play(url)
+            }
+        }
+    }
+
+    @objc func stop(_ node: NSNumber) {
+        DispatchQueue.main.async {
+            if let component = self.bridge.uiManager.view(forReactTag: node) as? HMSHLSPlayer {
+                component.stop()
+            }
+        }
+    }
+
+    @objc func pause(_ node: NSNumber) {
+        DispatchQueue.main.async {
+            if let component = self.bridge.uiManager.view(forReactTag: node) as? HMSHLSPlayer {
+                component.pause()
+            }
+        }
+    }
+
+    @objc func resume(_ node: NSNumber) {
+        DispatchQueue.main.async {
+            if let component = self.bridge.uiManager.view(forReactTag: node) as? HMSHLSPlayer {
+                component.resume()
+            }
+        }
+    }
+
+    @objc func seekToLivePosition(_ node: NSNumber) {
+        DispatchQueue.main.async {
+            if let component = self.bridge.uiManager.view(forReactTag: node) as? HMSHLSPlayer {
+                component.seekToLivePosition()
+            }
+        }
+    }
+
+    @objc func seekForward(_ node: NSNumber, seconds: NSNumber) {
+        DispatchQueue.main.async {
+            if let component = self.bridge.uiManager.view(forReactTag: node) as? HMSHLSPlayer {
+                component.seekForward(Double(truncating: seconds))
+            }
+        }
+    }
+
+    @objc func seekBackward(_ node: NSNumber, seconds: NSNumber) {
+        DispatchQueue.main.async {
+            if let component = self.bridge.uiManager.view(forReactTag: node) as? HMSHLSPlayer {
+                component.seekBackward(Double(truncating: seconds))
+            }
+        }
+    }
+
+    @objc func setVolume(_ node: NSNumber, level: NSNumber) {
+        DispatchQueue.main.async {
+            if let component = self.bridge.uiManager.view(forReactTag: node) as? HMSHLSPlayer {
+                component.setVolume(Int(truncating: level))
+            }
+        }
+    }
+}
+
+class HMSHLSPlayer: UIView {
+    // MARK: class instance properties
+    var hlsStatsTimerRef: Timer?
+    var eventController: HLSPlaybackEventController?
+    var hmsHLSPlayerViewController: AVPlayerViewController?
+    lazy var hmsHLSPlayer = HmsHlsPlayer()
+
+    // MARK: Handle HMSRNSDK Instance in HMSHLSPlayer instance
+    var hmsCollection = [String: HMSRNSDK]()
+
+    func setHms(_ hmsInstance: [String: HMSRNSDK]) {
+        hmsCollection = hmsInstance
+    }
+
+    // MARK: Handle HMSHLSPlayer RN Component props
+
+    @objc var onHmsHlsPlaybackEvent: RCTDirectEventBlock?
+
+    @objc var onHmsHlsStatsEvent: RCTDirectEventBlock?
+
+    @objc var url: String? {
+        didSet {
+            play(url)
+        }
+    }
+
+    @objc var enableStats: Bool = false {
+        didSet {
+            if enableStats == true {
+                attachHLSPlayerStatsListener()
+            } else {
+                // If we have existing Stats Timer, Invalidate it
+                if let hlsStatsTimer = hlsStatsTimerRef {
+                    hlsStatsTimer.invalidate()
+                    hlsStatsTimerRef = nil
+                }
+            }
+        }
+    }
+
+    @objc var enableControls: Bool = true {
+        didSet {
+            hmsHLSPlayerViewController?.showsPlaybackControls = enableControls
+        }
+    }
+
+    // MARK: Handle HMSHLSPlayer RN Component methods
+
+    @objc func play(_ url: String?) {
+        if let validURLString = url, !validURLString.isEmpty {
+            if let urlInstance = URL(string: validURLString) {
+                hmsHLSPlayer.play(urlInstance)
+            }
+            return
+        }
+
+        guard let hlsStreamingState = hmsCollection["12345"]?.hms?.room?.hlsStreamingState else {
+            return
+        }
+
+        if hlsStreamingState.running && !hlsStreamingState.variants.isEmpty {
+            hmsHLSPlayer.play(hlsStreamingState.variants[0].meetingURL)
+        }
+    }
+
+    @objc func stop() {
+        hmsHLSPlayer.stop()
+    }
+
+    @objc func pause() {
+        hmsHLSPlayer.pause()
+    }
+
+    @objc func resume() {
+        hmsHLSPlayer.resume()
+    }
+
+    @objc func seekForward(_ seconds: Double) {
+        hmsHLSPlayer.seekForward(seconds: seconds)
+    }
+
+    @objc func seekBackward(_ seconds: Double) {
+        hmsHLSPlayer.seekBackward(seconds: seconds)
+    }
+
+    @objc func seekToLivePosition() {
+        hmsHLSPlayer.seekToLivePosition()
+    }
+
+    @objc func setVolume(_ level: Int) {
+        hmsHLSPlayer.volume = level
+    }
+
+    // MARK: Constructor & Deconstructor
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+
+        // setting properties on current UIView
+        self.frame = frame
+        self.backgroundColor = UIColor(displayP3Red: 0, green: 0, blue: 0, alpha: 1)
+
+        // creating 100ms HLS Player and getting player view controller
+        let playerViewController = hmsHLSPlayer.videoPlayerViewController(showsPlayerControls: false)
+        hmsHLSPlayerViewController = playerViewController
+        playerViewController.view.frame = self.bounds
+
+        // Setting 100ms HLS Player as subview of current UIView
+        self.addSubview(playerViewController.view)
+
+        attachPlayerPlaybackListeners()
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    deinit {
+        cleanup()
+    }
+
+    // MARK: Utility functions
+    func cleanup() {
+        hmsHLSPlayer.stop()
+
+        // Remove HLS player playback events
+        hmsHLSPlayer.delegate = nil
+
+        // Remove HLS player stats timer
+        hlsStatsTimerRef?.invalidate()
+    }
+
+    private func sendHLSPlaybackEventToJS(_ eventName: String, _ data: [String: Any]) {
+        guard let onHmsHlsPlaybackEvent = onHmsHlsPlaybackEvent else { return }
+
+        onHmsHlsPlaybackEvent(["event": eventName, "data": data])
+    }
+
+    private func sendHLSStatsEventToJS(_ eventName: String, _ data: [String: Any]) {
+        guard let onHmsHlsStatsEvent = onHmsHlsStatsEvent else { return }
+
+        onHmsHlsStatsEvent(["event": eventName, "data": data])
+    }
+
+    private func attachPlayerPlaybackListeners() {
+        // Attaching HLS Player Playback Events Listener
+        eventController = HLSPlaybackEventController(self)
+        hmsHLSPlayer.delegate = eventController
+    }
+
+    private func attachHLSPlayerStatsListener() {
+        // Only Attach listener, if there is no previously attached listener
+        if hlsStatsTimerRef == nil {
+
+            // Attaching HLS Player Stats Event Listener
+            hlsStatsTimerRef = Timer.scheduledTimer(withTimeInterval: 2.0, repeats: true) { [weak self] _ in
+                guard let self = self, self.onHmsHlsStatsEvent != nil else { return }
+
+                let statsMonitor = self.hmsHLSPlayer.statMonitor
+
+                var data = [String: Any]()
+
+                // bandwidth
+                data["bandWidthEstimate"] = statsMonitor.estimatedBandwidth
+                data["totalBytesLoaded"] = statsMonitor.bytesDownloaded
+
+                // bufferedDuration
+                data["bufferedDuration"] = statsMonitor.bufferedDuration
+
+                // distanceFromLive
+                data["distanceFromLive"] = statsMonitor.distanceFromLiveEdge
+
+                // frameInfo
+                data["droppedFrameCount"] = statsMonitor.droppedFrames
+
+                // videoInfo
+                data["averageBitrate"] = statsMonitor.bitrate
+                data["videoHeight"] = statsMonitor.videoSize.height
+                data["videoWidth"] = statsMonitor.videoSize.width
+
+                self.sendHLSStatsEventToJS(HMSHLSPlayerConstants.ON_STATS_EVENT_UPDATE, data)
+            }
+        }
+    }
+
+    fileprivate func onCue(cue: HMSHLSCue) {
+        guard onHmsHlsPlaybackEvent != nil else { return }
+
+        var data = [String: Any]()
+
+        data["id"] = cue.id
+        data["startDate"] = String(cue.startDate.timeIntervalSince1970)
+        if let endDate = cue.endDate {
+            data["endDate"] = String(endDate.timeIntervalSince1970)
+        }
+        if let payload = cue.payload {
+            data["payloadval"] = payload
+        }
+
+        sendHLSPlaybackEventToJS(HMSHLSPlayerConstants.ON_PLAYBACK_CUE_EVENT, data)
+    }
+
+    fileprivate func onPlaybackFailure(error: Error) {
+        guard onHmsHlsPlaybackEvent != nil else { return }
+
+        var data = [String: Any]()
+
+        data["error"] = [
+            "errorCode": error.localizedDescription,
+            "errorCodeName": error.localizedDescription,
+            "message": error.localizedDescription
+        ]
+
+        sendHLSPlaybackEventToJS(HMSHLSPlayerConstants.ON_PLAYBACK_FAILURE_EVENT, data)
+    }
+
+    fileprivate func onPlaybackStateChanged(state: HMSHLSPlaybackState) {
+        guard onHmsHlsPlaybackEvent != nil else { return }
+
+        var data = [String: Any]()
+
+        data["state"] = state.description
+
+        sendHLSPlaybackEventToJS(HMSHLSPlayerConstants.ON_PLAYBACK_STATE_CHANGE_EVENT, data)
+    }
+}
+
+class HLSPlaybackEventController: HMSHLSPlayerDelegate {
+    weak var hmsHlsPlayerDelegate: HMSHLSPlayer?
+
+    init(_ hmsPlayerDelegate: HMSHLSPlayer) {
+        self.hmsHlsPlayerDelegate = hmsPlayerDelegate
+    }
+
+    func onPlaybackStateChanged(state: HMSHLSPlaybackState) {
+        hmsHlsPlayerDelegate?.onPlaybackStateChanged(state: state)
+    }
+
+    func onCue(cue: HMSHLSCue) {
+        hmsHlsPlayerDelegate?.onCue(cue: cue)
+    }
+
+    func onPlaybackFailure(error: Error) {
+        hmsHlsPlayerDelegate?.onPlaybackFailure(error: error)
+    }
+}
+
+enum HMSHLSPlayerConstants {
+    // HLS Playback Events
+    static let ON_PLAYBACK_CUE_EVENT = "ON_PLAYBACK_CUE_EVENT"
+    static let ON_PLAYBACK_FAILURE_EVENT = "ON_PLAYBACK_FAILURE_EVENT"
+    static let ON_PLAYBACK_STATE_CHANGE_EVENT = "ON_PLAYBACK_STATE_CHANGE_EVENT"
+
+    // HLS Playback Stats Events
+    static let ON_STATS_EVENT_UPDATE = "ON_STATS_EVENT_UPDATE"
+}
+
+extension HMSHLSPlaybackState: CustomStringConvertible {
+    public var description: String {
+        switch self {
+        case .buffering:
+            return "buffering"
+        case .failed:
+            return "failed"
+        case .paused:
+            return "paused"
+        case .playing:
+            return "playing"
+        case .stopped:
+            return "stopped"
+        case .unknown:
+            return "unknown"
+        @unknown default:
+            return "unknown"
+        }
+    }
+}

package/ios/HMSManager.m

@@ -38,6 +38,7 @@ RCT_EXTERN_METHOD(destroy: (NSDictionary) data :(RCTPromiseResolveBlock) resolve
 RCT_EXTERN_METHOD(startScreenshare: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
 RCT_EXTERN_METHOD(stopScreenshare: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
 RCT_EXTERN_METHOD(isScreenShared: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
+RCT_EXTERN_METHOD(switchAudioOutputUsingIOSUI: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
 RCT_EXTERN_METHOD(playAudioShare: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
 RCT_EXTERN_METHOD(setAudioShareVolume: (NSDictionary) data)
 RCT_EXTERN_METHOD(stopAudioShare: (NSDictionary) data)
@@ -51,8 +52,6 @@ RCT_EXTERN_METHOD(getRemotePeers: (NSDictionary) data :(RCTPromiseResolveBlock)
 RCT_EXTERN_METHOD(getRoles: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
 RCT_EXTERN_METHOD(enableNetworkQualityUpdates: (NSDictionary) data)
 RCT_EXTERN_METHOD(disableNetworkQualityUpdates: (NSDictionary) data)
-RCT_EXTERN_METHOD(setSessionMetaData: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
-RCT_EXTERN_METHOD(getSessionMetaData: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
 RCT_EXTERN_METHOD(changeRoleOfPeer: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
 RCT_EXTERN_METHOD(changeRoleOfPeersWithRoles: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
 

package/ios/HMSManager.swift

@@ -1,4 +1,5 @@
 import HMSSDK
+import AVKit.AVRoutePickerView
 
 @objc(HMSManager)
 class HMSManager: RCTEventEmitter {
@@ -182,6 +183,27 @@ class HMSManager: RCTEventEmitter {
         hms?.setVolume(data)
     }
 
+    @objc
+    func switchAudioOutputUsingIOSUI(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        DispatchQueue.main.async {
+            // Creating RoutePickerView
+            // Note:- We will trigger tap event on it without rendering this view in UI.
+            let routePickerView = AVRoutePickerView()
+
+            // Iterating over subviews of AVRoutePickerView
+            for view in routePickerView.subviews {
+                // Checking if the current subview is UIButton
+                if let button = view as? UIButton {
+                    // Trigger tap event on the button
+                    // so, that Picker View is shown
+                    button.sendActions(for: .touchUpInside)
+                    break
+                }
+            }
+            resolve?(true)
+        }
+    }
+
     // MARK: - Messaging
 
     @objc
@@ -411,15 +433,6 @@ class HMSManager: RCTEventEmitter {
         hms?.disableNetworkQualityUpdates()
     }
 
-    // MARK: - Session Metadata
-
-    @objc
-    func setSessionMetaData(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
-        let hms = HMSHelper.getHms(data, hmsCollection)
-
-        hms?.setSessionMetaData(data, resolve, reject)
-    }
-
     // MARK: - Peer & Room Property Getter Functions
 
     @objc
@@ -499,13 +512,6 @@ class HMSManager: RCTEventEmitter {
         hms?.getRoles(resolve)
     }
 
-    @objc
-    func getSessionMetaData(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
-        let hms = HMSHelper.getHms(data, hmsCollection)
-
-        hms?.getSessionMetaData(resolve, reject)
-    }
-
     @objc
     func getRemoteVideoTrackFromTrackId(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HMSHelper.getHms(data, hmsCollection)

package/ios/HMSRNSDK.swift

@@ -264,7 +264,7 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         DispatchQueue.main.async { [weak self] in
             self?.hms?.sendBroadcastMessage(type: type, message: message, completion: { message, error in
                 if error == nil {
-                    resolve?(["success": true, "data": ["sender": message?.sender?.name ?? "", "message": message?.message ?? "", "type": message?.type]] as [String: Any])
+                    resolve?(["messageId": message?.messageID ?? "", "data": ["sender": message?.sender?.name ?? "", "message": message?.message ?? "", "type": message?.type]] as [String: Any])
                     return
                 } else {
                     if self?.eventsEnableStatus[HMSConstants.ON_ERROR] == true {
@@ -292,7 +292,7 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
             let encodedTargetedRoles = HMSHelper.getRolesFromRoleNames(targetedRoles, roles: self?.hms?.roles)
             self?.hms?.sendGroupMessage(type: type, message: message, roles: encodedTargetedRoles, completion: { message, error in
                 if error == nil {
-                    resolve?(["success": true, "data": ["sender": message?.sender?.name ?? "", "message": message?.message ?? "", "type": message?.type]] as [String: Any])
+                    resolve?(["messageId": message?.messageID ?? "", "data": ["sender": message?.sender?.name ?? "", "message": message?.message ?? "", "type": message?.type]] as [String: Any])
                     return
                 } else {
                     if self?.eventsEnableStatus[HMSConstants.ON_ERROR] == true {
@@ -320,7 +320,7 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
             guard let peer = HMSHelper.getRemotePeerFromPeerId(peerId, remotePeers: self?.hms?.remotePeers) else { return }
             self?.hms?.sendDirectMessage(type: type, message: message, peer: peer, completion: { message, error in
                 if error == nil {
-                    resolve?(["success": true, "data": ["sender": message?.sender?.name ?? "", "message": message?.message ?? "", "type": message?.type]] as [String: Any])
+                    resolve?(["messageId": message?.messageID ?? "", "data": ["sender": message?.sender?.name ?? "", "message": message?.message ?? "", "type": message?.type]] as [String: Any])
                     return
                 } else {
                     if self?.eventsEnableStatus[HMSConstants.ON_ERROR] == true {
@@ -373,9 +373,17 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         let force = data.value(forKey: "force") as? Bool ?? false
 
         DispatchQueue.main.async { [weak self] in
-            guard let peer = HMSHelper.getPeerFromPeerId(peerId, remotePeers: self?.hms?.remotePeers, localPeer: self?.hms?.localPeer),
-            let role = HMSHelper.getRoleFromRoleName(role, roles: self?.hms?.roles)
-            else { return }
+            guard let peer = HMSHelper.getPeerFromPeerId(peerId, remotePeers: self?.hms?.remotePeers, localPeer: self?.hms?.localPeer)
+            else {
+                reject?("PEER_NOT_FOUND", "PEER_NOT_FOUND", nil)
+                return
+            }
+
+            guard let role = HMSHelper.getRoleFromRoleName(role, roles: self?.hms?.roles)
+            else {
+                reject?("ROLE_NOT_FOUND", "ROLE_NOT_FOUND", nil)
+                return
+            }
 
             self?.hms?.changeRole(for: peer, to: role, force: force, completion: { success, error in
                 if success {
@@ -695,25 +703,28 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
     }
 
     func startRTMPOrRecording(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
-        guard let record = data.value(forKey: "record") as? Bool,
-              let meetingString = data.value(forKey: "meetingURL") as? String
+        guard let record = data.value(forKey: "record") as? Bool
         else {
-            let errorMessage = "startRTMPOrRecording: " + HMSHelper.getUnavailableRequiredKey(data, ["record", "meetingURL"])
+            let errorMessage = "startRTMPOrRecording: " + HMSHelper.getUnavailableRequiredKey(data, ["record"])
             emitRequiredKeysError(errorMessage)
             reject?(errorMessage, errorMessage, nil)
             return
         }
 
+        let meetingNullableString = data.value(forKey: "meetingURL") as? String
+
         let rtmpStrings = data.value(forKey: "rtmpURLs") as? [String]
 
         var meetingUrl: URL?
-        if let meetLink = URL(string: meetingString) {
-            meetingUrl = meetLink
-        } else {
-            if eventsEnableStatus[HMSConstants.ON_ERROR] == true {
-                delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": ["code": 6002, "description": "Invalid meeting url passed", "isTerminal": false, "canRetry": true, "params": ["function": #function]] as [String: Any], "id": id])
+        if let meetingString = meetingNullableString, !meetingString.isEmpty {
+            if let meetLink = URL(string: meetingString) {
+                meetingUrl = meetLink
+            } else {
+                if eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+                    delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": ["code": 6002, "description": "Invalid meeting url passed", "isTerminal": false, "canRetry": true, "params": ["function": #function]] as [String: Any], "id": id])
+                }
+                reject?("Invalid meeting url passed", "Invalid meeting url passed", nil)
             }
-            reject?("Invalid meeting url passed", "Invalid meeting url passed", nil)
         }
 
         let URLs = HMSHelper.getRtmpUrls(rtmpStrings)
@@ -1070,39 +1081,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         networkQualityUpdatesAttached = false
     }
 
-    func setSessionMetaData(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
-        let metaData = data.value(forKey: "sessionMetaData") as? String ?? ""
-
-        DispatchQueue.main.async { [weak self] in
-
-            guard let self = self else {
-                let errorMessage = "\(#function) Unexpectedly encountered self as null"
-                self?.emitRequiredKeysError(errorMessage)
-                reject?(errorMessage, errorMessage, nil)
-                return
-            }
-
-            self.hms?.setSessionMetadata(metaData) { [weak self] success, error in
-
-                guard let self = self else {
-                    let errorMessage = "\(#function) Unexpectedly encountered self as null"
-                    self?.emitRequiredKeysError(errorMessage)
-                    reject?(errorMessage, errorMessage, nil)
-                    return
-                }
-
-                if success {
-                    resolve?(["success": success])
-                } else {
-                    if self.eventsEnableStatus[HMSConstants.ON_ERROR] == true {
-                      self.delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": HMSDecoder.getError(error), "id": self.id])
-                    }
-                    reject?(error?.localizedDescription, error?.localizedDescription, nil)
-                }
-            }
-        }
-    }
-
     func enableEvent(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         guard let eventType = data.value(forKey: "eventType") as? String else {
             let errorMessage = "enableEvent: " + HMSHelper.getUnavailableRequiredKey(data, ["eventType"])
@@ -1112,7 +1090,7 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         }
 
         eventsEnableStatus[eventType] = true
-        resolve?(["success": true, "message": "function call executed successfully"] as [String: Any])
+        resolve?(["success": true] as [String: Any])
     }
 
     func disableEvent(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
@@ -1162,36 +1140,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         resolve?(roles)
     }
 
-    func getSessionMetaData(_ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
-
-        DispatchQueue.main.async { [weak self] in
-
-            guard let self = self else {
-                let errorMessage = "\(#function) Unexpectedly encountered self as null"
-                self?.emitRequiredKeysError(errorMessage)
-                reject?(errorMessage, errorMessage, nil)
-                return
-            }
-
-            self.hms?.getSessionMetadata { [weak self] result, error in
-
-                guard let self = self else {
-                    let errorMessage = "\(#function) Unexpectedly encountered self as null"
-                    self?.emitRequiredKeysError(errorMessage)
-                    reject?(errorMessage, errorMessage, nil)
-                    return
-                }
-
-                if error != nil {
-                    self.delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": HMSDecoder.getError(error), "id": self.id])
-                    reject?(error?.localizedDescription, error?.localizedDescription, nil)
-                } else {
-                    resolve?(result)
-                }
-            }
-        }
-    }
-
     func getPeerProperty(_ data: NSDictionary) -> [AnyHashable: Any]? {
         guard let property = data.value(forKey: "property") as? String else {
             return nil
@@ -1383,16 +1331,17 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
     }
 
     func on(peer: HMSPeer, update: HMSPeerUpdate) {
-        if eventsEnableStatus[HMSConstants.ON_PEER_UPDATE] != true {
-            return
-        }
-        let type = getString(from: update)
-        let hmsPeer = HMSDecoder.getHmsPeerSubsetForPeerUpdateEvent(peer, update)
+
+        guard let isPeerUpdateEnabled = eventsEnableStatus[HMSConstants.ON_PEER_UPDATE],
+                isPeerUpdateEnabled
+        else { return }
 
         if !networkQualityUpdatesAttached && update == .networkQualityUpdated {
             return
         }
 
+        let hmsPeer = HMSDecoder.getHmsPeerSubsetForPeerUpdateEvent(peer, update)
+
         self.delegate?.emitEvent(HMSConstants.ON_PEER_UPDATE, hmsPeer)
     }
 
@@ -1432,7 +1381,7 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         if eventsEnableStatus[HMSConstants.ON_MESSAGE] != true {
             return
         }
-        self.delegate?.emitEvent(HMSConstants.ON_MESSAGE, ["event": HMSConstants.ON_MESSAGE, "id": self.id, "sender": HMSDecoder.getHmsPeerSubset(message.sender), "recipient": HMSDecoder.getHmsMessageRecipient(message.recipient), "time": message.time.timeIntervalSince1970 * 1000, "message": message.message, "type": message.type])
+        self.delegate?.emitEvent(HMSConstants.ON_MESSAGE, ["event": HMSConstants.ON_MESSAGE, "id": self.id, "sender": HMSDecoder.getHmsPeerSubset(message.sender), "recipient": HMSDecoder.getHmsMessageRecipient(message.recipient), "time": message.time.timeIntervalSince1970 * 1000, "message": message.message, "messageId": message.messageID, "type": message.type])
     }
 
     func on(updated speakers: [HMSSpeaker]) {