@100mslive/react-native-hms 1.1.1 → 1.2.0

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

@@ -13,6 +13,15 @@ import live.hms.video.sdk.models.role.*
 import live.hms.video.sdk.models.trackchangerequest.HMSChangeTrackStateRequest
 
 object HMSDecoder {
+  private var restrictRoleData = mutableMapOf<String, Boolean>()
+
+  fun setRestrictRoleData(roleName: String, value: Boolean) {
+    this.restrictRoleData[roleName] = value
+  }
+
+  fun clearRestrictDataStates() {
+    this.restrictRoleData.clear()
+  }
 
   fun getHmsRoom(hmsRoom: HMSRoom?): WritableMap {
     val room: WritableMap = Arguments.createMap()
@@ -21,21 +30,39 @@ object HMSDecoder {
       room.putString("sessionId", hmsRoom.sessionId)
       room.putString("name", hmsRoom.name)
       room.putString("metaData", null)
-      room.putString("startedAt", hmsRoom.startedAt.toString())
-      room.putMap(
-        "browserRecordingState",
-        this.getHMSBrowserRecordingState(hmsRoom.browserRecordingState)
-      )
-      room.putMap(
-        "rtmpHMSRtmpStreamingState",
-        this.getHMSRtmpStreamingState(hmsRoom.rtmpHMSRtmpStreamingState)
-      )
-      room.putMap(
-        "serverRecordingState",
-        this.getHMSServerRecordingState(hmsRoom.serverRecordingState)
-      )
-      room.putMap("hlsStreamingState", this.getHMSHlsStreamingState(hmsRoom.hlsStreamingState))
-      room.putMap("hlsRecordingState", this.getHMSHlsRecordingState(hmsRoom.hlsRecordingState))
+      hmsRoom.startedAt?.let {
+        room.putString("startedAt", it.toString())
+      }
+
+      hmsRoom.browserRecordingState?.let {
+        room.putMap(
+          "browserRecordingState",
+          this.getHMSBrowserRecordingState(it)
+        )
+      }
+
+      hmsRoom.rtmpHMSRtmpStreamingState?.let {
+        room.putMap(
+          "rtmpHMSRtmpStreamingState",
+          this.getHMSRtmpStreamingState(it)
+        )
+      }
+
+      hmsRoom.serverRecordingState?.let {
+        room.putMap(
+          "serverRecordingState",
+          this.getHMSServerRecordingState(it)
+        )
+      }
+
+      hmsRoom.hlsStreamingState?.let {
+        room.putMap("hlsStreamingState", this.getHMSHlsStreamingState(hmsRoom.hlsStreamingState))
+      }
+
+      hmsRoom.hlsRecordingState?.let {
+        room.putMap("hlsRecordingState", this.getHMSHlsRecordingState(hmsRoom.hlsRecordingState))
+      }
+
       room.putMap("localPeer", this.getHmsLocalPeer(hmsRoom.localPeer))
       room.putArray("peers", this.getAllPeers(hmsRoom.peerList))
       room.putInt("peerCount", hmsRoom.peerCount)
@@ -49,13 +76,32 @@ object HMSDecoder {
       peer.putString("peerID", hmsPeer.peerID)
       peer.putString("name", hmsPeer.name)
       peer.putBoolean("isLocal", hmsPeer.isLocal)
-      peer.putString("customerUserID", hmsPeer.customerUserID)
+
+      hmsPeer.customerUserID?.let {
+        peer.putString("customerUserID", it)
+      }
+
+      peer.putString("joinedAt", hmsPeer.joinedAt.toString())
+
       peer.putString("metadata", hmsPeer.metadata)
-      peer.putMap("networkQuality", this.getHmsNetworkQuality(hmsPeer.networkQuality))
-      peer.putMap("audioTrack", this.getHmsAudioTrack(hmsPeer.audioTrack))
-      peer.putMap("videoTrack", this.getHmsVideoTrack(hmsPeer.videoTrack))
+
       peer.putMap("role", this.getHmsRole(hmsPeer.hmsRole))
-      peer.putArray("auxiliaryTracks", this.getAllTracks(hmsPeer.auxiliaryTracks))
+
+      hmsPeer.networkQuality?.let {
+        peer.putMap("networkQuality", this.getHmsNetworkQuality(it))
+      }
+
+      hmsPeer.audioTrack?.let {
+        peer.putMap("audioTrack", this.getHmsAudioTrack(it))
+      }
+
+      hmsPeer.videoTrack?.let {
+        peer.putMap("videoTrack", this.getHmsVideoTrack(it))
+      }
+
+      hmsPeer.auxiliaryTracks.let {
+        peer.putArray("auxiliaryTracks", this.getAllTracks(it))
+      }
     }
     return peer
   }
@@ -112,10 +158,17 @@ object HMSDecoder {
     val role: WritableMap = Arguments.createMap()
     if (hmsRole != null) {
       role.putString("name", hmsRole.name)
-      role.putMap("permissions", this.getHmsPermissions(hmsRole.permission))
-      role.putMap("publishSettings", this.getHmsPublishSettings(hmsRole.publishParams))
-      role.putMap("subscribeSettings", this.getHmsSubscribeSettings(hmsRole.subscribeParams))
-      role.putInt("priority", hmsRole.priority)
+      if (this.restrictRoleData[hmsRole.name] != true) {
+        role.putMap("permissions", this.getHmsPermissions(hmsRole.permission))
+        hmsRole.publishParams?.let {
+          role.putMap("publishSettings", this.getHmsPublishSettings(it))
+        }
+        hmsRole.subscribeParams?.let {
+          role.putMap("subscribeSettings", this.getHmsSubscribeSettings(it))
+        }
+
+        role.putInt("priority", hmsRole.priority)
+      }
     }
     return role
   }
@@ -138,11 +191,18 @@ object HMSDecoder {
   private fun getHmsPublishSettings(hmsPublishSettings: PublishParams?): WritableMap {
     val publishSettings: WritableMap = Arguments.createMap()
     if (hmsPublishSettings != null) {
-      publishSettings.putMap("audio", this.getHmsAudioSettings(hmsPublishSettings.audio))
-      publishSettings.putMap("video", this.getHmsVideoSettings(hmsPublishSettings.video))
-      publishSettings.putMap("screen", this.getHmsVideoSettings(hmsPublishSettings.screen))
-      publishSettings.putMap("videoSimulcastLayers", null)
-      publishSettings.putMap("screenSimulcastLayers", null)
+      hmsPublishSettings.audio?.let {
+        publishSettings.putMap("audio", this.getHmsAudioSettings(it))
+      }
+
+      hmsPublishSettings.video?.let {
+        publishSettings.putMap("video", this.getHmsVideoSettings(it))
+      }
+
+      hmsPublishSettings.screen?.let {
+        publishSettings.putMap("screen", this.getHmsVideoSettings(it))
+      }
+
       publishSettings.putArray("allowed", this.getWriteableArray(hmsPublishSettings.allowed))
     }
     return publishSettings
@@ -160,7 +220,7 @@ object HMSDecoder {
 
   private fun getHmsAudioSettings(hmsAudioSettings: AudioParams?): WritableMap {
     val audioSettings: WritableMap = Arguments.createMap()
-    if (hmsAudioSettings != null && hmsAudioSettings.codec != null) {
+    if (hmsAudioSettings != null) {
       audioSettings.putInt("bitRate", hmsAudioSettings.bitRate)
       audioSettings.putString("codec", hmsAudioSettings.codec.name)
     }
@@ -169,7 +229,7 @@ object HMSDecoder {
 
   private fun getHmsVideoSettings(hmsVideoSettings: VideoParams?): WritableMap {
     val videoSettings: WritableMap = Arguments.createMap()
-    if (hmsVideoSettings != null && hmsVideoSettings.codec != null) {
+    if (hmsVideoSettings != null) {
       videoSettings.putInt("bitRate", hmsVideoSettings.bitRate)
       videoSettings.putInt("frameRate", hmsVideoSettings.frameRate)
       videoSettings.putInt("width", hmsVideoSettings.width)
@@ -185,15 +245,32 @@ object HMSDecoder {
       peer.putString("peerID", hmsLocalPeer.peerID)
       peer.putString("name", hmsLocalPeer.name)
       peer.putBoolean("isLocal", hmsLocalPeer.isLocal)
-      peer.putString("customerUserID", hmsLocalPeer.customerUserID)
-      peer.putString("metadata", hmsLocalPeer.metadata)
-      peer.putMap("networkQuality", this.getHmsNetworkQuality(hmsLocalPeer.networkQuality))
-      peer.putMap("audioTrack", this.getHmsAudioTrack(hmsLocalPeer.audioTrack))
-      peer.putMap("videoTrack", this.getHmsVideoTrack(hmsLocalPeer.videoTrack))
+
       peer.putMap("role", this.getHmsRole(hmsLocalPeer.hmsRole))
-      peer.putArray("auxiliaryTracks", this.getAllTracks(hmsLocalPeer.auxiliaryTracks))
-      peer.putMap("localAudioTrackData", this.getHmsLocalAudioTrack(hmsLocalPeer.audioTrack))
-      peer.putMap("localVideoTrackData", this.getHmsLocalVideoTrack(hmsLocalPeer.videoTrack))
+
+      peer.putString("metadata", hmsLocalPeer.metadata)
+
+      hmsLocalPeer.customerUserID?.let {
+        peer.putString("customerUserID", it)
+      }
+
+      hmsLocalPeer.networkQuality?.let {
+        peer.putMap("networkQuality", this.getHmsNetworkQuality(it))
+      }
+
+      hmsLocalPeer.audioTrack?.let {
+        peer.putMap("audioTrack", this.getHmsAudioTrack(it))
+        peer.putMap("localAudioTrackData", this.getHmsLocalAudioTrack(it))
+      }
+
+      hmsLocalPeer.videoTrack?.let {
+        peer.putMap("videoTrack", this.getHmsVideoTrack(it))
+        peer.putMap("localVideoTrackData", this.getHmsLocalVideoTrack(it))
+      }
+
+      hmsLocalPeer.auxiliaryTracks.let {
+        peer.putArray("auxiliaryTracks", this.getAllTracks(it))
+      }
     }
     return peer
   }
@@ -272,15 +349,30 @@ object HMSDecoder {
       peer.putString("peerID", hmsRemotePeer.peerID)
       peer.putString("name", hmsRemotePeer.name)
       peer.putBoolean("isLocal", hmsRemotePeer.isLocal)
-      peer.putString("customerUserID", hmsRemotePeer.customerUserID)
       peer.putString("metadata", hmsRemotePeer.metadata)
-      peer.putMap("networkQuality", this.getHmsNetworkQuality(hmsRemotePeer.networkQuality))
-      peer.putMap("audioTrack", this.getHmsAudioTrack(hmsRemotePeer.audioTrack))
-      peer.putMap("videoTrack", this.getHmsVideoTrack(hmsRemotePeer.videoTrack))
       peer.putMap("role", this.getHmsRole(hmsRemotePeer.hmsRole))
-      peer.putArray("auxiliaryTracks", this.getAllTracks(hmsRemotePeer.auxiliaryTracks))
-      peer.putMap("remoteAudioTrackData", this.getHmsRemoteAudioTrack(hmsRemotePeer.audioTrack))
-      peer.putMap("remoteVideoTrackData", this.getHmsRemoteVideoTrack(hmsRemotePeer.videoTrack))
+
+      hmsRemotePeer.customerUserID?.let {
+        peer.putString("customerUserID", it)
+      }
+
+      hmsRemotePeer.networkQuality?.let {
+        peer.putMap("networkQuality", this.getHmsNetworkQuality(it))
+      }
+
+      hmsRemotePeer.audioTrack?.let {
+        peer.putMap("audioTrack", this.getHmsAudioTrack(it))
+        peer.putMap("remoteAudioTrackData", this.getHmsRemoteAudioTrack(it))
+      }
+
+      hmsRemotePeer.videoTrack?.let {
+        peer.putMap("videoTrack", this.getHmsVideoTrack(hmsRemotePeer.videoTrack))
+        peer.putMap("remoteVideoTrackData", this.getHmsRemoteVideoTrack(hmsRemotePeer.videoTrack))
+      }
+
+      hmsRemotePeer.auxiliaryTracks.let {
+        peer.putArray("auxiliaryTracks", this.getAllTracks(it))
+      }
     }
     return peer
   }
@@ -330,7 +422,9 @@ object HMSDecoder {
   fun getHmsRoleChangeRequest(request: HMSRoleChangeRequest, id: String?): WritableMap {
     val roleChangeRequest: WritableMap = Arguments.createMap()
     if (id != null) {
-      roleChangeRequest.putMap("requestedBy", this.getHmsPeer(request.requestedBy))
+      request.requestedBy?.let {
+        roleChangeRequest.putMap("requestedBy", this.getHmsPeer(it))
+      }
       roleChangeRequest.putMap("suggestedRole", this.getHmsRole(request.suggestedRole))
       roleChangeRequest.putString("id", id)
       return roleChangeRequest
@@ -341,7 +435,9 @@ object HMSDecoder {
   fun getHmsChangeTrackStateRequest(request: HMSChangeTrackStateRequest, id: String): WritableMap {
     val changeTrackStateRequest: WritableMap = Arguments.createMap()
 
-    changeTrackStateRequest.putMap("requestedBy", this.getHmsPeer(request.requestedBy))
+    request.requestedBy?.let {
+      changeTrackStateRequest.putMap("requestedBy", this.getHmsPeer(it))
+    }
     changeTrackStateRequest.putString("trackType", request.track.type.name)
     changeTrackStateRequest.putBoolean("mute", request.mute)
     changeTrackStateRequest.putString("id", id)
@@ -367,10 +463,18 @@ object HMSDecoder {
     val input = Arguments.createMap()
     if (data !== null) {
       input.putBoolean("running", data.running)
-      input.putString("startedAt", data.startedAt.toString())
-      input.putString("stoppedAt", data.stoppedAt.toString())
-      input.putBoolean("running", data.running)
-      input.putMap("error", this.getError(data.error))
+
+      data.startedAt?.let {
+        input.putString("startedAt", it.toString())
+      }
+
+      data.stoppedAt?.let {
+        input.putString("stoppedAt", it.toString())
+      }
+
+      data.error?.let {
+        input.putMap("error", this.getError(it))
+      }
     }
     return input
   }
@@ -379,9 +483,18 @@ object HMSDecoder {
     val input = Arguments.createMap()
     if (data !== null) {
       input.putBoolean("running", data.running)
-      input.putString("startedAt", data.startedAt.toString())
-      input.putString("stoppedAt", data.stoppedAt.toString())
-      input.putMap("error", this.getError(data.error))
+
+      data.startedAt?.let {
+        input.putString("startedAt", it.toString())
+      }
+
+      data.stoppedAt?.let {
+        input.putString("stoppedAt", it.toString())
+      }
+
+      data.error?.let {
+        input.putMap("error", this.getError(it))
+      }
     }
     return input
   }
@@ -390,8 +503,14 @@ object HMSDecoder {
     val input = Arguments.createMap()
     if (data !== null) {
       input.putBoolean("running", data.running)
-      input.putString("startedAt", data.startedAt.toString())
-      input.putMap("error", this.getError(data.error))
+
+      data.startedAt?.let {
+        input.putString("startedAt", it.toString())
+      }
+
+      data.error?.let {
+        input.putMap("error", this.getError(it))
+      }
     }
     return input
   }
@@ -400,7 +519,9 @@ object HMSDecoder {
     val input = Arguments.createMap()
     if (data !== null) {
       input.putBoolean("running", data.running)
-      input.putArray("variants", this.getHMSHLSVariant(data.variants))
+      data.variants?.let {
+        input.putArray("variants", this.getHMSHLSVariant(it))
+      }
     }
     return input
   }
@@ -409,8 +530,11 @@ object HMSDecoder {
     val input = Arguments.createMap()
     if (data !== null) {
       data.running?.let { input.putBoolean("running", it) }
-      input.putString("startedAt", data.startedAt.toString())
-      // input.putMap("hlsRecordingConfig", this.getHMSHlsRecordingConfig(data.hlsRecordingConfig))
+
+      data.startedAt?.let {
+        input.putString("startedAt", it.toString())
+      }
+
       data.hlsRecordingConfig?.let { input.putBoolean("singleFilePerLayer", it.singleFilePerLayer) }
       data.hlsRecordingConfig?.let { input.putBoolean("videoOnDemand", it.videoOnDemand) }
     }
@@ -425,7 +549,9 @@ object HMSDecoder {
         input.putString("hlsStreamUrl", variant.hlsStreamUrl)
         input.putString("meetingUrl", variant.meetingUrl)
         input.putString("metadata", variant.metadata)
-        input.putString("startedAt", variant.startedAt.toString())
+        variant.startedAt?.let {
+          input.putString("startedAt", it.toString())
+        }
         variants.pushMap(input)
       }
     }
@@ -436,10 +562,6 @@ object HMSDecoder {
     val subscribeSettings: WritableMap = Arguments.createMap()
     if (hmsSubscribeSettings != null) {
       subscribeSettings.putInt("maxSubsBitRate", hmsSubscribeSettings.maxSubsBitRate)
-      subscribeSettings.putMap(
-        "subscribeDegradationParam",
-        this.getHmsSubscribeDegradationSettings(hmsSubscribeSettings.subscribeDegradationParam)
-      )
       subscribeSettings.putArray(
         "subscribeTo",
         this.getWriteableArray(hmsSubscribeSettings.subscribeTo)
@@ -494,7 +616,10 @@ object HMSDecoder {
   fun getHmsMessageRecipient(recipient: HMSMessageRecipient?): WritableMap {
     val hmsRecipient: WritableMap = Arguments.createMap()
     if (recipient != null) {
-      hmsRecipient.putMap("recipientPeer", this.getHmsPeer(recipient.recipientPeer))
+      recipient.recipientPeer?.let {
+        hmsRecipient.putMap("recipientPeer", this.getHmsPeer(it))
+      }
+
       hmsRecipient.putArray("recipientRoles", this.getAllRoles(recipient.recipientRoles))
       hmsRecipient.putString("recipientType", recipient.recipientType.name)
     }
@@ -533,19 +658,24 @@ object HMSDecoder {
     return localAudioStats
   }
 
-  fun getLocalVideoStats(hmsLocalVideoStats: HMSLocalVideoStats?): WritableMap {
-    val localVideoStats: WritableMap = Arguments.createMap()
-    if (hmsLocalVideoStats != null) {
-      localVideoStats.putString("bytesSent", hmsLocalVideoStats.bytesSent.toString())
+  fun getLocalVideoStats(hmsLocalVideoStats: List<HMSLocalVideoStats>): WritableArray {
+    val stats: WritableArray = Arguments.createArray()
+
+    for (stat in hmsLocalVideoStats) {
+      val localVideoStats: WritableMap = Arguments.createMap()
+
+      localVideoStats.putString("bytesSent", stat.bytesSent.toString())
       localVideoStats.putMap(
         "resolution",
-        hmsLocalVideoStats.resolution?.let { this.getHmsVideoTrackResolution(it) }
+        stat.resolution?.let { this.getHmsVideoTrackResolution(it) }
       )
-      hmsLocalVideoStats.bitrate?.let { localVideoStats.putDouble("bitrate", it) }
-      hmsLocalVideoStats.roundTripTime?.let { localVideoStats.putDouble("roundTripTime", it) }
-      hmsLocalVideoStats.frameRate?.let { localVideoStats.putDouble("frameRate", it) }
+      stat.bitrate?.let { localVideoStats.putDouble("bitrate", it) }
+      stat.roundTripTime?.let { localVideoStats.putDouble("roundTripTime", it) }
+      stat.frameRate?.let { localVideoStats.putDouble("frameRate", it) }
+      stats.pushMap(localVideoStats)
     }
-    return localVideoStats
+
+    return stats
   }
 
   fun getRemoteAudioStats(hmsRemoteAudioStats: HMSRemoteAudioStats?): WritableMap {