@100mslive/react-native-hms 0.9.92 → 0.9.94

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

@@ -10,15 +10,12 @@ import android.view.PixelCopy
 import android.webkit.URLUtil
 import androidx.annotation.RequiresApi
 import com.facebook.react.bridge.*
-import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.events.RCTEventEmitter
 import java.io.ByteArrayOutputStream
 import java.util.*
 import live.hms.video.audio.HMSAudioManager
 import live.hms.video.error.HMSException
-import live.hms.video.media.codec.HMSAudioCodec
-import live.hms.video.media.codec.HMSVideoCodec
+import live.hms.video.events.AgentType
 import live.hms.video.media.settings.*
 import live.hms.video.media.tracks.HMSRemoteAudioTrack
 import live.hms.video.media.tracks.HMSRemoteVideoTrack
@@ -26,6 +23,8 @@ import live.hms.video.media.tracks.HMSTrack
 import live.hms.video.sdk.models.*
 import live.hms.video.sdk.models.enums.AudioMixingMode
 import live.hms.video.sdk.models.role.HMSRole
+import live.hms.video.services.LogAlarmManager
+import live.hms.video.utils.HMSLogger
 import live.hms.video.utils.HmsUtilities
 import org.webrtc.SurfaceViewRenderer
 
@@ -161,93 +160,148 @@ object HMSHelper {
     return null
   }
 
