@100mslive/react-native-hms 1.9.4 → 1.9.5

package/README.md

@@ -182,7 +182,7 @@ To test audio/video functionality, you need to connect to a 100ms Room. Please c
 2. Use the `Video Conferencing Starter Kit` to create a room with a default template assigned to it to test this app quickly.
 3. Go to the [Rooms page](https://dashboard.100ms.live/rooms) in your dashboard, click on the `Room Id` of the room you created above, and click on the `Join Room` button on the top right.
 4. You will see 100ms demo URLs for the roles created when you deployed the starter kit; you can click on the 'key' icon to copy the token and update the `AUTH_TOKEN` variable in "App.js" file.
-   > Token from 100ms dashboard is for testing purposes only, For production applications you must generate tokens on your own server. Refer to the [Management Token section](/concepts/v2/concepts/security-and-tokens#management-token) in Authentication and Tokens guide for more information.
+   > Token from 100ms dashboard is for testing purposes only, For production applications you must generate tokens on your own server. Refer to the [Management Token section](https://www.100ms.live/docs/get-started/v2/get-started/security-and-tokens#management-token-for-rest-api) in Authentication and Tokens guide for more information.
 
 ## [Add Event Listeners](https://www.100ms.live/docs/react-native/v2/features/event-listeners)
 

package/android/build.gradle

@@ -86,7 +86,7 @@ dependencies {
     implementation "androidx.constraintlayout:constraintlayout:2.1.3"
     implementation "androidx.appcompat:appcompat:1.3.1"
 
-   implementation "live.100ms:android-sdk:${sdkVersions["android"]}"
-   implementation "live.100ms:video-view:${sdkVersions["android"]}"
-   implementation "live.100ms:hls-player:${sdkVersions["android"]}"
+    implementation "live.100ms:android-sdk:${sdkVersions["android"]}"
+    implementation "live.100ms:video-view:${sdkVersions["android"]}"
+    implementation "live.100ms:hls-player:${sdkVersions["android"]}"
 }

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

@@ -650,6 +650,8 @@ object HMSDecoder {
       data.error?.let {
         input.putMap("error", this.getError(it))
       }
+
+      input.putString("state", data.state.name)
     }
     return input
   }
@@ -670,6 +672,8 @@ object HMSDecoder {
       data.error?.let {
         input.putMap("error", this.getError(it))
       }
+
+      input.putString("state", data.state.name)
     }
     return input
   }
@@ -686,6 +690,8 @@ object HMSDecoder {
       data.error?.let {
         input.putMap("error", this.getError(it))
       }
+
+      input.putString("state", data.state.name)
     }
     return input
   }
@@ -694,6 +700,13 @@ object HMSDecoder {
     val input = Arguments.createMap()
     if (data !== null) {
       input.putBoolean("running", data.running)
+
+      data.error?.let {
+        input.putMap("error", this.getError(it))
+      }
+
+      input.putString("state", data.state.name)
+
       data.variants?.let {
         input.putArray("variants", this.getHMSHLSVariant(it))
       }
@@ -710,8 +723,7 @@ object HMSDecoder {
         input.putString("startedAt", it.toString())
       }
 
-      data.hlsRecordingConfig?.let { input.putBoolean("singleFilePerLayer", it.singleFilePerLayer) }
-      data.hlsRecordingConfig?.let { input.putBoolean("videoOnDemand", it.videoOnDemand) }
+      input.putString("state", data.state.name)
     }
     return input
   }

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

@@ -26,6 +26,7 @@ class HMSManager(reactContext: ReactApplicationContext) :
     const val REACT_CLASS = "HMSManager"
     var hmsCollection = mutableMapOf<String, HMSRNSDK>()
 
+    var startingScreenShare = false
     private var isInPIPMode = false
     var reactAppContext: ReactApplicationContext? = null
     var pipParamConfig: PipParamConfig? = null
