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

package/android/src/main/java/com/reactnativehmssdk/HMSRNSDK.kt

@@ -12,6 +12,7 @@ import live.hms.video.error.HMSException
 import live.hms.video.media.settings.HMSLayer
 import live.hms.video.media.tracks.*
 import live.hms.video.sdk.*
+import live.hms.video.sdk.listeners.PeerListResultListener
 import live.hms.video.sdk.models.*
 import live.hms.video.sdk.models.enums.AudioMixingMode
 import live.hms.video.sdk.models.enums.HMSPeerUpdate
@@ -50,6 +51,7 @@ class HMSRNSDK(
   private var eventsEnableStatus = mutableMapOf<String, Boolean>()
   private var sessionStore: HmsSessionStore? = null
   private val keyChangeObservers = mutableMapOf<String, HMSKeyChangeListener?>()
+  private val peerListIterators = mutableMapOf<String, PeerListIterator>()
 
   init {
     val builder = HMSSDK.Builder(reactApplicationContext)
@@ -131,6 +133,7 @@ class HMSRNSDK(
     eventsEnableStatus.clear()
     sessionStore = null
     keyChangeObservers.clear()
+    peerListIterators.clear()
     HMSDecoder.clearRestrictDataStates()
   }
 
@@ -241,6 +244,34 @@ class HMSRNSDK(
             data.putString("id", id)
             delegate.emitEvent("ON_PREVIEW", data)
           }
+
+          /*
+          override fun peerListUpdated(addedPeers: ArrayList<HMSPeer>?, removedPeers: ArrayList<HMSPeer>?) {
+
+            if (eventsEnableStatus["ON_PEER_LIST_UPDATED"] != true) {
+              return
+            }
+            val data: WritableMap = Arguments.createMap()
+            val addedPeersArray: WritableArray = Arguments.createArray()
+            val removedPeersArray: WritableArray = Arguments.createArray()
+
+            if (addedPeers != null) {
+              for (peer in addedPeers) {
+                addedPeersArray.pushMap(HMSDecoder.getHmsPeerSubset(peer))
+              }
+            }
+
+            if (removedPeers != null) {
+              for (peer in removedPeers) {
+                removedPeersArray.pushMap(HMSDecoder.getHmsPeerSubset(peer))
+              }
+            }
+
+            data.putArray("addedPeers", addedPeersArray)
+            data.putArray("removedPeers", removedPeersArray)
+            delegate.emitEvent("ON_PEER_LIST_UPDATED", data)
+          }
+           */
         },
       )
     } else {
@@ -440,6 +471,35 @@ class HMSRNSDK(
                 data.putString("id", id)
                 delegate.emitEvent("ON_SESSION_STORE_AVAILABLE", data)
               }
+
+              override fun peerListUpdated(
+                addedPeers: ArrayList<HMSPeer>?,
+                removedPeers: ArrayList<HMSPeer>?,
+              ) {
+                if (eventsEnableStatus["ON_PEER_LIST_UPDATED"] != true) {
+                  return
+                }
+                val data: WritableMap = Arguments.createMap()
+                val addedPeersArray: WritableArray = Arguments.createArray()
+                val removedPeersArray: WritableArray = Arguments.createArray()
+
+                if (addedPeers != null) {
+                  for (peer in addedPeers) {
+                    addedPeersArray.pushMap(HMSDecoder.getHmsPeerSubset(peer))
+                  }
+                }
+
+                if (removedPeers != null) {
+                  for (peer in removedPeers) {
+                    removedPeersArray.pushMap(HMSDecoder.getHmsPeerSubset(peer))
+                  }
+                }
+
+                data.putString("id", id)
+                data.putArray("addedPeers", addedPeersArray)
+                data.putArray("removedPeers", removedPeersArray)
+                delegate.emitEvent("ON_PEER_LIST_UPDATED", data)
+              }
             },
           )
         } catch (e: HMSException) {
@@ -1054,30 +1114,31 @@ class HMSRNSDK(
         arrayOf(Pair("peerId", "String"), Pair("reason", "String")),
       )
     if (requiredKeys === null) {
-      val peerId = data.getString("peerId")
-      val peer = HMSHelper.getRemotePeerFromPeerId(peerId, hmsSDK?.getRoom())
+      HMSCoroutineScope.launch {
+        val peerId = data.getString("peerId")
 
-      if (peer != null) {
-        hmsSDK?.removePeerRequest(
-          peer,
-          data.getString("reason") as String,
-          object : HMSActionResultListener {
-            override fun onSuccess() {
-              callback?.resolve(emitHMSSuccess())
-            }
+        val peer = HMSHelper.getRemotePeerFromPeerId(peerId, hmsSDK)
 
-            override fun onError(error: HMSException) {
-              callback?.reject(error.code.toString(), error.message)
-            }
-          },
-        )
-      } else {
-        self.emitCustomError("PEER_NOT_FOUND")
-        callback?.reject("101", "PEER_NOT_FOUND")
+        if (peer != null) {
+          hmsSDK?.removePeerRequest(
+            peer,
+            data.getString("reason") as String,
+            object : HMSActionResultListener {
+              override fun onSuccess() {
+                callback?.resolve(emitHMSSuccess())
+              }
+
+              override fun onError(error: HMSException) {
+                callback?.reject(error.code.toString(), error.message)
+              }
+            },
+          )
+        } else {
+          callback?.reject("101", "PEER_NOT_FOUND")
+        }
       }
     } else {
       val errorMessage = "removePeer: $requiredKeys"
-      self.emitRequiredKeysError(errorMessage)
       rejectCallback(callback, errorMessage)
     }
   }
@@ -1221,13 +1282,10 @@ class HMSRNSDK(
     val requiredKeys = HMSHelper.getUnavailableRequiredKey(data, arrayOf(Pair("mute", "Boolean")))
     if (requiredKeys === null) {
       val mute = data.getBoolean("mute")
-      val peers = hmsSDK?.getRemotePeers()
-      if (peers != null) {
-        for (remotePeer in peers) {
-          val peerId = remotePeer.peerID
-          val peer = HMSHelper.getRemotePeerFromPeerId(peerId, hmsSDK?.getRoom())
-          peer?.audioTrack?.isPlaybackAllowed = !mute
-        }
+      val remotePeers = hmsSDK?.getRemotePeers()
+
+      remotePeers?.forEach() {
+        it.audioTrack?.isPlaybackAllowed = !mute
       }
     } else {
       val errorMessage = "setPlaybackForAllAudio: $requiredKeys"
@@ -1733,6 +1791,9 @@ class HMSRNSDK(
         "role" -> {
           result.putMap("role", HMSDecoder.getHmsRole(peer.hmsRole))
         }
+        "isHandRaised" -> {
+          result.putBoolean("isHandRaised", peer.isHandRaised)
+        }
         "customerUserID" -> {
           if (peer.customerUserID !== null) {
             result.putString("customerUserID", peer.customerUserID)
@@ -2308,4 +2369,137 @@ class HMSRNSDK(
       },
     )
   }
+
+  fun raiseLocalPeerHand(
+    data: ReadableMap,
+    promise: Promise?,
+  ) {
+    hmsSDK?.raiseLocalPeerHand(
+      object : HMSActionResultListener {
+        override fun onError(error: HMSException) {
+          promise?.reject(error.code.toString(), error.message)
+        }
+
+        override fun onSuccess() {
+          promise?.resolve(true)
+        }
+      },
+    )
+  }
+
+  fun lowerLocalPeerHand(
+    data: ReadableMap,
+    promise: Promise?,
+  ) {
+    hmsSDK?.lowerLocalPeerHand(
+      object : HMSActionResultListener {
+        override fun onError(error: HMSException) {
+          promise?.reject(error.code.toString(), error.message)
+        }
+
+        override fun onSuccess() {
+          promise?.resolve(true)
+        }
+      },
+    )
+  }
+
+  fun lowerRemotePeerHand(
+    data: ReadableMap,
+    promise: Promise?,
+  ) {
+    val peerId = data.getString("peerId")
+    peerId?.let { peerID ->
+      hmsSDK?.getRoom()?.let { room ->
+        val peer = HMSHelper.getPeerFromPeerId(peerID, room)
+        peer?.let { peer ->
+          hmsSDK?.lowerRemotePeerHand(
+            forPeer = peer,
+            object : HMSActionResultListener {
+              override fun onError(error: HMSException) {
+                promise?.reject(error.code.toString(), error.message)
+              }
+
+              override fun onSuccess() {
+                promise?.resolve(true)
+              }
+            },
+          )
+        }
+      }
+    }
+  }
+
+  fun getPeerListIterator(data: ReadableMap): WritableMap? {
+    val uniqueId = data.getString("uniqueId")
+    if (uniqueId == null) {
+      print("Error in getPeerListIterator: uniqueId is not available")
+      return null
+    }
+
+    val options = HMSHelper.getPeerListIteratorOptions(data)
+
+    hmsSDK?.let {
+      val iterator = it.getPeerListIterator(options)
+
+      peerListIterators[uniqueId] = iterator
+      val map = Arguments.createMap()
+      map.putBoolean("success", true)
+      map.putString("uniqueId", uniqueId)
+      return map
+    }
+    print("Error in getPeerListIterator: HMS SDK is not available")
+    return null
+  }
+
+  fun peerListIteratorHasNext(
+    data: ReadableMap,
+    promise: Promise?,
+  ) {
+    val uniqueId = data.getString("uniqueId")
+
+    peerListIterators[uniqueId]?.let {
+      promise?.resolve(it.hasNext())
+      return
+    }
+    promise?.reject("101", "PeerListIterator is not available")
+  }
+
+  fun peerListIteratorNext(
+    data: ReadableMap,
+    promise: Promise?,
+  ) {
+    val uniqueId = data.getString("uniqueId")
+
+    val peerListIterator = peerListIterators[uniqueId]
+
+    if (peerListIterator == null) {
+      promise?.reject("101", "PeerListIterator is not available")
+      return
+    }
+
+    peerListIterator.next(
+      object : PeerListResultListener {
+        override fun onError(error: HMSException) {
+          promise?.reject(error.code.toString(), error.message)
+        }
+
+        override fun onSuccess(result: ArrayList<HMSPeer>) {
+          val resultData: WritableMap = Arguments.createMap()
+
+          resultData.putInt("totalCount", peerListIterator.totalCount)
+
+          val array: WritableArray = Arguments.createArray()
+          for (peer in result) {
+            val hmsPeer = HMSDecoder.getHmsPeer(peer)
+            array.pushMap(hmsPeer)
+          }
+
+          resultData.putArray("peers", array)
+
+          promise?.resolve(resultData)
+        }
+      },
+    )
+  }
 }

package/ios/HMSConstants.swift

@@ -14,6 +14,7 @@ struct HMSConstants {
     static let ON_JOIN = "ON_JOIN"
     static let ON_ROOM_UPDATE = "ON_ROOM_UPDATE"
     static let ON_PEER_UPDATE = "3"
+    static let ON_PEER_LIST_UPDATED = "ON_PEER_LIST_UPDATED"
     static let ON_TRACK_UPDATE = "ON_TRACK_UPDATE"
     static let ON_ROLE_CHANGE_REQUEST = "ON_ROLE_CHANGE_REQUEST"
     static let ON_CHANGE_TRACK_STATE_REQUEST = "ON_CHANGE_TRACK_STATE_REQUEST"

package/ios/HMSDecoder.swift

@@ -93,6 +93,7 @@ class HMSDecoder: NSObject {
             case .nameUpdated: return "5"
             case .metadataUpdated: return "6"
             case .networkQualityUpdated: return "7"
+            case .handRaiseUpdated: return "8"
             default: return nil
         }
     }
@@ -112,6 +113,9 @@ class HMSDecoder: NSObject {
             case .metadataUpdated:
                 peerDict["metadata"] = peer.metadata ?? ""
                 return peerDict
+            case .handRaiseUpdated:
+                peerDict["isHandRaised"] = peer.isHandRaised
+                return peerDict
             case .roleUpdated:
                 peerDict["role"] = getHmsRole(peer.role)
                 return peerDict
@@ -138,6 +142,9 @@ class HMSDecoder: NSObject {
             case .metadataUpdated:
                 peerDict["metadata"] = peer.metadata ?? ""
                 return peerDict
+            case .handRaiseUpdated:
+                peerDict["isHandRaised"] = peer.isHandRaised
+                return peerDict
             case .roleUpdated:
                 peerDict["role"] = getHmsRole(peer.role)
                 return peerDict
@@ -167,6 +174,7 @@ class HMSDecoder: NSObject {
         if let metadata = peer.metadata {
             data["metadata"] = metadata
         }
+        data["isHandRaised"] = peer.isHandRaised
 
         // joinedAt
 
@@ -883,16 +891,19 @@ class HMSDecoder: NSObject {
     }
 
     static func getRemoteVideoStats(_ data: HMSRemoteVideoStats) -> [Any] {
-        // [bitrate, bytesReceived, frameRate, jitter, packetsLost, packetsReceived, resolution]
-        return [
+
+        var stats = [Any]()
+
+        stats = [
             data.bitrate,
-            data.bytesReceived,
+            Double(data.bytesReceived),
             data.frameRate,
             data.jitter,
-            data.packetsLost,
-            data.packetsReceived,
+            Double(data.packetsLost),
+            Double(data.packetsReceived),
             HMSDecoder.getHmsVideoResolution(data.resolution)
         ]
+        return stats
     }
 
     static func getHmsMessageRecipient(_ recipient: HMSMessageRecipient) -> [String: Any] {

package/ios/HMSHelper.swift

@@ -17,7 +17,7 @@ class HMSHelper: NSObject {
         return "SEND_ALL_REQUIRED_KEYS"
     }
 
-    static func getPeerFromPeerId(_ peerID: String?, remotePeers: [HMSRemotePeer]?, localPeer: HMSLocalPeer?) -> HMSPeer? {
+    static func getPeerFromPeerId(_ peerID: String?, remotePeers: [HMSRemotePeer]?, localPeer: HMSLocalPeer? = nil) -> HMSPeer? {
 
         guard let peerID = peerID, let peers = remotePeers else { return nil }
         if peerID == localPeer?.peerID {
@@ -26,11 +26,25 @@ class HMSHelper: NSObject {
         return peers.first { $0.peerID == peerID }
     }
 
-    static func getRemotePeerFromPeerId(_ peerID: String?, remotePeers: [HMSRemotePeer]?) -> HMSPeer? {
+    static func getRemotePeerFromPeerId(_ peerID: String?, hmsSDK: HMSSDK?,  completion: @escaping (_ peer: HMSPeer?) -> Void) {
+        guard let peerID = peerID, let hms = hmsSDK, let peers = hms.remotePeers else {
+            completion(nil)
+            return
+        }
 
-        guard let peerID = peerID, let peers = remotePeers else { return nil }
+        if let peerFromList = peers.first(where: { $0.peerID == peerID }) {
+            completion(peerFromList)
+            return
+        }
 
-        return peers.first { $0.peerID == peerID }
+        let peerListIterator = hms.getPeerListIterator(options: HMSPeerListIteratorOptions(filterByPeerIds: [peerID], limit: 1))
+        peerListIterator.next() { peers, error in
+            guard let nonnilPeers = peers, let firstPeer = nonnilPeers.first else {
+                completion(nil)
+                return
+            }
+            completion(firstPeer)
+        }
     }
 
     static func getRolesFromRoleNames(_ targetedRoles: [String]?, roles: [HMSRole]?) -> [HMSRole] {
@@ -347,6 +361,21 @@ class HMSHelper: NSObject {
         return nil
     }
 
+    static func getPeerListIteratorOptions(_ data: NSDictionary?) -> HMSPeerListIteratorOptions? {
+        guard let config = data else {
+            return nil
+        }
+
+        let role = config["byRoleName"] as? String
+        let peerIds = config["peerIds"] as? [String]
+
+        if let limit = config["limit"] as? Int {
+            return HMSPeerListIteratorOptions(filterByRoleName: role, filterByPeerIds: peerIds, limit: limit)
+        }
+
+        return HMSPeerListIteratorOptions(filterByRoleName: role, filterByPeerIds: peerIds)
+    }
+
     private static func getAudioMode(from mode: String?) -> HMSAudioMode? {
         switch mode {
         case "voice":

package/ios/HMSManager.m

@@ -96,6 +96,18 @@ RCT_EXTERN_METHOD(changeName
                   : (NSDictionary)data
                   : (RCTPromiseResolveBlock)resolve
                   : (RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(raiseLocalPeerHand
+                  : (NSDictionary)data
+                  : (RCTPromiseResolveBlock)resolve
+                  : (RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(lowerLocalPeerHand
+                  : (NSDictionary)data
+                  : (RCTPromiseResolveBlock)resolve
+                  : (RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(lowerRemotePeerHand
+                  : (NSDictionary)data
+                  : (RCTPromiseResolveBlock)resolve
+                  : (RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(destroy
                   : (NSDictionary)data
                   : (RCTPromiseResolveBlock)resolve
@@ -240,4 +252,18 @@ RCT_EXTERN_METHOD(acceptRoleChange
                   : (RCTPromiseResolveBlock)resolve
                   : (RCTPromiseRejectBlock)reject)
 
+#pragma mark - Peer List Iterator
+
+RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(getPeerListIterator : (NSDictionary)data)
+
+RCT_EXTERN_METHOD(peerListIteratorHasNext
+                  : (NSDictionary)data
+                  : (RCTPromiseResolveBlock)resolve
+                  : (RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(peerListIteratorNext
+                  : (NSDictionary)data
+                  : (RCTPromiseResolveBlock)resolve
+                  : (RCTPromiseRejectBlock)reject)
+
 @end

package/ios/HMSManager.swift

@@ -37,7 +37,7 @@ class HMSManager: RCTEventEmitter {
     }
 
     override func supportedEvents() -> [String]! {
-        return [ON_JOIN, ON_PREVIEW, ON_ROOM_UPDATE, ON_PEER_UPDATE, ON_TRACK_UPDATE, ON_ERROR, ON_MESSAGE, ON_SPEAKER, RECONNECTING, RECONNECTED, ON_ROLE_CHANGE_REQUEST, ON_CHANGE_TRACK_STATE_REQUEST, ON_REMOVED_FROM_ROOM, ON_RTC_STATS, ON_LOCAL_AUDIO_STATS, ON_LOCAL_VIDEO_STATS, ON_REMOTE_AUDIO_STATS, ON_REMOTE_VIDEO_STATS, ON_AUDIO_DEVICE_CHANGED, HMSConstants.ON_SESSION_STORE_AVAILABLE, HMSConstants.ON_SESSION_STORE_CHANGED]
+        return [ON_JOIN, ON_PREVIEW, ON_ROOM_UPDATE, ON_PEER_UPDATE, ON_TRACK_UPDATE, ON_ERROR, ON_MESSAGE, ON_SPEAKER, RECONNECTING, RECONNECTED, ON_ROLE_CHANGE_REQUEST, ON_CHANGE_TRACK_STATE_REQUEST, ON_REMOVED_FROM_ROOM, ON_RTC_STATS, ON_LOCAL_AUDIO_STATS, ON_LOCAL_VIDEO_STATS, ON_REMOTE_AUDIO_STATS, ON_REMOTE_VIDEO_STATS, ON_AUDIO_DEVICE_CHANGED, HMSConstants.ON_SESSION_STORE_AVAILABLE, HMSConstants.ON_SESSION_STORE_CHANGED, HMSConstants.ON_PEER_LIST_UPDATED]
     }
 
     // MARK: - HMS SDK Delegate Callbacks
@@ -312,6 +312,27 @@ class HMSManager: RCTEventEmitter {
         hms?.changeName(data, resolve, reject)
     }
 
+    @objc
+    func raiseLocalPeerHand(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        let hms = HMSHelper.getHms(data, hmsCollection)
+
+        hms?.raiseLocalPeerHand(resolve, reject)
+    }
+
+    @objc
+    func lowerLocalPeerHand(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        let hms = HMSHelper.getHms(data, hmsCollection)
+
+        hms?.lowerLocalPeerHand(resolve, reject)
+    }
+
+    @objc
+    func lowerRemotePeerHand(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        let hms = HMSHelper.getHms(data, hmsCollection)
+
+        hms?.lowerRemotePeerHand(data, resolve, reject)
+    }
+
     // MARK: - RTMP Streaming & Recording
 
     @objc
@@ -599,4 +620,27 @@ class HMSManager: RCTEventEmitter {
 
         hms?.removeKeyChangeListener(data, resolve, reject)
     }
+
+    // MARK: - Peer List Iterator
+
+    @objc
+    func getPeerListIterator(_ data: NSDictionary) -> [AnyHashable: Any]? {
+        let hms = HMSHelper.getHms(data, hmsCollection)
+
+        return hms?.getPeerListIterator(data)
+    }
+
+    @objc
+    func peerListIteratorHasNext(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        let hms = HMSHelper.getHms(data, hmsCollection)
+
+        hms?.peerListIteratorHasNext(data, resolve, reject)
+    }
+
+    @objc
+    func peerListIteratorNext(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+        let hms = HMSHelper.getHms(data, hmsCollection)
+
+        hms?.peerListIteratorNext(data, resolve, reject)
+    }
 }