@100mslive/react-native-hms 1.7.2 → 1.9.0

package/ios/HMSRNSDK.swift

@@ -12,9 +12,12 @@ import ReplayKit
 class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
 
     var hms: HMSSDK?
-    var recentRoleChangeRequest: HMSRoleChangeRequest?
+
     var delegate: HMSManager?
     var id: String = "12345"
+
+    private var recentRoleChangeRequest: HMSRoleChangeRequest?
+    internal var previewForRoleTracks: [HMSTrack]?
     private var reconnectingStage: Bool = false
     private var preferredExtension: String?
     private var systemBroadcastPicker: RPSystemBroadcastPickerView?
@@ -26,6 +29,7 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
     private var eventsEnableStatus: [String: Bool] = [:]
     private var sessionStore: HMSSessionStore?
     private var sessionStoreChangeObservers = [String: NSObjectProtocol]()
+    private var peerListIterators = [String: HMSPeerListIterator]()
 
     // MARK: - Setup
     init(data: NSDictionary?, delegate manager: HMSManager?, uid id: String) {
@@ -129,25 +133,29 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         let roleObj = HMSHelper.getRoleFromRoleName(role, roles: hms?.roles)
 
         if let extractedRole = roleObj {
-            hms?.preview(role: extractedRole, completion: { tracks, error in
-                if error != nil {
-                    if eventsEnableStatus[HMSConstants.ON_ERROR] == true {
-                        delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": HMSDecoder.getError(error), "id": id])
+            DispatchQueue.main.async { [weak self] in
+                self?.hms?.preview(role: extractedRole) { tracks, error in
+                    if error != nil {
+                        reject?(error?.localizedDescription, error?.localizedDescription, nil)
+                        return
                     }
-                    reject?(error?.localizedDescription, error?.localizedDescription, nil)
-                    return
-                }
 
-                let decodedTracks = HMSDecoder.getAllTracks(tracks ?? [])
+                    self?.previewForRoleTracks = tracks
 
-                resolve?(["success": true, "tracks": decodedTracks] as [String: Any])
-                return
-            })
+                    let decodedTracks = HMSDecoder.getAllTracks(tracks ?? [])
+
+                    resolve?(["success": true, "tracks": decodedTracks] as [String: Any])
+                }
+            }
         }
     }
 
-    func cancelPreview() {
-        hms?.cancelPreview()
+    func cancelPreview(_ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        DispatchQueue.main.async { [weak self] in
+            self?.hms?.cancelPreview()
+            self?.previewForRoleTracks = nil
+            resolve?(["success": true])
+        }
     }
 
     func join(_ credentials: NSDictionary) {
@@ -230,7 +238,15 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         }
 
         DispatchQueue.main.async { [weak self] in
-            self?.hms?.localPeer?.localAudioTrack()?.setMute(isMute)
+            if let audioTrack = self?.hms?.localPeer?.localAudioTrack() {
+                audioTrack.setMute(isMute)
+            } else if let tracks = self?.previewForRoleTracks {
+                if let audioTrack = tracks.first(where: { $0.kind == HMSTrackKind.audio }) as? HMSLocalAudioTrack {
+                    audioTrack.setMute(isMute)
+                }
+            } else {
+                print(#function, "No local audio track available for setting mute state.")
+            }
         }
     }
 
@@ -243,42 +259,54 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         }
 
         DispatchQueue.main.async { [weak self] in
-            self?.hms?.localPeer?.localVideoTrack()?.setMute(isMute)
+            if let videoTrack = self?.hms?.localPeer?.localVideoTrack() {
+                videoTrack.setMute(isMute)
+            } else if let tracks = self?.previewForRoleTracks {
+                if let videoTrack = tracks.first(where: { $0.kind == HMSTrackKind.video }) as? HMSLocalVideoTrack {
+                    videoTrack.setMute(isMute)
+                }
+            } else {
+                print(#function, "No local video track available for setting mute state.")
+            }
         }
     }
 
     func switchCamera() {
         DispatchQueue.main.async { [weak self] in
-            self?.hms?.localPeer?.localVideoTrack()?.switchCamera()
+            if let localVideoTrack = self?.hms?.localPeer?.localVideoTrack() {
+                localVideoTrack.switchCamera()
+            } else if let tracks = self?.previewForRoleTracks {
+                if let videoTrack = tracks.first(where: { $0.kind == HMSTrackKind.video }) as? HMSLocalVideoTrack {
+                    videoTrack.switchCamera()
+                }
+            } else {
+                print(#function, "No local video track available for switching camera.")
+            }
         }
     }
 
     func leave(_ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
-        if reconnectingStage {
-            reject?("Still in reconnecting stage", "Still in reconnecting stage", nil)
-        } else {
-            DispatchQueue.main.async { [weak self] in
+        DispatchQueue.main.async { [weak self] 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 while executing Room leave")
+                    print(#function, "Could not find reference to self when callback is received 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 {
-                        resolve?(["success": success])
-                        strongSelf.cleanup() // resetting states and doing data cleanup
-                    } else {
-                        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)
+                if success {
+                    resolve?(["success": success])
+                    strongSelf.cleanup() // resetting states and doing data cleanup
+                } else {
+                    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)
                 }
             }
         }
@@ -301,9 +329,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                     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 {
-                        self?.delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
-                    }
                     reject?(error?.localizedDescription, error?.localizedDescription, nil)
                     return
                 }
@@ -329,9 +354,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                     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 {
-                        self?.delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
-                    }
                     reject?(error?.localizedDescription, error?.localizedDescription, nil)
                     return
                 }
@@ -351,15 +373,13 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
 
         let type = data.value(forKey: "type") as? String ?? "chat"
         DispatchQueue.main.async { [weak self] in
-            guard let peer = HMSHelper.getRemotePeerFromPeerId(peerId, remotePeers: self?.hms?.remotePeers) else { return }
+            guard let peer = HMSHelper.getPeerFromPeerId(peerId, remotePeers: self?.hms?.remotePeers) else { return }
+
             self?.hms?.sendDirectMessage(type: type, message: message, peer: peer, completion: { message, error in
                 if error == nil {
                     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 {
-                        self?.delegate?.emitEvent(HMSConstants.ON_ERROR, ["error": HMSDecoder.getError(error), "id": self?.id ?? "12345"])
-                    }
                     reject?(error?.localizedDescription, error?.localizedDescription, nil)
                     return
                 }
@@ -383,13 +403,11 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                 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 ?? "12345"])
-                    }
                     reject?(error?.localizedDescription, error?.localizedDescription, nil)
                 }
             })
             self?.recentRoleChangeRequest = nil
