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

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

@@ -17,6 +17,7 @@ import live.hms.video.sdk.models.enums.HMSRoomUpdate
 import live.hms.video.sdk.models.enums.HMSTrackUpdate
 import live.hms.video.sdk.models.trackchangerequest.HMSChangeTrackStateRequest
 import live.hms.video.utils.HMSCoroutineScope
+import live.hms.video.utils.HmsUtilities
 
 class HmsSDK(
     data: ReadableMap?,
@@ -25,8 +26,9 @@ class HmsSDK(
     reactApplicationContext: ReactApplicationContext
 ) {
   var hmsSDK: HMSSDK? = null
-  private var recentRoleChangeRequest: HMSRoleChangeRequest? = null
+  var screenshareCallback: Promise? = null
   var delegate: HmsModule = HmsDelegate
+  private var recentRoleChangeRequest: HMSRoleChangeRequest? = null
   private var context: ReactApplicationContext = reactApplicationContext
   private var previewInProgress: Boolean = false
   private var id: String = sdkId
@@ -95,42 +97,7 @@ class HmsSDK(
         )
     if (requiredKeys) {
       previewInProgress = true
-      var config =
-          HMSConfig(
-              credentials.getString("username") as String,
-              credentials.getString("authToken") as String,
-          )
-
-      when {
-        HmsHelper.areAllRequiredKeysAvailable(
-            credentials,
-            arrayOf(Pair("endpoint", "String"), Pair("metadata", "String"))
-        ) -> {
-          config =
-              HMSConfig(
-                  credentials.getString("username") as String,
-                  credentials.getString("authToken") as String,
-                  initEndpoint = credentials.getString("endpoint") as String,
-                  metadata = credentials.getString("metadata") as String,
-              )
-        }
-        HmsHelper.areAllRequiredKeysAvailable(credentials, arrayOf(Pair("endpoint", "String"))) -> {
-          config =
-              HMSConfig(
-                  credentials.getString("username") as String,
-                  credentials.getString("authToken") as String,
-                  initEndpoint = credentials.getString("endpoint") as String,
-              )
-        }
-        HmsHelper.areAllRequiredKeysAvailable(credentials, arrayOf(Pair("metadata", "String"))) -> {
-          config =
-              HMSConfig(
-                  credentials.getString("username") as String,
-                  credentials.getString("authToken") as String,
-                  metadata = credentials.getString("metadata") as String,
-              )
-        }
-      }
+      val config = HmsHelper.getHmsConfig(credentials)
 
       hmsSDK?.preview(
           config,
@@ -140,6 +107,50 @@ class HmsSDK(
               previewInProgress = false
             }
 
+            override fun onPeerUpdate(type: HMSPeerUpdate, peer: HMSPeer) {
+              if (type === HMSPeerUpdate.AUDIO_TOGGLED ||
+                      type === HMSPeerUpdate.VIDEO_TOGGLED ||
+                      type === HMSPeerUpdate.BECAME_DOMINANT_SPEAKER ||
+                      type === HMSPeerUpdate.NO_DOMINANT_SPEAKER ||
+                      type === HMSPeerUpdate.RESIGNED_DOMINANT_SPEAKER ||
+                      type === HMSPeerUpdate.STARTED_SPEAKING ||
+                      type === HMSPeerUpdate.STOPPED_SPEAKING
+              ) {
+                return
+              }
+              val updateType = type.name
+              val roomData = HmsDecoder.getHmsRoom(hmsSDK?.getRoom())
+              val localPeerData = HmsDecoder.getHmsLocalPeer(hmsSDK?.getLocalPeer())
+              val remotePeerData = HmsDecoder.getHmsRemotePeers(hmsSDK?.getRemotePeers())
+              val hmsPeer = HmsDecoder.getHmsPeer(peer)
+
+              val data: WritableMap = Arguments.createMap()
+
+              data.putMap("peer", hmsPeer)
+              data.putMap("room", roomData)
+              data.putString("type", updateType)
+              data.putMap("localPeer", localPeerData)
+              data.putArray("remotePeers", remotePeerData)
+              data.putString("id", id)
+              delegate.emitEvent("ON_PEER_UPDATE", data)
+            }
+
+            override fun onRoomUpdate(type: HMSRoomUpdate, hmsRoom: HMSRoom) {
+              val updateType = type.name
+              val roomData = HmsDecoder.getHmsRoom(hmsRoom)
+              val localPeerData = HmsDecoder.getHmsLocalPeer(hmsSDK?.getLocalPeer())
+              val remotePeerData = HmsDecoder.getHmsRemotePeers(hmsSDK?.getRemotePeers())
+
+              val data: WritableMap = Arguments.createMap()
+
+              data.putString("type", updateType)
+              data.putMap("room", roomData)
+              data.putMap("localPeer", localPeerData)
+              data.putArray("remotePeers", remotePeerData)
+              data.putString("id", id)
+              delegate.emitEvent("ON_ROOM_UPDATE", data)
+            }
+
             override fun onPreview(room: HMSRoom, localTracks: Array<HMSTrack>) {
               val previewTracks = HmsDecoder.getPreviewTracks(localTracks)
               val hmsRoom = HmsDecoder.getHmsRoom(room)
@@ -171,42 +182,7 @@ class HmsSDK(
             arrayOf(Pair("username", "String"), Pair("authToken", "String"))
         )
     if (requiredKeys) {
-      var config =
-          HMSConfig(
-              credentials.getString("username") as String,
-              credentials.getString("authToken") as String
-          )
-
-      when {
-        HmsHelper.areAllRequiredKeysAvailable(
-            credentials,
-            arrayOf(Pair("endpoint", "String"), Pair("metadata", "String"))
-        ) -> {
-          config =
-              HMSConfig(
-                  credentials.getString("username") as String,
-                  credentials.getString("authToken") as String,
-                  initEndpoint = credentials.getString("endpoint") as String,
-                  metadata = credentials.getString("metadata") as String,
-              )
-        }
-        HmsHelper.areAllRequiredKeysAvailable(credentials, arrayOf(Pair("endpoint", "String"))) -> {
-          config =
-              HMSConfig(
-                  credentials.getString("username") as String,
-                  credentials.getString("authToken") as String,
-                  initEndpoint = credentials.getString("endpoint") as String,
-              )
-        }
-        HmsHelper.areAllRequiredKeysAvailable(credentials, arrayOf(Pair("metadata", "String"))) -> {
-          config =
-              HMSConfig(
-                  credentials.getString("username") as String,
-                  credentials.getString("authToken") as String,
-                  metadata = credentials.getString("metadata") as String,
-              )
-        }
-      }
+      val config = HmsHelper.getHmsConfig(credentials)
 
       HMSCoroutineScope.launch {
         try {
@@ -260,6 +236,16 @@ class HmsSDK(
                 }
 
                 override fun onPeerUpdate(type: HMSPeerUpdate, peer: HMSPeer) {
+                  if (type === HMSPeerUpdate.AUDIO_TOGGLED ||
+                          type === HMSPeerUpdate.VIDEO_TOGGLED ||
+                          type === HMSPeerUpdate.BECAME_DOMINANT_SPEAKER ||
+                          type === HMSPeerUpdate.NO_DOMINANT_SPEAKER ||
+                          type === HMSPeerUpdate.RESIGNED_DOMINANT_SPEAKER ||
+                          type === HMSPeerUpdate.STARTED_SPEAKING ||
+                          type === HMSPeerUpdate.STOPPED_SPEAKING
+                  ) {
+                    return
+                  }
                   val updateType = type.name
                   val roomData = HmsDecoder.getHmsRoom(hmsSDK?.getRoom())
                   val localPeerData = HmsDecoder.getHmsLocalPeer(hmsSDK?.getLocalPeer())
@@ -316,12 +302,12 @@ class HmsSDK(
                 override fun onMessageReceived(message: HMSMessage) {
                   val data: WritableMap = Arguments.createMap()
 
-                  data.putString("sender", message.sender.name)
+                  data.putMap("sender", HmsDecoder.getHmsPeer(message.sender))
                   data.putString("message", message.message)
                   data.putString("type", message.type)
                   data.putString("time", message.serverReceiveTime.toString())
                   data.putString("id", id)
-                  data.putString("event", "ON_MESSAGE")
+                  data.putMap("recipient", HmsDecoder.getHmsMessageRecipient(message.recipient))
 
                   delegate.emitEvent("ON_MESSAGE", data)
                 }
@@ -381,19 +367,6 @@ class HmsSDK(
   fun setLocalMute(data: ReadableMap) {
     val isMute = data.getBoolean("isMute")
     hmsSDK?.getLocalPeer()?.audioTrack?.setMute(isMute)
-    val type = if (isMute) "TRACK_MUTED" else "TRACK_UNMUTED"
-    val localPeerData = HmsDecoder.getHmsLocalPeer(hmsSDK?.getLocalPeer())
-    val remotePeerData = HmsDecoder.getHmsRemotePeers(hmsSDK?.getRemotePeers())
-    val roomData = HmsDecoder.getHmsRoom(hmsSDK?.getRoom())
-
-    val map: WritableMap = Arguments.createMap()
-
-    map.putMap("room", roomData)
-    map.putString("type", type)
-    map.putMap("localPeer", localPeerData)
-    map.putArray("remotePeers", remotePeerData)
-    map.putString("id", id)
-    delegate.emitEvent("ON_TRACK_UPDATE", map)
   }
 
   fun setLocalVideoMute(data: ReadableMap) {
@@ -411,6 +384,7 @@ class HmsSDK(
     hmsSDK?.leave(
         object : HMSActionResultListener {
           override fun onSuccess() {
+            screenshareCallback = null
             callback?.resolve(emitHMSSuccess())
           }
 
@@ -487,8 +461,7 @@ class HmsSDK(
         )
     if (requiredKeys) {
       val peerId = data.getString("peerId")
-      val peers = hmsSDK?.getPeers()
-      val peer = HmsHelper.getPeerFromPeerId(peerId, peers)
+      val peer = HmsHelper.getPeerFromPeerId(peerId, hmsSDK?.getRoom())
       if (peer != null) {
         hmsSDK?.sendDirectMessage(
             data.getString("message") as String,
@@ -526,7 +499,7 @@ class HmsSDK(
       val force = data.getBoolean("force")
 
       if (peerId !== null && role !== null) {
-        val hmsPeer = HmsHelper.getPeerFromPeerId(peerId, hmsSDK?.getPeers())
+        val hmsPeer = HmsHelper.getPeerFromPeerId(peerId, hmsSDK?.getRoom())
         val hmsRole = HmsHelper.getRoleFromRoleName(role, hmsSDK?.getRoles())
 
         if (hmsRole != null && hmsPeer != null) {
@@ -561,8 +534,7 @@ class HmsSDK(
     if (requiredKeys) {
       val trackId = data.getString("trackId")
       val mute = data.getBoolean("mute")
-      val remotePeers = hmsSDK?.getRemotePeers()
-      val track = HmsHelper.getTrackFromTrackId(trackId, remotePeers)
+      val track = HmsHelper.getTrackFromTrackId(trackId, hmsSDK?.getRoom())
       if (track != null) {
         hmsSDK?.changeTrackState(
             track,
@@ -641,11 +613,9 @@ class HmsSDK(
         HmsHelper.areAllRequiredKeysAvailable(data, arrayOf(Pair("trackId", "String")))
     if (requiredKeys) {
       val trackId = data.getString("trackId")
-      val remotePeers = hmsSDK?.getRemotePeers()
-      val localPeer = hmsSDK?.getLocalPeer()
-      val localTrack = HmsHelper.getLocalTrackFromTrackId(trackId, localPeer)
+      val localTrack = HmsHelper.getTrackFromTrackId(trackId, hmsSDK?.getRoom())
       if (localTrack == null) {
-        val track = HmsHelper.getTrackFromTrackId(trackId, remotePeers)
+        val track = HmsHelper.getTrackFromTrackId(trackId, hmsSDK?.getRoom())
         if (track != null) {
           val mute = track.isMute
           callback?.resolve(mute)
@@ -669,8 +639,7 @@ class HmsSDK(
         )
     if (requiredKeys) {
       val peerId = data.getString("peerId")
-      val peers = hmsSDK?.getRemotePeers()
-      val peer = HmsHelper.getRemotePeerFromPeerId(peerId, peers)
+      val peer = HmsHelper.getRemotePeerFromPeerId(peerId, hmsSDK?.getRoom())
 
       if (peer != null) {
         hmsSDK?.removePeerRequest(
@@ -742,7 +711,29 @@ class HmsSDK(
     }
   }
 
-  fun muteAllPeersAudio(data: ReadableMap) {
+  fun remoteMuteAllAudio() {
+    val allAudioTracks = hmsSDK?.getRoom()?.let { HmsUtilities.getAllAudioTracks(it) }
+    if (allAudioTracks != null) {
+      var customError: HMSException? = null
+      for (audioTrack in allAudioTracks) {
+        hmsSDK?.changeTrackState(
+            audioTrack,
+            true,
+            object : HMSActionResultListener {
+              override fun onSuccess() {}
+              override fun onError(error: HMSException) {
+                customError = error
+              }
+            }
+        )
+      }
+      if (customError != null) {
+        self.emitHMSError(customError!!)
+      }
+    }
+  }
+
+  fun setPlaybackForAllAudio(data: ReadableMap) {
     val requiredKeys = HmsHelper.areAllRequiredKeysAvailable(data, arrayOf(Pair("mute", "Boolean")))
     if (requiredKeys) {
       val mute = data.getBoolean("mute")
@@ -750,7 +741,7 @@ class HmsSDK(
       if (peers != null) {
         for (remotePeer in peers) {
           val peerId = remotePeer.peerID
-          val peer = HmsHelper.getRemotePeerFromPeerId(peerId, peers)
+          val peer = HmsHelper.getRemotePeerFromPeerId(peerId, hmsSDK?.getRoom())
           peer?.audioTrack?.isPlaybackAllowed = !mute
         }
         val localPeerData = HmsDecoder.getHmsLocalPeer(hmsSDK?.getLocalPeer())
@@ -777,9 +768,8 @@ class HmsSDK(
     if (requiredKeys) {
       val trackId = data.getString("trackId")
       val playbackAllowed = data.getBoolean("playbackAllowed")
-      val remotePeers = hmsSDK?.getRemotePeers()
-      val remoteAudioTrack = HmsHelper.getRemoteAudioTrackFromTrackId(trackId, remotePeers)
-      val remoteVideoTrack = HmsHelper.getRemoteVideoTrackFromTrackId(trackId, remotePeers)
+      val remoteAudioTrack = HmsHelper.getRemoteAudioTrackFromTrackId(trackId, hmsSDK?.getRoom())
+      val remoteVideoTrack = HmsHelper.getRemoteVideoTrackFromTrackId(trackId, hmsSDK?.getRoom())
       if (remoteAudioTrack != null) {
         remoteAudioTrack.isPlaybackAllowed = playbackAllowed
       } else if (remoteVideoTrack != null) {
@@ -795,9 +785,8 @@ class HmsSDK(
         HmsHelper.areAllRequiredKeysAvailable(data, arrayOf(Pair("trackId", "String")))
     if (requiredKeys) {
       val trackId = data.getString("trackId")
-      val remotePeers = hmsSDK?.getRemotePeers()
-      val remoteAudioTrack = HmsHelper.getRemoteAudioTrackFromTrackId(trackId, remotePeers)
-      val remoteVideoTrack = HmsHelper.getRemoteVideoTrackFromTrackId(trackId, remotePeers)
+      val remoteAudioTrack = HmsHelper.getRemoteAudioTrackFromTrackId(trackId, hmsSDK?.getRoom())
+      val remoteVideoTrack = HmsHelper.getRemoteVideoTrackFromTrackId(trackId, hmsSDK?.getRoom())
       when {
         remoteAudioTrack != null -> {
           val isPlaybackAllowed = remoteAudioTrack.isPlaybackAllowed
@@ -854,6 +843,9 @@ class HmsSDK(
             }
           }
         }
+        this.emitCustomError("TRACKID_NOT_MATCHED")
+      } else {
+        this.emitCustomError("REMOTE_PEERS_NOT_FOUND")
       }
     } else {
       this.emitRequiredKeysError()
@@ -954,7 +946,8 @@ class HmsSDK(
     )
   }
 
-  fun startScreenshare() {
+  fun startScreenshare(callback: Promise?) {
+    screenshareCallback = callback
     runOnUiThread {
       val intent = Intent(context, HmsScreenshareActivity::class.java)
       intent.flags = FLAG_ACTIVITY_NEW_TASK
@@ -971,10 +964,12 @@ class HmsSDK(
     hmsSDK?.stopScreenshare(
         object : HMSActionResultListener {
           override fun onError(error: HMSException) {
+            screenshareCallback = null
             callback?.reject(error.code.toString(), error.message)
             self.emitHMSError(error)
           }
           override fun onSuccess() {
+            screenshareCallback = null
             callback?.resolve(emitHMSSuccess())
           }
         }
@@ -988,7 +983,8 @@ class HmsSDK(
       val meetingURLVariants =
           data.getArray("meetingURLVariants")?.toArrayList() as? ArrayList<HashMap<String, String>>
       val hlsMeetingUrlVariant = HmsHelper.getHMSHLSMeetingURLVariants(meetingURLVariants)
-      val config = HMSHLSConfig(hlsMeetingUrlVariant)
+      val hlsRecordingConfig = HmsHelper.getHlsRecordingConfig(data)
+      val config = HMSHLSConfig(hlsMeetingUrlVariant, hlsRecordingConfig)
 
       hmsSDK?.startHLSStreaming(
           config,
@@ -1043,4 +1039,32 @@ class HmsSDK(
       }
     }
   }
+
+  fun changeName(data: ReadableMap, callback: Promise?) {
+    val requiredKeys = HmsHelper.areAllRequiredKeysAvailable(data, arrayOf(Pair("name", "String")))
+    if (requiredKeys) {
+      val name = data.getString("name")
+      if (name != null && name != "") {
+        hmsSDK?.changeName(
+            name,
+            object : HMSActionResultListener {
+              override fun onSuccess() {
+                callback?.resolve(emitHMSSuccess())
+              }
+
+              override fun onError(error: HMSException) {
+                callback?.reject(error.code.toString(), error.message)
+                self.emitHMSError(error)
+              }
+            }
+        )
+      } else {
+        self.emitCustomError("NAME_UNDEFINED")
+        callback?.reject("101", "NAME_UNDEFINED")
+      }
+    } else {
+      callback?.reject("101", "REQUIRED_KEYS_NOT_FOUND")
+      self.emitRequiredKeysError()
+    }
+  }
 }

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

@@ -8,6 +8,8 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
 import live.hms.video.error.HMSException
 import live.hms.video.sdk.HMSActionResultListener
 
@@ -21,15 +23,24 @@ class HmsScreenshareActivity : ComponentActivity() {
               object : HMSActionResultListener {
                 override fun onError(error: HMSException) {
                   finish()
+                  HmsModule.hmsCollection[id]?.screenshareCallback?.reject(error)
                   HmsModule.hmsCollection[id]?.emitHMSError(error)
                 }
                 override fun onSuccess() {
+                  HmsModule.hmsCollection[id]?.screenshareCallback?.resolve(
+                      HmsModule.hmsCollection[id]?.emitHMSSuccess()
+                  )
                   finish()
                 }
               },
               mediaProjectionPermissionResultData
           )
         } else {
+          val id = intent.getStringExtra("id")
+          val data: WritableMap = Arguments.createMap()
+          data.putBoolean("success", true)
+          data.putString("message", "RESULT_CANCELED")
+          HmsModule.hmsCollection[id]?.screenshareCallback?.resolve(data)
           finish()
         }
       }

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

@@ -8,8 +8,8 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.RCTEventEmitter
-import live.hms.video.media.tracks.HMSTrackType
 import live.hms.video.media.tracks.HMSVideoTrack
+import live.hms.video.utils.HmsUtilities
 import live.hms.video.utils.SharedEglContext
 import org.webrtc.RendererCommon
 import org.webrtc.SurfaceViewRenderer
@@ -18,7 +18,6 @@ import org.webrtc.SurfaceViewRenderer
 class HmsView(context: ReactContext) : FrameLayout(context) {
   private var surfaceView: SurfaceViewRenderer = SurfaceViewRenderer(context)
   private var videoTrack: HMSVideoTrack? = null
-  private var localTrack: String? = null
   private var scaleTypeApplied: Boolean = false
   private var currentScaleType: RendererCommon.ScalingType =
       RendererCommon.ScalingType.SCALE_ASPECT_FILL
@@ -31,7 +30,7 @@ class HmsView(context: ReactContext) : FrameLayout(context) {
     surfaceView.setEnableHardwareScaler(true)
   }
 
-  fun onReceiveNativeEvent() {
+  private fun onReceiveNativeEvent() {
     val event: WritableMap = Arguments.createMap()
     event.putString("message", "MyMessage")
     val reactContext = context as ReactContext
@@ -91,36 +90,13 @@ class HmsView(context: ReactContext) : FrameLayout(context) {
     if (id != null) {
       sdkId = id
     }
-
     val hms = hmsCollection[sdkId]?.hmsSDK
 
     if (trackId != null && hms != null) {
       if (mirror != null) {
         surfaceView.setMirror(mirror)
       }
-      localTrack = trackId
-      val localTrackId = hms.getLocalPeer()?.videoTrack?.trackId
-      if (localTrackId == localTrack) {
-        videoTrack = hms.getLocalPeer()?.videoTrack
-      }
-
-      val remotePeers = hms.getRemotePeers()
-      for (peer in remotePeers) {
-        val videoTrackId = peer.videoTrack?.trackId
-
-        val auxiliaryTracks = peer.auxiliaryTracks
-        for (track in auxiliaryTracks) {
-          val auxTrackId = track.trackId
-          if (trackId == auxTrackId && track.type == HMSTrackType.VIDEO && !track.isMute) {
-            videoTrack = track as HMSVideoTrack
-            return
-          }
-        }
-        if (videoTrackId == localTrack) {
-          videoTrack = peer.videoTrack
-          return
-        }
-      }
+      videoTrack = hms.getRoom()?.let { HmsUtilities.getVideoTrack(trackId, it) }
     }
   }
 }

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

@@ -31,14 +31,12 @@ class HmssdkViewManager : SimpleViewManager<HmsView>() {
   @ReactProp(name = "data")
   fun setData(view: HmsView, data: ReadableMap) {
     val trackId = data.getString("trackId")
-    //    val sink = data.getBoolean("sink")
     val id = data.getString("id")
     val mirror = data.getBoolean("mirror")
     val hmsCollection = getHms()
     if (hmsCollection != null) {
       view.setData(id, trackId, hmsCollection, mirror)
     }
-    // do the processing here
   }
 
   @ReactProp(name = "scaleType")