@100mslive/react-native-hms 1.12.2 → 2.0.0-alpha.1

package/android/build.gradle

@@ -1,21 +1,34 @@
 import groovy.json.JsonSlurper
 
+// AGP, Kotlin, and the React Native gradle plugin all come from the consumer
+// app's classloader (root buildscript classpath in legacy consumers, or
+// pluginManagement.includeBuild in modern RN 0.71+ consumers). We deliberately
+// do NOT declare our own `buildscript { dependencies { classpath(...) } }`
+// block: that creates a separate buildscript classloader for this subproject,
+// which causes the React plugin to be loaded twice when another lib in the
+// same build also applies it ("Cannot add extension with name 'privateReact'"
+// — different Class<PrivateReactExtension> objects per classloader fail
+// findByType lookups). Inheriting plugins from the consumer's classpath
+// guarantees a single load.
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'com.facebook.react'
+}
+
 def sdkVersions = new JsonSlurper().parse file("../sdk-versions.json")
 
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath("com.android.tools.build:gradle:8.5.0")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21")
-    }
+// Helper that mirrors the consumer-app `newArchEnabled` Gradle property.
+// Used by the source-set switch below: when new arch is on, the build
+// pulls in `src/newarch/` Kotlin (TurboModule wrapper extending the
+// generated NativeHMSManagerSpec). When off, it pulls in `src/oldarch/`
+// (legacy wrapper extending ReactContextBaseJavaModule). Either way,
+// `src/main/` always provides the shared HMSManagerImpl with the
+// actual SDK logic.
+def isNewArchitectureEnabled() {
+    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-
 // Define helper functions for Kotlin version management (RN 0.77.3 requires 2.0.21)
 def getKotlinVersion() {
     return rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : "2.0.21"
@@ -38,6 +51,38 @@ android {
         targetSdkVersion safeExtGet('Hmssdk_targetSdkVersion', 35)
         versionCode 1
         versionName "1.0"
+
+        // Build flag exposed to Kotlin/Java via BuildConfig so runtime
+        // code can branch on the active arch if needed (rare — most
+        // arch-specific behavior is resolved at compile time via the
+        // sourceSets switch below).
+        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+    }
+
+    buildFeatures {
+        buildConfig = true
+    }
+
+    // Source-set switch — chooses the arch-specific wrapper classes.
+    // Both `src/newarch/` and `src/oldarch/` contain the same package
+    // and class names (HMSManager, HMSSDKViewManager, HMSHLSPlayerManager);
+    // only one is compiled per build, picked here based on the consumer
+    // app's `newArchEnabled` Gradle property.
+    //
+    // The actual SDK business logic lives in `src/main/` as `HMSManagerImpl`,
+    // `HMSSDKViewManagerImpl`, etc. Both arch wrappers delegate to it.
+    //
+    // This pattern is the canonical RN community approach for
+    // backward-compatible TurboModules — see:
+    // https://github.com/reactwg/react-native-new-architecture/blob/main/docs/backwards-compat-turbo-modules.md
+    sourceSets {
+        main {
+            if (isNewArchitectureEnabled()) {
+                java.srcDirs += ['src/newarch']
+            } else {
+                java.srcDirs += ['src/oldarch']
+            }
+        }
     }
 
     lint {
@@ -52,6 +97,19 @@ android {
     }
 }
 
+// Codegen configuration. Consumer's build picks up the TS specs in
+// `src/specs/` and generates:
+//   - Java abstract class `NativeHMSManagerSpec` (and others) under
+//     the package below, which our `src/newarch/` wrapper extends.
+//   - C++ Fabric component descriptors / event emitters / props under
+//     `react/renderer/components/RNHmsSpec/...` for iOS-side
+//     `*ComponentView.mm` files (see `react-native-hms.podspec`).
+react {
+    jsRootDir = file("../src/specs/")
+    libraryName = "RNHmsSpec"
+    codegenJavaPackageName = "com.reactnativehmssdk"
+}
+
 repositories {
     mavenLocal()
     maven {

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

@@ -18,17 +18,17 @@ class HMSAudioshareActivity : ComponentActivity() {
         val mediaProjectionPermissionResultData: Intent? = result.data
         val id = intent.getStringExtra("id")
         val audioMixingMode = intent.getStringExtra("audioMixingMode")
-        HMSManager.hmsCollection[id]?.hmsSDK?.startAudioshare(
+        HMSManagerImpl.hmsCollection[id]?.hmsSDK?.startAudioshare(
           object : HMSActionResultListener {
             override fun onError(error: HMSException) {
               finish()
-              HMSManager.hmsCollection[id]?.audioshareCallback?.reject(error)
+              HMSManagerImpl.hmsCollection[id]?.audioshareCallback?.reject(error)
             }
 
             override fun onSuccess() {
-              HMSManager.hmsCollection[id]?.isAudioSharing = true
-              HMSManager.hmsCollection[id]?.audioshareCallback?.resolve(
-                HMSManager.hmsCollection[id]?.getPromiseResolveData(),
+              HMSManagerImpl.hmsCollection[id]?.isAudioSharing = true
+              HMSManagerImpl.hmsCollection[id]?.audioshareCallback?.resolve(
+                HMSManagerImpl.hmsCollection[id]?.getPromiseResolveData(),
               )
               finish()
             }
@@ -46,7 +46,7 @@ class HMSAudioshareActivity : ComponentActivity() {
             "RESULT_CANCELED",
             "RESULT_CANCELED",
           )
-        HMSManager.hmsCollection[id]?.audioshareCallback?.reject(error)
+        HMSManagerImpl.hmsCollection[id]?.audioshareCallback?.reject(error)
         finish()
       }
     }
@@ -58,7 +58,7 @@ class HMSAudioshareActivity : ComponentActivity() {
 
   private fun startAudioshare() {
     val id = intent.getStringExtra("id")
-    val isAudioShared = HMSManager.hmsCollection[id]?.isAudioSharing
+    val isAudioShared = HMSManagerImpl.hmsCollection[id]?.isAudioSharing
     if (isAudioShared !== null && !isAudioShared) {
       try {
         val mediaProjectionManager =
@@ -68,7 +68,7 @@ class HMSAudioshareActivity : ComponentActivity() {
         println(e)
       }
     } else {
-      HMSManager.hmsCollection[id]?.emitHMSError(
+      HMSManagerImpl.hmsCollection[id]?.emitHMSError(
         HMSException(
           103,
           "AUDIOSHARE_IS_ALREADY_RUNNING",

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

@@ -2,6 +2,7 @@ package com.reactnativehmssdk
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.FrameLayout
@@ -15,7 +16,7 @@ import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.events.RCTEventEmitter
+import com.facebook.react.uimanager.UIManagerHelper
 import live.hms.hls_player.*
 import live.hms.stats.PlayerStatsListener
 import live.hms.stats.model.PlayerStatsModel
@@ -33,6 +34,11 @@ class HMSHLSPlayer(
   private var hmssdkInstance: HMSSDK? = null
   private var statsMonitorAttached = false
   private var shouldSendCaptionsToJS = false
+
+  // Held so `cleanup()` can remove the listener from ExoPlayer on unmount.
+  // The anonymous Player.Listener captures `this`, so leaking it across
+  // mount/unmount cycles prevents GC of HMSHLSPlayer view instances.
+  private var playerListener: Player.Listener? = null
   private val hmsHlsPlaybackEventsObject =
     object : HmsHlsPlaybackEvents {
       override fun onCue(cue: HmsHlsCue) {
@@ -139,7 +145,7 @@ class HMSHLSPlayer(
     // setting 100ms HLS Player on Exoplayer
     localPlayerView.player = localHmsHlsPlayer.getNativePlayer()
 
-    localPlayerView?.player?.addListener(
+    val listener =
       object : Player.Listener {
         override fun onVideoSizeChanged(videoSize: VideoSize) {
           super.onVideoSizeChanged(videoSize)
@@ -165,14 +171,21 @@ class HMSHLSPlayer(
               ?.toString()
           sendHLSPlayerCuesEventToJS(ccText)
         }
-      },
-    )
+      }
+    playerListener = listener
+    localPlayerView?.player?.addListener(listener)
   }
 
   fun cleanup() {
     hmsHlsPlayer?.stop()
     hmsHlsPlayer?.addPlayerEventListener(null)
     hmsHlsPlayer?.setStatsMonitor(null)
+    // Remove the ExoPlayer Player.Listener registered in init. Without
+    // this, the anonymous listener (which captures `this`) leaks across
+    // mount/unmount cycles — visible in long-running video conferencing
+    // sessions where users repeatedly join and leave rooms.
+    playerListener?.let { listener -> playerView?.player?.removeListener(listener) }
+    playerListener = null
   }
 
   fun play(url: String?) {
@@ -300,6 +313,23 @@ class HMSHLSPlayer(
     statsMonitorAttached = false
   }
 
+  private fun dispatchViewEvent(
+    eventName: String,
+    payload: WritableMap,
+  ) {
+    val reactContext = context as ReactContext
+    val surfaceId = UIManagerHelper.getSurfaceId(this)
+    val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, id)
+    if (dispatcher != null) {
+      dispatcher.dispatchEvent(HMSReactNativeEvent(surfaceId, id, eventName, payload))
+    } else {
+      // Bridgeless mode: dispatcher can be null if the view is detaching or
+      // the React tag is no longer valid. Log instead of silently dropping
+      // so the event loss is debuggable.
+      Log.w("HMSHLSPlayer", "Event '$eventName' dropped — dispatcher null for tag $id")
+    }
+  }
+
   private fun sendHLSPlaybackEventToJS(
     eventName: String,
     data: WritableMap,
@@ -308,8 +338,7 @@ class HMSHLSPlayer(
     event.putString("event", eventName)
     event.putMap("data", data)
 
-    val reactContext = context as ReactContext
-    reactContext.getJSModule(RCTEventEmitter::class.java).receiveEvent(id, HMSHLSPlayerConstants.HMS_HLS_PLAYBACK_EVENT, event)
+    dispatchViewEvent(HMSHLSPlayerConstants.HMS_HLS_PLAYBACK_EVENT, event)
   }
 
   private fun sendHLSStatsEventToJS(
@@ -320,8 +349,7 @@ class HMSHLSPlayer(
     event.putString("event", eventName)
     event.putMap("data", data)
 
-    val reactContext = context as ReactContext
-    reactContext.getJSModule(RCTEventEmitter::class.java).receiveEvent(id, HMSHLSPlayerConstants.HMS_HLS_STATS_EVENT, event)
+    dispatchViewEvent(HMSHLSPlayerConstants.HMS_HLS_STATS_EVENT, event)
   }
 
   private fun sendHLSDataRequestEventToJS(
@@ -347,8 +375,7 @@ class HMSHLSPlayer(
       event.putNull("data")
     }
 
-    val reactContext = context as ReactContext
-    reactContext.getJSModule(RCTEventEmitter::class.java).receiveEvent(id, HMSHLSPlayerConstants.HLS_DATA_REQUEST_EVENT, event)
+    dispatchViewEvent(HMSHLSPlayerConstants.HLS_DATA_REQUEST_EVENT, event)
   }
 
   private fun sendHLSPlayerCuesEventToJS(ccText: String?) {
@@ -360,8 +387,7 @@ class HMSHLSPlayer(
     } else {
       event.putNull("data")
     }
-    val reactContext = context as ReactContext
-    reactContext.getJSModule(RCTEventEmitter::class.java).receiveEvent(id, HMSHLSPlayerConstants.HLS_PLAYER_CUES_EVENT, event)
+    dispatchViewEvent(HMSHLSPlayerConstants.HLS_PLAYER_CUES_EVENT, event)
   }
 }
 

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

@@ -0,0 +1,185 @@
+package com.reactnativehmssdk
+
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.common.MapBuilder
+import com.facebook.react.uimanager.ThemedReactContext
+
+/**
+ * HMSHLSPlayerManagerImpl — shared view-manager logic for `<HMSHLSPlayer />`.
+ *
+ * Phase 1 / 1C-4 of the New Architecture migration. View-manager
+ * responsibilities (creating/cleanup, prop dispatch, 13 commands, event
+ * registration) live here as static helpers. Arch-specific wrappers at:
+ *   - android/src/oldarch/.../HMSHLSPlayerManager.kt — paper, @ReactProp + numeric command IDs
+ *   - android/src/newarch/.../HMSHLSPlayerManager.kt — Fabric, implements the
+ *     Codegen-generated HMSHLSPlayerManagerInterface for typed prop + command dispatch
+ */
+class HMSHLSPlayerManagerImpl {
+  companion object {
+    const val REACT_CLASS = "HMSHLSPlayer"
+
+    fun createViewInstance(reactContext: ThemedReactContext): HMSHLSPlayer = HMSHLSPlayer(reactContext)
+
+    fun onDropViewInstance(view: HMSHLSPlayer) {
+      view.cleanup()
+    }
+
+    // ─────────────────────────────────────────────────────────────────
+    // Prop setters
+    // ─────────────────────────────────────────────────────────────────
+
+    fun setUrl(
+      view: HMSHLSPlayer,
+      data: String?,
+    ) = view.play(data)
+
+    fun setEnableStats(
+      view: HMSHLSPlayer,
+      data: Boolean,
+    ) = view.enableStats(data)
+
+    fun setEnableControls(
+      view: HMSHLSPlayer,
+      data: Boolean,
+    ) = view.enableControls(data)
+
+    // ─────────────────────────────────────────────────────────────────
+    // Imperative commands (13)
+    // ─────────────────────────────────────────────────────────────────
+
+    fun play(
+      view: HMSHLSPlayer,
+      url: String?,
+    ) = view.play(url)
+
+    fun stop(view: HMSHLSPlayer) = view.stop()
+
+    fun pause(view: HMSHLSPlayer) = view.pause()
+
+    fun resume(view: HMSHLSPlayer) = view.resume()
+
+    fun seekToLivePosition(view: HMSHLSPlayer) = view.seekToLivePosition()
+
+    fun seekForward(
+      view: HMSHLSPlayer,
+      seconds: Double,
+    ) = view.seekForward(seconds)
+
+    fun seekBackward(
+      view: HMSHLSPlayer,
+      seconds: Double,
+    ) = view.seekBackward(seconds)
+
+    fun setVolume(
+      view: HMSHLSPlayer,
+      level: Int,
+    ) = view.setVolume(level)
+
+    fun areClosedCaptionSupported(
+      view: HMSHLSPlayer,
+      requestId: Int,
+    ) = view.areClosedCaptionSupported(requestId)
+
+    fun isClosedCaptionEnabled(
+      view: HMSHLSPlayer,
+      requestId: Int,
+    ) = view.isClosedCaptionEnabled(requestId)
+
+    fun enableClosedCaption(view: HMSHLSPlayer) = view.enableClosedCaption()
+
+    fun disableClosedCaption(view: HMSHLSPlayer) = view.disableClosedCaption()
+
+    fun getPlayerDurationDetails(
+      view: HMSHLSPlayer,
+      requestId: Int,
+    ) = view.getPlayerDurationDetails(requestId)
+
+    // ─────────────────────────────────────────────────────────────────
+    // Paper-side dispatch helpers (used by the oldarch wrapper)
+    // ─────────────────────────────────────────────────────────────────
+
+    /**
+     * Numeric command IDs preserved from the original view manager so
+     * paper-side dispatch keeps the same wire protocol.
+     */
+    fun getCommandsMap(): Map<String, Int> =
+      MapBuilder
+        .builder<String, Int>()
+        .put("play", 10)
+        .put("stop", 20)
+        .put("pause", 30)
+        .put("resume", 40)
+        .put("seekToLivePosition", 50)
+        .put("seekForward", 60)
+        .put("seekBackward", 70)
+        .put("setVolume", 80)
+        .put("areClosedCaptionSupported", 90)
+        .put("isClosedCaptionEnabled", 100)
+        .put("enableClosedCaption", 110)
+        .put("disableClosedCaption", 120)
+        .put("getPlayerDurationDetails", 130)
+        .build()
+
+    /** Paper command dispatch by numeric ID. */
+    fun receiveCommandById(
+      view: HMSHLSPlayer,
+      commandId: Int,
+      args: ReadableArray?,
+    ) {
+      when (commandId) {
+        10 -> play(view, args?.getString(0))
+        20 -> stop(view)
+        30 -> pause(view)
+        40 -> resume(view)
+        50 -> seekToLivePosition(view)
+        60 -> args?.let { seekForward(view, it.getDouble(0)) }
+        70 -> args?.let { seekBackward(view, it.getDouble(0)) }
+        80 -> args?.let { setVolume(view, it.getInt(0)) }
+        90 -> args?.let { areClosedCaptionSupported(view, it.getInt(0)) }
+        100 -> args?.let { isClosedCaptionEnabled(view, it.getInt(0)) }
+        110 -> enableClosedCaption(view)
+        120 -> disableClosedCaption(view)
+        130 -> args?.let { getPlayerDurationDetails(view, it.getInt(0)) }
+      }
+    }
+
+    /** Fabric command dispatch by string name. */
+    fun receiveCommandByName(
+      view: HMSHLSPlayer,
+      commandName: String,
+      args: ReadableArray?,
+    ) {
+      when (commandName) {
+        "play" -> play(view, args?.getString(0))
+        "stop" -> stop(view)
+        "pause" -> pause(view)
+        "resume" -> resume(view)
+        "seekToLivePosition" -> seekToLivePosition(view)
+        "seekForward" -> args?.let { seekForward(view, it.getDouble(0)) }
+        "seekBackward" -> args?.let { seekBackward(view, it.getDouble(0)) }
+        "setVolume" -> args?.let { setVolume(view, it.getInt(0)) }
+        "areClosedCaptionSupported" -> args?.let { areClosedCaptionSupported(view, it.getInt(0)) }
+        "isClosedCaptionEnabled" -> args?.let { isClosedCaptionEnabled(view, it.getInt(0)) }
+        "enableClosedCaption" -> enableClosedCaption(view)
+        "disableClosedCaption" -> disableClosedCaption(view)
+        "getPlayerDurationDetails" -> args?.let { getPlayerDurationDetails(view, it.getInt(0)) }
+      }
+    }
+
+    // ─────────────────────────────────────────────────────────────────
+    // Event registration — 4 events on `<HMSHLSPlayer />`
+    // ─────────────────────────────────────────────────────────────────
+
+    fun getExportedCustomDirectEventTypeConstants(): Map<String, Any> =
+      MapBuilder.of(
+        HMSHLSPlayerConstants.HMS_HLS_PLAYBACK_EVENT,
+        MapBuilder.of("registrationName", "onHmsHlsPlaybackEvent"),
+        HMSHLSPlayerConstants.HMS_HLS_STATS_EVENT,
+        MapBuilder.of("registrationName", "onHmsHlsStatsEvent"),
+        HMSHLSPlayerConstants.HLS_DATA_REQUEST_EVENT,
+        MapBuilder.of("registrationName", "onDataReturned"),
+        HMSHLSPlayerConstants.HLS_PLAYER_CUES_EVENT,
+        MapBuilder.of("registrationName", "onHlsPlayerCuesEvent"),
+      )
+  }
+}

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

@@ -10,7 +10,7 @@ import android.view.PixelCopy
 import android.webkit.URLUtil
 import androidx.annotation.RequiresApi
 import com.facebook.react.bridge.*
-import com.facebook.react.uimanager.events.RCTEventEmitter
+import com.facebook.react.uimanager.UIManagerHelper
 import hms.webrtc.SurfaceViewRenderer
 import live.hms.video.audio.HMSAudioManager
 import live.hms.video.error.HMSException
@@ -634,6 +634,20 @@ object HMSHelper {
       output.putInt("requestId", -1)
     }
     val reactContext = context as ReactContext
+    val surfaceId = UIManagerHelper.getSurfaceId(reactContext)
+
+    // Bridgeless mode: dispatcher can be null if the view is detaching or
+    // the React tag is no longer valid. Log instead of silently dropping
+    // so the event loss is debuggable.
+    fun dispatchCaptureFrameEvent() {
+      val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, id)
+      if (dispatcher != null) {
+        dispatcher.dispatchEvent(HMSReactNativeEvent(surfaceId, id, "captureFrame", output))
+      } else {
+        Log.w("captureSurfaceView", "captureFrame event dropped — dispatcher null for tag $id")
+      }
+    }
+
     try {
       val bitmap: Bitmap =
         Bitmap.createBitmap(surfaceView.width, surfaceView.height, Bitmap.Config.ARGB_8888)
@@ -649,12 +663,10 @@ object HMSHelper {
             val encoded: String = Base64.encodeToString(byteArray, Base64.DEFAULT)
             Log.d("captureSurfaceView", "Base64: $encoded")
             output.putString("result", encoded)
-            reactContext
-              .getJSModule(RCTEventEmitter::class.java)
-              .receiveEvent(id, "captureFrame", output)
+            dispatchCaptureFrameEvent()
           } else {
             Log.e("captureSurfaceView", "copyResult: $copyResult")
-            HMSManager.hmsCollection[sdkId]?.emitHMSError(
+            HMSManagerImpl.hmsCollection[sdkId]?.emitHMSError(
               HMSException(
                 103,
                 copyResult.toString(),
@@ -664,18 +676,16 @@ object HMSHelper {
               ),
             )
             output.putString("error", copyResult.toString())
-            reactContext
-              .getJSModule(RCTEventEmitter::class.java)
-              .receiveEvent(id, "captureFrame", output)
+            dispatchCaptureFrameEvent()
           }
         },
         Handler(),
       )
     } catch (e: Exception) {
       Log.e("captureSurfaceView", "error: $e")
-      HMSManager.hmsCollection[sdkId]?.emitHMSError(e as HMSException)
+      HMSManagerImpl.hmsCollection[sdkId]?.emitHMSError(e as HMSException)
       output.putString("error", e.message)
-      reactContext.getJSModule(RCTEventEmitter::class.java).receiveEvent(id, "captureFrame", output)
+      dispatchCaptureFrameEvent()
     }
   }