@100mslive/react-native-hms 0.8.1 → 0.9.0

package/ios/HmsManager.swift

@@ -99,52 +99,52 @@ class HmsManager: RCTEventEmitter{
     }
     
     @objc
-    func sendBroadcastMessage(_ data: NSDictionary) {
+    func sendBroadcastMessage(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HmsHelper.getHms(data, hmsCollection)
         
-        hms?.sendBroadcastMessage(data)
+        hms?.sendBroadcastMessage(data, resolve, reject)
     }
     
     @objc
-    func sendGroupMessage(_ data: NSDictionary) {
+    func sendGroupMessage(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HmsHelper.getHms(data, hmsCollection)
         
-        hms?.sendGroupMessage(data)
+        hms?.sendGroupMessage(data, resolve, reject)
     }
     
     @objc
-    func sendDirectMessage(_ data: NSDictionary) {
+    func sendDirectMessage(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HmsHelper.getHms(data, hmsCollection)
         
-        hms?.sendDirectMessage(data)
+        hms?.sendDirectMessage(data, resolve, reject)
     }
     
     @objc
-    func acceptRoleChange(_ data: NSDictionary) {
+    func acceptRoleChange(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HmsHelper.getHms(data, hmsCollection)
         
-        hms?.acceptRoleChange()
+        hms?.acceptRoleChange(resolve, reject)
     }
     
     @objc
-    func changeRole(_ data: NSDictionary) {
+    func changeRole(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HmsHelper.getHms(data, hmsCollection)
         
-        hms?.changeRole(data)
+        hms?.changeRole(data, resolve, reject)
     }
     
     @objc
-    func changeTrackState(_ data: NSDictionary) {
+    func changeTrackState(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HmsHelper.getHms(data, hmsCollection)
         
-        hms?.changeTrackState(data)
+        hms?.changeTrackState(data, resolve, reject)
     }
     
     @objc
-    func changeTrackStateRoles(_ data: NSDictionary) {
+    func changeTrackStateForRoles(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HmsHelper.getHms(data, hmsCollection)
         
-        hms?.changeTrackStateRoles(data)
+        hms?.changeTrackStateForRoles(data, resolve, reject)
     }
     
     @objc
@@ -160,18 +160,18 @@ class HmsManager: RCTEventEmitter{
     
     
     @objc
-    func removePeer(_ data: NSDictionary) {
+    func removePeer(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HmsHelper.getHms(data, hmsCollection)
         
-        hms?.removePeer(data)
+        hms?.removePeer(data, resolve, reject)
     }
     
     
     @objc
-    func endRoom(_ data: NSDictionary) {
+    func endRoom(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HmsHelper.getHms(data, hmsCollection)
         
-        hms?.endRoom(data)
+        hms?.endRoom(data, resolve, reject)
     }
 
     @objc
@@ -237,6 +237,20 @@ class HmsManager: RCTEventEmitter{
         hms?.stopRtmpAndRecording(resolve, reject)
     }
     
+    @objc
+    func startHLSStreaming(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        let hms = HmsHelper.getHms(data, hmsCollection)
+        
+        hms?.startHLSStreaming(data, resolve, reject)
+    }
+    
+    @objc
+    func stopHLSStreaming(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        let hms = HmsHelper.getHms(data, hmsCollection)
+        
+        hms?.stopHLSStreaming(resolve, reject)
+    }
+    
 //    @objc
 //    func setLocalVideoSettings(_ data: NSDictionary) {
 //        let hms = HmsHelper.getHms(data, hmsCollection)

package/ios/HmsSDK.swift

@@ -7,12 +7,13 @@
 
 import Foundation
 import HMSSDK
+
+
 class HmsSDK: HMSUpdateListener, HMSPreviewListener {
     
     var hms: HMSSDK?
     var config: HMSConfig?
     var recentRoleChangeRequest: HMSRoleChangeRequest?
-    var recentChangeTrackStateRequest: HMSChangeTrackStateRequest?
     var delegate: HmsManager?
     var id: String = "12345"
     
@@ -45,9 +46,17 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
     }
     
     // MARK: - HMS SDK Actions
+    
+    private var previewInProgress = false
 
     func preview(_ credentials: NSDictionary) {
         
+        guard !previewInProgress else {
+            let error = HMSError(id: "PREVIEW", code: .joinErrorServer, message: "PREVIEW_IS_IN_PROGRESS", params: ["function": #function, "credentials": credentials])
+            on(error: error)
+            return
+        }
+        
         guard let authToken = credentials.value(forKey: "authToken") as? String,
               let user = credentials.value(forKey: "username") as? String
         else {
@@ -66,11 +75,19 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
                 strongSelf.config = HMSConfig(userName: user, authToken: authToken, metadata: metadata)
                 strongSelf.hms?.preview(config: strongSelf.config!, delegate: strongSelf)
             }
+            strongSelf.previewInProgress = true
         }
     }
     
+    
     func join(_ credentials: NSDictionary) {
         
+        guard !previewInProgress else {
+            let error = HMSError(id: "PREVIEW", code: .joinErrorServer, message: "PREVIEW_IS_IN_PROGRESS", params: ["function": #function, "credentials": credentials])
+            on(error: error)
+            return
+        }
+        
         guard let authToken = credentials.value(forKey: "authToken") as? String,
               let user = credentials.value(forKey: "username") as? String
         else {
@@ -134,7 +151,6 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
             guard let strongSelf = self else { return }
             self?.config = nil
             self?.recentRoleChangeRequest = nil
-            self?.recentChangeTrackStateRequest = nil
             self?.hms?.leave({ success, error in
                 if(success){
                     resolve?("")
@@ -146,7 +162,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
         }
     }
     
-    func sendBroadcastMessage(_ data: NSDictionary) {
+    func sendBroadcastMessage(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         guard let message = data.value(forKey: "message") as? String
         else {
             let error = HMSError(id: "108", code: HMSErrorCode.genericErrorUnknown, message: "REQUIRED_KEYS_NOT_FOUND")
@@ -157,11 +173,20 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
         let type = data.value(forKey: "type") as? String ?? "chat"
         
         DispatchQueue.main.async { [weak self] in
-            self?.hms?.sendBroadcastMessage(type: type, message: message)
+            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]])
+                    return
+                } else {
+                    self?.delegate?.emitEvent("ON_ERROR", ["event": "ON_ERROR", "error": HmsDecoder.getError(error), "id": self?.id ?? "12345"])
+                    reject?(error?.message, error?.localizedDescription, nil)
+                    return
+                }
+            })
         }
     }
     
-    func sendGroupMessage(_ data: NSDictionary) {
+    func sendGroupMessage(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         guard let message = data.value(forKey: "message") as? String,
               let targetedRoles = data.value(forKey: "roles") as? [String]
         else {
@@ -173,11 +198,20 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
         let type = data.value(forKey: "type") as? String ?? "chat"
         DispatchQueue.main.async { [weak self] in
             let encodedTargetedRoles = HmsHelper.getRolesFromRoleNames(targetedRoles, roles: self?.hms?.roles)
-            self?.hms?.sendGroupMessage(type: type, message: message, roles: encodedTargetedRoles)
+            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]])
+                    return
+                } else {
+                    self?.delegate?.emitEvent("ON_ERROR", ["event": "ON_ERROR", "error": HmsDecoder.getError(error), "id": self?.id ?? "12345"])
+                    reject?(error?.message, error?.localizedDescription, nil)
+                    return
+                }
+            })
         }
     }
     
-    func sendDirectMessage(_ data: NSDictionary) {
+    func sendDirectMessage(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         guard let message = data.value(forKey: "message") as? String,
               let peerId = data.value(forKey: "peerId") as? String
         else {
@@ -188,24 +222,40 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
         
         let type = data.value(forKey: "type") as? String ?? "chat"
         DispatchQueue.main.async { [weak self] in
-            guard let peer = HmsHelper.getPeerFromPeerId(peerId, remotePeers: self?.hms?.remotePeers) else { return }
-            self?.hms?.sendDirectMessage(type: type, message: message, peer: peer)
+            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]])
+                    return
+                } else {
+                    self?.delegate?.emitEvent("ON_ERROR", ["event": "ON_ERROR", "error": HmsDecoder.getError(error), "id": self?.id ?? "12345"])
+                    reject?(error?.message, error?.localizedDescription, nil)
+                    return
+                }
+            })
         }
     }
     
-    func acceptRoleChange() {
+    func acceptRoleChange(_ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         
         DispatchQueue.main.async { [weak self] in
             
             guard let request = self?.recentRoleChangeRequest else { return }
             
-            self?.hms?.accept(changeRole: request)
+            self?.hms?.accept(changeRole: request, completion: { success, error in
+                if(success) {
+                    resolve?(["success": true])
+                } else{
+                    self?.delegate?.emitEvent("ON_ERROR", ["event": self?.ON_ERROR ?? "", "error": HmsDecoder.getError(error), "id":self?.id ?? "12345"])
+                    reject?(error?.message, error?.localizedDescription,nil)
+                }
+            })
             
             self?.recentRoleChangeRequest = nil
         }
     }
     
-    func changeRole(_ data: NSDictionary) {
+    func changeRole(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         
         guard let peerId = data.value(forKey: "peerId") as? String,
               let role = data.value(forKey: "role") as? String
@@ -218,15 +268,22 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
         let force = data.value(forKey: "force") as? Bool ?? false
         
         DispatchQueue.main.async { [weak self] in
-            guard let peer = HmsHelper.getPeerFromPeerId(peerId, remotePeers: self?.hms?.remotePeers),
+            guard let peer = HmsHelper.getPeerFromPeerId(peerId, remotePeers: self?.hms?.remotePeers, localPeer:self?.hms?.localPeer),
             let role = HmsHelper.getRoleFromRoleName(role, roles: self?.hms?.roles)
             else { return }
-        
-            self?.hms?.changeRole(for: peer, to: role, force: force)
+            
+            self?.hms?.changeRole(for: peer, to: role, force: force, completion: { success, error in
+                if(success) {
+                    resolve?(["success": true])
+                } else{
+                    self?.delegate?.emitEvent("ON_ERROR", ["event": self?.ON_ERROR ?? "", "error": HmsDecoder.getError(error), "id":self?.id ?? "12345"])
+                    reject?(error?.message, error?.localizedDescription,nil)
+                }
+            })
         }
     }
     
-    func changeTrackState(_ data: NSDictionary) {
+    func changeTrackState(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         
         guard let trackId = data.value(forKey: "trackId") as? String
         else {
@@ -242,31 +299,48 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
                   let track = HmsHelper.getTrackFromTrackId(trackId, remotePeers)
             else { return }
 
-            self?.hms?.changeTrackState(for: track, mute: mute)
+            self?.hms?.changeTrackState(for: track, mute: mute, completion: { success, error in
+                if(success) {
+                    resolve?(["success": true])
+                } else{
+                    self?.delegate?.emitEvent("ON_ERROR", ["event": self?.ON_ERROR ?? "", "error": HmsDecoder.getError(error), "id":self?.id ?? "12345"])
+                    reject?(error?.message, error?.localizedDescription, nil)
+                }
+            })
         }
     }
     
-    func changeTrackStateRoles(_ data: NSDictionary) {
+    func changeTrackStateForRoles(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         
-        guard let source = data.value(forKey: "source") as? String,
-                let targetedRoles = data.value(forKey: "roles") as? [String],
-                    let type = data.value(forKey: "type") as? String
+        guard let mute = data.value(forKey: "mute") as? Bool
         else {
             let error = HMSError(id: "113", code: HMSErrorCode.genericErrorUnknown, message: "REQUIRED_KEYS_NOT_FOUND")
             delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HmsDecoder.getError(error), "id":id])
             return
         }
-        var decodeType: HMSTrackKind;
-        if( type == "AUDIO") {
-            decodeType = HMSTrackKind.audio
-        }else {
-            decodeType = HMSTrackKind.video
+        let source = data.value(forKey: "source") as? String
+        let targetedRoles = data.value(forKey: "roles") as? [String]
+        let type = data.value(forKey: "type") as? String
+
+        var decodeType: HMSTrackKind? = nil;
+        if( type != nil){
+            if( type == "AUDIO") {
+                decodeType = HMSTrackKind.audio
+            }else {
+                decodeType = HMSTrackKind.video
+            }
         }
-        let mute = data.value(forKey: "mute") as? Bool ?? true
         
         DispatchQueue.main.async { [weak self] in
             let encodedTargetedRoles = HmsHelper.getRolesFromRoleNames(targetedRoles, roles: self?.hms?.roles)
-            self?.hms?.changeTrackState(mute: mute, for: decodeType, source: source, roles: encodedTargetedRoles)
+            self?.hms?.changeTrackState(mute: mute, for: decodeType, source: source, roles: encodedTargetedRoles, completion: { success, error in
+                if(success) {
+                    resolve?(["success": true])
+                } else{
+                    self?.delegate?.emitEvent("ON_ERROR", ["event": self?.ON_ERROR ?? "", "error": HmsDecoder.getError(error), "id":self?.id ?? "12345"])
+                    reject?(error?.message, error?.localizedDescription,nil)
+                }
+            })
         }
     }
     
@@ -301,7 +375,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
         }
     }
     
-    func removePeer(_ data: NSDictionary) {
+    func removePeer(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         
         guard let peerId = data.value(forKey: "peerId") as? String
         else {
@@ -315,15 +389,22 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
         DispatchQueue.main.async { [weak self] in
 
             guard let remotePeers = self?.hms?.remotePeers,
-                  let peer = HmsHelper.getPeerFromPeerId(peerId, remotePeers: remotePeers)
+                  let peer = HmsHelper.getRemotePeerFromPeerId(peerId, remotePeers: remotePeers)
             else { return }
             
-            self?.hms?.removePeer(peer, reason: reason ?? "Removed from room")
+            self?.hms?.removePeer(peer, reason: reason ?? "Removed from room", completion: { success, error in
+                if(success) {
+                    resolve?(["success": true])
+                } else{
+                    self?.delegate?.emitEvent("ON_ERROR", ["event": self?.ON_ERROR ?? "", "error": HmsDecoder.getError(error), "id":self?.id ?? "12345"])
+                    reject?(error?.message, error?.localizedDescription,nil)
+                }
+            })
         }
     }
     
     
-    func endRoom(_ data: NSDictionary) {
+    func endRoom(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         
         guard let lock = data.value(forKey: "lock") as? Bool,
                 let reason = data.value(forKey: "reason") as? String
@@ -334,7 +415,14 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
         }
         
         DispatchQueue.main.async { [weak self] in
-            self?.hms?.endRoom(lock: lock ?? false, reason: reason ?? "Room was ended")
+            self?.hms?.endRoom(lock: lock, reason: reason, completion: { success, error in
+                if(success) {
+                    resolve?(["success": true])
+                } else{
+                    self?.delegate?.emitEvent("ON_ERROR", ["event": self?.ON_ERROR ?? "", "error": HmsDecoder.getError(error), "id":self?.id ?? "12345"])
+                    reject?(error?.message, error?.localizedDescription,nil)
+                }
+            })
         }
     }
     
@@ -512,6 +600,54 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
         })
     }
     
+    func startHLSStreaming(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        guard let meetingURLVariants = data.value(forKey: "meetingURLVariants") as? [[String: Any]]?
+        else {
+            let error = HMSError(id: "126", code: HMSErrorCode.genericErrorUnknown, message: "REQUIRED_KEYS_NOT_FOUND")
+            delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HmsDecoder.getError(error), "id":id])
+            return
+        }
+        
+        let hlsMeetingUrlVariant = HmsHelper.getHMSHLSMeetingURLVariants(meetingURLVariants)
+        let config = HMSHLSConfig(variants: hlsMeetingUrlVariant)
+        
+        hms?.startHLSStreaming(config: config, completion: { success, error in
+            if (success) {
+                let roomData = HmsDecoder.getHmsRoom(self.hms?.room)
+                let type = self.getString(from: HMSRoomUpdate.hlsStreamingStateUpdated)
+                
+                let localPeerData = HmsDecoder.getHmsLocalPeer(self.hms?.localPeer)
+                let remotePeerData = HmsDecoder.getHmsRemotePeers(self.hms?.remotePeers)
+                self.delegate?.emitEvent(self.ON_ROOM_UPDATE, ["event": self.ON_ROOM_UPDATE, "id": self.id, "type": type, "room": roomData, "localPeer": localPeerData, "remotePeers": remotePeerData])
+                resolve?(["success": success])
+                return
+            } else {
+                self.delegate?.emitEvent(self.ON_ERROR, ["event": self.ON_ERROR, "error": HmsDecoder.getError(error), "id":self.id])
+                reject?(error?.message, error?.localizedDescription, nil)
+                return
+            }
+        })
+    }
+    
+    func stopHLSStreaming(_ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        hms?.stopHLSStreaming(config: nil, completion: { success, error in
+            if (success) {
+                let roomData = HmsDecoder.getHmsRoom(self.hms?.room)
+                let type = self.getString(from: HMSRoomUpdate.browserRecordingStateUpdated)
+                
+                let localPeerData = HmsDecoder.getHmsLocalPeer(self.hms?.localPeer)
+                let remotePeerData = HmsDecoder.getHmsRemotePeers(self.hms?.remotePeers)
+                self.delegate?.emitEvent(self.ON_ROOM_UPDATE, ["event": self.ON_ROOM_UPDATE, "id": self.id, "type": type, "room": roomData, "localPeer": localPeerData, "remotePeers": remotePeerData])
+                resolve?(["success": success])
+                return
+            } else {
+                self.delegate?.emitEvent(self.ON_ERROR, ["event": self.ON_ERROR, "error": HmsDecoder.getError(error), "id":self.id])
+                reject?(error?.message, error?.localizedDescription, nil)
+                return
+            }
+        })
+    }
+    
     //TODO: to be implemented after volume is exposed for iOS
 //    func getVolume(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
 //        guard let trackId = data.value(forKey: "trackId") as? String
@@ -548,7 +684,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
         
         let decodedRoles = HmsDecoder.getAllRoles(hms?.roles)
         
-        self.delegate?.emitEvent(ON_JOIN, ["event": ON_JOIN, "id": self.id ?? "", "room": roomData, "localPeer": localPeerData, "remotePeers": remotePeerData, "roles": decodedRoles])
+        self.delegate?.emitEvent(ON_JOIN, ["event": ON_JOIN, "id": self.id , "room": roomData, "localPeer": localPeerData, "remotePeers": remotePeerData, "roles": decodedRoles])
     }
     
     func onPreview(room: HMSRoom, localTracks: [HMSTrack]) {
@@ -556,7 +692,8 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
         let hmsRoom = HmsDecoder.getHmsRoom(room)
         let localPeerData = HmsDecoder.getHmsLocalPeer(hms?.localPeer)
         
-        self.delegate?.emitEvent(ON_PREVIEW, ["event": ON_PREVIEW, "id": self.id ?? "", "room": hmsRoom, "previewTracks": previewTracks, "localPeer": localPeerData])
+        previewInProgress = false
+        self.delegate?.emitEvent(ON_PREVIEW, ["event": ON_PREVIEW, "id": self.id , "room": hmsRoom, "previewTracks": previewTracks, "localPeer": localPeerData])
     }
     
     func on(room: HMSRoom, update: HMSRoomUpdate) {
@@ -567,7 +704,7 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
         let localPeerData = HmsDecoder.getHmsLocalPeer(hms?.localPeer)
         let remotePeerData = HmsDecoder.getHmsRemotePeers(hms?.remotePeers)
         
-        self.delegate?.emitEvent(ON_ROOM_UPDATE, ["event": ON_ROOM_UPDATE, "id": self.id ?? "", "type": type, "room": roomData, "localPeer": localPeerData, "remotePeers": remotePeerData])
+        self.delegate?.emitEvent(ON_ROOM_UPDATE, ["event": ON_ROOM_UPDATE, "id": self.id , "type": type, "room": roomData, "localPeer": localPeerData, "remotePeers": remotePeerData])
     }
     
     func on(peer: HMSPeer, update: HMSPeerUpdate) {
@@ -577,8 +714,9 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
         
         let localPeerData = HmsDecoder.getHmsLocalPeer(hms?.localPeer)
         let remotePeerData = HmsDecoder.getHmsRemotePeers(hms?.remotePeers)
+        let hmsPeer = HmsDecoder.getHmsPeer(peer)
                 
-        self.delegate?.emitEvent(ON_PEER_UPDATE, ["event": ON_PEER_UPDATE, "id": self.id ?? "", "type": type, "room": roomData, "localPeer": localPeerData, "remotePeers": remotePeerData])
+        self.delegate?.emitEvent(ON_PEER_UPDATE, ["event": ON_PEER_UPDATE, "id": self.id, "type": type, "room": roomData, "localPeer": localPeerData, "remotePeers": remotePeerData, "peer": hmsPeer])
     }
     
     func on(track: HMSTrack, update: HMSTrackUpdate, for peer: HMSPeer) {
@@ -588,16 +726,19 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
         
         let localPeerData = HmsDecoder.getHmsLocalPeer(hms?.localPeer)
         let remotePeerData = HmsDecoder.getHmsRemotePeers(hms?.remotePeers)
+        let hmsPeer = HmsDecoder.getHmsPeer(peer)
+        let hmsTrack = HmsDecoder.getHmsTrack(track)
         
-        self.delegate?.emitEvent(ON_TRACK_UPDATE, ["event": ON_TRACK_UPDATE, "id": self.id ?? "", "room": roomData, "type": type, "localPeer": localPeerData, "remotePeers": remotePeerData])
+        self.delegate?.emitEvent(ON_TRACK_UPDATE, ["event": ON_TRACK_UPDATE, "id": self.id, "room": roomData, "type": type, "localPeer": localPeerData, "remotePeers": remotePeerData, "peer": hmsPeer, "track": hmsTrack])
     }
     
     func on(error: HMSError) {
+        if (previewInProgress) { previewInProgress = false }
         self.delegate?.emitEvent(ON_ERROR, ["event": ON_ERROR, "error": HmsDecoder.getError(error), "id":id])
     }
     
     func on(message: HMSMessage) {
-        self.delegate?.emitEvent(ON_MESSAGE, ["event": ON_MESSAGE, "id": self.id ?? "", "sender": message.sender?.name ?? "", "time": message.time, "message": message.message, "type": message.type])
+        self.delegate?.emitEvent(ON_MESSAGE, ["event": ON_MESSAGE, "id": self.id , "sender": message.sender?.name ?? "", "time": message.time, "message": message.message, "type": message.type])
     }
     
     func on(updated speakers: [HMSSpeaker]) {
@@ -605,15 +746,15 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
         for speaker in speakers {
             speakerPeerIds.append(["peer": HmsDecoder.getHmsPeer(speaker.peer), "level": speaker.level, "track": HmsDecoder.getHmsTrack(speaker.track)])
         }
-        self.delegate?.emitEvent(ON_SPEAKER, ["event": ON_SPEAKER, "id": self.id ?? "", "count": speakers.count, "peers" :speakerPeerIds])
+        self.delegate?.emitEvent(ON_SPEAKER, ["event": ON_SPEAKER, "id": self.id , "count": speakers.count, "peers" :speakerPeerIds])
     }
     
     func onReconnecting() {
-        self.delegate?.emitEvent(RECONNECTING, ["event": RECONNECTING, "id": self.id ?? ""])
+        self.delegate?.emitEvent(RECONNECTING, ["event": RECONNECTING, "id": self.id ])
     }
     
     func onReconnected() {
-        self.delegate?.emitEvent(RECONNECTED, ["event": RECONNECTED, "id": self.id ?? ""])
+        self.delegate?.emitEvent(RECONNECTED, ["event": RECONNECTED, "id": self.id ])
     }
     
     func on(roleChangeRequest: HMSRoleChangeRequest) {
@@ -623,7 +764,8 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
     }
     
     func on(changeTrackStateRequest: HMSChangeTrackStateRequest) {
-        // On track state change required
+        let decodedChangeTrackStateRequest = HmsDecoder.getHmsChangeTrackStateRequest(changeTrackStateRequest, id)
+        delegate?.emitEvent("ON_CHANGE_TRACK_STATE_REQUEST", decodedChangeTrackStateRequest)
     }
     
     func on(removedFromRoom notification: HMSRemovedFromRoomNotification) {
@@ -705,6 +847,8 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
             return "META_DATA_CHANGED"
         case .browserRecordingStateUpdated:
             return "BROWSER_RECORDING_STATE_UPDATED"
+        case .hlsStreamingStateUpdated:
+            return "HLS_STREAMING_STATE_UPDATED"
         case .rtmpStreamingStateUpdated:
             return "RTMP_STREAMING_STATE_UPDATED"
         case.serverRecordingStateUpdated:
@@ -714,3 +858,9 @@ class HmsSDK: HMSUpdateListener, HMSPreviewListener {
         }
     }
 }
