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

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
@@ -56,12 +57,20 @@ class HMSView(context: ReactContext) : FrameLayout(context) {
 
   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()
+
+    videoTrack?.let { // Safe Call Operator to check if videoTrack is not null
+      hmsVideoView.addTrack(it) // add the videoTrack to the hmsVideoView
+      if (!scaleTypeApplied) { // check if the scaleTypeApplied flag is false
+        if (currentScaleType != RendererCommon.ScalingType.SCALE_ASPECT_FILL) { // check if the currentScaleType is not SCALE_ASPECT_FILL
+          onReceiveNativeEvent() // call the onReceiveNativeEvent function
+        }
+        scaleTypeApplied = true // set the scaleTypeApplied flag to true
       }
-      scaleTypeApplied = true
+    } ?: 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
     }
   }
 
@@ -101,7 +110,7 @@ class HMSView(context: ReactContext) : FrameLayout(context) {
     id: String?,
     trackId: String?,
     hmsCollection: MutableMap<String, HMSRNSDK>,
-    mirror: Boolean?
+    mirror: Boolean?,
   ) {
     if (id != null) {
       sdkId = id

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)
+    }
 }