@100mslive/react-native-hms 1.6.2 → 1.7.1

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

@@ -2,9 +2,9 @@ package com.reactnativehmssdk
 
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
-import android.util.Log
 import com.facebook.react.bridge.*
 import com.facebook.react.bridge.UiThreadUtil.runOnUiThread
+import com.google.gson.JsonElement
 import kotlinx.coroutines.launch
 import live.hms.video.audio.HMSAudioManager
 import live.hms.video.connection.stats.*
@@ -20,9 +20,7 @@ import live.hms.video.sdk.models.enums.HMSTrackUpdate
 import live.hms.video.sdk.models.trackchangerequest.HMSChangeTrackStateRequest
 import live.hms.video.sessionstore.HMSKeyChangeListener
 import live.hms.video.sessionstore.HmsSessionStore
-import live.hms.video.signal.init.HMSTokenListener
-import live.hms.video.signal.init.TokenRequest
-import live.hms.video.signal.init.TokenRequestOptions
+import live.hms.video.signal.init.*
 import live.hms.video.utils.HMSCoroutineScope
 import live.hms.video.utils.HmsUtilities
 import java.io.File
@@ -186,13 +184,8 @@ class HMSRNSDK(
             if (eventsEnableStatus["3"] != true) {
               return
             }
-            if (type === HMSPeerUpdate.AUDIO_TOGGLED ||
-              type === HMSPeerUpdate.VIDEO_TOGGLED ||
-              type === HMSPeerUpdate.BECAME_DOMINANT_SPEAKER ||
-              type === HMSPeerUpdate.NO_DOMINANT_SPEAKER ||
-              type === HMSPeerUpdate.RESIGNED_DOMINANT_SPEAKER ||
-              type === HMSPeerUpdate.STARTED_SPEAKING ||
-              type === HMSPeerUpdate.STOPPED_SPEAKING
+            if (type === HMSPeerUpdate.BECAME_DOMINANT_SPEAKER ||
+              type === HMSPeerUpdate.NO_DOMINANT_SPEAKER
             ) {
               return
             }
@@ -208,9 +201,6 @@ class HMSRNSDK(
             if (eventsEnableStatus["ON_ROOM_UPDATE"] != true) {
               return
             }
-            if (type == HMSRoomUpdate.ROOM_PEER_COUNT_UPDATED) {
-              return
-            }
 
             val updateType = type.name
             val roomData = HMSDecoder.getHmsRoomSubset(hmsRoom, type)
@@ -321,13 +311,8 @@ class HMSRNSDK(
                 if (eventsEnableStatus["3"] != true) {
                   return
                 }
-                if (type === HMSPeerUpdate.AUDIO_TOGGLED ||
-                  type === HMSPeerUpdate.VIDEO_TOGGLED ||
-                  type === HMSPeerUpdate.BECAME_DOMINANT_SPEAKER ||
-                  type === HMSPeerUpdate.NO_DOMINANT_SPEAKER ||
-                  type === HMSPeerUpdate.RESIGNED_DOMINANT_SPEAKER ||
-                  type === HMSPeerUpdate.STARTED_SPEAKING ||
-                  type === HMSPeerUpdate.STOPPED_SPEAKING
+                if (type === HMSPeerUpdate.BECAME_DOMINANT_SPEAKER ||
+                  type === HMSPeerUpdate.NO_DOMINANT_SPEAKER
                 ) {
                   return
                 }
@@ -344,9 +329,6 @@ class HMSRNSDK(
                 if (eventsEnableStatus["ON_ROOM_UPDATE"] != true) {
                   return
                 }
-                if (type == HMSRoomUpdate.ROOM_PEER_COUNT_UPDATED) {
-                  return
-                }
 
                 val updateType = type.name
                 val roomData = HMSDecoder.getHmsRoomSubset(hmsRoom, type)
@@ -770,24 +752,30 @@ class HMSRNSDK(
 
       if (peerId !== null && role !== null) {
         val hmsPeer = HMSHelper.getPeerFromPeerId(peerId, hmsSDK?.getRoom())
+        if (hmsPeer == null) {
+          callback?.reject("4000", "PEER_NOT_FOUND")
+          return
+        }
         val hmsRole = HMSHelper.getRoleFromRoleName(role, hmsSDK?.getRoles())
-
-        if (hmsRole != null && hmsPeer != null) {
-          hmsSDK?.changeRole(
-            hmsPeer,
-            hmsRole,
-            force,
-            object : HMSActionResultListener {
-              override fun onSuccess() {
-                callback?.resolve(emitHMSSuccess())
-              }
-              override fun onError(error: HMSException) {
-                self.emitHMSError(error)
-                callback?.reject(error.code.toString(), error.message)
-              }
-            },
-          )
+        if (hmsRole == null) {
+          callback?.reject("4000", "ROLE_NOT_FOUND")
+          return
         }
+
+        hmsSDK?.changeRole(
+          hmsPeer,
+          hmsRole,
+          force,
+          object : HMSActionResultListener {
+            override fun onSuccess() {
+              callback?.resolve(emitHMSSuccess())
+            }
+            override fun onError(error: HMSException) {
+              self.emitHMSError(error)
+              callback?.reject(error.code.toString(), error.message)
+            }
+          },
+        )
       }
     } else {
       val errorMessage = "changeRole: $requiredKeys"
@@ -809,24 +797,30 @@ class HMSRNSDK(
 
       if (peerId !== null && role !== null) {
         val hmsPeer = HMSHelper.getPeerFromPeerId(peerId, hmsSDK?.getRoom())
+        if (hmsPeer == null) {
+          promise?.reject("4000", "PEER_NOT_FOUND")
+          return
+        }
         val hmsRole = HMSHelper.getRoleFromRoleName(role, hmsSDK?.getRoles())
-
-        if (hmsRole != null && hmsPeer != null) {
-          hmsSDK?.changeRoleOfPeer(
-            hmsPeer,
-            hmsRole,
-            force,
-            object : HMSActionResultListener {
-              override fun onSuccess() {
-                promise?.resolve(emitHMSSuccess())
-              }
-              override fun onError(error: HMSException) {
-                self.emitHMSError(error)
-                promise?.reject(error.code.toString(), error.message)
-              }
-            },
-          )
+        if (hmsRole == null) {
+          promise?.reject("4000", "ROLE_NOT_FOUND")
+          return
         }
+
+        hmsSDK?.changeRoleOfPeer(
+          hmsPeer,
+          hmsRole,
+          force,
+          object : HMSActionResultListener {
+            override fun onSuccess() {
+              promise?.resolve(emitHMSSuccess())
+            }
+            override fun onError(error: HMSException) {
+              self.emitHMSError(error)
+              promise?.reject(error.code.toString(), error.message)
+            }
+          },
+        )
       }
     } else {
       val errorMessage = "changeRoleOfPeer: $requiredKeys"
@@ -1266,7 +1260,7 @@ class HMSRNSDK(
     val requiredKeys =
       HMSHelper.getUnavailableRequiredKey(
         data,
-        arrayOf(Pair("record", "Boolean"), Pair("meetingURL", "String")),
+        arrayOf(Pair("record", "Boolean")),
       )
     if (requiredKeys === null) {
       val config = HMSHelper.getRtmpConfig(data)
@@ -1541,50 +1535,6 @@ class HMSRNSDK(
     }
   }
 
-  @Deprecated("SessionMetaData APIs has been deprecated in favour of Session Store APIs", ReplaceWith("setSessionMetadataForKey"), DeprecationLevel.WARNING)
-  fun setSessionMetaData(data: ReadableMap, callback: Promise?) {
-    if (data.hasKey("sessionMetaData")) {
-      val sessionMetaData = data.getString("sessionMetaData")
-      hmsSDK?.setSessionMetaData(
-        sessionMetaData,
-        object : HMSActionResultListener {
-          override fun onSuccess() {
-            callback?.resolve(emitHMSSuccess())
-          }
-
-          override fun onError(error: HMSException) {
-            callback?.reject(error.code.toString(), error.message)
-            self.emitHMSError(error)
-          }
-        },
-      )
-    } else {
-      val errorMessage = "setSessionMetaData: sessionMetaData_Is_Required"
-      self.emitRequiredKeysError(errorMessage)
-      rejectCallback(callback, errorMessage)
-    }
-  }
-
-  @Deprecated("SessionMetaData APIs has been deprecated in favour of Session Store APIs", ReplaceWith("getSessionMetadataForKey"), DeprecationLevel.WARNING)
-  fun getSessionMetaData(callback: Promise?) {
-    hmsSDK?.getSessionMetaData(
-      object : HMSSessionMetadataListener {
-        override fun onSuccess(sessionMetadata: Any?) {
-          if (sessionMetadata is String?) {
-            callback?.resolve(sessionMetadata)
-          } else {
-            callback?.reject("6002", "Session Store: Unsupported type received, only String type is supported")
-          }
-        }
-
-        override fun onError(error: HMSException) {
-          callback?.reject(error.code.toString(), error.message)
-          self.emitHMSError(error)
-        }
-      },
-    )
-  }
-
   fun getPeerProperty(data: ReadableMap): WritableMap? {
     val requiredKeys =
       HMSHelper.getUnavailableRequiredKey(data, arrayOf(Pair("peerId", "String"), Pair("property", "String")))
@@ -1678,7 +1628,13 @@ class HMSRNSDK(
           data.putString("metaData", null)
         }
         "peerCount" -> {
-          data.putInt("peerCount", hmsRoom.peerCount)
+          hmsRoom.peerCount.let {
+            if (it == null) {
+              data.putNull("peerCount")
+            } else {
+              data.putInt("peerCount", it)
+            }
+          }
         }
         "peers" -> {
           data.putArray("peers", HMSDecoder.getAllPeers(hmsRoom.peerList))
@@ -1993,11 +1949,20 @@ class HMSRNSDK(
             override fun onError(error: HMSException) {
               promise?.reject(error.code.toString(), error.message)
             }
-            override fun onSuccess(sessionMetadata: Any?) {
-              if (sessionMetadata is String?) {
-                promise?.resolve(sessionMetadata)
-              } else {
-                promise?.reject("6002", "Session Store: Unsupported type received for '$key' key, only String type is supported")
+
+            override fun onSuccess(sessionMetadata: JsonElement?) {
+              sessionMetadata.let { sm ->
+                if (sm == null) {
+                  promise?.resolve(null)
+                } else {
+                  if (sm.isJsonPrimitive) {
+                    promise?.resolve(sm.asString)
+                  } else if (sm.isJsonNull) {
+                    promise?.resolve(null)
+                  } else {
+                    promise?.resolve(sm.toString())
+                  }
+                }
               }
             }
           },
@@ -2023,16 +1988,25 @@ class HMSRNSDK(
         }
 
         val keyChangeListener = object : HMSKeyChangeListener {
-          override fun onKeyChanged(key: String, value: Any?) {
+          override fun onKeyChanged(key: String, value: JsonElement?) {
             val map = Arguments.createMap()
             map.putString("id", id)
             map.putString("key", key)
-            if (value is String?) {
-              map.putString("value", value)
-            } else {
-              Log.e("HMSRNSDK", "Session Store: '$value' value received for '$key' key, expected only NullableString type for value")
-              map.putString("value", null) // resetting value to `null`, as the current type is not supported
+
+            value.let { sm ->
+              if (sm == null) {
+                map.putString("value", null)
+              } else {
+                if (sm.isJsonPrimitive) {
+                  map.putString("value", sm.asString)
+                } else if (sm.isJsonNull) {
+                  map.putString("value", null)
+                } else {
+                  map.putString("value", sm.toString())
+                }
+              }
             }
+
             delegate.emitEvent("ON_SESSION_STORE_CHANGED", map)
           }
         }
@@ -2087,4 +2061,35 @@ class HMSRNSDK(
       rejectCallback(promise, errorMessage)
     }
   }
+
+  fun getRoomLayout(data: ReadableMap, promise: Promise?) {
+    val unavailableKeys = HMSHelper.getUnavailableRequiredKey(data, arrayOf(Pair("authToken", "String")))
+
+    if (unavailableKeys != null) {
+      val errorMessage = "getRoomLayout: $unavailableKeys"
+      rejectCallback(promise, errorMessage)
+      return
+    }
+
+    val authToken = data.getString("authToken")!!
+    val endpoint = data.getString("endpoint")
+
+    val layoutRequestOptions = endpoint?.let {
+      LayoutRequestOptions(endpoint)
+    }
+
+    hmsSDK?.getRoomLayout(
+      authToken,
+      layoutRequestOptions,
+      object : HMSLayoutListener {
+        override fun onError(error: HMSException) {
+          promise?.reject(error.code.toString(), error.message)
+        }
+
+        override fun onLayoutSuccess(layout: HMSRoomLayout) {
+          promise?.resolve(layout.toString())
+        }
+      },
+    )
+  }
 }

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

@@ -11,6 +11,6 @@ class HmssdkPackage : ReactPackage {
   }
 
   override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-    return listOf<ViewManager<*, *>>(HMSSDKViewManager())
+    return listOf<ViewManager<*, *>>(HMSSDKViewManager(), HMSHLSPlayerManager())
   }
 }

package/android/src/main/res/layout/player_view.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.media3.ui.PlayerView xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/hls_view"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:layout_gravity="center"
+  />

package/ios/HMSDecoder.swift

@@ -22,8 +22,7 @@ class HMSDecoder: NSObject {
             case .none:
                 return data
             case .metaDataUpdated:
-                let count = room.peerCount ?? 0
-                data["peerCount"] = count
+                data["peerCount"] = room.peerCount
                 return data
             case .hlsRecordingStateUpdated:
                 let hlsRecordingState = HMSDecoder.getHlsRecordingState(hmsRoom?.hlsRecordingState)
@@ -63,7 +62,7 @@ class HMSDecoder: NSObject {
         if let metaData = room.metaData {
             data["metaData"] = metaData
         }
-        data["peerCount"] = room.peerCount ?? 0
+        data["peerCount"] = room.peerCount
         // if let startedAt = room.sessionStartedAt?.timeIntervalSince1970 {
         //     data["startedAt"] = startedAt * 1000
         // }
@@ -90,10 +89,10 @@ class HMSDecoder: NSObject {
         switch peerUpdateType {
             case .peerJoined: return "0"
             case .peerLeft: return "1"
-            case .roleUpdated: return "9"
-            case .nameUpdated: return "10"
-            case .metadataUpdated: return "11"
-            case .networkQualityUpdated: return "12"
+            case .roleUpdated: return "4"
+            case .nameUpdated: return "5"
+            case .metadataUpdated: return "6"
+            case .networkQualityUpdated: return "7"
             default: return nil
         }
     }
@@ -668,6 +667,8 @@ class HMSDecoder: NSObject {
 
             var state = [String: Any]()
 
+            state["initialising"] = recordingState.initialising
+
             state["running"] = recordingState.running
 
             if let startedAt = recordingState.startedAt?.timeIntervalSince1970 {

package/ios/HMSHLSPlayerManager.m

@@ -0,0 +1,22 @@
+
+#import "React/RCTViewManager.h"
+#import <Foundation/Foundation.h>
+
+@interface RCT_EXTERN_MODULE(HMSHLSPlayerManager, RCTViewManager)
+
+RCT_EXPORT_VIEW_PROPERTY(url, NSString);
+RCT_EXPORT_VIEW_PROPERTY(enableStats, BOOL);
+RCT_EXPORT_VIEW_PROPERTY(enableControls, BOOL);
+RCT_EXPORT_VIEW_PROPERTY(onHmsHlsPlaybackEvent, RCTDirectEventBlock);
+RCT_EXPORT_VIEW_PROPERTY(onHmsHlsStatsEvent, RCTDirectEventBlock);
+
+RCT_EXTERN_METHOD(play:(nonnull NSNumber *)node url:(nullable NSString *)url)
+RCT_EXTERN_METHOD(stop:(nonnull NSNumber *)node)
+RCT_EXTERN_METHOD(pause:(nonnull NSNumber *)node)
+RCT_EXTERN_METHOD(resume:(nonnull NSNumber *)node)
+RCT_EXTERN_METHOD(seekToLivePosition:(nonnull NSNumber *)node)
+RCT_EXTERN_METHOD(seekForward:(nonnull NSNumber *)node seconds:(nonnull NSNumber *)seconds)
+RCT_EXTERN_METHOD(seekBackward:(nonnull NSNumber *)node seconds:(nonnull NSNumber *)seconds)
+RCT_EXTERN_METHOD(setVolume:(nonnull NSNumber *)node level:(nonnull NSNumber *)level)
+
+@end