@100mslive/react-native-hms 1.4.0 → 1.6.0

package/ios/HMSRNSDK.swift

@@ -1,8 +1,8 @@
 //
 //  Hmssdk.swift
-//  Hmssdk
+//  HMSSDK
 //
-//  Copyright © 2021 Facebook. All rights reserved.
+//  Copyright © 2023 100ms. All rights reserved.
 //
 
 import Foundation
@@ -16,7 +16,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
     var recentRoleChangeRequest: HMSRoleChangeRequest?
     var delegate: HMSManager?
     var id: String = "12345"
-    var recentPreviewTracks: [HMSTrack]? = []
     private var reconnectingStage: Bool = false
     private var preferredExtension: String?
     private var systemBroadcastPicker: RPSystemBroadcastPickerView?
@@ -24,27 +23,10 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
     private var stopScreenshareResolve: RCTPromiseResolveBlock?
     private var isScreenShared: Bool? = false
     private var previewInProgress = false
-    private var rtcStatsAttached = false
     private var networkQualityUpdatesAttached = false
     private var eventsEnableStatus: [String: Bool] = [:]
-
-    let ON_PREVIEW = "ON_PREVIEW"
-    let ON_JOIN = "ON_JOIN"
-    let ON_ROOM_UPDATE = "ON_ROOM_UPDATE"
-    let ON_PEER_UPDATE = "3"
-    let ON_TRACK_UPDATE = "ON_TRACK_UPDATE"
-    let ON_ROLE_CHANGE_REQUEST = "ON_ROLE_CHANGE_REQUEST"
-    let ON_REMOVED_FROM_ROOM = "ON_REMOVED_FROM_ROOM"
-    let ON_ERROR = "ON_ERROR"
-    let ON_MESSAGE = "ON_MESSAGE"
-    let ON_SPEAKER = "ON_SPEAKER"
-    let RECONNECTING = "RECONNECTING"
-    let RECONNECTED = "RECONNECTED"
-    let ON_RTC_STATS = "ON_RTC_STATS"
-    let ON_LOCAL_AUDIO_STATS = "ON_LOCAL_AUDIO_STATS"
-    let ON_LOCAL_VIDEO_STATS = "ON_LOCAL_VIDEO_STATS"
-    let ON_REMOTE_AUDIO_STATS = "ON_REMOTE_AUDIO_STATS"
-    let ON_REMOTE_VIDEO_STATS = "ON_REMOTE_VIDEO_STATS"
+    private var sessionStore: HMSSessionStore?
+    private var sessionStoreChangeObservers = [String: NSObjectProtocol]()
 
     // MARK: - Setup
     init(data: NSDictionary?, delegate manager: HMSManager?, uid id: String) {
@@ -68,8 +50,8 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
     func preview(_ credentials: NSDictionary) {
 
         guard !previewInProgress else {
-            if eventsEnableStatus[ON_ERROR] == true {
-                delegate?.emitEvent(ON_ERROR, ["error": ["code": 5000, "description": "Preview is in progress", "isTerminal": false, "canRetry": true, "params": ["function": #function]], "id": id])
+            if eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+                delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": ["code": 5000, "description": "Preview is in progress", "isTerminal": false, "canRetry": true, "params": ["function": #function]] as [String: Any], "id": id])
             }
             return
         }
@@ -112,32 +94,30 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         if let extractedRole = roleObj {
             hms?.preview(role: extractedRole, completion: { tracks, error in
                 if error != nil {
-                    if eventsEnableStatus[ON_ERROR] == true {
-                        delegate?.emitEvent(ON_ERROR, ["error": HMSDecoder.getError(error), "id": id])
+                    if eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+                        delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": HMSDecoder.getError(error), "id": id])
                     }
                     reject?(error?.localizedDescription, error?.localizedDescription, nil)
                     return
                 }
-                self.recentPreviewTracks = tracks
 
                 let decodedTracks = HMSDecoder.getAllTracks(tracks ?? [])
 
-                resolve?(["success": true, "tracks": decodedTracks])
+                resolve?(["success": true, "tracks": decodedTracks] as [String: Any])
                 return
             })
         }
     }
 
     func cancelPreview() {
-        self.recentPreviewTracks = []
         hms?.cancelPreview()
     }
 
     func join(_ credentials: NSDictionary) {
 
         guard !previewInProgress else {
-            if eventsEnableStatus[ON_ERROR] == true {
-                delegate?.emitEvent("ON_ERROR", ["error": ["code": 5000, "description": "Preview is in progress", "isTerminal": false, "canRetry": true, "params": ["function": #function]], "id": id])
+            if eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+                delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": ["code": 5000, "description": "Preview is in progress", "isTerminal": false, "canRetry": true, "params": ["function": #function]] as [String: Any], "id": id])
             }
             return
         }
@@ -244,27 +224,28 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
             reject?("Still in reconnecting stage", "Still in reconnecting stage", nil)
         } else {
             DispatchQueue.main.async { [weak self] in
-                guard let strongSelf = self else { return }
-                self?.config = nil
-                self?.recentRoleChangeRequest = nil
-                self?.systemBroadcastPicker = nil
-                self?.preferredExtension = nil
-                self?.stopScreenshareResolve = nil
-                self?.startScreenshareResolve = nil
-                self?.isScreenShared = false
-                self?.rtcStatsAttached = false
-                self?.networkQualityUpdatesAttached = false
-                self?.hms?.leave({ success, error in
+                guard let strongSelf = self else {
+                    print(#function, "Could not find reference to self while executing Room leave")
+                    return
+                }
+
+                strongSelf.hms?.leave { [weak self] success, error in
+
+                    guard let strongSelf = self else {
+                        print(#function, "Could not find reference to self when callback is received while executing Room leave")
+                        return
+                    }
+
                     if success {
-                        HMSDecoder.clearRestrictDataStates()
                         resolve?(["success": success])
+                        strongSelf.cleanup() // resetting states and doing data cleanup
                     } else {
-                        if strongSelf.eventsEnableStatus[strongSelf.ON_ERROR] == true {
-                            strongSelf.delegate?.emitEvent(strongSelf.ON_ERROR, ["error": HMSDecoder.getError(error), "id": strongSelf.id])
+                        if strongSelf.eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+                            strongSelf.delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": HMSDecoder.getError(error), "id": strongSelf.id])
                         }
                         reject?("error in leave", "error in leave", nil)
                     }
-                })
+                }
             }
         }
     }
@@ -283,11 +264,11 @@ 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]])
+                    resolve?(["success": true, "data": ["sender": message?.sender?.name ?? "", "message": message?.message ?? "", "type": message?.type]] as [String: Any])
                     return
                 } else {
-                    if self?.eventsEnableStatus["ON_ERROR"] == true {
-                        self?.delegate?.emitEvent("ON_ERROR", ["error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
+                    if self?.eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+                        self?.delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
                     }
                     reject?(error?.localizedDescription, error?.localizedDescription, nil)
                     return
@@ -311,11 +292,11 @@ 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]])
+                    resolve?(["success": true, "data": ["sender": message?.sender?.name ?? "", "message": message?.message ?? "", "type": message?.type]] as [String: Any])
                     return
                 } else {
-                    if self?.eventsEnableStatus["ON_ERROR"] == true {
-                        self?.delegate?.emitEvent("ON_ERROR", ["error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
+                    if self?.eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+                        self?.delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
                     }
                     reject?(error?.localizedDescription, error?.localizedDescription, nil)
                     return
@@ -339,11 +320,11 @@ 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]])
+                    resolve?(["success": true, "data": ["sender": message?.sender?.name ?? "", "message": message?.message ?? "", "type": message?.type]] as [String: Any])
                     return
                 } else {
-                    if self?.eventsEnableStatus["ON_ERROR"] == true {
-                        self?.delegate?.emitEvent("ON_ERROR", ["error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
+                    if self?.eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+                        self?.delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
                     }
                     reject?(error?.localizedDescription, error?.localizedDescription, nil)
                     return
@@ -368,13 +349,12 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                 if success {
                     resolve?(["success": success])
                 } else {
-                    if self?.eventsEnableStatus["ON_ERROR"] == true {
-                        self?.delegate?.emitEvent("ON_ERROR", ["error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
+                    if self?.eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+                        self?.delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
                     }
                     reject?(error?.localizedDescription, error?.localizedDescription, nil)
                 }
             })
-            self?.recentPreviewTracks = []
             self?.recentRoleChangeRequest = nil
         }
     }
@@ -401,8 +381,8 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                 if success {
                     resolve?(["success": success])
                 } else {
-                    if self?.eventsEnableStatus["ON_ERROR"] == true {
-                        self?.delegate?.emitEvent("ON_ERROR", ["error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
+                    if self?.eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+                        self?.delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
                     }
                     reject?(error?.localizedDescription, error?.localizedDescription, nil)
                 }
@@ -439,8 +419,8 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                 if success {
                     resolve?(["success": success])
                 } else {
-                    if self?.eventsEnableStatus["ON_ERROR"] == true {
-                        self?.delegate?.emitEvent("ON_ERROR", ["error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
+                    if self?.eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+                        self?.delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
                     }
                     reject?(error?.localizedDescription, error?.localizedDescription, nil)
                 }
@@ -472,8 +452,8 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                 if success {
                     resolve?(["success": success])
                 } else {
-                    if self?.eventsEnableStatus["ON_ERROR"] == true {
-                        self?.delegate?.emitEvent("ON_ERROR", ["error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
+                    if self?.eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+                        self?.delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
                     }
                     reject?(error?.localizedDescription, error?.localizedDescription, nil)
                 }
@@ -509,8 +489,8 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                 if success {
                     resolve?(["success": success])
                 } else {
-                    if self?.eventsEnableStatus["ON_ERROR"] == true {
-                        self?.delegate?.emitEvent("ON_ERROR", ["error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
+                    if self?.eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+                        self?.delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
                     }
                     reject?(error?.localizedDescription, error?.localizedDescription, nil)
                 }
@@ -535,8 +515,8 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                 guard let remotePeers = self?.hms?.remotePeers,
                     let track = HMSHelper.getTrackFromTrackId(trackId, remotePeers)
                 else {
-                    if strongSelf.eventsEnableStatus["ON_ERROR"] == true {
-                        strongSelf.delegate?.emitEvent("ON_ERROR", ["error": ["code": 6002, "description": "Track not found", "isTerminal": false, "canRetry": true, "params": ["function": #function]], "id": strongSelf.id])
+                    if strongSelf.eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+                        strongSelf.delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": ["code": 6002, "description": "Track not found", "isTerminal": false, "canRetry": true, "params": ["function": #function]] as [String: Any], "id": strongSelf.id])
                     }
                     reject?("Track not found", "Track not found", nil)
                     return
@@ -575,8 +555,8 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                 if success {
                     resolve?(["success": success])
                 } else {
-                    if self?.eventsEnableStatus["ON_ERROR"] == true {
-                        self?.delegate?.emitEvent("ON_ERROR", ["error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
+                    if self?.eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+                        self?.delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
                     }
                     reject?(error?.localizedDescription, error?.localizedDescription, nil)
                 }
@@ -599,9 +579,10 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
             self?.hms?.endRoom(lock: lock, reason: reason, completion: { success, error in
                 if success {
                     resolve?(["success": success])
+                    self?.cleanup() // resetting states and doing data cleanup
                 } else {
-                    if self?.eventsEnableStatus["ON_ERROR"] == true {
-                        self?.delegate?.emitEvent("ON_ERROR", ["error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
+                    if self?.eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+                        self?.delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
                     }
                     reject?(error?.localizedDescription, error?.localizedDescription, nil)
                 }
@@ -681,8 +662,8 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                 resolve?(["success": success])
                 return
             } else {
-                if self.eventsEnableStatus["ON_ERROR"] == true {
-                    self.delegate?.emitEvent(self.ON_ERROR, ["error": HMSDecoder.getError(error), "id": self.id])
+                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)
                 return
@@ -707,8 +688,8 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
 
             if remoteAudioTrack != nil {
                 remoteAudioTrack?.setVolume(volume)
-            } else if strongSelf.eventsEnableStatus["ON_ERROR"] == true {
-                strongSelf.delegate?.emitEvent("ON_ERROR", ["error": ["code": 6002, "description": "Track not found", "isTerminal": false, "canRetry": true, "params": ["function": #function]], "id": strongSelf.id])
+            } else if strongSelf.eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+                strongSelf.delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": ["code": 6002, "description": "Track not found", "isTerminal": false, "canRetry": true, "params": ["function": #function]] as [String: Any], "id": strongSelf.id])
             }
         }
     }
@@ -729,8 +710,8 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         if let meetLink = URL(string: meetingString) {
             meetingUrl = meetLink
         } else {
-            if eventsEnableStatus[ON_ERROR] == true {
-                delegate?.emitEvent(ON_ERROR, ["error": ["code": 6002, "description": "Invalid meeting url passed", "isTerminal": false, "canRetry": true, "params": ["function": #function]], "id": id])
+            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)
         }
@@ -743,8 +724,8 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                 resolve?(["success": success])
                 return
             } else {
-                if self.eventsEnableStatus[self.ON_ERROR] == true {
-                    self.delegate?.emitEvent(self.ON_ERROR, ["error": HMSDecoder.getError(error), "id": self.id])
+                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)
                 return
@@ -758,8 +739,8 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                 resolve?(["success": success])
                 return
             } else {
-                if self.eventsEnableStatus[self.ON_ERROR] == true {
-                    self.delegate?.emitEvent(self.ON_ERROR, ["error": HMSDecoder.getError(error), "id": self.id])
+                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)
                 return
@@ -780,8 +761,8 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                 resolve?(["success": success])
                 return
             } else {
-                if self.eventsEnableStatus[self.ON_ERROR] == true {
-                    self.delegate?.emitEvent(self.ON_ERROR, ["error": HMSDecoder.getError(error), "id": self.id])
+                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)
                 return
@@ -795,8 +776,8 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                 resolve?(["success": success])
                 return
             } else {
-                if self.eventsEnableStatus[self.ON_ERROR] == true {
-                    self.delegate?.emitEvent(self.ON_ERROR, ["error": HMSDecoder.getError(error), "id": self.id])
+                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)
                 return
@@ -817,8 +798,8 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
             if success {
                 resolve?(["success": success])
             } else {
-                if self.eventsEnableStatus[self.ON_ERROR] == true {
-                    self.delegate?.emitEvent(self.ON_ERROR, ["error": HMSDecoder.getError(error), "id": self.id])
+                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)
             }
@@ -859,18 +840,10 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         }
     }
 
-    func enableRTCStats() {
-        rtcStatsAttached = true
-    }
-
-    func disableRTCStats() {
-        rtcStatsAttached = false
-    }
-
     func startScreenshare(_ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         guard let preferredExtension = preferredExtension else {
-            if eventsEnableStatus[ON_ERROR] == true {
-                delegate?.emitEvent(ON_ERROR, ["error": ["code": 6002, "description": "Could not start screen share, preferredExtension not passed in Build method", "isTerminal": false, "canRetry": true, "params": ["function": #function]], "id": id])
+            if eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+                delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": ["code": 6002, "description": "Could not start screen share, preferredExtension not passed in Build method", "isTerminal": false, "canRetry": true, "params": ["function": #function]] as [String: Any], "id": id])
             }
             reject?("Could not start screen share, preferredExtension not passed in Build method", "Could not start screen share, preferredExtension not passed in Build method", nil)
             return
@@ -893,8 +866,8 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
 
     func stopScreenshare(_ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         guard let preferredExtension = preferredExtension else {
-            if eventsEnableStatus[ON_ERROR] == true {
-                delegate?.emitEvent(ON_ERROR, ["error": ["code": 6002, "description": "Could not start screen share, preferredExtension not passed in Build method", "isTerminal": false, "canRetry": true, "params": ["function": #function]], "id": id])
+            if eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+                delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": ["code": 6002, "description": "Could not start screen share, preferredExtension not passed in Build method", "isTerminal": false, "canRetry": true, "params": ["function": #function]] as [String: Any], "id": id])
             }
             reject?("Could not start screen share, preferredExtension not passed in Build method", "Could not start screen share, preferredExtension not passed in Build method", nil)
             return
@@ -938,20 +911,20 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                     try audioFilePlayerNode.play(fileUrl: url, loops: loops, interrupts: interrupts)
                     resolve?(["success": true])
                 } catch {
-                    if eventsEnableStatus[ON_ERROR] == true {
-                        delegate?.emitEvent(ON_ERROR, ["error": ["code": 6002, "description": error.localizedDescription, "isTerminal": false, "canRetry": true, "params": ["function": #function]], "id": id])
+                    if eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+                        delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": ["code": 6002, "description": error.localizedDescription, "isTerminal": false, "canRetry": true, "params": ["function": #function]] as [String: Any], "id": id])
                     }
                     reject?(error.localizedDescription, error.localizedDescription, nil)
                 }
             } else {
-                if eventsEnableStatus[ON_ERROR] == true {
-                    delegate?.emitEvent(ON_ERROR, ["error": ["code": 6002, "description": "Incorrect url", "isTerminal": false, "canRetry": true, "params": ["function": #function]], "id": id])
+                if eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+                    delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": ["code": 6002, "description": "Incorrect url", "isTerminal": false, "canRetry": true, "params": ["function": #function]] as [String: Any], "id": id])
                 }
                 reject?("Incorrect URL", "Incorrect URL", nil)
             }
         } else {
-            if eventsEnableStatus[ON_ERROR] == true {
-                delegate?.emitEvent(ON_ERROR, ["error": ["code": 6002, "description": "AudioFilePlayerNode not found", "isTerminal": false, "canRetry": true, "params": ["function": #function]], "id": id])
+            if eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+                delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": ["code": 6002, "description": "AudioFilePlayerNode not found", "isTerminal": false, "canRetry": true, "params": ["function": #function]] as [String: Any], "id": id])
             }
             reject?("AudioFilePlayerNode not found", "AudioFilePlayerNode not found", nil)
         }
@@ -986,8 +959,8 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         }
         if let audioFilePlayerNode = playerNode as? HMSAudioFilePlayerNode {
             audioFilePlayerNode.stop()
-        } else if eventsEnableStatus[ON_ERROR] == true {
-            delegate?.emitEvent(ON_ERROR, ["error": ["code": 6002, "description": "AudioFilePlayerNode not found", "isTerminal": false, "canRetry": true, "params": ["function": #function]], "id": id])
+        } else if eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+            delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": ["code": 6002, "description": "AudioFilePlayerNode not found", "isTerminal": false, "canRetry": true, "params": ["function": #function]] as [String: Any], "id": id])
         }
     }
 
@@ -1004,12 +977,12 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
             do {
                 try audioFilePlayerNode.resume()
             } catch {
-                if eventsEnableStatus[ON_ERROR] == true {
-                    delegate?.emitEvent(ON_ERROR, ["error": ["code": 6002, "description": error.localizedDescription, "isTerminal": false, "canRetry": true, "params": ["function": #function]], "id": id])
+                if eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+                    delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": ["code": 6002, "description": error.localizedDescription, "isTerminal": false, "canRetry": true, "params": ["function": #function]] as [String: Any], "id": id])
                 }
             }
-        } else if eventsEnableStatus[ON_ERROR] == true {
-            delegate?.emitEvent(ON_ERROR, ["error": ["code": 6002, "description": "AudioFilePlayerNode not found", "isTerminal": false, "canRetry": true, "params": ["function": #function]], "id": id])
+        } else if eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+            delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": ["code": 6002, "description": "AudioFilePlayerNode not found", "isTerminal": false, "canRetry": true, "params": ["function": #function]] as [String: Any], "id": id])
         }
     }
 
@@ -1024,8 +997,8 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         }
         if let audioFilePlayerNode = playerNode as? HMSAudioFilePlayerNode {
             audioFilePlayerNode.pause()
-        } else if eventsEnableStatus[ON_ERROR] == true {
-            delegate?.emitEvent(ON_ERROR, ["error": ["code": 6002, "description": "AudioFilePlayerNode not found", "isTerminal": false, "canRetry": true, "params": ["function": #function]], "id": id])
+        } else if eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+            delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": ["code": 6002, "description": "AudioFilePlayerNode not found", "isTerminal": false, "canRetry": true, "params": ["function": #function]] as [String: Any], "id": id])
         }
     }
 
@@ -1042,8 +1015,8 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         if let audioFilePlayerNode = playerNode as? HMSAudioFilePlayerNode {
             resolve?(audioFilePlayerNode.isPlaying)
         } else {
-            if eventsEnableStatus[ON_ERROR] == true {
-                delegate?.emitEvent(ON_ERROR, ["error": ["code": 6002, "description": "AudioFilePlayerNode not found", "isTerminal": false, "canRetry": true, "params": ["function": #function]], "id": id])
+            if eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+                delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": ["code": 6002, "description": "AudioFilePlayerNode not found", "isTerminal": false, "canRetry": true, "params": ["function": #function]] as [String: Any], "id": id])
             }
             reject?("AudioFilePlayerNode not found", "AudioFilePlayerNode not found", nil)
         }
@@ -1062,8 +1035,8 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         if let audioFilePlayerNode = playerNode as? HMSAudioFilePlayerNode {
             resolve?(audioFilePlayerNode.currentTime)
         } else {
-            if eventsEnableStatus[ON_ERROR] == true {
-                delegate?.emitEvent(ON_ERROR, ["error": ["code": 6002, "description": "AudioFilePlayerNode not found", "isTerminal": false, "canRetry": true, "params": ["function": #function]], "id": id])
+            if eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+                delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": ["code": 6002, "description": "AudioFilePlayerNode not found", "isTerminal": false, "canRetry": true, "params": ["function": #function]] as [String: Any] as [String: Any], "id": id])
             }
             reject?("AudioFilePlayerNode not found", "AudioFilePlayerNode not found", nil)
         }
@@ -1082,8 +1055,8 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         if let audioFilePlayerNode = playerNode as? HMSAudioFilePlayerNode {
             resolve?(audioFilePlayerNode.duration)
         } else {
-            if eventsEnableStatus[ON_ERROR] == true {
-                delegate?.emitEvent(ON_ERROR, ["error": ["code": 6002, "description": "AudioFilePlayerNode not found", "isTerminal": false, "canRetry": true, "params": ["function": #function]], "id": id])
+            if eventsEnableStatus[HMSConstants.ON_ERROR] == true {
+                delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": ["code": 6002, "description": "AudioFilePlayerNode not found", "isTerminal": false, "canRetry": true, "params": ["function": #function]] as [String: Any], "id": id])
             }
             reject?("AudioFilePlayerNode not found", "AudioFilePlayerNode not found", nil)
         }
@@ -1100,14 +1073,32 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
     func setSessionMetaData(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let metaData = data.value(forKey: "sessionMetaData") as? String ?? ""
 
-        hms?.setSessionMetadata(metaData) { success, error in
-            if success {
-                resolve?(["success": success])
-            } else {
-                if self.eventsEnableStatus[self.ON_ERROR] == true {
-                    self.delegate?.emitEvent(self.ON_ERROR, ["error": HMSDecoder.getError(error), "id": self.id])
+        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)
                 }
-                reject?(error?.localizedDescription, error?.localizedDescription, nil)
             }
         }
     }
@@ -1121,7 +1112,7 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         }
 
         eventsEnableStatus[eventType] = true
-        resolve?(["success": true, "message": "function call executed successfully"])
+        resolve?(["success": true, "message": "function call executed successfully"] as [String: Any])
     }
 
     func disableEvent(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
@@ -1133,7 +1124,7 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         }
 
         eventsEnableStatus[eventType] = false
-        resolve?(["success": true, "message": "function call executed successfully"])
+        resolve?(["success": true, "message": "function call executed successfully"] as [String: Any])
     }
 
     func restrictData(_ data: NSDictionary) {
@@ -1172,14 +1163,31 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
     }
 
     func getSessionMetaData(_ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
-        hms?.getSessionMetadata { result, error in
-            if error != nil {
-                if self.eventsEnableStatus[self.ON_ERROR] == true {
-                    self.delegate?.emitEvent(self.ON_ERROR, ["error": HMSDecoder.getError(error), "id": self.id])
+
+        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)
                 }
-                reject?(error?.localizedDescription, error?.localizedDescription, nil)
-            } else {
-                resolve?(result)
             }
         }
     }
@@ -1289,29 +1297,79 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         }
     }
 
+    func getRemoteVideoTrackFromTrackId(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+
+        guard let trackId = data.value(forKey: "trackId") as? String
+        else {
+            let errorMessage = "\(#function) " + HMSHelper.getUnavailableRequiredKey(data, ["trackId"])
+            emitRequiredKeysError(errorMessage)
+            reject?(errorMessage, errorMessage, nil)
+            return
+        }
+
+        DispatchQueue.main.async { [weak self] in
+
+            guard let self = self,
+                  let remotePeers = self.hms?.remotePeers,
+                  let remoteVideoTrack = HMSHelper.getRemoteVideoTrackFromTrackId(trackId, remotePeers)
+            else {
+                let errorMessage = "\(#function) " + "TRACK_NOT_FOUND"
+                self?.emitRequiredKeysError(errorMessage)
+                reject?(errorMessage, errorMessage, nil)
+                return
+            }
+
+            resolve?(HMSDecoder.getHMSRemoteVideoTrack(remoteVideoTrack))
+        }
+    }
+
+    func getRemoteAudioTrackFromTrackId(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        guard let trackId = data.value(forKey: "trackId") as? String
+        else {
+            let errorMessage = "\(#function) " + HMSHelper.getUnavailableRequiredKey(data, ["trackId"])
+            emitRequiredKeysError(errorMessage)
+            reject?(errorMessage, errorMessage, nil)
+            return
+        }
+
+        DispatchQueue.main.async { [weak self] in
+
+            guard let self = self,
+                  let remotePeers = self.hms?.remotePeers,
+                  let remoteAudioTrack = HMSHelper.getRemoteAudioTrackFromTrackId(trackId, remotePeers)
+            else {
+                let errorMessage = "\(#function) " + "TRACK_NOT_FOUND"
+                self?.emitRequiredKeysError(errorMessage)
+                reject?(errorMessage, errorMessage, nil)
+                return
+            }
+
+            resolve?(HMSDecoder.getHMSRemoteAudioTrack(remoteAudioTrack))
+        }
+    }
+
     // MARK: - HMS SDK Delegate Callbacks
     func on(join room: HMSRoom) {
-        self.recentPreviewTracks = []
-        if eventsEnableStatus[ON_JOIN] != true {
+        if eventsEnableStatus[HMSConstants.ON_JOIN] != true {
             return
         }
         let roomData = HMSDecoder.getHmsRoomSubset(room)
-        self.delegate?.emitEvent(ON_JOIN, ["event": ON_JOIN, "id": self.id, "room": roomData])
+        self.delegate?.emitEvent(HMSConstants.ON_JOIN, ["event": HMSConstants.ON_JOIN, "id": self.id, "room": roomData])
     }
 
     func onPreview(room: HMSRoom, localTracks: [HMSTrack]) {
         previewInProgress = false
-        if eventsEnableStatus[ON_PREVIEW] != true {
+        if eventsEnableStatus[HMSConstants.ON_PREVIEW] != true {
             return
         }
         let previewTracks = HMSDecoder.getPreviewTracks(localTracks)
         let hmsRoom = HMSDecoder.getHmsRoomSubset(room)
 
-        self.delegate?.emitEvent(ON_PREVIEW, ["event": ON_PREVIEW, "id": self.id, "room": hmsRoom, "previewTracks": previewTracks])
+        self.delegate?.emitEvent(HMSConstants.ON_PREVIEW, ["event": HMSConstants.ON_PREVIEW, "id": self.id, "room": hmsRoom, "previewTracks": previewTracks])
     }
 
     func on(room: HMSRoom, update: HMSRoomUpdate) {
-        if eventsEnableStatus[ON_ROOM_UPDATE] != true {
+        if eventsEnableStatus[HMSConstants.ON_ROOM_UPDATE] != true {
             return
         }
         if update == .metaDataUpdated || update == .roomTypeChanged {
@@ -1321,11 +1379,11 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         let roomData = HMSDecoder.getHmsRoomSubset(room, update)
         let type = getString(from: update)
 
-        self.delegate?.emitEvent(ON_ROOM_UPDATE, ["event": ON_ROOM_UPDATE, "id": self.id, "type": type, "room": roomData])
+        self.delegate?.emitEvent(HMSConstants.ON_ROOM_UPDATE, ["event": HMSConstants.ON_ROOM_UPDATE, "id": self.id, "type": type, "room": roomData])
     }
 
     func on(peer: HMSPeer, update: HMSPeerUpdate) {
-        if eventsEnableStatus[ON_PEER_UPDATE] != true {
+        if eventsEnableStatus[HMSConstants.ON_PEER_UPDATE] != true {
             return
         }
         let type = getString(from: update)
@@ -1335,7 +1393,7 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
             return
         }
 
-        self.delegate?.emitEvent(ON_PEER_UPDATE, hmsPeer)
+        self.delegate?.emitEvent(HMSConstants.ON_PEER_UPDATE, hmsPeer)
     }
 
     func on(track: HMSTrack, update: HMSTrackUpdate, for peer: HMSPeer) {
@@ -1351,7 +1409,7 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
             }
         }
 
-        if eventsEnableStatus[ON_TRACK_UPDATE] != true {
+        if eventsEnableStatus[HMSConstants.ON_TRACK_UPDATE] != true {
             return
         }
 
@@ -1359,73 +1417,75 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         let hmsPeer = HMSDecoder.getHmsPeerSubset(peer)
         let hmsTrack = HMSDecoder.getHmsTrack(track)
 
-        self.delegate?.emitEvent(ON_TRACK_UPDATE, ["event": ON_TRACK_UPDATE, "id": self.id, "type": type, "peer": hmsPeer, "track": hmsTrack])
+        self.delegate?.emitEvent(HMSConstants.ON_TRACK_UPDATE, ["event": HMSConstants.ON_TRACK_UPDATE, "id": self.id, "type": type, "peer": hmsPeer, "track": hmsTrack])
     }
 
     func on(error: Error) {
         if previewInProgress { previewInProgress = false }
-        if eventsEnableStatus[ON_ERROR] != true {
+        if eventsEnableStatus[HMSConstants.ON_ERROR] != true {
             return
         }
-        self.delegate?.emitEvent(ON_ERROR, ["error": HMSDecoder.getError(error), "id": id])
+        self.delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": HMSDecoder.getError(error), "id": id])
     }
 
     func on(message: HMSMessage) {
-        if eventsEnableStatus[ON_MESSAGE] != true {
+        if eventsEnableStatus[HMSConstants.ON_MESSAGE] != true {
             return
         }
-        self.delegate?.emitEvent(ON_MESSAGE, ["event": 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, "type": message.type])
     }
 
     func on(updated speakers: [HMSSpeaker]) {
-        if eventsEnableStatus[ON_SPEAKER] != true {
+        if eventsEnableStatus[HMSConstants.ON_SPEAKER] != true {
             return
         }
         var speakerPeerIds: [[String: Any]] = []
         for speaker in speakers {
             speakerPeerIds.append(["peer": HMSDecoder.getHmsPeerSubset(speaker.peer), "level": speaker.level, "track": HMSDecoder.getHmsTrack(speaker.track)])
         }
-        self.delegate?.emitEvent(ON_SPEAKER, ["event": ON_SPEAKER, "id": self.id, "speakers": speakerPeerIds])
+        self.delegate?.emitEvent(HMSConstants.ON_SPEAKER, ["event": HMSConstants.ON_SPEAKER, "id": self.id, "speakers": speakerPeerIds])
     }
 
     func onReconnecting() {
         reconnectingStage = true
-        if eventsEnableStatus[RECONNECTING] != true {
+        if eventsEnableStatus[HMSConstants.RECONNECTING] != true {
             return
         }
-        self.delegate?.emitEvent(RECONNECTING, ["event": RECONNECTING, "error": ["code": 1003, "description": "Network connection lost ", "isTerminal": false, "canRetry": true], "id": self.id ])
+        self.delegate?.emitEvent(HMSConstants.RECONNECTING, ["event": HMSConstants.RECONNECTING, "error": ["code": 1003, "description": "Network connection lost ", "isTerminal": false, "canRetry": true] as [String: Any], "id": self.id ])
     }
 
     func onReconnected() {
         reconnectingStage = false
-        if eventsEnableStatus[RECONNECTED] != true {
+        if eventsEnableStatus[HMSConstants.RECONNECTED] != true {
             return
         }
-        self.delegate?.emitEvent(RECONNECTED, ["event": RECONNECTED, "id": self.id ])
+        self.delegate?.emitEvent(HMSConstants.RECONNECTED, ["event": HMSConstants.RECONNECTED, "id": self.id ])
     }
 
     func on(roleChangeRequest: HMSRoleChangeRequest) {
         recentRoleChangeRequest = roleChangeRequest
-        if eventsEnableStatus[ON_ROLE_CHANGE_REQUEST] != true {
+        if eventsEnableStatus[HMSConstants.ON_ROLE_CHANGE_REQUEST] != true {
             return
         }
         let decodedRoleChangeRequest = HMSDecoder.getHmsRoleChangeRequest(roleChangeRequest, self.id)
-        self.delegate?.emitEvent(ON_ROLE_CHANGE_REQUEST, decodedRoleChangeRequest)
+        self.delegate?.emitEvent(HMSConstants.ON_ROLE_CHANGE_REQUEST, decodedRoleChangeRequest)
     }
 
     func on(changeTrackStateRequest: HMSChangeTrackStateRequest) {
-        if eventsEnableStatus["ON_CHANGE_TRACK_STATE_REQUEST"] != true {
+        if eventsEnableStatus[HMSConstants.ON_CHANGE_TRACK_STATE_REQUEST] != true {
             return
         }
         let decodedChangeTrackStateRequest = HMSDecoder.getHmsChangeTrackStateRequest(changeTrackStateRequest, id)
-        delegate?.emitEvent("ON_CHANGE_TRACK_STATE_REQUEST", decodedChangeTrackStateRequest)
+        delegate?.emitEvent(HMSConstants.ON_CHANGE_TRACK_STATE_REQUEST, decodedChangeTrackStateRequest)
     }
 
     func on(removedFromRoom notification: HMSRemovedFromRoomNotification) {
-        HMSDecoder.clearRestrictDataStates()
-        if eventsEnableStatus[ON_REMOVED_FROM_ROOM] != true {
+
+        if eventsEnableStatus[HMSConstants.ON_REMOVED_FROM_ROOM] != true {
+            self.cleanup() // resetting states and doing data cleanup
             return
         }
+
         let requestedBy = notification.requestedBy as HMSPeer?
         var decodedRequestedBy: [String: Any]?
         if let requested = requestedBy {
@@ -1433,80 +1493,439 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         }
         let reason = notification.reason
         let roomEnded = notification.roomEnded
-        self.delegate?.emitEvent(ON_REMOVED_FROM_ROOM, ["event": ON_REMOVED_FROM_ROOM, "id": self.id, "requestedBy": decodedRequestedBy as Any, "reason": reason, "roomEnded": roomEnded ])
+        self.delegate?.emitEvent(HMSConstants.ON_REMOVED_FROM_ROOM, ["event": HMSConstants.ON_REMOVED_FROM_ROOM, "id": self.id, "requestedBy": decodedRequestedBy as Any, "reason": reason, "roomEnded": roomEnded ])
+
+        self.cleanup() // resetting states and doing data cleanup
     }
 
-    func on(rtcStats: HMSRTCStatsReport) {
-        if eventsEnableStatus[ON_RTC_STATS] != true {
+    func on(sessionStoreAvailable store: HMSSessionStore) {
+        self.sessionStore = store
+        if eventsEnableStatus[HMSConstants.ON_SESSION_STORE_AVAILABLE] != true {
             return
         }
-        if !rtcStatsAttached {
+        self.delegate?.emitEvent(HMSConstants.ON_SESSION_STORE_AVAILABLE, ["id": self.id])
+    }
+
+    func on(rtcStats: HMSRTCStatsReport) {
+        if eventsEnableStatus[HMSConstants.ON_RTC_STATS] != true {
             return
         }
-        let video = HMSDecoder.getHMSRTCStats(rtcStats.video)
-        let audio = HMSDecoder.getHMSRTCStats(rtcStats.audio)
-        let combined = HMSDecoder.getHMSRTCStats(rtcStats.combined)
+        let video = HMSDecoder.getHMSRTCStats(rtcStats.video) // [bitrateReceived, bitrateSent, bytesReceived, bytesSent, packetsLost, packetsReceived, roundTripTime]
+        let audio = HMSDecoder.getHMSRTCStats(rtcStats.audio) // [bitrateReceived, bitrateSent, bytesReceived, bytesSent, packetsLost, packetsReceived, roundTripTime]
+        let combined = HMSDecoder.getHMSRTCStats(rtcStats.combined) // [bitrateReceived, bitrateSent, bytesReceived, bytesSent, packetsLost, packetsReceived, roundTripTime]
 
-        self.delegate?.emitEvent(ON_RTC_STATS, ["video": video, "audio": audio, "combined": combined, "id": self.id])
+        self.delegate?.emitEvent(HMSConstants.ON_RTC_STATS, ["video": video, "audio": audio, "combined": combined, "id": self.id])
     }
 
     func on(localAudioStats: HMSLocalAudioStats, track: HMSAudioTrack, peer: HMSPeer) {
-        if eventsEnableStatus[ON_LOCAL_AUDIO_STATS] != true {
+        if eventsEnableStatus[HMSConstants.ON_LOCAL_AUDIO_STATS] != true {
             return
         }
-        if !rtcStatsAttached {
-            return
-        }
-        let localStats = HMSDecoder.getLocalAudioStats(localAudioStats)
+        let localStats = HMSDecoder.getLocalAudioStats(localAudioStats) // [bitrate, bytesSent, roundTripTime]
         let localTrack = HMSDecoder.getHmsAudioTrack(track)
         let decodedPeer = HMSDecoder.getHmsPeerSubset(peer)
 
-        self.delegate?.emitEvent(ON_LOCAL_AUDIO_STATS, ["localAudioStats": localStats, "track": localTrack, "peer": decodedPeer, "id": self.id])
+        self.delegate?.emitEvent(HMSConstants.ON_LOCAL_AUDIO_STATS, ["localAudioStats": localStats, "track": localTrack, "peer": decodedPeer, "id": self.id])
     }
 
-    func on(localVideoStats: [HMSLocalVideoStats], track: HMSVideoTrack, peer: HMSPeer) {
-        if eventsEnableStatus[ON_LOCAL_VIDEO_STATS] != true {
+    func on(localVideoStats: [HMSLocalVideoStats], track: HMSVideoTrack, peer: HMSPeer) { // DOUBT: HMSLocalVideoTrack instead of HMSVideoTrack?
+        if eventsEnableStatus[HMSConstants.ON_LOCAL_VIDEO_STATS] != true {
             return
         }
-        if !rtcStatsAttached {
-            return
-        }
-        let localStats = HMSDecoder.getLocalVideoStats(localVideoStats)
+        let localStats = HMSDecoder.getLocalVideoStats(localVideoStats) // List<[bitrate, bytesSent, roundTripTime, frameRate, resolution, layer]>
         let decodedPeer = HMSDecoder.getHmsPeerSubset(peer)
         let localTrack = HMSDecoder.getHmsVideoTrack(track)
 
-        self.delegate?.emitEvent(ON_LOCAL_VIDEO_STATS, ["localVideoStats": localStats, "track": localTrack, "peer": decodedPeer, "id": self.id])
+        self.delegate?.emitEvent(HMSConstants.ON_LOCAL_VIDEO_STATS, ["localVideoStats": localStats, "track": localTrack, "peer": decodedPeer, "id": self.id])
     }
 
     func on(remoteAudioStats: HMSRemoteAudioStats, track: HMSAudioTrack, peer: HMSPeer) {
-        if eventsEnableStatus[ON_REMOTE_AUDIO_STATS] != true {
-            return
-        }
-        if !rtcStatsAttached {
+        if eventsEnableStatus[HMSConstants.ON_REMOTE_AUDIO_STATS] != true {
             return
         }
-        let remoteStats = HMSDecoder.getRemoteAudioStats(remoteAudioStats)
+        let remoteStats = HMSDecoder.getRemoteAudioStats(remoteAudioStats) // [bitrate, bytesReceived, jitter, packetsLost, packetsReceived]
         let remoteTrack = HMSDecoder.getHmsAudioTrack(track)
         let decodedPeer = HMSDecoder.getHmsPeerSubset(peer)
 
-        self.delegate?.emitEvent(ON_REMOTE_AUDIO_STATS, ["remoteAudioStats": remoteStats, "track": remoteTrack, "peer": decodedPeer, "id": self.id])
+        self.delegate?.emitEvent(HMSConstants.ON_REMOTE_AUDIO_STATS, ["remoteAudioStats": remoteStats, "track": remoteTrack, "peer": decodedPeer, "id": self.id])
     }
 
     func on(remoteVideoStats: HMSRemoteVideoStats, track: HMSVideoTrack, peer: HMSPeer) {
-        if eventsEnableStatus[ON_REMOTE_VIDEO_STATS] != true {
-            return
-        }
-        if !rtcStatsAttached {
+        if eventsEnableStatus[HMSConstants.ON_REMOTE_VIDEO_STATS] != true {
             return
         }
-        let remoteStats = HMSDecoder.getRemoteVideoStats(remoteVideoStats)
+        let remoteStats = HMSDecoder.getRemoteVideoStats(remoteVideoStats) // [bitrate, bytesReceived, frameRate, jitter, packetsLost, packetsReceived, resolution]
         let decodedPeer = HMSDecoder.getHmsPeerSubset(peer)
         let remoteTrack = HMSDecoder.getHmsVideoTrack(track)
 
-        self.delegate?.emitEvent(ON_REMOTE_VIDEO_STATS, ["remoteVideoStats": remoteStats, "track": remoteTrack, "peer": decodedPeer, "id": self.id])
+        self.delegate?.emitEvent(HMSConstants.ON_REMOTE_VIDEO_STATS, ["remoteVideoStats": remoteStats, "track": remoteTrack, "peer": decodedPeer, "id": self.id])
+    }
+
+    // MARK: - Simulcast
+
+    func getVideoTrackLayerDefinition(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        guard let trackId = data.value(forKey: "trackId") as? String
+        else {
+            let errorMessage = "\(#function) " + HMSHelper.getUnavailableRequiredKey(data, ["trackId"])
+            emitRequiredKeysError(errorMessage)
+            reject?(errorMessage, errorMessage, nil)
+            return
+        }
+
+        DispatchQueue.main.async { [weak self] in
+
+            guard let self = self,
+                  let remotePeers = self.hms?.remotePeers,
+                  let remoteVideoTrack = HMSHelper.getRemoteVideoTrackFromTrackId(trackId, remotePeers)
+            else {
+                let errorMessage = "\(#function) " + "TRACK_NOT_FOUND"
+                self?.emitRequiredKeysError(errorMessage)
+                reject?(errorMessage, errorMessage, nil)
+                return
+            }
+
+            guard let layerDefinitions = remoteVideoTrack.layerDefinitions
+            else {
+                let errorMessage = "\(#function) " + "layer definitions not available for track: '\(trackId)' !"
+                self.emitRequiredKeysError(errorMessage)
+                reject?(errorMessage, errorMessage, nil)
+                return
+            }
+
+            let parsedLayerDefinitions = HMSDecoder.getSimulcastLayerDefinitions(for: layerDefinitions)
+
+            resolve?(parsedLayerDefinitions)
+        }
+    }
+
+    func getVideoTrackLayer(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+
+        guard let trackId = data.value(forKey: "trackId") as? String
+        else {
+            let errorMessage = "\(#function) " + HMSHelper.getUnavailableRequiredKey(data, ["trackId"])
+            emitRequiredKeysError(errorMessage)
+            reject?(errorMessage, errorMessage, nil)
+            return
+        }
+
+        DispatchQueue.main.async { [weak self] in
+
+            guard let self = self,
+                  let remotePeers = self.hms?.remotePeers,
+                  let remoteVideoTrack = HMSHelper.getRemoteVideoTrackFromTrackId(trackId, remotePeers)
+            else {
+                let errorMessage = "\(#function) " + "TRACK_NOT_FOUND"
+                self?.emitRequiredKeysError(errorMessage)
+                reject?(errorMessage, errorMessage, nil)
+                return
+            }
+
+            let parsedLayer = HMSDecoder.getString(from: remoteVideoTrack.layer)
+
+            resolve?(parsedLayer)
+        }
+    }
+
+    func setVideoTrackLayer(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        guard let trackId = data.value(forKey: "trackId") as? String,
+              let layer = data.value(forKey: "layer") as? String
+        else {
+            let errorMessage = "\(#function) " + HMSHelper.getUnavailableRequiredKey(data, ["trackId", "layer"])
+            emitRequiredKeysError(errorMessage)
+            reject?(errorMessage, errorMessage, nil)
+            return
+        }
+
+        DispatchQueue.main.async { [weak self] in
+
+            guard let self = self,
+                  let remotePeers = self.hms?.remotePeers,
+                  let remoteVideoTrack = HMSHelper.getRemoteVideoTrackFromTrackId(trackId, remotePeers)
+            else {
+                let errorMessage = "\(#function) " + "TRACK_NOT_FOUND"
+                self?.emitRequiredKeysError(errorMessage)
+                reject?(errorMessage, errorMessage, nil)
+                return
+            }
+
+            switch layer.uppercased() {
+            case "LOW":
+                remoteVideoTrack.layer = .low
+            case "MEDIUM":
+                remoteVideoTrack.layer = .mid
+            default:
+                remoteVideoTrack.layer = .high
+            }
+
+            resolve?(true)
+        }
+    }
+
+    // MARK: - Advanced Camera Controls
+
+    func captureImageAtMaxSupportedResolution(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+
+        let withFlash = data["flash"] as? Bool ?? false
+
+        DispatchQueue.main.async { [weak self] in
+
+            guard let localPeer = self?.hms?.localPeer else {
+                let errorMessage = "\(#function) An instance of Local Peer could not be found. Please check if a Room is joined."
+                reject?("6004", errorMessage, nil)
+                return
+            }
+
+            guard let localVideoTrack = localPeer.localVideoTrack()
+            else {
+                let errorMessage = "\(#function) Video Track of Local Peer could not be found. Please check if the Local Peer has permission to publish video & video is unmuted currently."
+                reject?("6004", errorMessage, nil)
+                return
+            }
+
+            localVideoTrack.captureImageAtMaxSupportedResolution(withFlash: withFlash) { image in
+
+                guard let rawImage = image, let capturedImage = rawImage.fixOrientation() else {
+                    let errorMessage = "\(#function) Could not capture image of the Local Peer's Video Track."
+                    reject?("6004", errorMessage, nil)
+                    return
+                }
+
+                guard let data = capturedImage.pngData() else {
+                    let errorMessage = "\(#function) Could not compress image of the Local Peer's Video Track to png data."
+                    reject?("6004", errorMessage, nil)
+                    return
+                }
+
+                let filePath = HMSRNSDK.getDocumentsDirectory().appendingPathComponent("hms_\(HMSRNSDK.getTimeStamp()).png")
+
+                do {
+                    try data.write(to: filePath)
+
+                    resolve?(filePath.relativePath)
+                } catch let error {
+                    let errorMessage = "\(#function) Could not write to disk the image data  of the Local Peer's Video Track. \(error.localizedDescription)"
+                    reject?("6004", errorMessage, nil)
+                    return
+                }
+            }
+        }
+    }
+
+    // MARK: - Session Store
+
+    func getSessionMetadataForKey(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+
+        DispatchQueue.main.async { [weak self] in
+
+            guard let store = self?.sessionStore
+            else {
+                let errorMessage = "\(#function) Session Store is null"
+                reject?("6004", errorMessage, nil)
+                return
+            }
+
+            guard let data = data as? [AnyHashable: Any],
+                let key = data["key"] as? String
+            else {
+                let errorMessage = "\(#function) Key to be fetched from Session Store is null." + HMSHelper.getUnavailableRequiredKey(data, ["key"])
+                reject?("6004", errorMessage, nil)
+                return
+            }
+
+            store.object(forKey: key) { value, error in
+
+                if let error = error {
+                    let errorMessage = "\(#function) Error in fetching key: \(key) from Session Store. Error: \(error.localizedDescription)"
+                    reject?("6004", errorMessage, nil)
+                    return
+                }
+
+                if let value = value {
+                    if let stringValue = value as? String {
+                        resolve?(stringValue)
+                    } else {
+                        let errorMessage = "\(#function) Session Store value for the key: \(key) is not of String Type. Value: \(value)"
+                        reject?("6004", errorMessage, nil)
+                    }
+                } else {
+                    resolve?(nil)
+                }
+            }
+        }
+    }
+
+    func setSessionMetadataForKey(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+
+        DispatchQueue.main.async { [weak self] in
+
+            guard let store = self?.sessionStore
+            else {
+                let errorMessage = "\(#function) Session Store is null"
+                reject?("6004", errorMessage, nil)
+                return
+            }
+
+            guard let data = data as? [AnyHashable: Any],
+                let key = data["key"] as? String
+            else {
+                let errorMessage = "\(#function) Key for the object to be set in Session Store is null." + HMSHelper.getUnavailableRequiredKey(data, ["key"])
+                reject?("6004", errorMessage, nil)
+                return
+            }
+
+            let valueToBeSet = data["value"] as Any
+
+            store.set(valueToBeSet, forKey: key) { value, error in
+
+                if let error = error {
+                    let errorMessage = "\(#function) Error in setting value: \(valueToBeSet) for key: \(key) to the Session Store. Error: \(error.localizedDescription)"
+                    reject?("6004", errorMessage, nil)
+                    return
+                }
+                resolve?(["success": true, "finalValue": value])
+            }
+        }
+    }
+
+    func addKeyChangeListener(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+
+        DispatchQueue.main.async { [weak self] in
+
+            guard let store = self?.sessionStore
+            else {
+                let errorMessage = "\(#function) Session Store is null"
+                reject?("6004", errorMessage, nil)
+                return
+            }
+
+            guard let data = data as? [AnyHashable: Any]
+            else {
+                let errorMessage = "\(#function) No arguments passed which can be attached to Key Change Listener on the Session Store."
+                reject?("6004", errorMessage, nil)
+                return
+            }
+
+            guard let keys = data["keys"] as? [String]
+            else {
+                let errorMessage = "\(#function) No keys passed which can be attached to Key Change Listener on the Session Store. Available arguments: \(data)"
+                reject?("6004", errorMessage, nil)
+                return
+            }
+
+            guard let uniqueId = data["uniqueId"] as? String
+            else {
+                let errorMessage = "\(#function) No uniqueId passed which can be used to attach Key Change Listener on the Session Store. Available arguments: \(data)"
+                reject?("6004", errorMessage, nil)
+                return
+            }
+
+            store.observeChanges(forKeys: keys, changeObserver: { [weak self] key, value in
+
+                var data = [String: Any]()
+
+                data["id"] = self?.id
+
+                data["key"] = key
+
+                if let value = value {
+                    if let stringValue = value as? String {
+                        data["value"] = stringValue
+                    } else {
+                        let errorMessage = "\(#function) Session Store value for the key: \(key) is not of String Type. Value: \(value)"
+                        print(errorMessage)
+                    }
+                }
+                self?.delegate?.emitEvent(HMSConstants.ON_SESSION_STORE_CHANGED, data)
+
+            }) { [weak self] observer, error in
+
+                    if let error = error {
+                        let errorMessage = "\(#function) Error in observing changes for key: \(keys) in the Session Store. Error: \(error.localizedDescription)"
+                        reject?("6004", errorMessage, nil)
+                        return
+                    }
+
+                    guard let observer = observer
+                    else {
+                        let errorMessage = "\(#function) Unknown Error in observing changes for key: \(keys) in the Session Store."
+                        reject?("6004", errorMessage, nil)
+                        return
+                    }
+
+                    guard let self = self
+                    else {
+                        let errorMessage = "\(#function) Could not find self instance while observing changes for key: \(keys) in the Session Store."
+                        reject?("6004", errorMessage, nil)
+                        return
+                    }
+
+                    self.sessionStoreChangeObservers[uniqueId] = observer
+
+                    resolve?(true)
+                }
+        }
+    }
+
+    func removeKeyChangeListener(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+
+        DispatchQueue.main.async { [weak self] in
+
+            guard let store = self?.sessionStore
+            else {
+                let errorMessage = "\(#function) Session Store is null"
+                reject?("6004", errorMessage, nil)
+                return
+            }
+
+            guard let data = data as? [AnyHashable: Any]
+            else {
+                let errorMessage = "\(#function) No arguments passed which can be used to remove Key Change Listener from the Session Store."
+                reject?("6004", errorMessage, nil)
+                return
+            }
+
+            guard let uniqueId = data["uniqueId"] as? String
+            else {
+                let errorMessage = "\(#function) No uniqueId passed which can be used to remove Key Change Listener from the Session Store. Available arguments: \(data)"
+                reject?("6004", errorMessage, nil)
+                return
+            }
+
+            guard let observerToBeRemoved = self?.sessionStoreChangeObservers[uniqueId]
+            else {
+                let errorMessage = "\(#function) No listener found to remove for the uniqueId passed. Available arguments: \(data)"
+                reject?("6004", errorMessage, nil)
+                return
+            }
+
+            self?.sessionStoreChangeObservers.removeValue(forKey: uniqueId)
+
+            store.removeObserver(observerToBeRemoved)
+
+            resolve?(true)
+        }
+    }
+
+    // MARK: - Helper Functions
+
+    // Handle resetting states and data cleanup
+    private func cleanup() {
+        self.config = nil
+        self.recentRoleChangeRequest = nil
+        self.reconnectingStage = false
+        self.preferredExtension = nil
+        self.systemBroadcastPicker = nil
+        self.startScreenshareResolve = nil
+        self.stopScreenshareResolve = nil
+        self.isScreenShared = false
+        self.previewInProgress = false
+        self.networkQualityUpdatesAttached = false
+        self.eventsEnableStatus.removeAll()
+        self.sessionStore = nil
+        self.sessionStoreChangeObservers.removeAll()
+        HMSDecoder.clearRestrictDataStates()
     }
 
-    // MARK: Helper Functions
     private func getString(from update: HMSPeerUpdate) -> String {
         switch update {
         case .peerJoined:
@@ -1571,9 +1990,32 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
     }
 
     func emitRequiredKeysError(_ error: String) {
-        if eventsEnableStatus[ON_ERROR] != true {
+        if eventsEnableStatus[HMSConstants.ON_ERROR] != true {
             return
         }
-        delegate?.emitEvent(ON_ERROR, ["error": ["code": 6002, "description": error, "isTerminal": false, "canRetry": true], "id": id])
+        delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": ["code": 7000, "description": error, "isTerminal": false, "canRetry": true] as [String: Any], "id": id])
+    }
+
+    static private func getDocumentsDirectory() -> URL {
+        let paths = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)
+        return paths[0]
+    }
+
+    static private func getTimeStamp() -> String {
+        "\(Date().timeIntervalSince1970)"
+    }
+}
+
+extension UIImage {
+    func fixOrientation() -> UIImage? {
+        if self.imageOrientation == UIImage.Orientation.up {
+            return self
+        }
+
+        UIGraphicsBeginImageContext(self.size)
+        self.draw(in: CGRect(origin: .zero, size: self.size))
+        let normalizedImage = UIGraphicsGetImageFromCurrentImageContext()
+        UIGraphicsEndImageContext()
+        return normalizedImage
     }
 }