Release 1.10.2: Develop to main

.trunk/trunk.yaml

@@ -4,7 +4,7 @@ cli:
 plugins:
   sources:
     - id: trunk
-      ref: v1.4.4
+      ref: v1.4.5
       uri: https://github.com/trunk-io/plugins
 lint:
   disabled:
@@ -14,9 +14,9 @@ lint:
     - [email protected]
     - [email protected]
     - [email protected]
-    - [email protected].38
-    - trivy@0.49.1
-    - trufflehog@3.69.0
+    - [email protected].53
+    - trivy@0.50.1
+    - trufflehog@3.71.0
     - [email protected]
     - [email protected]
     - [email protected]
@@ -26,7 +26,7 @@ lint:
     - [email protected]
     - git-diff-check
     - [email protected]
-    - buildifier@6.4.0
+    - buildifier@7.1.0
 runtimes:
   enabled:
     - [email protected]

packages/react-native-hms/android/build.gradle

@@ -86,7 +86,13 @@ 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 "com.github.100mslive:android-sdk:2.9.6"
+    implementation "com.github.100mslive:video-view:2.9.6"
+    implementation "com.github.100mslive:hls-player:2.9.6"
+    implementation "com.github.100mslive:hms-noise-cancellation-android:2.9.6"
+
+//     implementation "live.100ms:android-sdk:${sdkVersions["android"]}"
+//     implementation "live.100ms:video-view:${sdkVersions["android"]}"
+//     implementation "live.100ms:hls-player:${sdkVersions["android"]}"
+//     implementation "live.100ms:hms-noise-cancellation-android:${sdkVersions["android"]}"
 }

packages/react-native-hms/android/src/main/java/com/reactnativehmssdk/HMSDecoder.kt

@@ -258,6 +258,8 @@ object HMSDecoder {
       hmsPeer.auxiliaryTracks.let {
         peer.putArray("auxiliaryTracks", this.getAllTracks(it))
       }
+
+      peer.putString("type", hmsPeer.type.name)
     }
     return peer
   }

packages/react-native-hms/android/src/main/java/com/reactnativehmssdk/HMSHelper.kt

@@ -318,6 +318,21 @@ object HMSHelper {
       val initialState = getHMSTrackSettingsInitState(data.getString("initialState"))
       builder.initialState(initialState)
     }
+
+    if (areAllRequiredKeysAvailable(data, arrayOf(Pair("noiseCancellationPlugin", "Map")))) {
+      val plugin = data.getMap("noiseCancellationPlugin")
+
+      /**
+       * ***** Plugin Signature *****
+       *  {
+       *    modelName: "SMALL_FULL_BAND"
+       *    initialState: "ENABLED" | "DISABLED"
+       *  }
+       */
+      val initialState = plugin?.getString("initialState") ?: "DISABLED"
+      builder.enableNoiseCancellation(initialState == "ENABLED")
+    }
+
     return builder.build()
   }
 

packages/react-native-hms/android/src/main/java/com/reactnativehmssdk/HMSManager.kt

@@ -8,6 +8,7 @@ import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
+import android.util.Log
 import android.util.Rational
 import android.view.WindowManager
 import androidx.annotation.RequiresApi
@@ -19,6 +20,7 @@ import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.reactnativehmssdk.HMSManager.Companion.REACT_CLASS
 import live.hms.video.error.HMSException
+import live.hms.video.factories.noisecancellation.AvailabilityStatus
 import java.util.UUID
 
 @ReactModule(name = REACT_CLASS)
@@ -1456,6 +1458,117 @@ class HMSManager(reactContext: ReactApplicationContext) :
   }
   // endregion
 
