@100mslive/react-native-hms 1.8.0 → 1.9.1-beta.0

package/android/build.gradle

@@ -86,7 +86,7 @@ dependencies {
     implementation "androidx.constraintlayout:constraintlayout:2.1.3"
     implementation "androidx.appcompat:appcompat:1.3.1"
 
-    implementation "live.100ms:android-sdk:${sdkVersions["android"]}"
-    implementation "live.100ms:video-view:${sdkVersions["android"]}"
-    implementation "live.100ms:hls-player:${sdkVersions["android"]}"
+   implementation "live.100ms:android-sdk:${sdkVersions["android"]}"
+   implementation "live.100ms:video-view:${sdkVersions["android"]}"
+   implementation "live.100ms:hls-player:${sdkVersions["android"]}"
 }

package/android/local.properties

@@ -1 +1,8 @@
-sdk.dir=/Users/yogesh/Library/Android/sdk
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Mon Nov 14 20:51:00 IST 2022
+sdk.dir=/Users/jatinnagar/Library/Android/sdk

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

@@ -29,7 +29,7 @@ class HMSAudioshareActivity : ComponentActivity() {
             override fun onSuccess() {
               HMSManager.hmsCollection[id]?.isAudioSharing = true
               HMSManager.hmsCollection[id]?.audioshareCallback?.resolve(
-                HMSManager.hmsCollection[id]?.emitHMSSuccess(),
+                HMSManager.hmsCollection[id]?.getPromiseResolveData(),
               )
               finish()
             }

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

@@ -172,6 +172,9 @@ object HMSDecoder {
         HMSPeerUpdate.NAME_CHANGED -> {
           print("$peerUpdateType received")
         }
+        HMSPeerUpdate.HAND_RAISED_CHANGED -> {
+          peer.putBoolean("isHandRaised", hmsPeer.isHandRaised)
+        }
         else -> {
           print("Unhandled Peer Update Type received: $peerUpdateType")
         }
@@ -205,6 +208,9 @@ object HMSDecoder {
           HMSPeerUpdate.NAME_CHANGED -> {
             print("$peerUpdateType received")
           }
+          HMSPeerUpdate.HAND_RAISED_CHANGED -> {
+            peer.putBoolean("isHandRaised", hmsPeer.isHandRaised)
+          }
           else -> {
             print("Unhandled Peer Update Type received: $peerUpdateType")
           }
@@ -231,6 +237,8 @@ object HMSDecoder {
 
       peer.putMap("role", this.getHmsRole(hmsPeer.hmsRole))
 
+      peer.putBoolean("isHandRaised", hmsPeer.isHandRaised)
+
       hmsPeer.networkQuality?.let {
         peer.putMap("networkQuality", this.getHmsNetworkQuality(it))
       }
@@ -479,10 +487,12 @@ object HMSDecoder {
   private fun getHmsAudioTrackSettings(hmsAudioTrackSettings: HMSAudioTrackSettings?): WritableMap {
     val settings: WritableMap = Arguments.createMap()
     if (hmsAudioTrackSettings != null) {
-      settings.putBoolean(
-        "useHardwareAcousticEchoCanceler",
-        hmsAudioTrackSettings.useHardwareAcousticEchoCanceler,
-      )
+      hmsAudioTrackSettings.useHardwareAcousticEchoCanceler?.let {
+        settings.putBoolean(
+          "useHardwareAcousticEchoCanceler",
+          it,
+        )
+      }
       settings.putString("initialState", hmsAudioTrackSettings.initialState.name)
     }
     return settings
@@ -625,7 +635,7 @@ object HMSDecoder {
   fun getHMSBrowserRecordingState(data: HMSBrowserRecordingState?): ReadableMap {
     val input = Arguments.createMap()
     if (data !== null) {
-      input.putBoolean("initialising", false)
+      input.putBoolean("initialising", data.initialising)
 
       input.putBoolean("running", data.running)
 

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

@@ -153,9 +153,9 @@ class HMSHLSPlayer(context: ReactContext) : FrameLayout(context) {
             }
 
             val data = Arguments.createMap()
-            data.putString("state", "onVideoSizeChanged")
-            data.putDouble("aspectRatio", (width / height))
-            sendHLSPlaybackEventToJS(HMSHLSPlayerConstants.ON_PLAYBACK_STATE_CHANGE_EVENT, data)
+            data.putDouble("width", width)
+            data.putDouble("height", height)
+            sendHLSPlaybackEventToJS(HMSHLSPlayerConstants.ON_PLAYBACK_RESOLUTION_CHANGE_EVENT, data)
           }
         }
       },
@@ -285,6 +285,7 @@ object HMSHLSPlayerConstants {
   const val ON_PLAYBACK_CUE_EVENT = "ON_PLAYBACK_CUE_EVENT"
   const val ON_PLAYBACK_FAILURE_EVENT = "ON_PLAYBACK_FAILURE_EVENT"
   const val ON_PLAYBACK_STATE_CHANGE_EVENT = "ON_PLAYBACK_STATE_CHANGE_EVENT"
+  const val ON_PLAYBACK_RESOLUTION_CHANGE_EVENT = "ON_PLAYBACK_RESOLUTION_CHANGE_EVENT"
 
   // HLS Playback Stats Events
   const val HMS_HLS_STATS_EVENT = "hmsHlsStatsEvent"

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

@@ -18,6 +18,8 @@ import live.hms.video.media.settings.*
 import live.hms.video.media.tracks.HMSRemoteAudioTrack
 import live.hms.video.media.tracks.HMSRemoteVideoTrack
 import live.hms.video.media.tracks.HMSTrack
+import live.hms.video.sdk.HMSSDK
+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.role.HMSRole
@@ -27,6 +29,10 @@ import live.hms.video.utils.HmsUtilities
 import org.webrtc.SurfaceViewRenderer
 import java.io.ByteArrayOutputStream
 import java.util.*
+import kotlin.collections.ArrayList
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+import kotlin.coroutines.suspendCoroutine
 
 object HMSHelper {
   fun areAllRequiredKeysAvailable(
@@ -105,14 +111,35 @@ object HMSHelper {
     return null
   }
 
-  fun getRemotePeerFromPeerId(
+  suspend fun getRemotePeerFromPeerId(
     peerId: String?,
-    room: HMSRoom?,
+    hmsSDK: HMSSDK?,
   ): HMSRemotePeer? {
-    if (peerId != null && room != null) {
-      return HmsUtilities.getPeer(peerId, room) as? HMSRemotePeer
+    return suspendCoroutine {
+      val room = hmsSDK?.getRoom()
+
+      if (peerId != null && room != null) {
+        val peerFromRoom = HmsUtilities.getPeer(peerId, room) as? HMSRemotePeer
+        if (peerFromRoom != null) {
+          it.resume(peerFromRoom)
+        } else {
+          val limit = 1
+          val peerIds = arrayListOf(peerId)
+          val peerListIterator = hmsSDK.getPeerListIterator(PeerListIteratorOptions(limit = limit, byPeerIds = peerIds))
+          peerListIterator.next(object : PeerListResultListener {
+            override fun onError(error: HMSException) {
+              it.resumeWithException(error)
+            }
+            override fun onSuccess(result: ArrayList<HMSPeer>) {
+              val peerFromIterator = result[0]
+              it.resume(peerFromIterator as? HMSRemotePeer)
+            }
+          })
+        }
+      } else {
+        it.resume(null)
+      }
     }
-    return null
   }
 
   fun getRolesFromRoleNames(
@@ -668,4 +695,15 @@ object HMSHelper {
     }
     return HMSAudioManager.AudioDevice.SPEAKER_PHONE
   }
+
+  fun getPeerListIteratorOptions(data: ReadableMap?): PeerListIteratorOptions? {
+    if (data == null) {
+      return null
+    }
+    val limit = data.getInt("limit")
+    val role = data.getString("byRoleName")
+    val peerIds = data.getArray("byPeerIds")?.toArrayList() as? ArrayList<String>
+
+    return PeerListIteratorOptions(null, role, peerIds, limit)
+  }
 }

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

@@ -5,6 +5,7 @@ import android.app.Application
 import android.app.PendingIntent
 import android.content.Intent
 import android.content.pm.PackageManager
+import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
 import android.util.Rational
@@ -13,6 +14,7 @@ import com.facebook.react.bridge.*
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.reactnativehmssdk.HMSManager.Companion.REACT_CLASS
+import live.hms.video.error.HMSException
 import java.util.UUID
 
 @ReactModule(name = REACT_CLASS)
@@ -21,6 +23,32 @@ class HMSManager(reactContext: ReactApplicationContext) :
   companion object {
     const val REACT_CLASS = "HMSManager"
     var hmsCollection = mutableMapOf<String, HMSRNSDK>()
+
+    var reactAppContext: ReactApplicationContext? = null
+    var pipParamConfig: PipParamConfig? = null;
+    var pipParamsUntyped: Any? = null;
+    var emitter: DeviceEventManagerModule.RCTDeviceEventEmitter? = null
+
+    fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration) {
+      emitter?.let {
+        val data = Arguments.createMap()
+        data.putBoolean("isInPictureInPictureMode", isInPictureInPictureMode)
+
+        it.emit("ON_PIP_MODE_CHANGED", data)
+      }
+    }
+
+    fun onUserLeaveHint() {
+      val pipParams = pipParamsUntyped
+      if (
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &&
+        Build.VERSION.SDK_INT < Build.VERSION_CODES.S &&
+        pipParamConfig?.autoEnterPipMode == true &&
+        pipParams is android.app.PictureInPictureParams
+      ) {
+        reactAppContext?.currentActivity?.enterPictureInPictureMode(pipParams)
+      }
+    }
   }
 
   override fun getName(): String {
@@ -31,6 +59,21 @@ class HMSManager(reactContext: ReactApplicationContext) :
     return hmsCollection
   }
 
+  private fun setupPip() {
+    if (emitter == null) {
+      reactAppContext = reactApplicationContext
+
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        currentActivity?.let {
+         pipReceiver?.register(it)
+        }
+      }
+
+      emitter = reactApplicationContext
+        .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+    }
+  }
+
   // Example method
   // See https://reactnative.dev/docs/native-modules-android
   @ReactMethod
@@ -38,22 +81,26 @@ class HMSManager(reactContext: ReactApplicationContext) :
     data: ReadableMap?,
     callback: Promise?,
   ) {
-    val hasItem = hmsCollection.containsKey("12345")
-    if (hasItem) {
-      val uuid = UUID.randomUUID()
-      val randomUUIDString = uuid.toString()
-      val sdkInstance = HMSRNSDK(data, this, randomUUIDString, reactApplicationContext)
+    try {
+      val hasItem = hmsCollection.containsKey("12345")
+      if (hasItem) {
+        val uuid = UUID.randomUUID()
+        val randomUUIDString = uuid.toString()
+        val sdkInstance = HMSRNSDK(data, this, randomUUIDString, reactApplicationContext)
 
-      hmsCollection[randomUUIDString] = sdkInstance
+        hmsCollection[randomUUIDString] = sdkInstance
 
-      callback?.resolve(randomUUIDString)
-    } else {
-      val randomUUIDString = "12345"
-      val sdkInstance = HMSRNSDK(data, this, randomUUIDString, reactApplicationContext)
+        callback?.resolve(randomUUIDString)
+      } else {
+        val randomUUIDString = "12345"
+        val sdkInstance = HMSRNSDK(data, this, randomUUIDString, reactApplicationContext)
 
-      hmsCollection[randomUUIDString] = sdkInstance
+        hmsCollection[randomUUIDString] = sdkInstance
 
-      callback?.resolve(randomUUIDString)
+        callback?.resolve(randomUUIDString)
+      }
+    } catch (e: HMSException) {
+      callback?.reject(e.code.toString(), e.description)
     }
   }
 
@@ -254,10 +301,10 @@ class HMSManager(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun setPlaybackAllowed(data: ReadableMap) {
+  fun setPlaybackAllowed(data: ReadableMap, callback: Promise?) {
     val hms = HMSHelper.getHms(data, hmsCollection)
 
-    hms?.setPlaybackAllowed(data)
+    hms?.setPlaybackAllowed(data, callback)
   }
 
   @ReactMethod
@@ -301,10 +348,10 @@ class HMSManager(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun setVolume(data: ReadableMap) {
+  fun setVolume(data: ReadableMap, callback: Promise?) {
     val hms = HMSHelper.getHms(data, hmsCollection)
 
-    hms?.setVolume(data)
+    hms?.setVolume(data, callback)
   }
 
   @ReactMethod
@@ -318,10 +365,10 @@ class HMSManager(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun setPlaybackForAllAudio(data: ReadableMap) {
+  fun setPlaybackForAllAudio(data: ReadableMap, callback: Promise?) {
     val hms = HMSHelper.getHms(data, hmsCollection)
 
-    hms?.setPlaybackForAllAudio(data)
+    hms?.setPlaybackForAllAudio(data, callback)
   }
 
   @ReactMethod
@@ -533,17 +580,17 @@ class HMSManager(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun switchAudioOutput(data: ReadableMap) {
+  fun switchAudioOutput(data: ReadableMap, callback: Promise?) {
     val hms = HMSHelper.getHms(data, hmsCollection)
 
-    hms?.switchAudioOutput(data)
+    hms?.switchAudioOutput(data, callback)
   }
 
   @ReactMethod
-  fun setAudioMode(data: ReadableMap) {
+  fun setAudioMode(data: ReadableMap, callback: Promise?) {
     val hms = HMSHelper.getHms(data, hmsCollection)
 
-    hms?.setAudioMode(data)
+    hms?.setAudioMode(data, callback)
   }
 
   @ReactMethod
@@ -743,7 +790,8 @@ class HMSManager(reactContext: ReactApplicationContext) :
   }
   // endregion
 
-  private data class PipParamConfig(
+  data class PipParamConfig(
+    val autoEnterPipMode: Boolean,
     val aspectRatio: Pair<Int, Int>?,
     val showEndButton: Boolean,
     val showVideoButton: Boolean,
@@ -767,6 +815,8 @@ class HMSManager(reactContext: ReactApplicationContext) :
     }
 
     try {
+      setupPip()
+
       PipActionReceiver.sdkIdForPIP = data.getString("id")
 
       when (action) {
@@ -774,8 +824,8 @@ class HMSManager(reactContext: ReactApplicationContext) :
           val result = isPipModeSupported()
           promise?.resolve(result)
         }
-        "enablePipMode" -> {
-          val result = enablePipMode(data)
+        "enterPipMode" -> {
+          val result = enterPipMode(data)
           promise?.resolve(result)
         }
         "setPictureInPictureParams" -> {
@@ -807,10 +857,9 @@ class HMSManager(reactContext: ReactApplicationContext) :
           )
         }
 
-//      TODO:= We need compileSdkVersion >= 31 for autoEnterEnabled
-//      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && config.autoEnterEnabled !== null)
-//        it.setAutoEnterEnabled(config.autoEnterEnabled)
-//      }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+          it.setAutoEnterEnabled(config.autoEnterPipMode)
+        }
 
         // region Setting RemoteActions on PictureInPictureParams
         val hmssdk = getHmsInstance()[PipActionReceiver.sdkIdForPIP!!]?.hmsSDK
@@ -897,14 +946,12 @@ class HMSManager(reactContext: ReactApplicationContext) :
       return null
     }
 
+    var autoEnterPipMode = false
     var aspectRatio: Pair<Int, Int> = Pair(16, 9)
     var showEndButton = false
     var showAudioButton = false
     var showVideoButton = false
 
-//    TODO:= We need compileSdkVersion >= 31 for autoEnterEnabled
-//    var autoEnterEnabled: Boolean? = null;
-
     if (data !== null) {
       if (data.hasKey("aspectRatio")) {
         val aspectRatioArray = data.getArray("aspectRatio")
@@ -940,17 +987,17 @@ class HMSManager(reactContext: ReactApplicationContext) :
         showVideoButton = data.getBoolean("videoButton")
       }
 
-//      TODO:= We need compileSdkVersion >= 31 for autoEnterEnabled
-//      if (data.hasKey("autoEnterEnabled")) {
-//        val autoEnterEnabledType = data.getType("autoEnterEnabled")
-//
-//        if (autoEnterEnabledType === ReadableType.Boolean) {
-//          autoEnterEnabled = data.getBoolean("autoEnterEnabled")
-//        }
-//      }
+      if (data.hasKey("autoEnterPipMode")) {
+        val autoEnterPipModeType = data.getType("autoEnterPipMode")
+
+        if (autoEnterPipModeType === ReadableType.Boolean) {
+          autoEnterPipMode = data.getBoolean("autoEnterPipMode")
+        }
+      }
     }
 
     return PipParamConfig(
+      autoEnterPipMode = autoEnterPipMode,
       aspectRatio = aspectRatio,
       showEndButton = showEndButton,
       showAudioButton = showAudioButton,
@@ -975,6 +1022,10 @@ class HMSManager(reactContext: ReactApplicationContext) :
       if (pipParams !is android.app.PictureInPictureParams) {
         return false
       }
+
+      HMSManager.pipParamConfig = pipParamConfig
+      HMSManager.pipParamsUntyped = pipParams
+
       activity.setPictureInPictureParams(pipParams)
       return true
     } catch (e: Exception) {
@@ -991,7 +1042,7 @@ class HMSManager(reactContext: ReactApplicationContext) :
   }
 
   @RequiresApi(Build.VERSION_CODES.O)
-  private fun enablePipMode(data: ReadableMap): Boolean {
+  private fun enterPipMode(data: ReadableMap): Boolean {
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
       return false
     }
@@ -1007,12 +1058,11 @@ class HMSManager(reactContext: ReactApplicationContext) :
       if (pipParams !is android.app.PictureInPictureParams) {
         return false
       }
-      pipReceiver?.register(activity)
-      val entered = activity.enterPictureInPictureMode(pipParams)
-      if (entered === false) {
-        pipReceiver?.unregister(activity)
-      }
-      return entered
+
+      HMSManager.pipParamConfig = pipParamConfig
+      HMSManager.pipParamsUntyped = pipParams
+
+      return activity.enterPictureInPictureMode(pipParams)
     } catch (e: Exception) {
       throw e
     }
@@ -1128,6 +1178,56 @@ class HMSManager(reactContext: ReactApplicationContext) :
     hms?.getRoomLayout(data, promise)
   }
 
+  @ReactMethod
+  fun raiseLocalPeerHand(
+    data: ReadableMap,
+    promise: Promise?,
+  ) {
+    val hms = HMSHelper.getHms(data, hmsCollection)
+    hms?.raiseLocalPeerHand(data, promise)
+  }
+
+  @ReactMethod
+  fun lowerLocalPeerHand(
+    data: ReadableMap,
+    promise: Promise?,
+  ) {
+    val hms = HMSHelper.getHms(data, hmsCollection)
+    hms?.lowerLocalPeerHand(data, promise)
+  }
+
+  fun lowerRemotePeerHand(
+    data: ReadableMap,
+    promise: Promise?,
+  ) {
+    val hms = HMSHelper.getHms(data, hmsCollection)
+    hms?.lowerRemotePeerHand(data, promise)
+  }
+
+  @ReactMethod(isBlockingSynchronousMethod = true)
+  fun getPeerListIterator(data: ReadableMap): WritableMap? {
+    val hms = HMSHelper.getHms(data, hmsCollection) ?: return null
+    return hms.getPeerListIterator(data)
+  }
+
+  @ReactMethod
+  fun peerListIteratorHasNext(
+    data: ReadableMap,
+    promise: Promise?,
+  ) {
+    val hms = HMSHelper.getHms(data, hmsCollection)
+    hms?.peerListIteratorHasNext(data, promise)
+  }
+
+  @ReactMethod
+  fun peerListIteratorNext(
+    data: ReadableMap,
+    promise: Promise?,
+  ) {
+    val hms = HMSHelper.getHms(data, hmsCollection)
+    hms?.peerListIteratorNext(data, promise)
+  }
+
   fun emitEvent(
     event: String,
     data: WritableMap,