bitmovin-player-react-native 0.44.1-alpha.0 → 1.0.0-alpha.0

package/android/src/main/java/com/bitmovin/player/reactnative/RNPlayerViewManager.kt

@@ -1,302 +1,115 @@
 package com.bitmovin.player.reactnative
 
-import android.os.Handler
-import android.os.Looper
-import android.util.Log
-import android.view.ViewGroup.LayoutParams
-import com.bitmovin.player.PlayerView
-import com.bitmovin.player.SubtitleView
-import com.bitmovin.player.api.ui.PlayerViewConfig
-import com.bitmovin.player.api.ui.ScalingMode
-import com.bitmovin.player.api.ui.UiConfig
 import com.bitmovin.player.reactnative.converter.toRNPlayerViewConfigWrapper
-import com.bitmovin.player.reactnative.converter.toRNStyleConfigWrapperFromPlayerConfig
-import com.bitmovin.player.reactnative.extensions.customMessageHandlerModule
 import com.bitmovin.player.reactnative.extensions.getBooleanOrNull
-import com.bitmovin.player.reactnative.extensions.getModule
-import com.bitmovin.player.reactnative.extensions.playerModule
-import com.bitmovin.player.reactnative.ui.FullscreenHandlerModule
-import com.bitmovin.player.reactnative.ui.RNPictureInPictureHandler
-import com.facebook.react.bridge.*
-import com.facebook.react.module.annotations.ReactModule
-import com.facebook.react.uimanager.SimpleViewManager
-import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.annotations.ReactProp
-import java.security.InvalidParameterException
-
-private const val MODULE_NAME = "NativePlayerView"
-
-@ReactModule(name = MODULE_NAME)
-class RNPlayerViewManager(private val context: ReactApplicationContext) : SimpleViewManager<RNPlayerView>() {
-    /**
-     * Native component functions.
-     */
-    enum class Commands(val command: String) {
-        ATTACH_PLAYER("attachPlayer"),
-        ATTACH_FULLSCREEN_BRIDGE("attachFullscreenBridge"),
-        SET_CUSTOM_MESSAGE_HANDLER_BRIDGE_ID("setCustomMessageHandlerBridgeId"),
-        SET_FULLSCREEN("setFullscreen"),
-        SET_SCALING_MODE("setScalingMode"),
-        SET_PICTURE_IN_PICTURE("setPictureInPicture"),
-    }
-
-    /**
-     * Exported module name to JS.
-     */
-    override fun getName() = MODULE_NAME
-
-    private var customMessageHandlerBridgeId: NativeId? = null
-    private val handler = Handler(Looper.getMainLooper())
-
-    /**
-     * The component's native view factory. RN may call this method multiple times
-     * for each component instance.
-     */
-    override fun createViewInstance(reactContext: ThemedReactContext) = RNPlayerView(context)
-
-    /**
-     * Called when the component's view gets detached from the view hierarchy. Useful to perform
-     * cleanups.
-     */
-    override fun onDropViewInstance(view: RNPlayerView) {
-        super.onDropViewInstance(view)
-        view.dispose()
-    }
-
-    /**
-     * A mapping between a event native identifier and its bubbled version that will
-     * be accessed from React.
-     */
-    private val bubblingEventsMapping: Map<String, String> = mapOf(
-        "event" to "onBmpEvent",
-        "playerError" to "onBmpPlayerError",
-        "playerWarning" to "onBmpPlayerWarning",
-        "destroy" to "onBmpDestroy",
-        "muted" to "onBmpMuted",
-        "unmuted" to "onBmpUnmuted",
-        "ready" to "onBmpReady",
-        "paused" to "onBmpPaused",
-        "play" to "onBmpPlay",
-        "playing" to "onBmpPlaying",
-        "playbackFinished" to "onBmpPlaybackFinished",
-        "seek" to "onBmpSeek",
-        "seeked" to "onBmpSeeked",
-        "timeShift" to "onBmpTimeShift",
-        "timeShifted" to "onBmpTimeShifted",
-        "stallStarted" to "onBmpStallStarted",
-        "stallEnded" to "onBmpStallEnded",
-        "timeChanged" to "onBmpTimeChanged",
-        "sourceLoad" to "onBmpSourceLoad",
-        "sourceLoaded" to "onBmpSourceLoaded",
-        "sourceUnloaded" to "onBmpSourceUnloaded",
-        "sourceError" to "onBmpSourceError",
-        "sourceWarning" to "onBmpSourceWarning",
-        "audioAdded" to "onBmpAudioAdded",
-        "audioChanged" to "onBmpAudioChanged",
-        "audioRemoved" to "onBmpAudioRemoved",
-        "subtitleAdded" to "onBmpSubtitleAdded",
-        "subtitleChanged" to "onBmpSubtitleChanged",
-        "subtitleRemoved" to "onBmpSubtitleRemoved",
-        "downloadFinished" to "onBmpDownloadFinished",
-        "videoDownloadQualityChanged" to "onBmpVideoDownloadQualityChanged",
-        "pictureInPictureAvailabilityChanged" to "onBmpPictureInPictureAvailabilityChanged",
-        "pictureInPictureEnter" to "onBmpPictureInPictureEnter",
-        "pictureInPictureExit" to "onBmpPictureInPictureExit",
-        "adBreakFinished" to "onBmpAdBreakFinished",
-        "adBreakStarted" to "onBmpAdBreakStarted",
-        "adClicked" to "onBmpAdClicked",
-        "adError" to "onBmpAdError",
-        "adFinished" to "onBmpAdFinished",
-        "adManifestLoad" to "onBmpAdManifestLoad",
-        "adManifestLoaded" to "onBmpAdManifestLoaded",
-        "adQuartile" to "onBmpAdQuartile",
-        "adScheduled" to "onBmpAdScheduled",
-        "adSkipped" to "onBmpAdSkipped",
-        "adStarted" to "onBmpAdStarted",
-        "videoPlaybackQualityChanged" to "onBmpVideoPlaybackQualityChanged",
-        "fullscreenEnabled" to "onBmpFullscreenEnabled",
-        "fullscreenDisabled" to "onBmpFullscreenDisabled",
-        "fullscreenEnter" to "onBmpFullscreenEnter",
-        "fullscreenExit" to "onBmpFullscreenExit",
-        "castStart" to "onBmpCastStart",
-        "castPlaybackFinished" to "onBmpCastPlaybackFinished",
-        "castPaused" to "onBmpCastPaused",
-        "castPlaying" to "onBmpCastPlaying",
-        "castStarted" to "onBmpCastStarted",
-        "castAvailable" to "onBmpCastAvailable",
-        "castStopped" to "onBmpCastStopped",
-        "castWaitingForDevice" to "onBmpCastWaitingForDevice",
-        "castTimeUpdated" to "onBmpCastTimeUpdated",
-        "cueEnter" to "onBmpCueEnter",
-        "cueExit" to "onBmpCueExit",
-    )
-
-    /**
-     * Component's event registry. Bubbling events are directly mapped to react props. No
-     * need to use proxy functions or `NativeEventEmitter`.
-     * @return map between event names (sent from native code) to js props.
-     */
-    override fun getExportedCustomBubblingEventTypeConstants(): MutableMap<String, Any> =
-        bubblingEventsMapping.entries.associate {
-            it.key to mapOf(
-                "phasedRegistrationNames" to mapOf("bubbled" to it.value),
-            )
-        }.toMutableMap()
-
-    /**
-     * Component's command registry. They enable granular control over
-     * instances of a certain native component from js and give the ability
-     * to call 'functions' on them.
-     * @return map between names (used in js) and command ids (used in native code).
-     */
-    override fun getCommandsMap(): Map<String, Int> = Commands.values().associate {
-        it.command to it.ordinal
-    }
-
-    /**
-     * Callback triggered in response to command dispatches from the js side.
-     * @param view Root native view of the targeted component.
-     * @param commandId Command number identifier. It's a number even though RN sends it as a string.
-     * @param args Arguments list sent from the js side.
-     */
-    override fun receiveCommand(view: RNPlayerView, commandId: String?, args: ReadableArray?) {
-        fun Int.toCommand(): Commands? = Commands.values().getOrNull(this)
-        val command = commandId?.toInt()?.toCommand() ?: throw IllegalArgumentException(
-            "The received command is not supported by the Bitmovin Player View",
-        )
-
-        fun <T> T?.require(): T = this ?: throw InvalidParameterException("Missing parameter")
-        when (command) {
-            Commands.ATTACH_PLAYER -> attachPlayer(view, args?.getString(1).require(), args?.getMap(2))
-            Commands.ATTACH_FULLSCREEN_BRIDGE -> attachFullscreenBridge(view, args?.getString(1).require())
-            Commands.SET_CUSTOM_MESSAGE_HANDLER_BRIDGE_ID -> setCustomMessageHandlerBridgeId(
-                view,
-                args?.getString(1).require(),
-            )
-
-            Commands.SET_FULLSCREEN -> setFullscreen(view, args?.getBoolean(1).require())
-            Commands.SET_SCALING_MODE -> setScalingMode(view, args?.getString(1).require())
-            Commands.SET_PICTURE_IN_PICTURE -> setPictureInPicture(view, args?.getBoolean(1).require())
-        }
-    }
-
-    @ReactProp(name = "config")
-    fun setConfig(view: RNPlayerView, config: ReadableMap?) {
-        view.config = config?.toRNPlayerViewConfigWrapper()
-    }
-
-    private fun attachFullscreenBridge(view: RNPlayerView, fullscreenBridgeId: NativeId) {
-        handler.postAndLogException {
-            view.playerView?.setFullscreenHandler(
-                context.getModule<FullscreenHandlerModule>()?.getInstance(fullscreenBridgeId),
-            )
-        }
-    }
-
-    private fun setFullscreen(view: RNPlayerView, isFullscreenRequested: Boolean) {
-        handler.postAndLogException {
-            val playerView = view.playerView ?: return@postAndLogException
-            if (playerView.isFullscreen == isFullscreenRequested) return@postAndLogException
-            if (isFullscreenRequested) {
-                playerView.enterFullscreen()
-            } else {
-                playerView.exitFullscreen()
+import com.bitmovin.player.reactnative.extensions.getMap
+import com.bitmovin.player.reactnative.extensions.getString
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
+
+class RNPlayerViewManager : Module() {
+    override fun definition() = ModuleDefinition {
+        Name("RNPlayerViewManager")
+
+        View(RNPlayerView::class) {
+            Prop("config") { view: RNPlayerView, playerInfo: Map<String, Any>? ->
+                val playerId = playerInfo?.get("playerId") as? String
+                    ?: throw IllegalArgumentException("Player info must contain 'playerId' field")
+                val customMessageHandlerBridgeId = playerInfo.getString("customMessageHandlerBridgeId")
+                val enableBackgroundPlayback = playerInfo.getBooleanOrNull("enableBackgroundPlayback") ?: false
+                val isPictureInPictureEnabledOnPlayer =
+                    playerInfo.getBooleanOrNull("isPictureInPictureEnabledOnPlayer") ?: false
+                val userInterfaceTypeName = playerInfo.getString("userInterfaceTypeName")
+                val playerViewConfigWrapper = playerInfo.getMap("playerViewConfig")?.toRNPlayerViewConfigWrapper()
+                view.attachPlayer(
+                    playerId,
+                    playerViewConfigWrapper,
+                    customMessageHandlerBridgeId,
+                    enableBackgroundPlayback,
+                    isPictureInPictureEnabledOnPlayer,
+                    userInterfaceTypeName,
+                )
             }
-        }
-    }
 
-    private fun setPictureInPicture(view: RNPlayerView, isPictureInPictureRequested: Boolean) {
-        handler.postAndLogException {
-            val playerView = view.playerView ?: throw IllegalStateException("The player view is not yet created")
-            if (playerView.isPictureInPicture == isPictureInPictureRequested) return@postAndLogException
-            if (isPictureInPictureRequested) {
-                playerView.enterPictureInPicture()
-            } else {
-                playerView.exitPictureInPicture()
+            Prop("scalingMode") { view: RNPlayerView, scalingMode: String? ->
+                view.setScalingMode(scalingMode)
             }
-        }
-    }
-
-    private fun setScalingMode(view: RNPlayerView, scalingMode: String) {
-        handler.postAndLogException {
-            view.playerView?.scalingMode = ScalingMode.valueOf(scalingMode)
-        }
-    }
 
-    private fun setCustomMessageHandlerBridgeId(view: RNPlayerView, customMessageHandlerBridgeId: NativeId) {
-        this.customMessageHandlerBridgeId = customMessageHandlerBridgeId
-        attachCustomMessageHandlerBridge(view)
-    }
-
-    private fun attachCustomMessageHandlerBridge(view: RNPlayerView) {
-        view.playerView?.setCustomMessageHandler(
-            context.customMessageHandlerModule
-                ?.getInstance(customMessageHandlerBridgeId)
-                ?.customMessageHandler,
-        )
-    }
-
-    /**
-     * Set the `Player` instance for the target view using `playerId`.
-     * @param view Target `RNPlayerView`.
-     * @param playerId `Player` instance id inside `PlayerModule`'s registry.
-     */
-    private fun attachPlayer(view: RNPlayerView, playerId: NativeId, playerConfig: ReadableMap?) {
-        handler.postAndLogException {
-            val player = playerId.let { context.playerModule?.getPlayerOrNull(it) }
-                ?: throw InvalidParameterException("Cannot create a PlayerView, invalid playerId was passed: $playerId")
-            val playbackConfig = playerConfig?.getMap("playbackConfig")
-            val isPictureInPictureEnabled = view.config?.pictureInPictureConfig?.isEnabled == true ||
-                playbackConfig?.getBooleanOrNull("isPictureInPictureEnabled") == true
-            view.enableBackgroundPlayback = playbackConfig?.getBooleanOrNull("isBackgroundPlaybackEnabled") == true
-
-            val rnStyleConfigWrapper = playerConfig?.toRNStyleConfigWrapperFromPlayerConfig()
-            val configuredPlayerViewConfig = view.config?.playerViewConfig ?: PlayerViewConfig()
-
-            if (view.playerView != null) {
-                view.player = player
-            } else {
-                // PlayerView has to be initialized with Activity context
-                val currentActivity = context.currentActivity
-                    ?: throw IllegalStateException("Cannot create a PlayerView, because no activity is attached.")
-                val userInterfaceType = rnStyleConfigWrapper?.userInterfaceType ?: UserInterfaceType.Bitmovin
-                val playerViewConfig: PlayerViewConfig = if (userInterfaceType != UserInterfaceType.Bitmovin) {
-                    configuredPlayerViewConfig.copy(uiConfig = UiConfig.Disabled)
-                } else {
-                    configuredPlayerViewConfig
-                }
-
-                val playerView = PlayerView(currentActivity, player, playerViewConfig)
+            Prop("isFullscreenRequested") { view: RNPlayerView, isFullscreen: Boolean ->
+                view.setFullscreen(isFullscreen)
+            }
 
-                playerView.layoutParams = LayoutParams(
-                    LayoutParams.MATCH_PARENT,
-                    LayoutParams.MATCH_PARENT,
-                )
-                if (isPictureInPictureEnabled) {
-                    playerView.setPictureInPictureHandler(RNPictureInPictureHandler(currentActivity, player))
-                }
-                view.setPlayerView(playerView)
-                attachCustomMessageHandlerBridge(view)
+            Prop("isPictureInPictureRequested") { view: RNPlayerView, isPictureInPicture: Boolean ->
+                view.setPictureInPicture(isPictureInPicture)
             }
 
-            if (rnStyleConfigWrapper?.styleConfig?.isUiEnabled != false &&
-                rnStyleConfigWrapper?.userInterfaceType == UserInterfaceType.Subtitle
-            ) {
-                context.currentActivity?.let { activity ->
-                    val subtitleView = SubtitleView(activity)
-                    subtitleView.setPlayer(player)
-                    view.setSubtitleView(subtitleView)
-                }
+            Prop("fullscreenBridgeId") { view: RNPlayerView, fullscreenBridgeId: String ->
+                view.attachFullscreenBridge(fullscreenBridgeId)
             }
-        }
-    }
 
-    /** Post and log any exceptions instead of crashing the app. */
-    private inline fun Handler.postAndLogException(crossinline block: () -> Unit) = post {
-        try {
-            block()
-        } catch (e: Exception) {
-            Log.e(MODULE_NAME, "Error while executing command", e)
+            Events(
+                "onBmpEvent",
+                "onBmpPlayerError",
+                "onBmpPlayerWarning",
+                "onBmpDestroy",
+                "onBmpMuted",
+                "onBmpUnmuted",
+                "onBmpReady",
+                "onBmpPaused",
+                "onBmpPlay",
+                "onBmpPlaying",
+                "onBmpPlaybackFinished",
+                "onBmpSeek",
+                "onBmpSeeked",
+                "onBmpTimeShift",
+                "onBmpTimeShifted",
+                "onBmpStallStarted",
+                "onBmpStallEnded",
+                "onBmpTimeChanged",
+                "onBmpSourceLoad",
+                "onBmpSourceLoaded",
+                "onBmpSourceUnloaded",
+                "onBmpSourceError",
+                "onBmpSourceWarning",
+                "onBmpAudioAdded",
+                "onBmpAudioChanged",
+                "onBmpAudioRemoved",
+                "onBmpSubtitleAdded",
+                "onBmpSubtitleChanged",
+                "onBmpSubtitleRemoved",
+                "onBmpDownloadFinished",
+                "onBmpVideoDownloadQualityChanged",
+                "onBmpPictureInPictureAvailabilityChanged",
+                "onBmpPictureInPictureEnter",
+                "onBmpPictureInPictureExit",
+                "onBmpAdBreakFinished",
+                "onBmpAdBreakStarted",
+                "onBmpAdClicked",
+                "onBmpAdError",
+                "onBmpAdFinished",
+                "onBmpAdManifestLoad",
+                "onBmpAdManifestLoaded",
+                "onBmpAdQuartile",
+                "onBmpAdScheduled",
+                "onBmpAdSkipped",
+                "onBmpAdStarted",
+                "onBmpVideoPlaybackQualityChanged",
+                "onBmpFullscreenEnabled",
+                "onBmpFullscreenDisabled",
+                "onBmpFullscreenEnter",
+                "onBmpFullscreenExit",
+                "onBmpCastStart",
+                "onBmpCastPlaybackFinished",
+                "onBmpCastPaused",
+                "onBmpCastPlaying",
+                "onBmpCastStarted",
+                "onBmpCastAvailable",
+                "onBmpCastStopped",
+                "onBmpCastWaitingForDevice",
+                "onBmpCastTimeUpdated",
+                "onBmpCueEnter",
+                "onBmpCueExit",
+            )
         }
     }
 }

package/android/src/main/java/com/bitmovin/player/reactnative/ResultWaiter.kt

@@ -0,0 +1,58 @@
+package com.bitmovin.player.reactnative
+
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.atomic.AtomicInteger
+
+/**
+ * Lets native code synchronously wait for a value that will be supplied
+ * later (typically from JavaScript).  Thread-safe, generic, timeout-aware.
+ *
+ *     val (id, wait) = boolWaiter.make(250)   // 250 ms
+ *     sendEvent("...", mapOf("id" to id))
+ *     val answer = wait() ?: false            // fallback on timeout
+ */
+class ResultWaiter<T> {
+
+    private data class Entry<V>(
+        val latch: CountDownLatch = CountDownLatch(1),
+        @Volatile var value: V? = null,
+    )
+
+    private val nextId = AtomicInteger()
+    private val table = ConcurrentHashMap<Int, Entry<T>>()
+
+    /**
+     * Registers a new waiter and returns:
+     *   • id    – unique request handle
+     *   • wait  – blocking lambda that returns null on timeout
+     *
+     * @param timeoutMs  max time the caller is willing to block
+     */
+    fun make(timeoutMs: Long): Pair<Int, () -> T?> {
+        val id = nextId.incrementAndGet()
+        val entry = Entry<T>()
+        table[id] = entry
+
+        val waitFn = {
+            entry.latch.await(timeoutMs, TimeUnit.MILLISECONDS)
+            table.remove(id) // GC once done
+            entry.value
+        }
+
+        return id to waitFn
+    }
+
+    /** Completes the waiter if it exists; does nothing otherwise. */
+    fun complete(id: Int, value: T) {
+        table[id]?.let {
+            it.value = value
+            it.latch.countDown()
+        }
+    }
+
+    fun clear() {
+        table.clear()
+    }
+}