-  fun getTrackSettings(data: ReadableMap?): HMSTrackSettings? {
-    if (data == null) {
-      return null
+  fun getFrameworkInfo(data: ReadableMap?): FrameworkInfo? {
+    if (data != null &&
+            this.areAllRequiredKeysAvailable(
+                data,
+                arrayOf(Pair("version", "String"), Pair("sdkVersion", "String"))
+            )
+    ) {
+      val version = data.getString("version") as String
+      val sdkVersion = data.getString("sdkVersion") as String
+      return FrameworkInfo(AgentType.REACT_NATIVE, sdkVersion, version)
     }
+    return null
+  }
 
-    var useHardwareEchoCancellation = false
-    val requiredKeysUseHardwareEchoCancellation =
-        this.areAllRequiredKeysAvailable(
-            data,
-            arrayOf(Pair("useHardwareEchoCancellation", "Boolean"))
-        )
-    if (requiredKeysUseHardwareEchoCancellation) {
-      useHardwareEchoCancellation = data.getBoolean("useHardwareEchoCancellation")
+  fun getLogSettings(data: ReadableMap?): HMSLogSettings? {
+    if (data != null &&
+            this.areAllRequiredKeysAvailable(
+                data,
+                arrayOf(
+                    Pair("level", "String"),
+                    Pair("maxDirSizeInBytes", "String"),
+                    Pair("isLogStorageEnabled", "Boolean")
+                )
+            )
+    ) {
+      val level = getLogLevel(data.getString("level"))
+      val maxDirSizeInBytes = getLogAlarmManager(data.getString("maxDirSizeInBytes"))
+      val isLogStorageEnabled = data.getBoolean("isLogStorageEnabled")
+      return HMSLogSettings(maxDirSizeInBytes, isLogStorageEnabled, level)
     }
+    return null
+  }
 
-    var video: ReadableMap? = null
-    val requiredKeysVideo = this.areAllRequiredKeysAvailable(data, arrayOf(Pair("video", "Map")))
-    if (requiredKeysVideo) {
-      video = data.getMap("video")
+  private fun getLogAlarmManager(logAlarmManager: String?): Long {
+    when (logAlarmManager) {
+      "DEFAULT_DIR_SIZE" -> {
+        return LogAlarmManager.DEFAULT_DIR_SIZE
+      }
+      "DEFAULT_LOGS_FILE_NAME" -> {
+        return LogAlarmManager.DEFAULT_LOGS_FILE_NAME.toLong()
+      }
+      "MAX_DIR_SIZE" -> {
+        return LogAlarmManager.MAX_DIR_SIZE.toLong()
+      }
     }
+    return LogAlarmManager.DEFAULT_DIR_SIZE
+  }
 
-    var audio: ReadableMap? = null
-    val requiredKeysAudio = this.areAllRequiredKeysAvailable(data, arrayOf(Pair("audio", "Map")))
-    if (requiredKeysAudio) {
-      audio = data.getMap("audio")
+  private fun getLogLevel(logLevel: String?): HMSLogger.LogLevel {
+    when (logLevel) {
+      "VERBOSE" -> {
+        return HMSLogger.LogLevel.VERBOSE
+      }
+      "WARN" -> {
+        return HMSLogger.LogLevel.WARN
+      }
+      "ERROR" -> {
+        return HMSLogger.LogLevel.ERROR
+      }
     }
+    return HMSLogger.LogLevel.VERBOSE
+  }
 
-    if (video == null && audio == null && !useHardwareEchoCancellation) {
+  fun getTrackSettings(data: ReadableMap?): HMSTrackSettings? {
+    if (data == null) {
       return null
     }
+    val builder = HMSTrackSettings.Builder()
+    if (this.areAllRequiredKeysAvailable(data, arrayOf(Pair("video", "Map")))) {
+      val video = data.getMap("video")
+      val videoSettings = this.getVideoTrackSettings(video)
+      if (videoSettings != null) {
+        builder.video(videoSettings)
+      }
+    }
 
-    val videoSettings = this.getVideoTrackSettings(video)
-    val audioSettings = this.getAudioTrackSettings(audio, useHardwareEchoCancellation)
-    val trackSettingsBuilder = HMSTrackSettings.Builder()
-    return trackSettingsBuilder.audio(audioSettings).video(videoSettings).build()
+    if (this.areAllRequiredKeysAvailable(data, arrayOf(Pair("audio", "Map")))) {
+      val audio = data.getMap("audio")
+      val audioSettings = this.getAudioTrackSettings(audio)
+      if (audioSettings != null) {
+        builder.audio(audioSettings)
+      }
+    }
+    return builder.build()
   }
 
-  private fun getAudioTrackSettings(
-      data: ReadableMap?,
-      useHardwareEchoCancellation: Boolean
-  ): HMSAudioTrackSettings {
-    val builder =
-        HMSAudioTrackSettings.Builder()
-            .setUseHardwareAcousticEchoCanceler(useHardwareEchoCancellation)
-
-    if (data != null) {
-      val maxBitrate = data.getInt("maxBitrate")
-      val codec = getAudioCodec(data.getString("codec"))
-
-      builder.maxBitrate(maxBitrate)
-      builder.codec(codec)
+  private fun getAudioTrackSettings(data: ReadableMap?): HMSAudioTrackSettings? {
+    if (data == null) {
+      return null
+    }
+    val builder = HMSAudioTrackSettings.Builder()
+    if (areAllRequiredKeysAvailable(data, arrayOf(Pair("useHardwareEchoCancellation", "Boolean")))
+    ) {
+      val useHardwareEchoCancellation = data.getBoolean("useHardwareEchoCancellation")
+      builder.setUseHardwareAcousticEchoCanceler(useHardwareEchoCancellation)
     }
 
+    if (areAllRequiredKeysAvailable(data, arrayOf(Pair("initialState", "String")))) {
+      val initialState = getHMSTrackSettingsInitState(data.getString("initialState"))
+      builder.initialState(initialState)
+    }
     return builder.build()
   }
 
-  // TODO: find out a way to set settings required to create HMSVideoTrackSettings
-
-  private fun getVideoTrackSettings(data: ReadableMap?): HMSVideoTrackSettings {
+  private fun getVideoTrackSettings(data: ReadableMap?): HMSVideoTrackSettings? {
+    if (data == null) {
+      return null
+    }
     val builder = HMSVideoTrackSettings.Builder()
-    if (data != null) {
-      val codec = getVideoCodec(data.getString("codec"))
-      val resolution = getVideoResolution(data.getMap("resolution"))
-      val maxBitrate = data.getInt("maxBitrate")
-      val maxFrameRate = data.getInt("maxFrameRate")
-      val cameraFacing = getCameraFacing(data.getString("cameraFacing"))
 
-      builder.codec(codec)
+    if (areAllRequiredKeysAvailable(data, arrayOf(Pair("cameraFacing", "String")))) {
+      val cameraFacing = getCameraFacing(data.getString("cameraFacing"))
       builder.cameraFacing(cameraFacing)
-      if (resolution != null) {
-        builder.resolution(resolution)
-      }
-      builder.maxBitrate(maxBitrate)
-      builder.maxFrameRate(maxFrameRate)
+    }
+
+    if (areAllRequiredKeysAvailable(data, arrayOf(Pair("disableAutoResize", "Boolean")))) {
+      val disableAutoResize = data.getBoolean("disableAutoResize")
+      builder.disableAutoResize(disableAutoResize)
+    }
+
+    if (areAllRequiredKeysAvailable(data, arrayOf(Pair("initialState", "String")))) {
+      val initialState = getHMSTrackSettingsInitState(data.getString("initialState"))
+      builder.initialState(initialState)
+    }
+
+    if (areAllRequiredKeysAvailable(data, arrayOf(Pair("forceSoftwareDecoder", "Boolean")))) {
+      val forceSoftwareDecoder = data.getBoolean("forceSoftwareDecoder")
+      builder.forceSoftwareDecoder(forceSoftwareDecoder)
     }
     return builder.build()
   }
 
-  private fun getVideoResolution(map: ReadableMap?): HMSVideoResolution? {
-    val width = map?.getDouble("width")
-    val height = map?.getDouble("height")
-
-    return if (width != null && height != null) {
-      HMSVideoResolution(width = width.toInt(), height = height.toInt())
-    } else {
-      null
+  private fun getHMSTrackSettingsInitState(initState: String?): HMSTrackSettings.InitState {
+    when (initState) {
+      "UNMUTED" -> {
+        return HMSTrackSettings.InitState.UNMUTED
+      }
+      "MUTED" -> {
+        return HMSTrackSettings.InitState.MUTED
+      }
     }
+    return HMSTrackSettings.InitState.UNMUTED
   }
 
   fun getAudioMixingMode(audioMixingMode: String?): AudioMixingMode {
@@ -265,30 +319,6 @@ object HMSHelper {
     return AudioMixingMode.TALK_AND_MUSIC
   }
 
-  private fun getAudioCodec(codecString: String?): HMSAudioCodec {
-    when (codecString) {
-      "opus" -> {
-        return HMSAudioCodec.OPUS
-      }
-    }
-    return HMSAudioCodec.OPUS
-  }
-
-  private fun getVideoCodec(codecString: String?): HMSVideoCodec {
-    when (codecString) {
-      "H264" -> {
-        return HMSVideoCodec.H264
-      }
-      "VP8" -> {
-        return HMSVideoCodec.VP8
-      }
-      "VP9" -> {
-        return HMSVideoCodec.VP9
-      }
-    }
-    return HMSVideoCodec.H264
-  }
-
   private fun getCameraFacing(cameraFacing: String?): HMSVideoTrackSettings.CameraFacing {
     when (cameraFacing) {
       "FRONT" -> {

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

@@ -159,6 +159,27 @@ class HMSManager(reactContext: ReactApplicationContext) :
     hms?.getRoom(callback)
   }
 
+  @ReactMethod
+  fun getLocalPeer(data: ReadableMap, callback: Promise?) {
+    val hms = HMSHelper.getHms(data, hmsCollection)
+
+    hms?.getLocalPeer(callback)
+  }
+
+  @ReactMethod
+  fun getRemotePeers(data: ReadableMap, callback: Promise?) {
+    val hms = HMSHelper.getHms(data, hmsCollection)
+
+    hms?.getRemotePeers(callback)
+  }
+
+  @ReactMethod
+  fun getRoles(data: ReadableMap, callback: Promise?) {
+    val hms = HMSHelper.getHms(data, hmsCollection)
+
+    hms?.getRoles(callback)
+  }
+
   @ReactMethod
   fun setPlaybackAllowed(data: ReadableMap) {
     val hms = HMSHelper.getHms(data, hmsCollection)
@@ -341,6 +362,20 @@ class HMSManager(reactContext: ReactApplicationContext) :
     hms?.disableRTCStats()
   }
 
+  @ReactMethod
+  fun enableNetworkQualityUpdates(data: ReadableMap) {
+    val hms = HMSHelper.getHms(data, hmsCollection)
+
+    hms?.enableNetworkQualityUpdates()
+  }
+
+  @ReactMethod
+  fun disableNetworkQualityUpdates(data: ReadableMap) {
+    val hms = HMSHelper.getHms(data, hmsCollection)
+
+    hms?.disableNetworkQualityUpdates()
+  }
+
   @ReactMethod
   fun getAudioDevicesList(data: ReadableMap, callback: Promise?) {
     val hms = HMSHelper.getHms(data, hmsCollection)

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

@@ -4,7 +4,6 @@ import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import com.facebook.react.bridge.*
 import com.facebook.react.bridge.UiThreadUtil.runOnUiThread
-import java.util.*
 import kotlinx.coroutines.launch
 import live.hms.video.audio.HMSAudioManager
 import live.hms.video.connection.stats.*
@@ -36,17 +35,39 @@ class HMSRNSDK(
   private var previewInProgress: Boolean = false
   private var reconnectingStage: Boolean = false
   private var rtcStatsAttached: Boolean = false
+  private var networkQualityUpdatesAttached: Boolean = false
   private var audioMixingMode: AudioMixingMode = AudioMixingMode.TALK_AND_MUSIC
   private var id: String = sdkId
   private var self = this
 
   init {
-    val trackSettings = HMSHelper.getTrackSettings(data?.getMap("trackSettings"))
-    if (trackSettings == null) {
-      this.hmsSDK = HMSSDK.Builder(reactApplicationContext).build()
+    val builder = HMSSDK.Builder(reactApplicationContext)
+    if (HMSHelper.areAllRequiredKeysAvailable(data, arrayOf(Pair("trackSettings", "Map")))) {
+      val trackSettings = HMSHelper.getTrackSettings(data?.getMap("trackSettings"))
+      if (trackSettings != null) {
+        builder.setTrackSettings(trackSettings)
+      }
+    }
+
+    if (HMSHelper.areAllRequiredKeysAvailable(data, arrayOf(Pair("frameworkInfo", "Map")))) {
+      val frameworkInfo = HMSHelper.getFrameworkInfo(data?.getMap("frameworkInfo"))
+      if (frameworkInfo != null) {
+        builder.setFrameworkInfo(frameworkInfo)
+      } else {
+        emitCustomError("Unable to decode framework info")
+      }
     } else {
-      this.hmsSDK = HMSSDK.Builder(reactApplicationContext).setTrackSettings(trackSettings).build()
+      emitCustomError("Framework info not sent in build function")
+    }
+
+    if (HMSHelper.areAllRequiredKeysAvailable(data, arrayOf(Pair("logSettings", "Map")))) {
+      val logSettings = HMSHelper.getLogSettings(data?.getMap("logSettings"))
+      if (logSettings != null) {
+        builder.setLogSettings(logSettings)
+      }
     }
+
+    this.hmsSDK = builder.build()
   }
 
   private fun emitCustomError(message: String) {
@@ -127,19 +148,17 @@ class HMSRNSDK(
               ) {
                 return
               }
+              if (!networkQualityUpdatesAttached && type === HMSPeerUpdate.NETWORK_QUALITY_UPDATED
+              ) {
+                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)
             }
@@ -147,15 +166,11 @@ class HMSRNSDK(
             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)
             }
@@ -163,12 +178,10 @@ class HMSRNSDK(
             override fun onPreview(room: HMSRoom, localTracks: Array<HMSTrack>) {
               val previewTracks = HMSDecoder.getPreviewTracks(localTracks)
               val hmsRoom = HMSDecoder.getHmsRoom(room)
-              val localPeerData = HMSDecoder.getHmsLocalPeer(hmsSDK?.getLocalPeer())
               val data: WritableMap = Arguments.createMap()
 
-              data.putMap("previewTracks", previewTracks)
+              data.putArray("previewTracks", previewTracks)
               data.putMap("room", hmsRoom)
-              data.putMap("localPeer", localPeerData)
               data.putString("id", id)
               delegate.emitEvent("ON_PREVIEW", data)
               previewInProgress = false
@@ -232,16 +245,10 @@ class HMSRNSDK(
 
                 override fun onJoin(room: HMSRoom) {
                   val roomData = HMSDecoder.getHmsRoom(room)
-                  val localPeerData = HMSDecoder.getHmsLocalPeer(hmsSDK?.getLocalPeer())
-                  val remotePeerData = HMSDecoder.getHmsRemotePeers(hmsSDK?.getRemotePeers())
-                  val roles = HMSDecoder.getAllRoles(hmsSDK?.getRoles())
 
                   val data: WritableMap = Arguments.createMap()
 
                   data.putMap("room", roomData)
-                  data.putMap("localPeer", localPeerData)
-                  data.putArray("remotePeers", remotePeerData)
-                  data.putArray("roles", roles)
                   data.putString("id", id)
                   delegate.emitEvent("ON_JOIN", data)
                 }
@@ -257,19 +264,18 @@ class HMSRNSDK(
                   ) {
                     return
                   }
+                  if (!networkQualityUpdatesAttached &&
+                          type === HMSPeerUpdate.NETWORK_QUALITY_UPDATED
+                  ) {
+                    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)
                 }
@@ -277,24 +283,17 @@ class HMSRNSDK(
                 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 onTrackUpdate(type: HMSTrackUpdate, track: HMSTrack, peer: HMSPeer) {
                   val updateType = type.name
-                  val localPeerData = HMSDecoder.getHmsLocalPeer(hmsSDK?.getLocalPeer())
-                  val remotePeerData = HMSDecoder.getHmsRemotePeers(hmsSDK?.getRemotePeers())
-                  val roomData = HMSDecoder.getHmsRoom(hmsSDK?.getRoom())
                   val hmsPeer = HMSDecoder.getHmsPeer(peer)
                   val hmsTrack = HMSDecoder.getHmsTrack(track)
 
@@ -302,10 +301,7 @@ class HMSRNSDK(
 
                   data.putMap("peer", hmsPeer)
                   data.putMap("track", hmsTrack)
-                  data.putMap("room", roomData)
                   data.putString("type", updateType)
-                  data.putMap("localPeer", localPeerData)
-                  data.putArray("remotePeers", remotePeerData)
                   data.putString("id", id)
                   delegate.emitEvent("ON_TRACK_UPDATE", data)
                 }
@@ -507,6 +503,8 @@ class HMSRNSDK(
               isAudioSharing = false
               screenshareCallback = null
               audioshareCallback = null
+              networkQualityUpdatesAttached = false
+              rtcStatsAttached = false
               callback?.resolve(emitHMSSuccess())
             }
 
@@ -938,6 +936,21 @@ class HMSRNSDK(
     callback?.resolve(roomData)
   }
 
+  fun getLocalPeer(callback: Promise?) {
+    val localPeer = HMSDecoder.getHmsLocalPeer(hmsSDK?.getLocalPeer())
+    callback?.resolve(localPeer)
+  }
+
+  fun getRemotePeers(callback: Promise?) {
+    val remotePeers = HMSDecoder.getHmsRemotePeers(hmsSDK?.getRemotePeers())
+    callback?.resolve(remotePeers)
+  }
+
+  fun getRoles(callback: Promise?) {
+    val roles = HMSDecoder.getAllRoles(hmsSDK?.getRoles())
+    callback?.resolve(roles)
+  }
+
   fun setVolume(data: ReadableMap) {
     val requiredKeys =
         HMSHelper.getUnavailableRequiredKey(
@@ -1194,6 +1207,14 @@ class HMSRNSDK(
     rtcStatsAttached = false
   }
 
+  fun enableNetworkQualityUpdates() {
+    networkQualityUpdatesAttached = true
+  }
+
+  fun disableNetworkQualityUpdates() {
+    networkQualityUpdatesAttached = false
+  }
+
   fun getAudioDevicesList(callback: Promise?) {
     callback?.resolve(HMSHelper.getAudioDevicesList(hmsSDK?.getAudioDevicesList()))
   }

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

@@ -31,7 +31,7 @@ class HMSView(context: ReactContext) : FrameLayout(context) {
     val view = inflater.inflate(R.layout.hms_view, this)
 
     surfaceView = view.findViewById(R.id.surfaceView)
-    surfaceView.setEnableHardwareScaler(true)
+    surfaceView.setEnableHardwareScaler(false)
   }
 
   @RequiresApi(Build.VERSION_CODES.N)