+            self?.previewForRoleTracks = nil
         }
     }
 
@@ -423,9 +441,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                 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 ?? "12345"])
-                    }
                     reject?(error?.localizedDescription, error?.localizedDescription, nil)
                 }
             })
@@ -461,9 +476,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                 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 ?? "12345"])
-                    }
                     reject?(error?.localizedDescription, error?.localizedDescription, nil)
                 }
             }
@@ -494,9 +506,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                 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 ?? "12345"])
-                    }
                     reject?(error?.localizedDescription, error?.localizedDescription, nil)
                 }
             })
@@ -531,9 +540,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                 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 ?? "12345"])
-                    }
                     reject?(error?.localizedDescription, error?.localizedDescription, nil)
                 }
             })
@@ -557,9 +563,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                 guard let remotePeers = self?.hms?.remotePeers,
                     let track = HMSHelper.getTrackFromTrackId(trackId, remotePeers)
                 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])
-                    }
                     reject?("Track not found", "Track not found", nil)
                     return
                 }
@@ -584,25 +587,22 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
 
         let reason = data.value(forKey: "reason") as? String
 
-        DispatchQueue.main.async { [weak self] in
+        HMSHelper.getRemotePeerFromPeerId(peerId, hmsSDK: self.hms) { peer in
 
-            guard let remotePeers = self?.hms?.remotePeers,
-                  let peer = HMSHelper.getRemotePeerFromPeerId(peerId, remotePeers: remotePeers)
-            else {
-                reject?("PEER_NOT_FOUND", "PEER_NOT_FOUND", nil)
-                return
-            }
+            DispatchQueue.main.async { [weak self] in
+                guard let nonnilPeer = peer else {
+                    reject?("PEER_NOT_FOUND", "PEER_NOT_FOUND", nil)
+                    return
+                }
 
-            self?.hms?.removePeer(peer, reason: reason ?? "Removed from room", completion: { success, error in
-                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 ?? "12345"])
+                self?.hms?.removePeer(nonnilPeer, reason: reason ?? "Removed from room", completion: { success, error in
+                    if success {
+                        resolve?(["success": success])
+                    } else {
+                        reject?(error?.localizedDescription, error?.localizedDescription, nil)
                     }
-                    reject?(error?.localizedDescription, error?.localizedDescription, nil)
-                }
-            })
+                })
+            }
         }
     }
 
@@ -623,9 +623,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                     resolve?(["success": success])
                     self?.cleanup() // resetting states and doing data cleanup
                 } else {
-                    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)
                 }
             })
@@ -704,9 +701,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                 resolve?(["success": success])
                 return
             } 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)
                 return
             }
@@ -730,8 +724,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
 
             if remoteAudioTrack != nil {
                 remoteAudioTrack?.setVolume(volume)
-            } 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])
             }
         }
     }
@@ -754,9 +746,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
             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)
             }
         }