@@ -61,6 +62,7 @@ class HMSManager(reactContext: ReactApplicationContext) :
     fun onUserLeaveHint() {
       val pipParams = pipParamsUntyped
       if (
+        !startingScreenShare &&
         Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &&
         pipParamConfig?.autoEnterPipMode == true &&
         pipParams is android.app.PictureInPictureParams
@@ -1264,13 +1266,13 @@ class HMSManager(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun checkNotifications(promise: Promise?) {
-    val reactAppContext = reactAppContext
+    val reactApplicationContext = reactApplicationContext
 
-    if (reactAppContext == null) {
-      promise?.reject(Throwable("`reactAppContext` is not available!"))
+    if (reactApplicationContext == null) {
+      promise?.reject(Throwable("`reactApplicationContext` is not available!"))
       return
     }
-    val enabled = NotificationManagerCompat.from(reactAppContext).areNotificationsEnabled()
+    val enabled = NotificationManagerCompat.from(reactApplicationContext).areNotificationsEnabled()
     val data: WritableMap = Arguments.createMap()
 
     data.putString("status", if (enabled) "granted" else "blocked")
@@ -1280,6 +1282,21 @@ class HMSManager(reactContext: ReactApplicationContext) :
     promise?.resolve(data)
   }
 
+  @ReactMethod(isBlockingSynchronousMethod = true)
+  fun setSoftInputMode(inputMode: Int): Int {
+    val window = reactApplicationContext?.currentActivity?.window ?: return -1
+    UiThreadUtil.runOnUiThread {
+      window.setSoftInputMode(inputMode)
+    }
+    return 0
+  }
+
+  @ReactMethod(isBlockingSynchronousMethod = true)
+  fun getSoftInputMode(): Int {
+    val attributes = reactApplicationContext?.currentActivity?.window?.attributes ?: return -1
+    return attributes.softInputMode
+  }
+
   fun emitEvent(
     event: String,
     data: WritableMap,

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

@@ -1545,6 +1545,7 @@ class HMSRNSDK(
 
   fun startScreenshare(callback: Promise?) {
     screenshareCallback = callback
+    HMSManager.startingScreenShare = true
     runOnUiThread {
       val intent = Intent(context, HmsScreenshareActivity::class.java)
       intent.flags = FLAG_ACTIVITY_NEW_TASK

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

@@ -66,7 +66,9 @@ class HmsScreenshareActivity : ComponentActivity() {
       } catch (e: Exception) {
         println(e)
       }
+      HMSManager.startingScreenShare = false
     } else {
+      HMSManager.startingScreenShare = false
       HMSManager.hmsCollection[id]?.emitHMSError(
         HMSException(
           103,

package/ios/HMSDecoder.swift

@@ -29,7 +29,7 @@ class HMSDecoder: NSObject {
                 data["hlsRecordingState"] = hlsRecordingState
                 return data
             case .browserRecordingStateUpdated:
-                let browserRecordingState = HMSDecoder.getHMSBrowserRecordingState(hmsRoom?.browserRecordingState)
+                let browserRecordingState = HMSDecoder.getBrowserRecordingState(hmsRoom?.browserRecordingState)
                 data["browserRecordingState"] = browserRecordingState
                 return data
             case .hlsStreamingStateUpdated:
@@ -37,11 +37,11 @@ class HMSDecoder: NSObject {
                 data["hlsStreamingState"] = hlsStreamingState
                 return data
             case .rtmpStreamingStateUpdated:
-                let rtmpStreamingState = HMSDecoder.getHMSRtmpStreamingState(hmsRoom?.rtmpStreamingState)
+                let rtmpStreamingState = HMSDecoder.getRtmpStreamingState(hmsRoom?.rtmpStreamingState)
                 data["rtmpHMSRtmpStreamingState"] = rtmpStreamingState
                 return data
             case .serverRecordingStateUpdated:
-                let serverRecordingState = HMSDecoder.getHMSServerRecordingState(hmsRoom?.serverRecordingState)
+                let serverRecordingState = HMSDecoder.getServerRecordingState(hmsRoom?.serverRecordingState)
                 data["serverRecordingState"] = serverRecordingState
                 return data
             default:
@@ -66,9 +66,9 @@ class HMSDecoder: NSObject {
         // if let startedAt = room.sessionStartedAt?.timeIntervalSince1970 {
         //     data["startedAt"] = startedAt * 1000
         // }
-        data["browserRecordingState"] = HMSDecoder.getHMSBrowserRecordingState(hmsRoom?.browserRecordingState)
-        data["rtmpHMSRtmpStreamingState"] = HMSDecoder.getHMSRtmpStreamingState(hmsRoom?.rtmpStreamingState)
-        data["serverRecordingState"] = HMSDecoder.getHMSServerRecordingState(hmsRoom?.serverRecordingState)
+        data["browserRecordingState"] = HMSDecoder.getBrowserRecordingState(hmsRoom?.browserRecordingState)
+        data["rtmpHMSRtmpStreamingState"] = HMSDecoder.getRtmpStreamingState(hmsRoom?.rtmpStreamingState)
+        data["serverRecordingState"] = HMSDecoder.getServerRecordingState(hmsRoom?.serverRecordingState)
         data["hlsStreamingState"] = HMSDecoder.getHlsStreamingState(hmsRoom?.hlsStreamingState)
         data["hlsRecordingState"] = HMSDecoder.getHlsRecordingState(hmsRoom?.hlsRecordingState)
         var peers = [[String: Any]]()
@@ -667,7 +667,7 @@ class HMSDecoder: NSObject {
         return ["code": error.errorCode, "description": error.localizedDescription, "isTerminal": isTerminal, "canRetry": canRetry]
     }
 
-    static func getHMSBrowserRecordingState(_ data: HMSBrowserRecordingState?) -> [String: Any] {
+    static func getBrowserRecordingState(_ data: HMSBrowserRecordingState?) -> [String: Any] {
 
         if let recordingState = data {
 
@@ -685,13 +685,15 @@ class HMSDecoder: NSObject {
                 state["error"] = HMSDecoder.getError(error)
             }
 
+            state["state"] = recordingState.state.displayString().uppercased()
+
             return state
         } else {
             return  [String: Any]()
         }
     }
 
-    static func getHMSRtmpStreamingState(_ data: HMSRTMPStreamingState?) -> [String: Any] {
+    static func getRtmpStreamingState(_ data: HMSRTMPStreamingState?) -> [String: Any] {
         if let streamingState = data {
 
             var state = [String: Any]()
@@ -706,13 +708,15 @@ class HMSDecoder: NSObject {
                 state["error"] = HMSDecoder.getError(error)
             }
 
+            state["state"] = streamingState.state.displayString().uppercased()
+
             return state
         } else {
             return [String: Any]()
         }
     }
 
-    static func getHMSServerRecordingState(_ data: HMSServerRecordingState?) -> [String: Any] {
+    static func getServerRecordingState(_ data: HMSServerRecordingState?) -> [String: Any] {
         if let recordingState = data {
 
             var state = [String: Any]()
@@ -727,6 +731,8 @@ class HMSDecoder: NSObject {
                 state["error"] = HMSDecoder.getError(error)
             }
 
+            state["state"] = recordingState.state.displayString().uppercased()
+
             return state
         } else {
             return [String: Any]()
@@ -735,10 +741,24 @@ class HMSDecoder: NSObject {
 
     static func getHlsStreamingState(_ data: HMSHLSStreamingState?) -> [String: Any] {
         if let streamingState = data {
-            let running = streamingState.running
-            let variants = HMSDecoder.getHMSHlsVariant(streamingState.variants)
 
-            return ["running": running, "variants": variants]
+            var state = [String: Any]()
+
+            state["running"] = streamingState.running
+
+            if let startedAt = streamingState.startedAt?.timeIntervalSince1970 {
+                state["startedAt"] = startedAt * 1000
+            }
+
+            if let error = streamingState.error {
+                state["error"] = HMSDecoder.getError(error)
+            }
+
+            state["state"] = streamingState.state.displayString().uppercased()
+
+            state["variants"] = HMSDecoder.getHlsVariant(streamingState.variants)
+
+            return state
         } else {
             return [String: Any]()
         }
@@ -748,15 +768,23 @@ class HMSDecoder: NSObject {
       var state = [String: Any]()
 
       if let recordingState = data {
+
           state["running"] = recordingState.running
+
           if let startedAt = recordingState.startedAt?.timeIntervalSince1970 {
               state["startedAt"] = startedAt * 1000
           }
+
+          if let error = recordingState.error {
+              state["error"] = HMSDecoder.getError(error)
+          }
+
+          state["state"] = recordingState.state.displayString().uppercased()
       }
       return state
     }
 
-    static func getHMSHlsVariant(_ data: [HMSHLSVariant]?) -> [[String: Any]] {
+    static func getHlsVariant(_ data: [HMSHLSVariant]?) -> [[String: Any]] {
         var variants = [[String: Any]]()
 
         if let hlsVariant = data {

package/ios/HMSRNSDK.swift

@@ -1267,13 +1267,13 @@ class HMSRNSDK: HMSUpdateListener, HMSPreviewListener {
                 return ["localPeer": HMSDecoder.getHmsLocalPeer(hms?.localPeer)]
 
             case "browserRecordingState":
-                return ["browserRecordingState": HMSDecoder.getHMSBrowserRecordingState(hmsRoom.browserRecordingState)]
+                return ["browserRecordingState": HMSDecoder.getBrowserRecordingState(hmsRoom.browserRecordingState)]
 
             case "rtmpHMSRtmpStreamingState":
-                return ["rtmpHMSRtmpStreamingState": HMSDecoder.getHMSRtmpStreamingState(hmsRoom.rtmpStreamingState)]
+                return ["rtmpHMSRtmpStreamingState": HMSDecoder.getRtmpStreamingState(hmsRoom.rtmpStreamingState)]
 
             case "serverRecordingState":
-                return ["serverRecordingState": HMSDecoder.getHMSServerRecordingState(hmsRoom.serverRecordingState)]
+                return ["serverRecordingState": HMSDecoder.getServerRecordingState(hmsRoom.serverRecordingState)]
 
             case "hlsStreamingState":
                 return ["hlsStreamingState": HMSDecoder.getHlsStreamingState(hmsRoom.hlsStreamingState)]

package/lib/commonjs/classes/HMSBrowserRecordingState.js

@@ -14,11 +14,13 @@ class HMSBrowserRecordingState {
     _defineProperty(this, "error", void 0);
     _defineProperty(this, "startedAt", void 0);
     _defineProperty(this, "stoppedAt", void 0);
+    _defineProperty(this, "state", void 0);
     this.initialising = params.initialising;
     this.running = params.running;
     this.error = params.error;
     this.startedAt = params.startedAt;
     this.stoppedAt = params.stoppedAt;
+    this.state = params.state;
   }
 }
 exports.HMSBrowserRecordingState = HMSBrowserRecordingState;

package/lib/commonjs/classes/HMSBrowserRecordingState.js.map

@@ -1 +1 @@
-{"version":3,"names":["HMSBrowserRecordingState","constructor","params","_defineProperty","initialising","running","error","startedAt","stoppedAt","exports"],"sources":["HMSBrowserRecordingState.ts"],"sourcesContent":["import type { HMSException } from './HMSException';\n\nexport class HMSBrowserRecordingState {\n  initialising: boolean;\n  running: boolean;\n  error?: HMSException;\n  startedAt?: Date;\n  stoppedAt?: Date;\n\n  constructor(params: {\n    initialising: boolean;\n    running: boolean;\n    error?: HMSException;\n    startedAt?: Date;\n    stoppedAt?: Date;\n  }) {\n    this.initialising = params.initialising;\n    this.running = params.running;\n    this.error = params.error;\n    this.startedAt = params.startedAt;\n    this.stoppedAt = params.stoppedAt;\n  }\n}\n"],"mappings":";;;;;;;;;AAEO,MAAMA,wBAAwB,CAAC;EAOpCC,WAAWA,CAACC,MAMX,EAAE;IAAAC,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA;IACD,IAAI,CAACC,YAAY,GAAGF,MAAM,CAACE,YAAY;IACvC,IAAI,CAACC,OAAO,GAAGH,MAAM,CAACG,OAAO;IAC7B,IAAI,CAACC,KAAK,GAAGJ,MAAM,CAACI,KAAK;IACzB,IAAI,CAACC,SAAS,GAAGL,MAAM,CAACK,SAAS;IACjC,IAAI,CAACC,SAAS,GAAGN,MAAM,CAACM,SAAS;EACnC;AACF;AAACC,OAAA,CAAAT,wBAAA,GAAAA,wBAAA"}
+{"version":3,"names":["HMSBrowserRecordingState","constructor","params","_defineProperty","initialising","running","error","startedAt","stoppedAt","state","exports"],"sources":["HMSBrowserRecordingState.ts"],"sourcesContent":["import type { HMSException } from './HMSException';\nimport type { HMSRecordingState } from './HMSRecordingState';\n\nexport class HMSBrowserRecordingState {\n  initialising: boolean;\n  running: boolean;\n  error?: HMSException;\n  startedAt?: Date;\n  stoppedAt?: Date;\n  state: HMSRecordingState;\n\n  constructor(params: {\n    initialising: boolean;\n    running: boolean;\n    error?: HMSException;\n    startedAt?: Date;\n    stoppedAt?: Date;\n    state: HMSRecordingState;\n  }) {\n    this.initialising = params.initialising;\n    this.running = params.running;\n    this.error = params.error;\n    this.startedAt = params.startedAt;\n    this.stoppedAt = params.stoppedAt;\n    this.state = params.state;\n  }\n}\n"],"mappings":";;;;;;;;;AAGO,MAAMA,wBAAwB,CAAC;EAQpCC,WAAWA,CAACC,MAOX,EAAE;IAAAC,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA;IACD,IAAI,CAACC,YAAY,GAAGF,MAAM,CAACE,YAAY;IACvC,IAAI,CAACC,OAAO,GAAGH,MAAM,CAACG,OAAO;IAC7B,IAAI,CAACC,KAAK,GAAGJ,MAAM,CAACI,KAAK;IACzB,IAAI,CAACC,SAAS,GAAGL,MAAM,CAACK,SAAS;IACjC,IAAI,CAACC,SAAS,GAAGN,MAAM,CAACM,SAAS;IACjC,IAAI,CAACC,KAAK,GAAGP,MAAM,CAACO,KAAK;EAC3B;AACF;AAACC,OAAA,CAAAV,wBAAA,GAAAA,wBAAA"}

package/lib/commonjs/classes/HMSEncoder.js

@@ -71,7 +71,6 @@ class HMSEncoder {
       localPeer: HMSEncoder.encodeHmsLocalPeer(room === null || room === void 0 ? void 0 : room.localPeer, id)
       // startedAt: HMSEncoder.encodeDate(room?.startedAt),
     };
-
     return new _HMSRoom.HMSRoom(encodedObj);
   }
   static encodeHmsPeers(peers) {
@@ -363,22 +362,24 @@ class HMSEncoder {
       running: (data === null || data === void 0 ? void 0 : data.running) || false,
       startedAt: HMSEncoder.encodeDate(data === null || data === void 0 ? void 0 : data.startedAt),
       stoppedAt: HMSEncoder.encodeDate(data === null || data === void 0 ? void 0 : data.stoppedAt),
-      error: (data === null || data === void 0 ? void 0 : data.error) || undefined
+      error: (data === null || data === void 0 ? void 0 : data.error) || undefined,
+      state: data === null || data === void 0 ? void 0 : data.state
     });
   }
   static encodeServerRecordingState(data) {
     return new _HMSServerRecordingState.HMSServerRecordingState({
       running: (data === null || data === void 0 ? void 0 : data.running) || false,
       error: (data === null || data === void 0 ? void 0 : data.error) || undefined,
-      startedAt: HMSEncoder.encodeDate(data === null || data === void 0 ? void 0 : data.startedAt)
+      startedAt: HMSEncoder.encodeDate(data === null || data === void 0 ? void 0 : data.startedAt),
+      state: data === null || data === void 0 ? void 0 : data.state
     });
   }
   static encodeRTMPStreamingState(data) {
     return new _HMSRtmpStreamingState.HMSRtmpStreamingState({
       running: (data === null || data === void 0 ? void 0 : data.running) || false,
       startedAt: HMSEncoder.encodeDate(data === null || data === void 0 ? void 0 : data.startedAt),
-      stoppedAt: HMSEncoder.encodeDate(data === null || data === void 0 ? void 0 : data.stoppedAt),
-      error: (data === null || data === void 0 ? void 0 : data.error) || undefined
+      error: (data === null || data === void 0 ? void 0 : data.error) || undefined,
+      state: data === null || data === void 0 ? void 0 : data.state
     });
   }
   static encodeDate(dateData) {
@@ -394,6 +395,9 @@ class HMSEncoder {
   static encodeHLSStreamingState(data) {
     return new _HMSHLSStreamingState.HMSHLSStreamingState({
       running: (data === null || data === void 0 ? void 0 : data.running) || false,
+      startedAt: HMSEncoder.encodeDate(data === null || data === void 0 ? void 0 : data.startedAt),
+      error: (data === null || data === void 0 ? void 0 : data.error) || undefined,
+      state: data === null || data === void 0 ? void 0 : data.state,
       variants: Array.isArray(data === null || data === void 0 ? void 0 : data.variants) ? this.encodeHLSVariants(data === null || data === void 0 ? void 0 : data.variants) : undefined
     });
   }
@@ -402,8 +406,8 @@ class HMSEncoder {
       return new _HMSHLSRecordingState.HMSHLSRecordingState({
         running: (data === null || data === void 0 ? void 0 : data.running) || false,
         startedAt: HMSEncoder.encodeDate(data === null || data === void 0 ? void 0 : data.startedAt),
-        singleFilePerLayer: (data === null || data === void 0 ? void 0 : data.singleFilePerLayer) || false,
-        videoOnDemand: (data === null || data === void 0 ? void 0 : data.videoOnDemand) || false
+        error: (data === null || data === void 0 ? void 0 : data.error) || undefined,
+        state: data === null || data === void 0 ? void 0 : data.state
       });
     } else {
       return undefined;
@@ -515,7 +519,6 @@ class HMSEncoder {
       } : undefined // resolution: [width, height]
     });
   }
-
   static encodeHMSSimulcastLayerDefinition(data) {
     return data.map(sld => {
       return new _HMSSimulcastLayerDefinition.HMSSimulcastLayerDefinition({