@100mslive/react-native-hms 0.9.4 → 0.9.7

package/README.md

@@ -192,10 +192,9 @@ const styles = StyleSheet.create({
 });
 
 // trackId can be acquired from the method explained above
-// sink is passed false video would be removed. It is a ios only prop, for android it is handled by the package itself.
 // scaleType can be selected from HMSVideoViewMode as required
 // mirror can be passed as true to flip videos horizontally
-<HmsView sink={true} style={styles.hmsView} trackId={trackId} mirror={true} scaleType={HMSVideoViewMode.ASPECT_FIT} />
+<HmsView style={styles.hmsView} trackId={trackId} mirror={true} scaleType={HMSVideoViewMode.ASPECT_FIT} />
 
 ...
 ```
@@ -355,15 +354,14 @@ hmsInstance?.startScreenshare();
 ```js
 import {
   HMSUpdateListenerActions,
-  HMSSpeakerUpdate,
   HMSSpeaker,
 } from '@100mslive/react-native-hms';
 
 // hms instance acquired by build method
 hmsInstance?.addEventListener(HMSUpdateListenerActions.ON_SPEAKER, onSpeaker);
 
-const onSpeaker = (data: HMSSpeakerUpdate) => {
-  data?.peers?.map((speaker: HMSSpeaker) =>
+const onSpeaker = (data: HMSSpeaker[]) => {
+  data?.map((speaker: HMSSpeaker) =>
     console.log('speaker audio level: ', speaker?.level)
   );
 };

package/android/build.gradle

@@ -63,8 +63,8 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"  // From node_modules
-    implementation 'com.github.100mslive.android-sdk:lib:2.3.5'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    implementation 'com.github.100mslive.android-sdk:lib:2.4.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'androidx.appcompat:appcompat:1.3.1'
 }

package/android/src/main/java/com/reactnativehmssdk/{HmsDecoder.kt → HMSDecoder.kt}

@@ -11,12 +11,13 @@ import live.hms.video.sdk.models.*
 import live.hms.video.sdk.models.role.*
 import live.hms.video.sdk.models.trackchangerequest.HMSChangeTrackStateRequest
 
-object HmsDecoder {
+object HMSDecoder {
 
   fun getHmsRoom(hmsRoom: HMSRoom?): WritableMap {
     val room: WritableMap = Arguments.createMap()
     if (hmsRoom != null) {
       room.putString("id", hmsRoom.roomId)
+      room.putString("sessionId", hmsRoom.sessionId)
       room.putString("name", hmsRoom.name)
       room.putString("metaData", null)
       room.putString("startedAt", hmsRoom.startedAt.toString())
@@ -33,6 +34,7 @@ object HmsDecoder {
           this.getHMSServerRecordingState(hmsRoom.serverRecordingState)
       )
       room.putMap("hlsStreamingState", this.getHMSHlsStreamingState(hmsRoom.hlsStreamingState))
+      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)
@@ -354,37 +356,18 @@ object HmsDecoder {
     return changeTrackStateRequest
   }
 
-  fun getError(error: HMSException): WritableMap {
-    val decodedError: WritableMap = Arguments.createMap()
-
-    decodedError.putInt("code", error.code)
-    decodedError.putString("localizedDescription", error.localizedMessage)
-    decodedError.putString("description", error.description)
-    decodedError.putString("message", error.message)
-    decodedError.putString("name", error.name)
-    decodedError.putString("action", error.action)
-
-    return decodedError
-  }
-
-  private fun getCustomError(message: String?, code: Int?): WritableMap {
-    val decodedError: WritableMap = Arguments.createMap()
-    var customCode = 101
-    var customMessage = "SOMETHING WENT WRONG"
-    if (code !== null) {
-      customCode = code.toInt()
+  fun getError(error: HMSException?): WritableMap? {
+    if (error !== null) {
+      val decodedError: WritableMap = Arguments.createMap()
+      decodedError.putInt("code", error.code)
+      decodedError.putString("localizedDescription", error.localizedMessage)
+      decodedError.putString("description", error.description)
+      decodedError.putString("message", error.message)
+      decodedError.putString("name", error.name)
+      decodedError.putString("action", error.action)
+      return decodedError
     }
-    if (message !== null) {
-      customMessage = message
-    }
-    decodedError.putInt("code", customCode)
-    decodedError.putString("localizedDescription", customMessage)
-    decodedError.putString("description", customMessage)
-    decodedError.putString("message", customMessage)
-    decodedError.putInt("name", customCode)
-    decodedError.putInt("action", customCode)
-
-    return decodedError
+    return null
   }
 
   private fun getHMSBrowserRecordingState(data: HMSBrowserRecordingState?): ReadableMap {
@@ -394,7 +377,7 @@ object HmsDecoder {
       input.putString("startedAt", data.startedAt.toString())
       input.putString("stoppedAt", data.stoppedAt.toString())
       input.putBoolean("running", data.running)
-      input.putMap("error", this.getCustomError(data.error?.message, data.error?.code))
+      input.putMap("error", this.getError(data.error))
     }
     return input
   }
@@ -405,7 +388,7 @@ object HmsDecoder {
       input.putBoolean("running", data.running)
       input.putString("startedAt", data.startedAt.toString())
       input.putString("stoppedAt", data.stoppedAt.toString())
-      input.putMap("error", this.getCustomError(data.error?.message, data.error?.code))
+      input.putMap("error", this.getError(data.error))
     }
     return input
   }
@@ -415,7 +398,7 @@ object HmsDecoder {
     if (data !== null) {
       input.putBoolean("running", data.running)
       input.putString("startedAt", data.startedAt.toString())
-      input.putMap("error", data.error?.let { this.getError(it) })
+      input.putMap("error", this.getError(data.error))
     }
     return input
   }
@@ -429,6 +412,27 @@ object HmsDecoder {
     return input
   }
 
+  private fun getHMSHlsRecordingState(data: HmsHlsRecordingState?): ReadableMap {
+    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.hlsRecordingConfig?.let { input.putBoolean("singleFilePerLayer", it.singleFilePerLayer) }
+      data.hlsRecordingConfig?.let { input.putBoolean("videoOnDemand", it.videoOnDemand) }
+    }
+    return input
+  }
+
+  //  private fun getHMSHlsRecordingConfig(data: HMSHlsRecordingConfig?): ReadableMap {
+  //    val input = Arguments.createMap()
+  //    if (data !== null) {
+  //      input.putBoolean("singleFilePerLayer", data.singleFilePerLayer)
+  //      input.putBoolean("videoOnDemand", data.videoOnDemand)
+  //    }
+  //    return input
+  //  }
+
   private fun getHMSHLSVariant(data: ArrayList<HMSHLSVariant>?): ReadableArray {
     val variants = Arguments.createArray()
     if (data !== null) {

package/android/src/main/java/com/reactnativehmssdk/{HmsHelper.kt → HMSHelper.kt}

@@ -2,15 +2,18 @@ package com.reactnativehmssdk
 
 import android.content.Context
 import android.graphics.Bitmap
-import android.media.MediaScannerConnection
 import android.os.Build
-import android.os.Environment
 import android.os.Handler
+import android.util.Base64
 import android.util.Log
 import android.view.PixelCopy
 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.error.HMSException
 import live.hms.video.media.codec.HMSAudioCodec
 import live.hms.video.media.codec.HMSVideoCodec
@@ -25,11 +28,8 @@ import live.hms.video.sdk.models.*
 import live.hms.video.sdk.models.role.HMSRole
 import live.hms.video.utils.HmsUtilities
 import org.webrtc.SurfaceViewRenderer
-import java.io.File
-import java.io.FileOutputStream
-import java.util.*
 
-object HmsHelper {
+object HMSHelper {
 
   fun areAllRequiredKeysAvailable(
       map: ReadableMap?,
@@ -64,6 +64,39 @@ object HmsHelper {
     return true
   }
 
+  fun getUnavailableRequiredKey(
+      map: ReadableMap?,
+      requiredKeys: Array<Pair<String, String>>
+  ): String? {
+    if (map == null) {
+      return "Object_Is_Null"
+    }
+    for ((key, value) in requiredKeys) {
+      if (map.hasKey(key)) {
+        when (value) {
+          "String" -> {
+            if (map.getString(key) == null) {
+              return key + "_Is_Null"
+            }
+          }
+          "Array" -> {
+            if (map.getArray(key) == null) {
+              return key + "_Is_Null"
+            }
+          }
+          "Map" -> {
+            if (map.getMap(key) == null) {
+              return key + "_Is_Null"
+            }
+          }
+        }
+      } else {
+        return key + "_Is_Required"
+      }
+    }
+    return null
+  }
+
   fun getPeerFromPeerId(peerId: String?, room: HMSRoom?): HMSPeer? {
     if (peerId != null && room != null) {
       return HmsUtilities.getPeer(peerId, room)
@@ -136,7 +169,9 @@ object HmsHelper {
     var useHardwareEchoCancellation = false
     val requiredKeysUseHardwareEchoCancellation =
         this.areAllRequiredKeysAvailable(
-            data, arrayOf(Pair("useHardwareEchoCancellation", "Boolean")))
+            data,
+            arrayOf(Pair("useHardwareEchoCancellation", "Boolean"))
+        )
     if (requiredKeysUseHardwareEchoCancellation) {
       useHardwareEchoCancellation = data.getBoolean("useHardwareEchoCancellation")
     }
@@ -251,7 +286,7 @@ object HmsHelper {
     return HMSVideoTrackSettings.CameraFacing.FRONT
   }
 
-  fun getHms(credentials: ReadableMap, hmsCollection: MutableMap<String, HmsSDK>): HmsSDK? {
+  fun getHms(credentials: ReadableMap, hmsCollection: MutableMap<String, HMSRNSDK>): HMSRNSDK? {
     val id = credentials.getString("id")
 
     return if (id != null) {
@@ -291,11 +326,17 @@ object HmsHelper {
         var singleFilePerLayer = false
         var videoOnDemand = false
         if (areAllRequiredKeysAvailable(
-            hmsHlsRecordingConfig, arrayOf(Pair("singleFilePerLayer", "Boolean")))) {
+                hmsHlsRecordingConfig,
+                arrayOf(Pair("singleFilePerLayer", "Boolean"))
+            )
+        ) {
           singleFilePerLayer = hmsHlsRecordingConfig.getBoolean("singleFilePerLayer")
         }
         if (areAllRequiredKeysAvailable(
-            hmsHlsRecordingConfig, arrayOf(Pair("videoOnDemand", "Boolean")))) {
+                hmsHlsRecordingConfig,
+                arrayOf(Pair("videoOnDemand", "Boolean"))
+            )
+        ) {
           videoOnDemand = hmsHlsRecordingConfig.getBoolean("videoOnDemand")
         }
         return HMSHlsRecordingConfig(singleFilePerLayer, videoOnDemand)
@@ -329,7 +370,9 @@ object HmsHelper {
           arrayOf(
               Pair("endpoint", "String"),
               Pair("metadata", "String"),
-              Pair("captureNetworkQualityInPreview", "Boolean"))) -> {
+              Pair("captureNetworkQualityInPreview", "Boolean")
+          )
+      ) -> {
         config =
             HMSConfig(
                 credentials.getString("username") as String,
@@ -341,7 +384,9 @@ object HmsHelper {
             )
       }
       areAllRequiredKeysAvailable(
-          credentials, arrayOf(Pair("endpoint", "String"), Pair("metadata", "String"))) -> {
+          credentials,
+          arrayOf(Pair("endpoint", "String"), Pair("metadata", "String"))
+      ) -> {
         config =
             HMSConfig(
                 credentials.getString("username") as String,
@@ -352,8 +397,8 @@ object HmsHelper {
       }
       areAllRequiredKeysAvailable(
           credentials,
-          arrayOf(
-              Pair("endpoint", "String"), Pair("captureNetworkQualityInPreview", "Boolean"))) -> {
+          arrayOf(Pair("endpoint", "String"), Pair("captureNetworkQualityInPreview", "Boolean"))
+      ) -> {
         config =
             HMSConfig(
                 credentials.getString("username") as String,
@@ -365,8 +410,8 @@ object HmsHelper {
       }
       areAllRequiredKeysAvailable(
           credentials,
-          arrayOf(
-              Pair("metadata", "String"), Pair("captureNetworkQualityInPreview", "Boolean"))) -> {
+          arrayOf(Pair("metadata", "String"), Pair("captureNetworkQualityInPreview", "Boolean"))
+      ) -> {
         config =
             HMSConfig(
                 credentials.getString("username") as String,
@@ -393,83 +438,78 @@ object HmsHelper {
             )
       }
       areAllRequiredKeysAvailable(
-          credentials, arrayOf(Pair("captureNetworkQualityInPreview", "Boolean"))) -> {
+          credentials,
+          arrayOf(Pair("captureNetworkQualityInPreview", "Boolean"))
+      ) -> {
         config =
             HMSConfig(
                 credentials.getString("username") as String,
                 credentials.getString("authToken") as String,
                 captureNetworkQualityInPreview =
-                    credentials.getBoolean("captureNetworkQualityInPreview"))
+                    credentials.getBoolean("captureNetworkQualityInPreview")
+            )
       }
     }
     return config
   }
 
   @RequiresApi(Build.VERSION_CODES.N)
-  fun captureSurfaceView(surfaceView: SurfaceViewRenderer, context: Context, id: String?) {
+  fun captureSurfaceView(
+      surfaceView: SurfaceViewRenderer,
+      sdkId: String,
+      args: ReadableArray?,
+      context: Context,
+      id: Int
+  ) {
+    val output = Arguments.createMap()
+    if (args != null) {
+      output.putInt("requestId", args.getInt(0))
+    } else {
+      output.putInt("requestId", -1)
+    }
+    val reactContext = context as ReactContext
     try {
       val bitmap: Bitmap =
-        Bitmap.createBitmap(surfaceView.width, surfaceView.height, Bitmap.Config.ARGB_8888)
+          Bitmap.createBitmap(surfaceView.width, surfaceView.height, Bitmap.Config.ARGB_8888)
       PixelCopy.request(
-        surfaceView,
-        bitmap,
-        { copyResult ->
-          if (copyResult === PixelCopy.SUCCESS) {
-            Log.d("captureSurfaceView", "bitmap: $bitmap")
-            saveImage(bitmap, context, id)
-          } else {
-            HmsModule.hmsCollection[id]?.emitHMSError(
-              HMSException(
-                103,
-                copyResult.toString(),
-                copyResult.toString(),
-                copyResult.toString(),
-                copyResult.toString()
+          surfaceView,
+          bitmap,
+          { copyResult ->
+            if (copyResult == PixelCopy.SUCCESS) {
+              Log.d("captureSurfaceView", "bitmap: $bitmap")
+              val byteArrayOutputStream = ByteArrayOutputStream()
+              bitmap.compress(Bitmap.CompressFormat.PNG, 100, byteArrayOutputStream)
+              val byteArray = byteArrayOutputStream.toByteArray()
+              val encoded: String = Base64.encodeToString(byteArray, Base64.DEFAULT)
+              Log.d("captureSurfaceView", "Base64: $encoded")
+              output.putString("result", encoded)
+              reactContext
+                  .getJSModule(RCTEventEmitter::class.java)
+                  .receiveEvent(id, "captureFrame", output)
+            } else {
+              Log.e("captureSurfaceView", "copyResult: $copyResult")
+              HMSManager.hmsCollection[sdkId]?.emitHMSError(
+                  HMSException(
+                      103,
+                      copyResult.toString(),
+                      copyResult.toString(),
+                      copyResult.toString(),
+                      copyResult.toString()
+                  )
               )
-            )
-            Log.e("captureSurfaceView", "copyResult: $copyResult")
-          }
-        },
-        Handler()
+              output.putString("error", copyResult.toString())
+              reactContext
+                  .getJSModule(RCTEventEmitter::class.java)
+                  .receiveEvent(id, "captureFrame", output)
+            }
+          },
+          Handler()
       )
     } catch (e: Exception) {
       Log.e("captureSurfaceView", "error: $e")
-    }
-  }
-
-  private fun saveImage(finalBitmap: Bitmap, context: Context, id: String?) {
-    val folder = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM)
-    if (!folder.exists()) {
-      folder.mkdir()
-    }
-    val generator = Random()
-    var n = 10000
-    n = generator.nextInt(n)
-    val fileName = "Image-$n.jpg"
-    val file = File(folder.absolutePath, fileName)
-    if (file.exists()) file.delete()
-    try {
-      val out = FileOutputStream(file)
-      finalBitmap.compress(Bitmap.CompressFormat.JPEG, 90, out)
-      out.flush()
-      out.close()
-    } catch (e: Exception) {
-      HmsModule.hmsCollection[id]?.emitHMSError(
-        HMSException(
-          103,
-          e.message.toString(),
-          e.message.toString(),
-          e.message.toString(),
-          e.message.toString()
-        )
-      )
-      Log.e("saveImage", "error: $e")
-    }
-    // Tell the media scanner about the new file so that it is
-    // immediately available to the user.
-    MediaScannerConnection.scanFile(context, arrayOf(file.toString()), null) { path, uri ->
-      Log.i("ExternalStorage", "Scanned $path:")
-      Log.i("ExternalStorage", "-> uri=$uri")
+      HMSManager.hmsCollection[sdkId]?.emitHMSError(e as HMSException)
+      output.putString("error", e.message)
+      reactContext.getJSModule(RCTEventEmitter::class.java).receiveEvent(id, "captureFrame", output)
     }
   }
 }