@@ -769,9 +758,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                 resolve?(["success": success])
                 return
             } 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)
                 return
             }
@@ -784,9 +770,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                 resolve?(["success": success])
                 return
             } 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)
                 return
             }
@@ -806,9 +789,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                 resolve?(["success": success])
                 return
             } 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)
                 return
             }
@@ -821,9 +801,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                 resolve?(["success": success])
                 return
             } 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)
                 return
             }
@@ -843,9 +820,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
             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)
             }
         }
@@ -887,9 +861,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
 
     func startScreenshare(_ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         guard let preferredExtension = preferredExtension else {
-            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
         }
@@ -911,9 +882,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
 
     func stopScreenshare(_ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         guard let preferredExtension = preferredExtension else {
-            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
         }
@@ -937,6 +905,48 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         resolve?(isScreenShared)
     }
 
+    func raiseLocalPeerHand(_ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        self.hms?.raiseLocalPeerHand { success, error in
+            if error != nil {
+                reject?(error?.localizedDescription, error?.localizedDescription, nil)
+                return
+            }
+            resolve?(success)
+        }
+    }
+
+    func lowerLocalPeerHand(_ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        self.hms?.lowerLocalPeerHand { success, error in
+            if error != nil {
+                reject?(error?.localizedDescription, error?.localizedDescription, nil)
+                return
+            }
+            resolve?(success)
+        }
+    }
+
+    func lowerRemotePeerHand(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        guard let peerId = data.value(forKey: "peerId") as? String else {
+            let errorMessage = "lowerRemotePeerHand: " + HMSHelper.getUnavailableRequiredKey(data, ["peerId"])
+            reject?(errorMessage, errorMessage, nil)
+            return
+        }
+
+        guard let remotePeer = HMSHelper.getPeerFromPeerId(peerId, remotePeers: self.hms?.remotePeers) else {
+            let errorMessage = "lowerRemotePeerHand: Could not find remote peer with peerID - " + peerId
+            reject?(errorMessage, errorMessage, nil)
+            return
+        }
+
+        self.hms?.lowerRemotePeerHand(remotePeer) { success, error in
+            if error != nil {
+                reject?(error?.localizedDescription, error?.localizedDescription, nil)
+                return
+            }
+            resolve?(success)
+        }
+    }
+
     func playAudioShare(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         guard let fileUrl = data.value(forKey: "fileUrl") as? String,
               let audioNodeName = data.value(forKey: "audioNode") as? String,
@@ -956,21 +966,12 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                     try audioFilePlayerNode.play(fileUrl: url, loops: loops, interrupts: interrupts)
                     resolve?(["success": true])
                 } catch {
-                    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[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[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)
         }
     }
@@ -1004,8 +1005,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         }
         if let audioFilePlayerNode = playerNode as? HMSAudioFilePlayerNode {
             audioFilePlayerNode.stop()
-        } 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])
         }
     }
 
@@ -1026,8 +1025,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                     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[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 +1039,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         }
         if let audioFilePlayerNode = playerNode as? HMSAudioFilePlayerNode {
             audioFilePlayerNode.pause()
-        } 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])
         }
     }
 
@@ -1060,9 +1055,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         if let audioFilePlayerNode = playerNode as? HMSAudioFilePlayerNode {
             resolve?(audioFilePlayerNode.isPlaying)
         } 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])
-            }
             reject?("AudioFilePlayerNode not found", "AudioFilePlayerNode not found", nil)
         }
     }
@@ -1080,9 +1072,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         if let audioFilePlayerNode = playerNode as? HMSAudioFilePlayerNode {
             resolve?(audioFilePlayerNode.currentTime)
         } 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] as [String: Any], "id": id])
-            }
             reject?("AudioFilePlayerNode not found", "AudioFilePlayerNode not found", nil)
         }
     }
@@ -1100,9 +1089,6 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         if let audioFilePlayerNode = playerNode as? HMSAudioFilePlayerNode {
             resolve?(audioFilePlayerNode.duration)
         } 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])
-            }
             reject?("AudioFilePlayerNode not found", "AudioFilePlayerNode not found", nil)
         }
     }
@@ -1200,6 +1186,8 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                 }
             case "metadata":
                 return ["metadata": peer.metadata ?? ""]
+            case "isHandRaised":
+                return ["isHandRaised": peer.isHandRaised]
             case "role":
                 return ["role": HMSDecoder.getHmsRole(peer.role)]
             case "customerUserID":
@@ -1361,6 +1349,24 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         self.delegate?.emitEvent(HMSConstants.ON_ROOM_UPDATE, ["event": HMSConstants.ON_ROOM_UPDATE, "id": self.id, "type": type, "room": roomData])
     }
 