+  // region Noise Cancellation Plugin
+  @ReactMethod
+  fun enableNoiseCancellationPlugin(
+    data: ReadableMap,
+    promise: Promise?,
+  ) {
+    val rnSDK =
+      HMSHelper.getHms(data, hmsCollection) ?: run {
+        promise?.reject(
+          "6004",
+          "RN HMS SDK not initialized",
+        )
+        return
+      }
+    val hmsSdk =
+      rnSDK.hmsSDK ?: run {
+        promise?.reject(
+          "6004",
+          "HMS SDK not initialized",
+        )
+        return
+      }
+    hmsSdk.setNoiseCancellationEnabled(true)
+    promise?.resolve(true)
+  }
+
+  @ReactMethod
+  fun disableNoiseCancellationPlugin(
+    data: ReadableMap,
+    promise: Promise?,
+  ) {
+    val rnSDK =
+      HMSHelper.getHms(data, hmsCollection) ?: run {
+        promise?.reject(
+          "6004",
+          "RN HMS SDK not initialized",
+        )
+        return
+      }
+    val hmsSdk =
+      rnSDK.hmsSDK ?: run {
+        promise?.reject(
+          "6004",
+          "HMS SDK not initialized",
+        )
+        return
+      }
+    hmsSdk.setNoiseCancellationEnabled(false)
+    promise?.resolve(true)
+  }
+
+  @ReactMethod
+  fun isNoiseCancellationPluginEnabled(
+    data: ReadableMap,
+    promise: Promise?,
+  ) {
+    val rnSDK =
+      HMSHelper.getHms(data, hmsCollection) ?: run {
+        promise?.reject(
+          "6004",
+          "RN HMS SDK not initialized",
+        )
+        return
+      }
+    val hmsSdk =
+      rnSDK.hmsSDK ?: run {
+        promise?.reject(
+          "6004",
+          "HMS SDK not initialized",
+        )
+        return
+      }
+    val isEnabled = hmsSdk.getNoiseCancellationEnabled()
+    promise?.resolve(isEnabled)
+  }
+
+  @ReactMethod
+  fun isNoiseCancellationPluginAvailable(
+    data: ReadableMap,
+    promise: Promise?,
+  ) {
+    val rnSDK =
+      HMSHelper.getHms(data, hmsCollection) ?: run {
+        promise?.reject(
+          "6004",
+          "RN HMS SDK not initialized",
+        )
+        return
+      }
+    val hmsSdk =
+      rnSDK.hmsSDK ?: run {
+        promise?.reject(
+          "6004",
+          "HMS SDK not initialized",
+        )
+        return
+      }
+
+    val availability: AvailabilityStatus = hmsSdk.isNoiseCancellationAvailable()
+    val isAvailable =
+      if (availability == AvailabilityStatus.Available) {
+        true
+      } else {
+        val reason = (availability as AvailabilityStatus.NotAvailable).reason
+        Log.d("HMSManager", "NoiseCancellation Not available because of $reason")
+        false
+      }
+    promise?.resolve(isAvailable)
+  }
+  // endregion
+
   // region ActivityLifecycleCallbacks
 
   override fun onActivityCreated(

packages/react-native-hms/android/src/main/java/com/reactnativehmssdk/HMSRNSDK.kt

@@ -1847,6 +1847,9 @@ class HMSRNSDK(
         "isLocal" -> {
           result.putBoolean("isLocal", peer.isLocal)
         }
+        "type" -> {
+          result.putString("type", peer.type.name)
+        }
         "networkQuality" -> {
           if (peer.networkQuality !== null) {
             result.putMap("networkQuality", HMSDecoder.getHmsNetworkQuality(peer.networkQuality))

packages/react-native-hms/example/android/Gemfile.lock

@@ -10,16 +10,16 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.896.0)
-    aws-sdk-core (3.191.3)
+    aws-partitions (1.904.0)
+    aws-sdk-core (3.191.5)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.77.0)
+    aws-sdk-kms (1.78.0)
       aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.143.0)
+    aws-sdk-s3 (1.146.1)
       aws-sdk-core (~> 3, >= 3.191.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
@@ -38,7 +38,7 @@ GEM
     domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.109.0)
+    excon (0.110.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -112,9 +112,9 @@ GEM
       google-apis-firebaseappdistribution_v1 (~> 0.3.0)
       google-apis-firebaseappdistribution_v1alpha (~> 0.2.0)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.58.0)
+    google-apis-androidpublisher_v3 (0.60.0)
       google-apis-core (>= 0.14.0, < 2.a)
-    google-apis-core (0.14.0)
+    google-apis-core (0.14.1)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 1.9)
       httpclient (>= 2.8.1, < 3.a)
@@ -130,7 +130,7 @@ GEM
       google-apis-core (>= 0.14.0, < 2.a)
     google-apis-playcustomapp_v1 (0.15.0)
       google-apis-core (>= 0.14.0, < 2.a)
-    google-apis-storage_v1 (0.35.0)
+    google-apis-storage_v1 (0.37.0)
       google-apis-core (>= 0.14.0, < 2.a)
     google-cloud-core (1.7.0)
       google-cloud-env (>= 1.0, < 3.a)

packages/react-native-hms/example/ios/Gemfile.lock

@@ -10,16 +10,16 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.896.0)
-    aws-sdk-core (3.191.3)
+    aws-partitions (1.904.0)
+    aws-sdk-core (3.191.5)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.77.0)
+    aws-sdk-kms (1.78.0)
       aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.143.0)
+    aws-sdk-s3 (1.146.1)
       aws-sdk-core (~> 3, >= 3.191.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
@@ -38,7 +38,7 @@ GEM
     domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.109.0)
+    excon (0.110.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -109,9 +109,9 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.58.0)
+    google-apis-androidpublisher_v3 (0.60.0)
       google-apis-core (>= 0.14.0, < 2.a)
-    google-apis-core (0.14.0)
+    google-apis-core (0.14.1)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 1.9)
       httpclient (>= 2.8.1, < 3.a)
@@ -123,7 +123,7 @@ GEM
       google-apis-core (>= 0.14.0, < 2.a)
     google-apis-playcustomapp_v1 (0.15.0)
       google-apis-core (>= 0.14.0, < 2.a)
-    google-apis-storage_v1 (0.35.0)
+    google-apis-storage_v1 (0.37.0)
       google-apis-core (>= 0.14.0, < 2.a)
     google-cloud-core (1.7.0)
       google-cloud-env (>= 1.0, < 3.a)