+
+//extension HmsSDK: HMSLogger {
+//    func log(_ message: String, _ level: HMSLogLevel) {
+//
+//    }
+//}

package/ios/HmsView.swift

@@ -30,7 +30,6 @@ class HmssdkDisplayView: UIView {
     }()
     
     var hmsCollection: [String: HmsSDK] = [:]
-    var localTrack: String?
     var sinked = false
     var sinkVideo = true
     
@@ -58,66 +57,31 @@ class HmssdkDisplayView: UIView {
     
     @objc var data: NSDictionary = [:] {
         didSet {
-            guard let trackID = data.value(forKey: "trackId") as? String,
+            
+            let sdkID = data.value(forKey: "id") as? String ?? "12345"
+            
+            guard let hmsSDK = hmsCollection[sdkID]?.hms,
+                  let trackID = data.value(forKey: "trackId") as? String,
+                  let videoTrack = HMSUtilities.getVideoTrack(for: trackID, in: hmsSDK.room!),
                   let sink = data.value(forKey: "sink") as? Bool
-            else { return }
+            else {
+                print(#function, "Required data to setup video view not found")
+                return
+            }
             
             sinkVideo = sink
-            localTrack = trackID
+            
             let mirror = data.value(forKey: "mirror") as? Bool
-            if(mirror != nil){
+            if (mirror != nil) {
                 videoView.mirror = mirror!
             }
             
-            var id : String = "12345"
-            
-            if let sdkId = data.value(forKey: "id") as? String {
-                id = sdkId
-            }
-            
-            if let videoTrack: HMSVideoTrack = hmsCollection[id]?.hms?.localPeer?.videoTrack {
-                if videoTrack.trackId == trackID {
-                    
-                    if !sinked && sinkVideo {
-                        videoView.setVideoTrack(videoTrack)
-                        sinked = true
-                    } else if !sinkVideo {
-                        videoView.setVideoTrack(nil)
-                        sinked = false
-                    }
-                    return
-                }
-            }
-            
-            if let remotePeers: [HMSRemotePeer] = hmsCollection[id]?.hms?.remotePeers {
-                for peer in remotePeers where peer.videoTrack?.trackId == trackID {
-                    
-                    if !sinked && sinkVideo {
-                        videoView.setVideoTrack(peer.videoTrack)
-                        sinked = true
-                    } else if !sinkVideo {
-                        videoView.setVideoTrack(nil)
-                        sinked = false
-                    }
-                    return
-                }
-                for peer in remotePeers {
-                    let auxTracks = peer.auxiliaryTracks
-                    if let auxTracksVals = auxTracks {
-                        for track in auxTracksVals where track.trackId == trackID {
-                            if (HmsHelper.getHmsTrackType(track.kind) == "VIDEO") {
-                                if !sinked && sinkVideo {
-                                    videoView.setVideoTrack(track as? HMSVideoTrack)
-                                    sinked = true
-                                } else if !sinkVideo {
-                                    videoView.setVideoTrack(nil)
-                                    sinked = false
-                                }
-                                return
-                            }
-                        }
-                    }
-                }
+            if !sinked && sinkVideo {
+                videoView.setVideoTrack(videoTrack)
+                sinked = true
+            } else if !sinkVideo {
+                videoView.setVideoTrack(nil)
+                sinked = false
             }
         }
     }
@@ -139,4 +103,8 @@ class HmssdkDisplayView: UIView {
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
+    
+    deinit {
+        videoView.setVideoTrack(nil)
+    }
 }