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

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

@@ -12,7 +12,6 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 
 class HMSSDKViewManager : SimpleViewManager<HMSView>() {
-
   private var reactContext: ThemedReactContext? = null
 
   override fun getName(): String {
@@ -41,14 +40,22 @@ class HMSSDKViewManager : SimpleViewManager<HMSView>() {
   }
 
   @RequiresApi(Build.VERSION_CODES.N)
-  override fun receiveCommand(@NonNull root: HMSView, commandId: String?, args: ReadableArray?) {
+  override fun receiveCommand(
+    @NonNull root: HMSView,
+    commandId: String?,
+    args: ReadableArray?,
+  ) {
     when (commandId) {
       "capture" -> root.captureHmsView(args)
     }
   }
 
   @RequiresApi(Build.VERSION_CODES.N)
-  override fun receiveCommand(@NonNull root: HMSView, commandId: Int, args: ReadableArray?) {
+  override fun receiveCommand(
+    @NonNull root: HMSView,
+    commandId: Int,
+    args: ReadableArray?,
+  ) {
     when (commandId) {
       1 -> root.captureHmsView(args)
     }
@@ -60,7 +67,10 @@ class HMSSDKViewManager : SimpleViewManager<HMSView>() {
   }
 
   @ReactProp(name = "data")
-  fun setData(view: HMSView, data: ReadableMap) {
+  fun setData(
+    view: HMSView,
+    data: ReadableMap,
+  ) {
     val trackId = data.getString("trackId")
     val id = data.getString("id")
     val mirror = data.getBoolean("mirror")
@@ -72,17 +82,26 @@ class HMSSDKViewManager : SimpleViewManager<HMSView>() {
   }
 
   @ReactProp(name = "scaleType")
-  fun setScaleType(view: HMSView, data: String?) {
+  fun setScaleType(
+    view: HMSView,
+    data: String?,
+  ) {
     view.updateScaleType(data)
   }
 
   @ReactProp(name = "setZOrderMediaOverlay")
-  fun setZOrderMediaOverlay(view: HMSView, data: Boolean?) {
+  fun setZOrderMediaOverlay(
+    view: HMSView,
+    data: Boolean?,
+  ) {
     view.updateZOrderMediaOverlay(data)
   }
 
   @ReactProp(name = "autoSimulcast")
-  fun setAutoSimulcast(view: HMSView, data: Boolean?) {
+  fun setAutoSimulcast(
+    view: HMSView,
+    data: Boolean?,
+  ) {
     data?.let { view.updateAutoSimulcast(it) }
   }
 

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

@@ -36,16 +36,21 @@ class HMSView(context: ReactContext) : FrameLayout(context) {
     hmsVideoView?.setMirror(false)
     hmsVideoView?.disableAutoSimulcastLayerSelect(disableAutoSimulcastLayerSelect)
 
-    hmsVideoView?.addVideoViewStateChangeListener(object : VideoViewStateChangeListener {
-      override fun onResolutionChange(newWidth: Int, newHeight: Int) {
-        super.onResolutionChange(newWidth, newHeight)
-        if (!jsCanApplyStyles) {
-          val event: WritableMap = Arguments.createMap()
-          context.getJSModule(RCTEventEmitter::class.java).receiveEvent(id, "topChange", event)
-          jsCanApplyStyles = true
+    hmsVideoView?.addVideoViewStateChangeListener(
+      object : VideoViewStateChangeListener {
+        override fun onResolutionChange(
+          newWidth: Int,
+          newHeight: Int,
+        ) {
+          super.onResolutionChange(newWidth, newHeight)
+          if (!jsCanApplyStyles) {
+            val event: WritableMap = Arguments.createMap()
+            context.getJSModule(RCTEventEmitter::class.java).receiveEvent(id, "topChange", event)
+            jsCanApplyStyles = true
+          }
         }
-      }
-    })
+      },
+    )
   }
 
   @RequiresApi(Build.VERSION_CODES.N)
@@ -112,15 +117,30 @@ class HMSView(context: ReactContext) : FrameLayout(context) {
     if (id != null) {
       sdkId = id
     }
-    val hms = hmsCollection[sdkId]?.hmsSDK
+    val rnSDK = hmsCollection[sdkId]
+    val hms = rnSDK?.hmsSDK
 
     if (trackId != null && hms != null) {
       if (mirror != null) {
         hmsVideoView?.setMirror(mirror)
       }
       updateScaleType(scaleType)
-      // TODO: can be optimized here
-      videoTrack = hms.getRoom()?.let { HmsUtilities.getVideoTrack(trackId, it) }
+
+      hms.getRoom()?.let { room ->
+        val regularVideoTrack: HMSVideoTrack? = HmsUtilities.getVideoTrack(trackId, room)
+
+        regularVideoTrack.let { fetchedTrack ->
+          if (fetchedTrack == null) {
+            rnSDK.previewForRoleVideoTrack?.let {
+              if (it.trackId == trackId) {
+                videoTrack = it
+              }
+            }
+          } else {
+            videoTrack = fetchedTrack
+          }
+        }
+      }
     }
   }
 

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

@@ -24,6 +24,7 @@ class HmsScreenshareActivity : ComponentActivity() {
               HMSManager.hmsCollection[id]?.screenshareCallback?.reject(error)
               HMSManager.hmsCollection[id]?.emitHMSError(error)
             }
+
             override fun onSuccess() {
               HMSManager.hmsCollection[id]?.screenshareCallback?.resolve(
                 HMSManager.hmsCollection[id]?.emitHMSSuccess(),

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

@@ -22,14 +22,18 @@ class PipActionReceiver(
     var sdkIdForPIP: String? = null
     private var registered = false
     const val PIP_INTENT_ACTION = "PIP_INTENT_ACTION"
-    val PIPActions = PIPActions(
-      endMeet = PIPAction(title = "End", description = "End Meeting", requestCode = 346),
-      localAudio = PIPAction(title = "Mic", description = "Toggle Mic", requestCode = 344),
-      localVideo = PIPAction(title = "Camera", description = "Toggle Camera", requestCode = 345),
-    )
+    val PIPActions =
+      PIPActions(
+        endMeet = PIPAction(title = "End", description = "End Meeting", requestCode = 346),
+        localAudio = PIPAction(title = "Mic", description = "Toggle Mic", requestCode = 344),
+        localVideo = PIPAction(title = "Camera", description = "Toggle Camera", requestCode = 345),
+      )
   }
 
-  override fun onReceive(context: Context?, intent: Intent?) {
+  override fun onReceive(
+    context: Context?,
+    intent: Intent?,
+  ) {
     if (intent !== null) {
       if (intent.hasExtra(PIPActions.endMeet.title)) {
         return endMeeting()

package/android/src/main/res/layout/player_view.xml

@@ -2,8 +2,9 @@
 
 <androidx.media3.ui.PlayerView xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:id="@+id/hls_view"
   android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:layout_gravity="center"
+  app:resize_mode="zoom"
+  android:layout_height="match_parent"
   />

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

@@ -21,7 +21,7 @@ class HMSDecoder: NSObject {
         switch hmsRoomUpdateType {
             case .none:
                 return data
-            case .metaDataUpdated:
+            case .peerCountUpdated:
                 data["peerCount"] = room.peerCount
                 return data
             case .hlsRecordingStateUpdated:
@@ -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
 
@@ -352,7 +360,7 @@ class HMSDecoder: NSObject {
 
         peerDict["peerID"] = peer.peerID
         peerDict["name"] = peer.name
-        
+
         // joinedAt
 
         if let audio = peer.audioTrack {
@@ -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/HMSHLSPlayerManager.swift

@@ -200,6 +200,9 @@ class HMSHLSPlayer: UIView {
         self.addSubview(playerViewController.view)
 
         attachPlayerPlaybackListeners()
+
+        hmsHLSPlayerViewController?.showsPlaybackControls = false
+        hmsHLSPlayerViewController?.allowsPictureInPicturePlayback = false
     }
 
     required init?(coder: NSCoder) {
@@ -305,12 +308,16 @@ class HMSHLSPlayer: UIView {
         sendHLSPlaybackEventToJS(HMSHLSPlayerConstants.ON_PLAYBACK_FAILURE_EVENT, data)
     }
 
-    fileprivate func onPlaybackStateChanged(state: HMSHLSPlaybackState) {
+    fileprivate func onPlaybackStateChanged(state: HMSHLSPlaybackState? = nil, videoSizeChanged: Bool = false, aspectRatio: Double? = nil) {
         guard onHmsHlsPlaybackEvent != nil else { return }
 
         var data = [String: Any]()
 
-        data["state"] = state.description
+        data["state"] = videoSizeChanged ? "onVideoSizeChanged" : state?.description
+
+        if let aspectRatio = aspectRatio {
+            data["aspectRatio"] = aspectRatio
+        }
 
         sendHLSPlaybackEventToJS(HMSHLSPlayerConstants.ON_PLAYBACK_STATE_CHANGE_EVENT, data)
     }
@@ -334,6 +341,15 @@ class HLSPlaybackEventController: HMSHLSPlayerDelegate {
     func onPlaybackFailure(error: Error) {
         hmsHlsPlayerDelegate?.onPlaybackFailure(error: error)
     }
+
+    func onResolutionChanged(videoSize: CGSize) {
+        if videoSize.width >= videoSize.height {
+            hmsHlsPlayerDelegate?.hmsHLSPlayerViewController?.videoGravity = .resizeAspect
+        } else {
+            hmsHlsPlayerDelegate?.hmsHLSPlayerViewController?.videoGravity = .resizeAspectFill
+        }
+        hmsHlsPlayerDelegate?.onPlaybackStateChanged(videoSizeChanged: true, aspectRatio: videoSize.width/videoSize.height)
+    }
 }
 
 enum HMSHLSPlayerConstants {

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":