@100mslive/react-native-hms 1.5.0 → 1.6.1

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

@@ -28,7 +28,7 @@ class HMSSDKViewManager : SimpleViewManager<HMSView>() {
     return MapBuilder.builder<String, Any>()
       .put(
         "topChange",
-        MapBuilder.of("phasedRegistrationNames", MapBuilder.of("bubbled", "onChange"))
+        MapBuilder.of("phasedRegistrationNames", MapBuilder.of("bubbled", "onChange")),
       )
       .build()
   }
@@ -36,7 +36,7 @@ class HMSSDKViewManager : SimpleViewManager<HMSView>() {
   override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any>? {
     return MapBuilder.of(
       "captureFrame",
-      MapBuilder.of("registrationName", "onDataReturned")
+      MapBuilder.of("registrationName", "onDataReturned"),
     )
   }
 
@@ -64,9 +64,10 @@ class HMSSDKViewManager : SimpleViewManager<HMSView>() {
     val trackId = data.getString("trackId")
     val id = data.getString("id")
     val mirror = data.getBoolean("mirror")
+    val scaleType = data.getString("scaleType")
     val hmsCollection = getHms()
     if (hmsCollection != null) {
-      view.setData(id, trackId, hmsCollection, mirror)
+      view.setData(id, trackId, hmsCollection, mirror, scaleType)
     }
   }
 

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

@@ -3,6 +3,7 @@ package com.reactnativehmssdk
 import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Build
+import android.util.Log
 import android.view.LayoutInflater
 import android.widget.FrameLayout
 import androidx.annotation.RequiresApi
@@ -14,61 +15,68 @@ import com.facebook.react.uimanager.events.RCTEventEmitter
 import live.hms.video.media.tracks.HMSVideoTrack
 import live.hms.video.utils.HmsUtilities
 import live.hms.videoview.HMSVideoView
+import live.hms.videoview.VideoViewStateChangeListener
 import org.webrtc.RendererCommon
 
 @SuppressLint("ViewConstructor")
 class HMSView(context: ReactContext) : FrameLayout(context) {
-  private var hmsVideoView: HMSVideoView = HMSVideoView(context)
+  private var hmsVideoView: HMSVideoView? = null
   private var videoTrack: HMSVideoTrack? = null
-  private var scaleTypeApplied: Boolean = false
   private var sdkId: String = "12345"
-  private var currentScaleType: RendererCommon.ScalingType =
-    RendererCommon.ScalingType.SCALE_ASPECT_FILL
   private var disableAutoSimulcastLayerSelect = false
+  private var jsCanApplyStyles = false
 
   init {
     val inflater = getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
     val view = inflater.inflate(R.layout.hms_view, this)
 
     hmsVideoView = view.findViewById(R.id.hmsVideoView)
-    hmsVideoView.setEnableHardwareScaler(false)
-    hmsVideoView.setScalingType(currentScaleType)
-    hmsVideoView.setMirror(false)
-    hmsVideoView.disableAutoSimulcastLayerSelect(disableAutoSimulcastLayerSelect)
+    hmsVideoView?.setEnableHardwareScaler(false)
+
+    hmsVideoView?.setMirror(false)
+    hmsVideoView?.disableAutoSimulcastLayerSelect(disableAutoSimulcastLayerSelect)
+
+    hmsVideoView?.addVideoViewStateChangeListener(object : VideoViewStateChangeListener {
+      override fun onResolutionChange(newWidth: Int, newHeight: Int) {
+        super.onResolutionChange(newWidth, newHeight)
+        if (!jsCanApplyStyles) {
+          val event: WritableMap = Arguments.createMap()
+          context.getJSModule(RCTEventEmitter::class.java).receiveEvent(id, "topChange", event)
+          jsCanApplyStyles = true
+        }
+      }
+    })
   }
 
   @RequiresApi(Build.VERSION_CODES.N)
   fun captureHmsView(args: ReadableArray?) {
-    HMSHelper.captureSurfaceView(hmsVideoView, sdkId, args, context, id)
-  }
-
-  private fun onReceiveNativeEvent() {
-    val event: WritableMap = Arguments.createMap()
-    event.putString("message", "MyMessage")
-    val reactContext = context as ReactContext
-    reactContext.getJSModule(RCTEventEmitter::class.java).receiveEvent(id, "topChange", event)
+    hmsVideoView?.let {
+      HMSHelper.captureSurfaceView(it, sdkId, args, context, id)
+    }
   }
 
   override fun onDetachedFromWindow() {
     super.onDetachedFromWindow()
-    hmsVideoView.removeTrack()
+    hmsVideoView?.removeTrack()
   }
 
   override fun onAttachedToWindow() {
     super.onAttachedToWindow()
-    hmsVideoView.addTrack(videoTrack!!) // DOUBT: Handle case when videoTrack is null
-    if (!scaleTypeApplied) {
-      if (currentScaleType != RendererCommon.ScalingType.SCALE_ASPECT_FILL) {
-        onReceiveNativeEvent()
-      }
-      scaleTypeApplied = true
+
+    videoTrack?.let { // Safe Call Operator to check if videoTrack is not null
+      hmsVideoView?.addTrack(it) // add the videoTrack to the hmsVideoView
+    } ?: run { // Elvis Operator to handle the case when videoTrack is null
+      Log.e(
+        "HMSView",
+        "HMSView attached to window, but it's videoTrack is null",
+      ) // log an error message
     }
   }
 
   fun updateZOrderMediaOverlay(setZOrderMediaOverlay: Boolean?) {
     if (setZOrderMediaOverlay != null && setZOrderMediaOverlay) {
       // hmsVideoView.setZOrderOnTop(true);
-      hmsVideoView.setZOrderMediaOverlay(setZOrderMediaOverlay)
+      hmsVideoView?.setZOrderMediaOverlay(setZOrderMediaOverlay)
     }
   }
 
@@ -76,18 +84,15 @@ class HMSView(context: ReactContext) : FrameLayout(context) {
     if (scaleType != null) {
       when (scaleType) {
         "ASPECT_FIT" -> {
-          hmsVideoView.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FIT)
-          currentScaleType = RendererCommon.ScalingType.SCALE_ASPECT_FIT
+          hmsVideoView?.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FIT)
           return
         }
         "ASPECT_FILL" -> {
-          hmsVideoView.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FILL)
-          currentScaleType = RendererCommon.ScalingType.SCALE_ASPECT_FILL
+          hmsVideoView?.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FILL)
           return
         }
         "ASPECT_BALANCED" -> {
-          hmsVideoView.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_BALANCED)
-          currentScaleType = RendererCommon.ScalingType.SCALE_ASPECT_BALANCED
+          hmsVideoView?.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_BALANCED)
           return
         }
         else -> {
@@ -101,7 +106,8 @@ class HMSView(context: ReactContext) : FrameLayout(context) {
     id: String?,
     trackId: String?,
     hmsCollection: MutableMap<String, HMSRNSDK>,
-    mirror: Boolean?
+    mirror: Boolean?,
+    scaleType: String?,
   ) {
     if (id != null) {
       sdkId = id
@@ -110,8 +116,9 @@ class HMSView(context: ReactContext) : FrameLayout(context) {
 
     if (trackId != null && hms != null) {
       if (mirror != null) {
-        hmsVideoView.setMirror(mirror)
+        hmsVideoView?.setMirror(mirror)
       }
+      updateScaleType(scaleType)
       // TODO: can be optimized here
       videoTrack = hms.getRoom()?.let { HmsUtilities.getVideoTrack(trackId, it) }
     }
@@ -119,7 +126,7 @@ class HMSView(context: ReactContext) : FrameLayout(context) {
 
   fun updateAutoSimulcast(autoSimulcast: Boolean?) {
     autoSimulcast?.let {
-      hmsVideoView.disableAutoSimulcastLayerSelect(!it)
+      hmsVideoView?.disableAutoSimulcastLayerSelect(!it)
     }
   }
 }

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

@@ -13,41 +13,41 @@ import live.hms.video.sdk.HMSActionResultListener
 
 class HmsScreenshareActivity : ComponentActivity() {
   private var resultLauncher: ActivityResultLauncher<Intent> =
-      this.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-        if (result.resultCode == Activity.RESULT_OK) {
-          val mediaProjectionPermissionResultData: Intent? = result.data
-          val id = intent.getStringExtra("id")
-          HMSManager.hmsCollection[id]?.hmsSDK?.startScreenshare(
-              object : HMSActionResultListener {
-                override fun onError(error: HMSException) {
-                  finish()
-                  HMSManager.hmsCollection[id]?.screenshareCallback?.reject(error)
-                  HMSManager.hmsCollection[id]?.emitHMSError(error)
-                }
-                override fun onSuccess() {
-                  HMSManager.hmsCollection[id]?.screenshareCallback?.resolve(
-                      HMSManager.hmsCollection[id]?.emitHMSSuccess()
-                  )
-                  finish()
-                }
-              },
-              mediaProjectionPermissionResultData
-          )
-        } else {
-          val id = intent.getStringExtra("id")
-          val error =
-              HMSException(
-                  103,
-                  "RESULT_CANCELED",
-                  "RESULT_CANCELED",
-                  "RESULT_CANCELED",
-                  "RESULT_CANCELED"
+    this.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+      if (result.resultCode == Activity.RESULT_OK) {
+        val mediaProjectionPermissionResultData: Intent? = result.data
+        val id = intent.getStringExtra("id")
+        HMSManager.hmsCollection[id]?.hmsSDK?.startScreenshare(
+          object : HMSActionResultListener {
+            override fun onError(error: HMSException) {
+              finish()
+              HMSManager.hmsCollection[id]?.screenshareCallback?.reject(error)
+              HMSManager.hmsCollection[id]?.emitHMSError(error)
+            }
+            override fun onSuccess() {
+              HMSManager.hmsCollection[id]?.screenshareCallback?.resolve(
+                HMSManager.hmsCollection[id]?.emitHMSSuccess(),
               )
-          HMSManager.hmsCollection[id]?.screenshareCallback?.reject(error)
-          HMSManager.hmsCollection[id]?.emitHMSError(error)
-          finish()
-        }
+              finish()
+            }
+          },
+          mediaProjectionPermissionResultData,
+        )
+      } else {
+        val id = intent.getStringExtra("id")
+        val error =
+          HMSException(
+            103,
+            "RESULT_CANCELED",
+            "RESULT_CANCELED",
+            "RESULT_CANCELED",
+            "RESULT_CANCELED",
+          )
+        HMSManager.hmsCollection[id]?.screenshareCallback?.reject(error)
+        HMSManager.hmsCollection[id]?.emitHMSError(error)
+        finish()
       }
+    }
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
@@ -60,20 +60,20 @@ class HmsScreenshareActivity : ComponentActivity() {
     if (isScreenShared !== null && !isScreenShared) {
       try {
         val mediaProjectionManager =
-            getSystemService(Context.MEDIA_PROJECTION_SERVICE) as MediaProjectionManager
+          getSystemService(Context.MEDIA_PROJECTION_SERVICE) as MediaProjectionManager
         resultLauncher.launch(mediaProjectionManager.createScreenCaptureIntent())
       } catch (e: Exception) {
         println(e)
       }
     } else {
       HMSManager.hmsCollection[id]?.emitHMSError(
-          HMSException(
-              103,
-              "SCREENSHARE_IS_ALREADY_RUNNING",
-              "SCREENSHARE_IS_ALREADY_RUNNING",
-              "SCREENSHARE_IS_ALREADY_RUNNING",
-              "SCREENSHARE_IS_ALREADY_RUNNING"
-          )
+        HMSException(
+          103,
+          "SCREENSHARE_IS_ALREADY_RUNNING",
+          "SCREENSHARE_IS_ALREADY_RUNNING",
+          "SCREENSHARE_IS_ALREADY_RUNNING",
+          "SCREENSHARE_IS_ALREADY_RUNNING",
+        ),
       )
       finish()
     }

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

@@ -16,7 +16,7 @@ data class PIPActions(val endMeet: PIPAction, val localAudio: PIPAction, val loc
 class PipActionReceiver(
   val toggleLocalAudio: () -> Unit,
   val toggleLocalVideo: () -> Unit,
-  val endMeeting: () -> Unit
+  val endMeeting: () -> Unit,
 ) : BroadcastReceiver() {
   companion object {
     var sdkIdForPIP: String? = null
@@ -25,7 +25,7 @@ class PipActionReceiver(
     val PIPActions = PIPActions(
       endMeet = PIPAction(title = "End", description = "End Meeting", requestCode = 346),
       localAudio = PIPAction(title = "Mic", description = "Toggle Mic", requestCode = 344),
-      localVideo = PIPAction(title = "Camera", description = "Toggle Camera", requestCode = 345)
+      localVideo = PIPAction(title = "Camera", description = "Toggle Camera", requestCode = 345),
     )
   }
 

package/ios/HMSConstants.swift

@@ -16,7 +16,7 @@ struct HMSConstants {
     static let ON_PEER_UPDATE = "3"
     static let ON_TRACK_UPDATE = "ON_TRACK_UPDATE"
     static let ON_ROLE_CHANGE_REQUEST = "ON_ROLE_CHANGE_REQUEST"
-    static let ON_CHANGE_TRACK_STATE_REQUEST = "ON_CHANGE_TRACK_STATE_REQUEST" // new
+    static let ON_CHANGE_TRACK_STATE_REQUEST = "ON_CHANGE_TRACK_STATE_REQUEST"
     static let ON_REMOVED_FROM_ROOM = "ON_REMOVED_FROM_ROOM"
     static let ON_ERROR = "ON_ERROR"
     static let ON_MESSAGE = "ON_MESSAGE"
@@ -28,4 +28,6 @@ struct HMSConstants {
     static let ON_LOCAL_VIDEO_STATS = "ON_LOCAL_VIDEO_STATS"
     static let ON_REMOTE_AUDIO_STATS = "ON_REMOTE_AUDIO_STATS"
     static let ON_REMOTE_VIDEO_STATS = "ON_REMOTE_VIDEO_STATS"
+    static let ON_SESSION_STORE_AVAILABLE = "ON_SESSION_STORE_AVAILABLE"
+    static let ON_SESSION_STORE_CHANGED = "ON_SESSION_STORE_CHANGED"
 }

package/ios/HMSDecoder.swift

@@ -278,7 +278,7 @@ class HMSDecoder: NSObject {
         return ["trackId": localVideo.trackId, "source": localVideo.source, "trackDescription": localVideo.trackDescription, "settings": getHmsVideoTrackSettings(localVideo.settings), "isMute": localVideo.isMute(), "type": type, "kind": type]
     }
 
-    static func getHmsAudioTrackSettings(_ hmsAudioTrackSettings: HMSAudioTrackSettings?) -> [String: Any] {
+    static func getHmsAudioTrackSettings(_ hmsAudioTrackSettings: HMSAudioTrackSettings?) -> [String: Any?] {
 
         guard let settings = hmsAudioTrackSettings else { return [String: Any]() }
 

package/ios/HMSHelper.swift

@@ -172,15 +172,21 @@ class HMSHelper: NSObject {
     }
 
     static func getLocalAudioSettings(_ settings: NSDictionary?, _ hms: HMSSDK?, _ delegate: HMSManager?, _ id: String) -> HMSAudioTrackSettings? {
-        if settings === nil {
+
+        guard let settings = settings
+        else {
+            print(#function, "No Local Audio Settings passed.")
             return nil
         }
-        let initialState = settings?.value(forKey: "initialState") as? String
+
+        let initialState = settings.value(forKey: "initialState") as? String
         let initialStateEncoded = HMSHelper.getHMSTrackSettingsInitState(initialState)
 
+        let audioMode = getAudioMode(from: settings["audioMode"] as? String)
+
         if #available(iOS 13.0, *) {
             var audioMixerSourceMap: [String: HMSAudioNode]?
-            if let playerNode = settings?.value(forKey: "audioSource") as? [String] {
+            if let playerNode = settings.value(forKey: "audioSource") as? [String] {
                 audioMixerSourceMap = [String: HMSAudioNode]()
                 for node in playerNode {
                     if audioMixerSourceMap?[node] == nil {
@@ -190,7 +196,7 @@ class HMSHelper: NSObject {
                             do {
                                 audioMixerSourceMap?["screen_broadcast_audio_receiver_node"] = try hms?.screenBroadcastAudioReceiverNode()
                             } catch {
-                                delegate?.emitEvent("ON_ERROR", ["error": ["code": 6002, "description": error.localizedDescription, "isTerminal": false, "canRetry": true, "params": ["function": #function]], "id": id])
+                                delegate?.emitEvent("ON_ERROR", ["error": ["code": 6002, "description": error.localizedDescription, "isTerminal": false, "canRetry": true, "params": ["function": #function]] as [String: Any], "id": id])
                             }
                         } else {
                             audioMixerSourceMap?[node] = HMSAudioFilePlayerNode()
@@ -203,15 +209,33 @@ class HMSHelper: NSObject {
                 do {
                     self.audioMixerSourceHashMap = audioMixerSourceMap
                     let audioMixerSource = try HMSAudioMixerSource(nodes: audioMixerSourceMap.values.map {$0})
-                    return HMSAudioTrackSettings(maxBitrate: 32, trackDescription: "", initialMuteState: initialStateEncoded, audioSource: audioMixerSource)
+
+                    return HMSAudioTrackSettings.build { builder in
+
+                        builder.initialMuteState = initialStateEncoded
+
+                        builder.audioSource = audioMixerSource
+
+                        if let audioMode = audioMode {
+                            builder.audioMode = audioMode
+                        }
+                    }
+
                 } catch {
-                    delegate?.emitEvent("ON_ERROR", ["error": ["code": 6002, "description": error.localizedDescription, "isTerminal": false, "canRetry": true, "params": ["function": #function]], "id": id])
+                    delegate?.emitEvent("ON_ERROR", ["error": ["code": 6002, "description": error.localizedDescription, "isTerminal": false, "canRetry": true, "params": ["function": #function]] as [String: Any], "id": id])
                     return nil
                 }
             }
         }
 
-        return HMSAudioTrackSettings(maxBitrate: 32, trackDescription: "", initialMuteState: initialStateEncoded, audioSource: nil)
+        return HMSAudioTrackSettings.build { builder in
+
+            builder.initialMuteState = initialStateEncoded
+
+            if let audioMode = audioMode {
+                builder.audioMode = audioMode
+            }
+        }
     }
 
     static func getAudioMixerSourceMap() -> [String: HMSAudioNode]? {
@@ -318,4 +342,17 @@ class HMSHelper: NSObject {
         }
         return nil
     }
+
+    private static func getAudioMode(from mode: String?) -> HMSAudioMode? {
+        switch mode {
+        case "voice":
+            return .voice
+
+        case "music":
+            return .music
+
+        default:
+            return nil
+        }
+    }
 }

package/ios/HMSManager.m

@@ -72,4 +72,12 @@ RCT_EXTERN_METHOD(setVideoTrackLayer: (NSDictionary) data :(RCTPromiseResolveBlo
 #pragma mark - Advanced Camera Controls
 
 RCT_EXTERN_METHOD(captureImageAtMaxSupportedResolution: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
+
+#pragma mark - Session Store
+
+RCT_EXTERN_METHOD(getSessionMetadataForKey: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
+RCT_EXTERN_METHOD(setSessionMetadataForKey: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
+RCT_EXTERN_METHOD(addKeyChangeListener: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
+RCT_EXTERN_METHOD(removeKeyChangeListener: (NSDictionary) data :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
+
 @end

package/ios/HMSManager.swift

@@ -36,7 +36,7 @@ class HMSManager: RCTEventEmitter {
     }
 
     override func supportedEvents() -> [String]! {
-        return [ON_JOIN, ON_PREVIEW, ON_ROOM_UPDATE, ON_PEER_UPDATE, ON_TRACK_UPDATE, ON_ERROR, ON_MESSAGE, ON_SPEAKER, RECONNECTING, RECONNECTED, ON_ROLE_CHANGE_REQUEST, ON_CHANGE_TRACK_STATE_REQUEST, ON_REMOVED_FROM_ROOM, ON_RTC_STATS, ON_LOCAL_AUDIO_STATS, ON_LOCAL_VIDEO_STATS, ON_REMOTE_AUDIO_STATS, ON_REMOTE_VIDEO_STATS, ON_AUDIO_DEVICE_CHANGED]
+        return [ON_JOIN, ON_PREVIEW, ON_ROOM_UPDATE, ON_PEER_UPDATE, ON_TRACK_UPDATE, ON_ERROR, ON_MESSAGE, ON_SPEAKER, RECONNECTING, RECONNECTED, ON_ROLE_CHANGE_REQUEST, ON_CHANGE_TRACK_STATE_REQUEST, ON_REMOVED_FROM_ROOM, ON_RTC_STATS, ON_LOCAL_AUDIO_STATS, ON_LOCAL_VIDEO_STATS, ON_REMOTE_AUDIO_STATS, ON_REMOTE_VIDEO_STATS, ON_AUDIO_DEVICE_CHANGED, HMSConstants.ON_SESSION_STORE_AVAILABLE, HMSConstants.ON_SESSION_STORE_CHANGED]
     }
 
     // MARK: - HMS SDK Delegate Callbacks
@@ -551,4 +551,38 @@ class HMSManager: RCTEventEmitter {
 
         hms?.captureImageAtMaxSupportedResolution(data, resolve, reject)
     }
+
+    // MARK: - Session Store
+
+    @objc
+    func getSessionMetadataForKey(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+
+        let hms = HMSHelper.getHms(data, hmsCollection)
+
+        hms?.getSessionMetadataForKey(data, resolve, reject)
+    }
+
+    @objc
+    func setSessionMetadataForKey(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+
+        let hms = HMSHelper.getHms(data, hmsCollection)
+
+        hms?.setSessionMetadataForKey(data, resolve, reject)
+    }
+
+    @objc
+    func addKeyChangeListener(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+
+        let hms = HMSHelper.getHms(data, hmsCollection)
+
+        hms?.addKeyChangeListener(data, resolve, reject)
+    }
+
+    @objc
+    func removeKeyChangeListener(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
+
+        let hms = HMSHelper.getHms(data, hmsCollection)
+
+        hms?.removeKeyChangeListener(data, resolve, reject)
+    }
 }