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

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

@@ -1,14 +1,17 @@
 package com.reactnativehmssdk
 
+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.error.HMSException
-import live.hms.video.media.settings.HMSTrackSettings
-import live.hms.video.media.tracks.*
+import live.hms.video.media.tracks.HMSRemoteAudioTrack
+import live.hms.video.media.tracks.HMSTrack
+import live.hms.video.media.tracks.HMSTrackType
 import live.hms.video.sdk.*
 import live.hms.video.sdk.models.*
-import live.hms.video.sdk.models.HMSConfig
 import live.hms.video.sdk.models.enums.HMSPeerUpdate
 import live.hms.video.sdk.models.enums.HMSRoomUpdate
 import live.hms.video.sdk.models.enums.HMSTrackUpdate
@@ -23,22 +26,31 @@ class HmsSDK(
 ) {
   var hmsSDK: HMSSDK? = null
   private var recentRoleChangeRequest: HMSRoleChangeRequest? = null
-  private var changeTrackStateRequest: HMSChangeTrackStateRequest? = null
-  val delegate: HmsModule = HmsDelegate
-  val id: String = sdkId
-  val self = this
+  var delegate: HmsModule = HmsDelegate
+  private var context: ReactApplicationContext = reactApplicationContext
+  private var previewInProgress: Boolean = false
+  private var id: String = sdkId
+  private var self = this
 
   init {
-    val videoSettings = HmsHelper.getVideoTrackSettings(data?.getMap("video"))
-    val audioSettings = HmsHelper.getAudioTrackSettings(data?.getMap("audio"))
-
-    val trackSettingsBuilder = HMSTrackSettings.Builder()
-    val trackSettings = trackSettingsBuilder.audio(audioSettings).video(videoSettings).build()
+    val trackSettings = HmsHelper.getTrackSettings(data)
+    if (trackSettings == null) {
+      this.hmsSDK = HMSSDK.Builder(reactApplicationContext).build()
+    } else {
+      this.hmsSDK = HMSSDK.Builder(reactApplicationContext).setTrackSettings(trackSettings).build()
+    }
+  }
 
-    this.hmsSDK = HMSSDK.Builder(reactApplicationContext).setTrackSettings(trackSettings).build()
+  private fun emitCustomError(message: String) {
+    val data: WritableMap = Arguments.createMap()
+    val hmsError = HMSException(102, message, message, message, message)
+    data.putString("event", "ON_ERROR")
+    data.putString("id", id)
+    data.putMap("error", HmsDecoder.getError(hmsError))
+    delegate.emitEvent("ON_ERROR", data)
   }
 
-  fun emitRequiredKeysError() {
+  private fun emitRequiredKeysError() {
     val data: WritableMap = Arguments.createMap()
     val hmsError =
         HMSException(
@@ -62,53 +74,62 @@ class HmsSDK(
     delegate.emitEvent("ON_ERROR", data)
   }
 
+  fun emitHMSSuccess(message: HMSMessage? = null): ReadableMap {
+    val hmsMessage =
+        if (message !== null) message.message else "function call executed successfully"
+    val data: WritableMap = Arguments.createMap()
+    data.putBoolean("success", true)
+    data.putString("message", hmsMessage)
+    return data
+  }
+
   fun preview(credentials: ReadableMap) {
+    if (previewInProgress) {
+      self.emitCustomError("PREVIEW_ALREADY_IN_PROGRESS")
+      return
+    }
     val requiredKeys =
         HmsHelper.areAllRequiredKeysAvailable(
             credentials,
             arrayOf(Pair("username", "String"), Pair("authToken", "String"))
         )
     if (requiredKeys) {
+      previewInProgress = true
       var config =
           HMSConfig(
               credentials.getString("username") as String,
               credentials.getString("authToken") as String,
           )
 
-      if (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,
-            )
-      } else if (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,
-            )
-      } else if (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,
-            )
+      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,
+              )
+        }
       }
 
       hmsSDK?.preview(
@@ -116,6 +137,7 @@ class HmsSDK(
           object : HMSPreviewListener {
             override fun onError(error: HMSException) {
               self.emitHMSError(error)
+              previewInProgress = false
             }
 
             override fun onPreview(room: HMSRoom, localTracks: Array<HMSTrack>) {
@@ -129,6 +151,7 @@ class HmsSDK(
               data.putMap("localPeer", localPeerData)
               data.putString("id", id)
               delegate.emitEvent("ON_PREVIEW", data)
+              previewInProgress = false
             }
           }
       )
@@ -138,6 +161,10 @@ class HmsSDK(
   }
 
   fun join(credentials: ReadableMap) {
+    if (previewInProgress) {
+      self.emitCustomError("PREVIEW_IS_IN_PROGRESS")
+      return
+    }
     val requiredKeys =
         HmsHelper.areAllRequiredKeysAvailable(
             credentials,
@@ -150,40 +177,35 @@ class HmsSDK(
               credentials.getString("authToken") as String
           )
 
-      if (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,
-            )
-      } else if (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,
-            )
-      } else if (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,
-            )
+      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,
+              )
+        }
       }
 
       HMSCoroutineScope.launch {
@@ -191,14 +213,13 @@ class HmsSDK(
           hmsSDK?.join(
               config,
               object : HMSUpdateListener {
-                override fun onChangeTrackStateRequest(request: HMSChangeTrackStateRequest) {
+                override fun onChangeTrackStateRequest(details: HMSChangeTrackStateRequest) {
                   val decodedChangeTrackStateRequest =
-                      HmsDecoder.getHmsChangeTrackStateRequest(request)
+                      HmsDecoder.getHmsChangeTrackStateRequest(details, id)
                   delegate.emitEvent(
                       "ON_CHANGE_TRACK_STATE_REQUEST",
                       decodedChangeTrackStateRequest
                   )
-                  changeTrackStateRequest = request
                 }
 
                 override fun onRemovedFromRoom(notification: HMSRemovedFromRoom) {
@@ -238,16 +259,18 @@ class HmsSDK(
                   delegate.emitEvent("ON_JOIN", data)
                 }
 
-                override fun onPeerUpdate(type: HMSPeerUpdate, hmsPeer: HMSPeer) {
-                  val type = type.name
+                override fun onPeerUpdate(type: HMSPeerUpdate, peer: HMSPeer) {
+                  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", type)
+                  data.putString("type", updateType)
                   data.putMap("localPeer", localPeerData)
                   data.putArray("remotePeers", remotePeerData)
                   data.putString("id", id)
@@ -255,14 +278,14 @@ class HmsSDK(
                 }
 
                 override fun onRoomUpdate(type: HMSRoomUpdate, hmsRoom: HMSRoom) {
-                  val type = type.name
+                  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", type)
+                  data.putString("type", updateType)
                   data.putMap("room", roomData)
                   data.putMap("localPeer", localPeerData)
                   data.putArray("remotePeers", remotePeerData)
@@ -271,15 +294,19 @@ class HmsSDK(
                 }
 
                 override fun onTrackUpdate(type: HMSTrackUpdate, track: HMSTrack, peer: HMSPeer) {
-                  val type = type.name
+                  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)
 
                   val data: WritableMap = Arguments.createMap()
 
+                  data.putMap("peer", hmsPeer)
+                  data.putMap("track", hmsTrack)
                   data.putMap("room", roomData)
-                  data.putString("type", type)
+                  data.putString("type", updateType)
                   data.putMap("localPeer", localPeerData)
                   data.putArray("remotePeers", remotePeerData)
                   data.putString("id", id)
@@ -334,9 +361,9 @@ class HmsSDK(
                 val peers: WritableArray = Arguments.createArray()
                 for (speaker in speakers) {
                   val speakerArray: WritableMap = Arguments.createMap()
-                  speakerArray.putMap("peer", HmsDecoder.getHmsPeer(speaker?.peer))
-                  speakerArray.putInt("level", speaker?.level)
-                  speakerArray.putMap("track", HmsDecoder.getHmsTrack(speaker?.hmsTrack))
+                  speakerArray.putMap("peer", HmsDecoder.getHmsPeer(speaker.peer))
+                  speakerArray.putInt("level", speaker.level)
+                  speakerArray.putMap("track", HmsDecoder.getHmsTrack(speaker.hmsTrack))
                   peers.pushMap(speakerArray)
                 }
                 data.putArray("peers", peers)
@@ -359,14 +386,14 @@ class HmsSDK(
     val remotePeerData = HmsDecoder.getHmsRemotePeers(hmsSDK?.getRemotePeers())
     val roomData = HmsDecoder.getHmsRoom(hmsSDK?.getRoom())
 
-    val data: WritableMap = Arguments.createMap()
+    val map: WritableMap = Arguments.createMap()
 
-    data.putMap("room", roomData)
-    data.putString("type", type)
-    data.putMap("localPeer", localPeerData)
-    data.putArray("remotePeers", remotePeerData)
-    data.putString("id", id)
-    delegate.emitEvent("ON_TRACK_UPDATE", data)
+    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) {
@@ -375,7 +402,7 @@ class HmsSDK(
   }
 
   fun switchCamera() {
-    if (hmsSDK?.getLocalPeer()?.videoTrack?.isMute ?: true) {} else {
+    if (hmsSDK?.getLocalPeer()?.videoTrack?.isMute == false) {
       HMSCoroutineScope.launch { hmsSDK?.getLocalPeer()?.videoTrack?.switchCamera() }
     }
   }
@@ -384,108 +411,110 @@ class HmsSDK(
     hmsSDK?.leave(
         object : HMSActionResultListener {
           override fun onSuccess() {
-            callback?.resolve("")
+            callback?.resolve(emitHMSSuccess())
           }
 
           override fun onError(error: HMSException) {
-            callback?.reject("101", "NOT_FOUND")
+            callback?.reject(error.code.toString(), error.message)
             self.emitHMSError(error)
           }
         }
     )
   }
 
-  fun sendBroadcastMessage(data: ReadableMap) {
+  fun sendBroadcastMessage(data: ReadableMap, callback: Promise?) {
     val requiredKeys =
-        HmsHelper.areAllRequiredKeysAvailable(data, arrayOf(Pair("message", "String")))
+        HmsHelper.areAllRequiredKeysAvailable(
+            data,
+            arrayOf(Pair("message", "String"), Pair("type", "String"))
+        )
     if (requiredKeys) {
-      val type =
-          if (HmsHelper.areAllRequiredKeysAvailable(data, arrayOf(Pair("type", "String"))))
-              data.getString("type")
-          else "chat"
       hmsSDK?.sendBroadcastMessage(
           data.getString("message") as String,
-          type as String,
+          data.getString("type") as String,
           object : HMSMessageResultListener {
             override fun onError(error: HMSException) {
               self.emitHMSError(error)
+              callback?.reject(error.code.toString(), error.message)
+            }
+            override fun onSuccess(hmsMessage: HMSMessage) {
+              callback?.resolve(emitHMSSuccess(hmsMessage))
             }
-            override fun onSuccess(hmsMessage: HMSMessage) {}
           }
       )
     } else {
       self.emitRequiredKeysError()
+      callback?.reject("101", "REQUIRED_KEYS_NOT_FOUND")
     }
   }
 
-  fun sendGroupMessage(data: ReadableMap) {
+  fun sendGroupMessage(data: ReadableMap, callback: Promise?) {
     val requiredKeys =
         HmsHelper.areAllRequiredKeysAvailable(
             data,
-            arrayOf(Pair("message", "String"), Pair("roles", "Array"))
+            arrayOf(Pair("message", "String"), Pair("roles", "Array"), Pair("type", "String"))
         )
     if (requiredKeys) {
-      val type =
-          if (HmsHelper.areAllRequiredKeysAvailable(data, arrayOf(Pair("type", "String"))))
-              data.getString("type")
-          else "chat"
-      val message = data.getString("message")
       val targetedRoles = data.getArray("roles")?.toArrayList() as? ArrayList<String>
       val roles = hmsSDK?.getRoles()
       val encodedTargetedRoles = HmsHelper.getRolesFromRoleNames(targetedRoles, roles)
 
-      if (message != null) {
-        hmsSDK?.sendGroupMessage(
-            message,
-            type as String,
-            encodedTargetedRoles,
-            object : HMSMessageResultListener {
-              override fun onError(error: HMSException) {
-                self.emitHMSError(error)
-              }
-              override fun onSuccess(hmsMessage: HMSMessage) {}
+      hmsSDK?.sendGroupMessage(
+          data.getString("message") as String,
+          data.getString("type") as String,
+          encodedTargetedRoles,
+          object : HMSMessageResultListener {
+            override fun onError(error: HMSException) {
+              self.emitHMSError(error)
+              callback?.reject(error.code.toString(), error.message)
             }
-        )
-      }
+            override fun onSuccess(hmsMessage: HMSMessage) {
+              callback?.resolve(emitHMSSuccess(hmsMessage))
+            }
+          }
+      )
     } else {
       self.emitRequiredKeysError()
+      callback?.reject("101", "REQUIRED_KEYS_NOT_FOUND")
     }
   }
 
-  fun sendDirectMessage(data: ReadableMap) {
+  fun sendDirectMessage(data: ReadableMap, callback: Promise?) {
     val requiredKeys =
         HmsHelper.areAllRequiredKeysAvailable(
             data,
-            arrayOf(Pair("message", "String"), Pair("peerId", "String"))
+            arrayOf(Pair("message", "String"), Pair("peerId", "String"), Pair("type", "String"))
         )
     if (requiredKeys) {
-      val type =
-          if (HmsHelper.areAllRequiredKeysAvailable(data, arrayOf(Pair("type", "String"))))
-              data.getString("type")
-          else "chat"
-      val message = data.getString("message")
       val peerId = data.getString("peerId")
       val peers = hmsSDK?.getPeers()
       val peer = HmsHelper.getPeerFromPeerId(peerId, peers)
-      if (message != null && peer != null) {
+      if (peer != null) {
         hmsSDK?.sendDirectMessage(
-            message,
-            type as String,
+            data.getString("message") as String,
+            data.getString("type") as String,
             peer,
             object : HMSMessageResultListener {
               override fun onError(error: HMSException) {
                 self.emitHMSError(error)
+                callback?.reject(error.code.toString(), error.message)
+              }
+              override fun onSuccess(hmsMessage: HMSMessage) {
+                callback?.resolve(emitHMSSuccess(hmsMessage))
               }
-              override fun onSuccess(hmsMessage: HMSMessage) {}
             }
         )
+      } else {
+        self.emitCustomError("PEER_NOT_FOUND")
+        callback?.reject("101", "PEER_NOT_FOUND")
       }
     } else {
       self.emitRequiredKeysError()
+      callback?.reject("101", "REQUIRED_KEYS_NOT_FOUND")
     }
   }
 
-  fun changeRole(data: ReadableMap) {
+  fun changeRole(data: ReadableMap, callback: Promise?) {
     val requiredKeys =
         HmsHelper.areAllRequiredKeysAvailable(
             data,
@@ -502,13 +531,16 @@ class HmsSDK(
 
         if (hmsRole != null && hmsPeer != null) {
           hmsSDK?.changeRole(
-              hmsPeer as HMSRemotePeer,
+              hmsPeer,
               hmsRole,
               force,
               object : HMSActionResultListener {
-                override fun onSuccess() {}
+                override fun onSuccess() {
+                  callback?.resolve(emitHMSSuccess())
+                }
                 override fun onError(error: HMSException) {
                   self.emitHMSError(error)
+                  callback?.reject(error.code.toString(), error.message)
                 }
               }
           )
@@ -516,10 +548,11 @@ class HmsSDK(
       }
     } else {
       self.emitRequiredKeysError()
+      callback?.reject("101", "REQUIRED_KEYS_NOT_FOUND")
     }
   }
 
-  fun changeTrackState(data: ReadableMap) {
+  fun changeTrackState(data: ReadableMap, callback: Promise?) {
     val requiredKeys =
         HmsHelper.areAllRequiredKeysAvailable(
             data,
@@ -535,36 +568,51 @@ class HmsSDK(
             track,
             mute,
             object : HMSActionResultListener {
-              override fun onSuccess() {}
+              override fun onSuccess() {
+                callback?.resolve(emitHMSSuccess())
+              }
               override fun onError(error: HMSException) {
                 self.emitHMSError(error)
+                callback?.reject(error.code.toString(), error.message)
               }
             }
         )
       }
     } else {
       self.emitRequiredKeysError()
+      callback?.reject("101", "REQUIRED_KEYS_NOT_FOUND")
     }
   }
 
-  fun changeTrackStateRoles(data: ReadableMap) {
+  fun changeTrackStateForRoles(data: ReadableMap, callback: Promise?) {
     val requiredKeys =
         HmsHelper.areAllRequiredKeysAvailable(
             data,
             arrayOf(
-                Pair("source", "String"),
                 Pair("mute", "Boolean"),
-                Pair("type", "String"),
-                Pair("roles", "Array")
             )
         )
     if (requiredKeys) {
       val mute: Boolean = data.getBoolean("mute")
       val type =
-          if (data.getString("type") == HMSTrackType.AUDIO.toString()) HMSTrackType.AUDIO
-          else HMSTrackType.VIDEO
-      val source = data.getString("source")
-      val targetedRoles = data.getArray("roles")?.toArrayList() as? ArrayList<String>
+          if (HmsHelper.areAllRequiredKeysAvailable(data, arrayOf(Pair("type", "String")))) {
+            if (data.getString("type") == HMSTrackType.AUDIO.toString()) HMSTrackType.AUDIO
+            else HMSTrackType.VIDEO
+          } else {
+            null
+          }
+      val source =
+          if (HmsHelper.areAllRequiredKeysAvailable(data, arrayOf(Pair("source", "String")))) {
+            data.getString("source")
+          } else {
+            null
+          }
+      val targetedRoles =
+          if (HmsHelper.areAllRequiredKeysAvailable(data, arrayOf(Pair("roles", "Array")))) {
+            data.getArray("roles")?.toArrayList() as? ArrayList<String>
+          } else {
+            null
+          }
       val roles = hmsSDK?.getRoles()
       val encodedTargetedRoles = HmsHelper.getRolesFromRoleNames(targetedRoles, roles)
       hmsSDK?.changeTrackState(
@@ -573,14 +621,18 @@ class HmsSDK(
           source,
           encodedTargetedRoles,
           object : HMSActionResultListener {
-            override fun onSuccess() {}
+            override fun onSuccess() {
+              callback?.resolve(emitHMSSuccess())
+            }
             override fun onError(error: HMSException) {
               self.emitHMSError(error)
+              callback?.reject(error.code.toString(), error.message)
             }
           }
       )
     } else {
       self.emitRequiredKeysError()
+      callback?.reject("101", "REQUIRED_KEYS_NOT_FOUND")
     }
   }
 
@@ -605,76 +657,88 @@ class HmsSDK(
         callback?.resolve(mute)
       }
     } else {
-      callback?.reject("102", "REQUIRED_KEYS_NOT_AVAILABLE")
+      callback?.reject("101", "REQUIRED_KEYS_NOT_FOUND")
     }
   }
 
-  fun removePeer(data: ReadableMap) {
+  fun removePeer(data: ReadableMap, callback: Promise?) {
     val requiredKeys =
-        HmsHelper.areAllRequiredKeysAvailable(data, arrayOf(Pair("peerId", "String")))
+        HmsHelper.areAllRequiredKeysAvailable(
+            data,
+            arrayOf(Pair("peerId", "String"), Pair("reason", "String"))
+        )
     if (requiredKeys) {
       val peerId = data.getString("peerId")
-      var reason = data.getString("reason")
-
-      if (reason == null) {
-        reason = ""
-      }
-
       val peers = hmsSDK?.getRemotePeers()
-
       val peer = HmsHelper.getRemotePeerFromPeerId(peerId, peers)
 
       if (peer != null) {
         hmsSDK?.removePeerRequest(
             peer,
-            reason,
+            data.getString("reason") as String,
             object : HMSActionResultListener {
-              override fun onSuccess() {}
+              override fun onSuccess() {
+                callback?.resolve(emitHMSSuccess())
+              }
               override fun onError(error: HMSException) {
                 self.emitHMSError(error)
+                callback?.reject(error.code.toString(), error.message)
               }
             }
         )
+      } else {
+        self.emitCustomError("PEER_NOT_FOUND")
+        callback?.reject("101", "PEER_NOT_FOUND")
       }
     } else {
       self.emitRequiredKeysError()
+      callback?.reject("101", "REQUIRED_KEYS_NOT_FOUND")
     }
   }
 
-  fun endRoom(data: ReadableMap) {
-    val lock = data.getBoolean("lock")
-    var reason = data.getString("reason")
-    if (reason == null) {
-      reason = ""
-    }
-
-    hmsSDK?.endRoom(
-        reason,
-        lock,
-        object : HMSActionResultListener {
-          override fun onSuccess() {}
-          override fun onError(error: HMSException) {
-            self.emitHMSError(error)
+  fun endRoom(data: ReadableMap, callback: Promise?) {
+    val requiredKeys =
+        HmsHelper.areAllRequiredKeysAvailable(
+            data,
+            arrayOf(Pair("lock", "Boolean"), Pair("reason", "String"))
+        )
+    if (requiredKeys) {
+      hmsSDK?.endRoom(
+          data.getString("reason") as String,
+          data.getBoolean("lock"),
+          object : HMSActionResultListener {
+            override fun onSuccess() {
+              callback?.resolve(emitHMSSuccess())
+            }
+            override fun onError(error: HMSException) {
+              self.emitHMSError(error)
+              callback?.reject(error.code.toString(), error.message)
+            }
           }
-        }
-    )
+      )
+    } else {
+      self.emitRequiredKeysError()
+      callback?.reject("101", "REQUIRED_KEYS_NOT_FOUND")
+    }
   }
 
-  fun acceptRoleChange() {
+  fun acceptRoleChange(callback: Promise?) {
     if (recentRoleChangeRequest !== null) {
+
       hmsSDK?.acceptChangeRole(
           recentRoleChangeRequest!!,
           object : HMSActionResultListener {
             override fun onSuccess() {
-              recentRoleChangeRequest = null
+              callback?.resolve(emitHMSSuccess())
             }
-
             override fun onError(error: HMSException) {
-              recentRoleChangeRequest = null
               self.emitHMSError(error)
+              callback?.reject(error.code.toString(), error.message)
             }
           }
       )
+
+      recentRoleChangeRequest = null
     }
   }
 
@@ -687,19 +751,17 @@ class HmsSDK(
         for (remotePeer in peers) {
           val peerId = remotePeer.peerID
           val peer = HmsHelper.getRemotePeerFromPeerId(peerId, peers)
-          if (peerId != null) {
-            peer?.audioTrack?.isPlaybackAllowed = !mute
-          }
+          peer?.audioTrack?.isPlaybackAllowed = !mute
         }
         val localPeerData = HmsDecoder.getHmsLocalPeer(hmsSDK?.getLocalPeer())
         val remotePeerData = HmsDecoder.getHmsRemotePeers(hmsSDK?.getRemotePeers())
 
-        val data: WritableMap = Arguments.createMap()
+        val map: WritableMap = Arguments.createMap()
 
-        data.putMap("localPeer", localPeerData)
-        data.putArray("remotePeers", remotePeerData)
-        data.putString("id", id)
-        delegate.emitEvent("ON_PEER_UPDATE", data)
+        map.putMap("localPeer", localPeerData)
+        map.putArray("remotePeers", remotePeerData)
+        map.putString("id", id)
+        delegate.emitEvent("ON_PEER_UPDATE", map)
       }
     } else {
       this.emitRequiredKeysError()
@@ -736,14 +798,18 @@ class HmsSDK(
       val remotePeers = hmsSDK?.getRemotePeers()
       val remoteAudioTrack = HmsHelper.getRemoteAudioTrackFromTrackId(trackId, remotePeers)
       val remoteVideoTrack = HmsHelper.getRemoteVideoTrackFromTrackId(trackId, remotePeers)
-      if (remoteAudioTrack != null) {
-        val isPlaybackAllowed = remoteAudioTrack.isPlaybackAllowed
-        callback?.resolve(isPlaybackAllowed)
-      } else if (remoteVideoTrack != null) {
-        val isPlaybackAllowed = remoteVideoTrack.isPlaybackAllowed
-        callback?.resolve(isPlaybackAllowed)
-      } else {
-        callback?.reject("101", "NOT_FOUND")
+      when {
+        remoteAudioTrack != null -> {
+          val isPlaybackAllowed = remoteAudioTrack.isPlaybackAllowed
+          callback?.resolve(isPlaybackAllowed)
+        }
+        remoteVideoTrack != null -> {
+          val isPlaybackAllowed = remoteVideoTrack.isPlaybackAllowed
+          callback?.resolve(isPlaybackAllowed)
+        }
+        else -> {
+          callback?.reject("101", "NOT_FOUND")
+        }
       }
     } else {
       callback?.reject("101", "TRACK_ID_NOT_FOUND")
@@ -752,7 +818,6 @@ class HmsSDK(
 
   fun getRoom(callback: Promise?) {
     val roomData = HmsDecoder.getHmsRoom(hmsSDK?.getRoom())
-
     callback?.resolve(roomData)
   }
 
@@ -827,14 +892,10 @@ class HmsSDK(
             metadata,
             object : HMSActionResultListener {
               override fun onSuccess() {
-                val result: WritableMap = Arguments.createMap()
-
-                result.putBoolean("success", true)
-
-                callback?.resolve(result)
+                callback?.resolve(emitHMSSuccess())
               }
               override fun onError(error: HMSException) {
-                callback?.reject(error.message, error.description)
+                callback?.reject(error.code.toString(), error.message)
                 self.emitHMSError(error)
               }
             }
@@ -853,7 +914,7 @@ class HmsSDK(
         )
     if (requiredKeys) {
       val record = data.getBoolean("record")
-      var meetingURL = data.getString("meetingURL") as String
+      val meetingURL = data.getString("meetingURL") as String
       var rtmpURLs = data.getArray("rtmpURLs")
       if (rtmpURLs == null) {
         rtmpURLs = Arguments.createArray()
@@ -865,12 +926,10 @@ class HmsSDK(
           config,
           object : HMSActionResultListener {
             override fun onSuccess() {
-              val result: WritableMap = Arguments.createMap()
-              result.putBoolean("success", true)
-              callback?.resolve(result)
+              callback?.resolve(emitHMSSuccess())
             }
             override fun onError(error: HMSException) {
-              callback?.reject(error.message, error.description)
+              callback?.reject(error.code.toString(), error.message)
               self.emitHMSError(error)
             }
           }
@@ -885,15 +944,103 @@ class HmsSDK(
     hmsSDK?.stopRtmpAndRecording(
         object : HMSActionResultListener {
           override fun onSuccess() {
-            val result: WritableMap = Arguments.createMap()
-            result.putBoolean("success", true)
-            callback?.resolve(result)
+            callback?.resolve(emitHMSSuccess())
           }
           override fun onError(error: HMSException) {
-            callback?.reject(error.message, error.description)
+            callback?.reject(error.code.toString(), error.message)
             self.emitHMSError(error)
           }
         }
     )
   }
+
+  fun startScreenshare() {
+    runOnUiThread {
+      val intent = Intent(context, HmsScreenshareActivity::class.java)
+      intent.flags = FLAG_ACTIVITY_NEW_TASK
+      intent.putExtra("id", id)
+      context.startActivity(intent)
+    }
+  }
+
+  fun isScreenShared(callback: Promise?) {
+    callback?.resolve(hmsSDK?.isScreenShared())
+  }
+
+  fun stopScreenshare(callback: Promise?) {
+    hmsSDK?.stopScreenshare(
+        object : HMSActionResultListener {
+          override fun onError(error: HMSException) {
+            callback?.reject(error.code.toString(), error.message)
+            self.emitHMSError(error)
+          }
+          override fun onSuccess() {
+            callback?.resolve(emitHMSSuccess())
+          }
+        }
+    )
+  }
+
+  fun startHLSStreaming(data: ReadableMap, callback: Promise?) {
+    val requiredKeys =
+        HmsHelper.areAllRequiredKeysAvailable(data, arrayOf(Pair("meetingURLVariants", "Array")))
+    if (requiredKeys) {
+      val meetingURLVariants =
+          data.getArray("meetingURLVariants")?.toArrayList() as? ArrayList<HashMap<String, String>>
+      val hlsMeetingUrlVariant = HmsHelper.getHMSHLSMeetingURLVariants(meetingURLVariants)
+      val config = HMSHLSConfig(hlsMeetingUrlVariant)
+
+      hmsSDK?.startHLSStreaming(
+          config,
+          object : HMSActionResultListener {
+            override fun onSuccess() {
+              callback?.resolve(emitHMSSuccess())
+            }
+            override fun onError(error: HMSException) {
+              callback?.reject(error.code.toString(), error.message)
+              self.emitHMSError(error)
+            }
+          }
+      )
+    } else {
+      callback?.reject("101", "REQUIRED_KEYS_NOT_FOUND")
+      self.emitRequiredKeysError()
+    }
+  }
+
+  fun stopHLSStreaming(callback: Promise?) {
+    hmsSDK?.stopHLSStreaming(
+        null,
+        object : HMSActionResultListener {
+          override fun onSuccess() {
+            callback?.resolve(emitHMSSuccess())
+          }
+          override fun onError(error: HMSException) {
+            callback?.reject(error.code.toString(), error.message)
+            self.emitHMSError(error)
+          }
+        }
+    )
+  }
+
+  fun resetVolume() {
+    val remotePeers = hmsSDK?.getRemotePeers()
+
+    if (remotePeers != null) {
+      for (peer in remotePeers) {
+        val playbackAllowed = peer.audioTrack?.isPlaybackAllowed
+        if (playbackAllowed !== null && playbackAllowed) {
+          peer.audioTrack?.setVolume(10.0)
+        }
+        val auxTracks = peer.auxiliaryTracks
+
+        for (track in auxTracks) {
+          if (track.type === HMSTrackType.AUDIO) {
+
+            (track as? HMSRemoteAudioTrack)?.setVolume(10.0)
+          }
+        }
+      }
+    }
+  }
 }