+    func onPeerListUpdate(added: [HMSPeer], removed: [HMSPeer]) {
+        if eventsEnableStatus["ON_PEER_LIST_UPDATED"] != true {
+            return
+        }
+        var addedPeers = [[String: Any]]()
+        var removedPeers = [[String: Any]]()
+
+        for peer in added {
+            addedPeers.append(HMSDecoder.getHmsPeerSubset(peer))
+        }
+
+        for peer in removed {
+            removedPeers.append(HMSDecoder.getHmsPeerSubset(peer))
+        }
+
+        self.delegate?.emitEvent(HMSConstants.ON_PEER_LIST_UPDATED, ["event": HMSConstants.ON_PEER_LIST_UPDATED, "id": self.id, "addedPeers": addedPeers, "removedPeers": removedPeers])
+    }
+
     func on(peer: HMSPeer, update: HMSPeerUpdate) {
 
         guard let isPeerUpdateEnabled = eventsEnableStatus[HMSConstants.ON_PEER_UPDATE],
@@ -1886,11 +1892,90 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         }
     }
 
+    // MARK: - Peer List Iterator
+
+    func getPeerListIterator(_ data: NSDictionary) -> [AnyHashable: Any]? {
+        guard let uniqueId = data["uniqueId"] as? String else {
+            print("Error in getPeerListIterator: uniqueId is not available")
+            return nil
+        }
+
+        guard let hmssdk = hms else {
+            print("Error in getPeerListIterator: HMSSDK is not available")
+            return nil
+        }
+
+        var peerListIterator: HMSPeerListIterator
+
+        if let peerListIteratorOptions = HMSHelper.getPeerListIteratorOptions(data) {
+            peerListIterator = hmssdk.getPeerListIterator(options: peerListIteratorOptions)
+        } else {
+            peerListIterator = hmssdk.getPeerListIterator()
+        }
+
+        peerListIterators[uniqueId] = peerListIterator
+
+        return [
+            "success": true,
+            "uniqueId": uniqueId,
+            "totalCount": peerListIterator.totalCount
+        ]
+    }
+
+    func peerListIteratorHasNext(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        guard let uniqueId = data["uniqueId"] as? String else {
+            let errorMessage = "\(#function) uniqueId is not available"
+            reject?("6004", errorMessage, nil)
+            return
+        }
+
+        guard let peerListIterator = peerListIterators[uniqueId] else {
+            let errorMessage = "\(#function) HMSPeerListIterator is not available for uniqueId - \(uniqueId)"
+            reject?("6004", errorMessage, nil)
+            return
+        }
+
+        resolve?(peerListIterator.hasNext)
+    }
+
+    func peerListIteratorNext(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        guard let uniqueId = data["uniqueId"] as? String else {
+            let errorMessage = "\(#function) uniqueId is not available"
+            reject?("6004", errorMessage, nil)
+            return
+        }
+
+        guard let peerListIterator = peerListIterators[uniqueId] else {
+            let errorMessage = "\(#function) HMSPeerListIterator is not available for uniqueId - \(uniqueId)"
+            reject?("6004", errorMessage, nil)
+            return
+        }
+
+        peerListIterator.next { peers, error in
+            if let nonnilError = error {
+                reject?("6004", nonnilError.localizedDescription, nil)
+                return
+            }
+
+            if let nonnilPeers = peers {
+                var data = [[String: Any]]()
+                for peer in nonnilPeers {
+                    data.append(HMSDecoder.getHmsPeer(peer))
+                }
+                resolve?(["totalCount": peerListIterator.totalCount, "peers": data])
+            } else {
+                let errorMessage = "\(#function) peers is nil"
+                reject?("6004", errorMessage, nil)
+            }
+        }
+    }
+
     // MARK: - Helper Functions
 
     // Handle resetting states and data cleanup
     private func cleanup() {
         self.recentRoleChangeRequest = nil
+        self.previewForRoleTracks = nil
         self.reconnectingStage = false
         self.preferredExtension = nil
         self.systemBroadcastPicker = nil
@@ -1902,6 +1987,7 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
         self.eventsEnableStatus.removeAll()
         self.sessionStore = nil
         self.sessionStoreChangeObservers.removeAll()
+        self.peerListIterators.removeAll()
         HMSDecoder.clearRestrictDataStates()
     }
 
@@ -1949,9 +2035,7 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
 
     func getString(from update: HMSRoomUpdate) -> String {
         switch update {
-        case .roomTypeChanged:
-            return "ROOM_PEER_COUNT_UPDATED"
-        case .metaDataUpdated:
+        case .roomTypeChanged, .metaDataUpdated, .peerCountUpdated:
             return "ROOM_PEER_COUNT_UPDATED"
         case .browserRecordingStateUpdated:
             return "BROWSER_RECORDING_STATE_UPDATED"