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

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

@@ -31,7 +31,7 @@ import java.util.Date
 
 class HMSRNSDK(
   data: ReadableMap?,
-  HmsDelegate: HMSManager,
+  HmsDelegate: HMSManagerImpl,
   sdkId: String,
   reactApplicationContext: ReactApplicationContext,
 ) {
@@ -39,7 +39,7 @@ class HMSRNSDK(
   var screenshareCallback: Promise? = null
   var audioshareCallback: Promise? = null
   var isAudioSharing: Boolean = false
-  var delegate: HMSManager = HmsDelegate
+  var delegate: HMSManagerImpl = HmsDelegate
   var previewForRoleVideoTrack: HMSLocalVideoTrack? = null
   var previewForRoleAudioTrack: HMSLocalAudioTrack? = null
   private var recentRoleChangeRequest: HMSRoleChangeRequest? = null
@@ -1596,7 +1596,7 @@ class HMSRNSDK(
 
   fun startScreenshare(callback: Promise?) {
     screenshareCallback = callback
-    HMSManager.startingScreenShare = true
+    HMSManagerImpl.startingScreenShare = true
     runOnUiThread {
       val intent = Intent(context, HmsScreenshareActivity::class.java)
       intent.flags = FLAG_ACTIVITY_NEW_TASK

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

@@ -0,0 +1,29 @@
+package com.reactnativehmssdk
+
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+
+/**
+ * Generic view-event wrapper used by `<HMSView />` and `<HMSHLSPlayer />`.
+ *
+ * Replaces the legacy paper-only `getJSModule(RCTEventEmitter::class.java).receiveEvent(...)`
+ * call. Dispatched through `UIManagerHelper.getEventDispatcherForReactTag(...)`,
+ * which routes to paper's RCTEventEmitter or Fabric's typed event emitter
+ * depending on which arch is active — including bridgeless mode.
+ *
+ * The event-name → JSX-prop mapping is registered separately in each view
+ * manager via `getExportedCustomDirectEventTypeConstants()`.
+ */
+class HMSReactNativeEvent(
+  surfaceId: Int,
+  viewId: Int,
+  // Renamed from `eventName` to `name` because RN 0.82's `Event<T>` introduced
+  // a same-named member on the supertype; Kotlin 2.x (default in Gradle 8.13)
+  // promotes the hides-supertype-member warning to an error.
+  private val name: String,
+  private val payload: WritableMap?,
+) : Event<HMSReactNativeEvent>(surfaceId, viewId) {
+  override fun getEventName(): String = name
+
+  override fun getEventData(): WritableMap? = payload
+}

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

@@ -0,0 +1,119 @@
+package com.reactnativehmssdk
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.common.MapBuilder
+import com.facebook.react.uimanager.ThemedReactContext
+
+/**
+ * HMSSDKViewManagerImpl — shared view-manager logic for `<HMSView />`.
+ *
+ * Phase 1 / 1C-3 of the New Architecture migration. View-manager
+ * responsibilities (creating the view, prop dispatch, command handling,
+ * event-type registration) live here as static helpers. Arch-specific
+ * wrappers live at:
+ *   - android/src/oldarch/.../HMSSDKViewManager.kt
+ *     (extends SimpleViewManager — paper)
+ *   - android/src/newarch/.../HMSSDKViewManager.kt
+ *     (extends SimpleViewManager + implements the Codegen-generated
+ *     HMSViewManagerInterface — Fabric)
+ *
+ * Both wrappers delegate every call here, so the actual logic stays
+ * in one place.
+ */
+class HMSSDKViewManagerImpl {
+  companion object {
+    const val REACT_CLASS = "HMSView"
+
+    fun createViewInstance(reactContext: ThemedReactContext): HMSView = HMSView(reactContext)
+
+    /**
+     * Set the `data` prop. Resolves the active SDK instance via the
+     * passed-in `reactContext` (route through `reactApplicationContext`
+     * for new-arch interop / bridgeless safety).
+     */
+    fun setData(
+      view: HMSView,
+      data: ReadableMap,
+      reactContext: ThemedReactContext?,
+    ) {
+      val trackId = data.getString("trackId")
+      val id = data.getString("id")
+      val mirror = data.getBoolean("mirror")
+      val scaleType = data.getString("scaleType")
+      val hmsCollection = getHmsCollection(reactContext) ?: return
+      view.setData(id, trackId, hmsCollection, mirror, scaleType)
+    }
+
+    fun setScaleType(
+      view: HMSView,
+      data: String?,
+    ) = view.updateScaleType(data)
+
+    fun setZOrderMediaOverlay(
+      view: HMSView,
+      data: Boolean?,
+    ) = view.updateZOrderMediaOverlay(data)
+
+    fun setAutoSimulcast(
+      view: HMSView,
+      data: Boolean?,
+    ) {
+      data?.let { view.updateAutoSimulcast(it) }
+    }
+
+    /** Imperative `capture` command (paper — args is a numeric-array). */
+    fun capture(
+      view: HMSView,
+      args: ReadableArray?,
+    ) = view.captureHmsView(args)
+
+    /** Imperative `capture` command (Fabric — typed `requestId`). */
+    fun capture(
+      view: HMSView,
+      requestId: Int,
+    ) {
+      val args = Arguments.createArray().apply { pushInt(requestId) }
+      view.captureHmsView(args)
+    }
+
+    fun getCommandsMap(): Map<String, Int> = MapBuilder.of("capture", 1)
+
+    /**
+     * Called from both arch wrappers' `onDropViewInstance` override.
+     * Forwards to `HMSView.cleanup()` to release the listener registered
+     * in `init`, avoiding a memory leak across mount/unmount cycles.
+     */
+    fun onDropViewInstance(view: HMSView) = view.cleanup()
+
+    /**
+     * Both events are DIRECT, matching the Codegen spec which declares both as
+     * `DirectEventHandler<...>`. The names are deliberately unique (not the
+     * default `topChange`) to avoid colliding with RN's built-in `topChange`
+     * (which RN registers as bubbling on every RCTView), which would trigger
+     * "Event cannot be both direct and bubbling" at runtime.
+     *
+     * - `topResolutionChange` → JS receives as `onResolutionChange`.
+     * - `captureFrame`        → JS receives as `onDataReturned`.
+     */
+    fun getExportedCustomDirectEventTypeConstants(): Map<String, Any> =
+      MapBuilder
+        .builder<String, Any>()
+        .put("topResolutionChange", MapBuilder.of("registrationName", "onResolutionChange"))
+        .put("captureFrame", MapBuilder.of("registrationName", "onDataReturned"))
+        .build()
+
+    /**
+     * Look up the active SDK instances map. Routes through
+     * `reactApplicationContext` rather than `themedContext.getNativeModule`
+     * directly — the themed-context lookup is unreliable under the New
+     * Architecture Interop Layer / bridgeless mode.
+     */
+    fun getHmsCollection(reactContext: ThemedReactContext?): MutableMap<String, HMSRNSDK>? =
+      reactContext
+        ?.reactApplicationContext
+        ?.getNativeModule(HMSManager::class.java)
+        ?.getHmsInstance()
+  }
+}

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

@@ -11,7 +11,7 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.WritableMap
-import com.facebook.react.uimanager.events.RCTEventEmitter
+import com.facebook.react.uimanager.UIManagerHelper
 import hms.webrtc.RendererCommon
 import live.hms.video.media.tracks.HMSVideoTrack
 import live.hms.video.utils.HmsUtilities
@@ -28,6 +28,12 @@ class HMSView(
   private var disableAutoSimulcastLayerSelect = false
   private var jsCanApplyStyles = false
 
+  // Held so `cleanup()` can clear the listener from `HMSVideoView` on view
+  // drop. The anonymous VideoViewStateChangeListener captures `this`, so
+  // leaking it across mount/unmount cycles prevents GC of HMSView instances.
+  // Mirrors the same fix applied to HMSHLSPlayer's Player.Listener.
+  private var videoViewStateChangeListener: VideoViewStateChangeListener? = null
+
   init {
     val inflater = getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
     val view = inflater.inflate(R.layout.hms_view, this)
@@ -38,7 +44,7 @@ class HMSView(
     hmsVideoView?.setMirror(false)
     hmsVideoView?.disableAutoSimulcastLayerSelect(disableAutoSimulcastLayerSelect)
 
-    hmsVideoView?.addVideoViewStateChangeListener(
+    val listener =
       object : VideoViewStateChangeListener {
         override fun onResolutionChange(
           newWidth: Int,
@@ -59,8 +65,21 @@ class HMSView(
             }
           }
         }
-      },
-    )
+      }
+    videoViewStateChangeListener = listener
+    hmsVideoView?.addVideoViewStateChangeListener(listener)
+  }
+
+  /**
+   * Called from `HMSSDKViewManager.onDropViewInstance` when RN destroys the
+   * view. Clears the VideoViewStateChangeListener registered in `init` so
+   * the anonymous listener doesn't retain `this` across mount/unmount.
+   */
+  fun cleanup() {
+    if (videoViewStateChangeListener != null) {
+      hmsVideoView?.addVideoViewStateChangeListener(null)
+      videoViewStateChangeListener = null
+    }
   }
 
   private fun sendEventToJS(
@@ -72,7 +91,16 @@ class HMSView(
     event.putMap("data", data)
 
     val reactContext = context as ReactContext
-    reactContext.getJSModule(RCTEventEmitter::class.java).receiveEvent(id, "topChange", event)
+    val surfaceId = UIManagerHelper.getSurfaceId(this)
+    val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, id)
+    if (dispatcher != null) {
+      dispatcher.dispatchEvent(HMSReactNativeEvent(surfaceId, id, "topResolutionChange", event))
+    } 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. Same pattern as HMSHLSPlayer.kt.
+      Log.w("HMSView", "Event 'topResolutionChange' dropped — dispatcher null for tag $id")
+    }
   }
 
   @RequiresApi(Build.VERSION_CODES.N)

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

@@ -17,16 +17,16 @@ class HmsScreenshareActivity : ComponentActivity() {
       if (result.resultCode == Activity.RESULT_OK) {
         val mediaProjectionPermissionResultData: Intent? = result.data
         val id = intent.getStringExtra("id")
-        HMSManager.hmsCollection[id]?.hmsSDK?.startScreenshare(
+        HMSManagerImpl.hmsCollection[id]?.hmsSDK?.startScreenshare(
           object : HMSActionResultListener {
             override fun onError(error: HMSException) {
               finish()
-              HMSManager.hmsCollection[id]?.screenshareCallback?.reject(error)
+              HMSManagerImpl.hmsCollection[id]?.screenshareCallback?.reject(error)
             }
 
             override fun onSuccess() {
-              HMSManager.hmsCollection[id]?.screenshareCallback?.resolve(
-                HMSManager.hmsCollection[id]?.getPromiseResolveData(),
+              HMSManagerImpl.hmsCollection[id]?.screenshareCallback?.resolve(
+                HMSManagerImpl.hmsCollection[id]?.getPromiseResolveData(),
               )
               finish()
             }
@@ -43,7 +43,7 @@ class HmsScreenshareActivity : ComponentActivity() {
             "RESULT_CANCELED",
             "RESULT_CANCELED",
           )
-        HMSManager.hmsCollection[id]?.screenshareCallback?.reject(error)
+        HMSManagerImpl.hmsCollection[id]?.screenshareCallback?.reject(error)
         finish()
       }
     }
@@ -55,7 +55,7 @@ class HmsScreenshareActivity : ComponentActivity() {
 
   private fun startScreenshare() {
     val id = intent.getStringExtra("id")
-    val isScreenShared = HMSManager.hmsCollection[id]?.hmsSDK?.isScreenShared()
+    val isScreenShared = HMSManagerImpl.hmsCollection[id]?.hmsSDK?.isScreenShared()
     if (isScreenShared !== null && !isScreenShared) {
       try {
         val mediaProjectionManager =
@@ -64,10 +64,10 @@ class HmsScreenshareActivity : ComponentActivity() {
       } catch (e: Exception) {
         println(e)
       }
-      HMSManager.startingScreenShare = false
+      HMSManagerImpl.startingScreenShare = false
     } else {
-      HMSManager.startingScreenShare = false
-      HMSManager.hmsCollection[id]?.emitHMSError(
+      HMSManagerImpl.startingScreenShare = false
+      HMSManagerImpl.hmsCollection[id]?.emitHMSError(
         HMSException(
           103,
           "SCREENSHARE_IS_ALREADY_RUNNING",

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

@@ -1,12 +1,51 @@
 package com.reactnativehmssdk
 
-import com.facebook.react.ReactPackage
+import com.facebook.react.BaseReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
 import com.facebook.react.uimanager.ViewManager
 
-class HmssdkPackage : ReactPackage {
-  override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> = listOf(HMSManager(reactContext))
+/**
+ * HmssdkPackage — Phase 1 / 1C-2 of the New Architecture migration.
+ *
+ * Converted from `ReactPackage` to `BaseReactPackage` so that under New
+ * Architecture, modules are instantiated lazily via `getModule(name)` —
+ * matching how TurboModules are registered. `getReactModuleInfoProvider()`
+ * advertises which modules this package owns.
+ *
+ * The same package class works under both arches; the active source set
+ * (oldarch or newarch) determines which `HMSManager` class is on the
+ * classpath. View managers are still registered eagerly via
+ * `createViewManagers()` — Fabric component-view migration for them
+ * lives in 1C-3 (HMSSDKViewManager) and 1C-4 (HMSHLSPlayerManager).
+ */
+class HmssdkPackage : BaseReactPackage() {
+  override fun getModule(
+    name: String,
+    reactContext: ReactApplicationContext,
+  ): NativeModule? =
+    when (name) {
+      HMSManagerImpl.REACT_CLASS -> HMSManager(reactContext)
+      else -> null
+    }
+
+  override fun getReactModuleInfoProvider(): ReactModuleInfoProvider =
+    ReactModuleInfoProvider {
+      mapOf(
+        HMSManagerImpl.REACT_CLASS to
+          ReactModuleInfo(
+            HMSManagerImpl.REACT_CLASS, // name
+            "com.reactnativehmssdk.HMSManager", // className (the wrapper, set per source set)
+            false, // canOverrideExistingModule
+            false, // needsEagerInit
+            false, // hasConstants (deprecated, ignored under New Arch)
+            false, // isCxxModule
+            BuildConfig.IS_NEW_ARCHITECTURE_ENABLED, // isTurboModule
+          ),
+      )
+    }
 
   override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> =
     listOf<ViewManager<*, *>>(HMSSDKViewManager(), HMSHLSPlayerManager())

package/android/src/newarch/java/com/reactnativehmssdk/HMSHLSPlayerManager.kt

@@ -0,0 +1,128 @@
+package com.reactnativehmssdk
+
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.uimanager.SimpleViewManager
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.HMSHLSPlayerManagerDelegate
+import com.facebook.react.viewmanagers.HMSHLSPlayerManagerInterface
+
+/**
+ * HMSHLSPlayerManager — new-arch (Fabric) view manager for `<HMSHLSPlayer />`.
+ *
+ * Phase 1 / 1C-4 of the New Architecture migration. Compiled only when
+ * the consumer's app uses new architecture.
+ *
+ * Differences from the old-arch wrapper:
+ *   - Implements the Codegen-generated `HMSHLSPlayerManagerInterface<HMSHLSPlayer>`
+ *     (typed prop setters AND typed command methods that Fabric calls directly).
+ *   - Uses `HMSHLSPlayerManagerDelegate` for prop dispatch via Fabric's
+ *     mounting mechanism.
+ *   - Drops @ReactProp annotations — Fabric doesn't scan for them.
+ *   - Implements receiveCommand(commandName: String, args) for Fabric's
+ *     string-based command dispatch (in addition to numeric Int dispatch
+ *     via the typed command methods).
+ *
+ * All logic delegates to HMSHLSPlayerManagerImpl in src/main/.
+ */
+class HMSHLSPlayerManager :
+  SimpleViewManager<HMSHLSPlayer>(),
+  HMSHLSPlayerManagerInterface<HMSHLSPlayer> {
+  private val mDelegate: ViewManagerDelegate<HMSHLSPlayer> = HMSHLSPlayerManagerDelegate(this)
+
+  override fun getName(): String = HMSHLSPlayerManagerImpl.REACT_CLASS
+
+  override fun getDelegate(): ViewManagerDelegate<HMSHLSPlayer> = mDelegate
+
+  override fun createViewInstance(reactContext: ThemedReactContext): HMSHLSPlayer =
+    HMSHLSPlayerManagerImpl.createViewInstance(reactContext)
+
+  override fun onDropViewInstance(view: HMSHLSPlayer) {
+    super.onDropViewInstance(view)
+    HMSHLSPlayerManagerImpl.onDropViewInstance(view)
+  }
+
+  override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any> =
+    HMSHLSPlayerManagerImpl.getExportedCustomDirectEventTypeConstants()
+
+  /** Fabric command dispatch by string name (Codegen routes here via the delegate). */
+  override fun receiveCommand(
+    root: HMSHLSPlayer,
+    commandId: String?,
+    args: ReadableArray?,
+  ) {
+    if (commandId != null) {
+      HMSHLSPlayerManagerImpl.receiveCommandByName(root, commandId, args)
+    }
+  }
+
+  // ─────────────────────────────────────────────────────────────────
+  // Codegen-interface methods — typed prop setters
+  // ─────────────────────────────────────────────────────────────────
+
+  override fun setUrl(
+    view: HMSHLSPlayer,
+    value: String?,
+  ) = HMSHLSPlayerManagerImpl.setUrl(view, value)
+
+  override fun setEnableStats(
+    view: HMSHLSPlayer,
+    value: Boolean,
+  ) = HMSHLSPlayerManagerImpl.setEnableStats(view, value)
+
+  override fun setEnableControls(
+    view: HMSHLSPlayer,
+    value: Boolean,
+  ) = HMSHLSPlayerManagerImpl.setEnableControls(view, value)
+
+  // ─────────────────────────────────────────────────────────────────
+  // Codegen-interface methods — typed imperative commands (13)
+  // ─────────────────────────────────────────────────────────────────
+
+  override fun play(
+    view: HMSHLSPlayer,
+    url: String?,
+  ) = HMSHLSPlayerManagerImpl.play(view, url)
+
+  override fun stop(view: HMSHLSPlayer) = HMSHLSPlayerManagerImpl.stop(view)
+
+  override fun pause(view: HMSHLSPlayer) = HMSHLSPlayerManagerImpl.pause(view)
+
+  override fun resume(view: HMSHLSPlayer) = HMSHLSPlayerManagerImpl.resume(view)
+
+  override fun seekToLivePosition(view: HMSHLSPlayer) = HMSHLSPlayerManagerImpl.seekToLivePosition(view)
+
+  override fun seekForward(
+    view: HMSHLSPlayer,
+    seconds: Double,
+  ) = HMSHLSPlayerManagerImpl.seekForward(view, seconds)
+
+  override fun seekBackward(
+    view: HMSHLSPlayer,
+    seconds: Double,
+  ) = HMSHLSPlayerManagerImpl.seekBackward(view, seconds)
+
+  override fun setVolume(
+    view: HMSHLSPlayer,
+    level: Int,
+  ) = HMSHLSPlayerManagerImpl.setVolume(view, level)
+
+  override fun areClosedCaptionSupported(
+    view: HMSHLSPlayer,
+    requestId: Int,
+  ) = HMSHLSPlayerManagerImpl.areClosedCaptionSupported(view, requestId)
+
+  override fun isClosedCaptionEnabled(
+    view: HMSHLSPlayer,
+    requestId: Int,
+  ) = HMSHLSPlayerManagerImpl.isClosedCaptionEnabled(view, requestId)
+
+  override fun enableClosedCaption(view: HMSHLSPlayer) = HMSHLSPlayerManagerImpl.enableClosedCaption(view)
+
+  override fun disableClosedCaption(view: HMSHLSPlayer) = HMSHLSPlayerManagerImpl.disableClosedCaption(view)
+
+  override fun getPlayerDurationDetails(
+    view: HMSHLSPlayer,
+    requestId: Int,
+  ) = HMSHLSPlayerManagerImpl.getPlayerDurationDetails(view, requestId)
+}