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

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

@@ -1,188 +1,114 @@
 package com.bitmovin.player.reactnative
 
-import android.util.Log
 import com.bitmovin.player.api.analytics.create
 import com.bitmovin.player.api.source.Source
 import com.bitmovin.player.reactnative.converter.toAnalyticsSourceMetadata
 import com.bitmovin.player.reactnative.converter.toJson
 import com.bitmovin.player.reactnative.converter.toSourceConfig
-import com.bitmovin.player.reactnative.extensions.toMap
-import com.bitmovin.player.reactnative.extensions.toReadableMap
-import com.facebook.react.bridge.Promise
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReactMethod
-import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.module.annotations.ReactModule
-import java.security.InvalidParameterException
-
-private const val MODULE_NAME = "SourceModule"
-
-@ReactModule(name = MODULE_NAME)
-class SourceModule(context: ReactApplicationContext) : BitmovinBaseModule(context) {
-    /**
-     * In-memory mapping from `nativeId`s to `Source` instances.
-     */
-    private val sources: Registry<Source> = mutableMapOf()
+import expo.modules.kotlin.exception.CodedException
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
 
+class SourceModule : Module() {
     /**
-     * JS exported module name.
+     * In-memory mapping from [NativeId]s to [Source] instances.
+     * This must match the Registry pattern from legacy SourceModule
      */
-    override fun getName() = MODULE_NAME
+    private val sources: Registry<Source> = mutableMapOf()
 
-    /**
-     * Fetches the [Source] instance associated with [nativeId] from internal sources or null.
-     */
-    fun getSourceOrNull(nativeId: NativeId): Source? = sources[nativeId]
+    override fun definition() = ModuleDefinition {
+        Name("SourceModule")
 
-    /**
-     * Creates a new `Source` instance inside the internal sources using the provided
-     * `config` and `analyticsSourceMetadata` object as well as an initialized DRM configuration ID.
-     * @param nativeId ID to be associated with the `Source` instance.
-     * @param drmNativeId ID of the DRM config to use.
-     * @param config `SourceConfig` object received from JS.
-     * @param sourceRemoteControlConfig `SourceRemoteControlConfig` object received from JS. Not supported on Android.
-     * @param analyticsSourceMetadata `SourceMetadata` object received from JS.
-     */
-    @ReactMethod
-    fun initWithAnalyticsConfig(
-        nativeId: NativeId,
-        drmNativeId: NativeId?,
-        config: ReadableMap?,
-        sourceRemoteControlConfig: ReadableMap?,
-        analyticsSourceMetadata: ReadableMap,
-        promise: Promise,
-    ) = initializeSource(nativeId, drmNativeId, config, analyticsSourceMetadata, promise)
+        OnCreate {
+            // Module initialization
+        }
 
-    /**
-     * Creates a new `Source` instance inside the internal sources using the provided
-     * `config` object and an initialized DRM configuration ID.
-     * @param nativeId ID to be associated with the `Source` instance.
-     * @param drmNativeId ID of the DRM config to use.
-     * @param config `SourceConfig` object received from JS.
-     * @param sourceRemoteControlConfig `SourceRemoteControlConfig` object received from JS. Not supported on Android.
-     */
-    @ReactMethod
-    fun initWithConfig(
-        nativeId: NativeId,
-        drmNativeId: NativeId?,
-        config: ReadableMap?,
-        sourceRemoteControlConfig: ReadableMap?,
-        promise: Promise,
-    ) = initializeSource(nativeId, drmNativeId, config, analyticsSourceMetadata = null, promise)
+        OnDestroy {
+            // Clean up sources
+            sources.clear()
+        }
 
-    private fun initializeSource(
-        nativeId: NativeId,
-        drmNativeId: NativeId?,
-        config: ReadableMap?,
-        analyticsSourceMetadata: ReadableMap?,
-        promise: Promise,
-    ) = promise.unit.resolveOnUiThread {
-        if (sources.containsKey(nativeId)) {
-            if (drmNativeId != null || config != null || analyticsSourceMetadata != null) {
-                Log.w("BitmovinSourceModule", "Cannot reconfigure an existing source")
-            }
-            return@resolveOnUiThread // key can be reused to access the same native instance (see NativeInstanceConfig)
+        AsyncFunction("initializeWithConfig") { nativeId: NativeId, drmNativeId: NativeId?,
+            config: Map<String, Any>?, sourceRemoteControlConfig: Map<String, Any>?, ->
+            initializeSource(nativeId, drmNativeId, config, sourceRemoteControlConfig, null)
         }
-        val drmConfig = drmNativeId?.let { drmModule.getConfig(it) }
-        val sourceConfig = config?.toSourceConfig() ?: throw InvalidParameterException("Invalid SourceConfig")
-        val sourceMetadata = analyticsSourceMetadata?.toAnalyticsSourceMetadata()
-        sourceConfig.drmConfig = drmConfig
-        sources[nativeId] = if (sourceMetadata == null) {
-            Source.create(sourceConfig)
-        } else {
-            Source.create(sourceConfig, sourceMetadata)
+
+        AsyncFunction("initializeWithAnalyticsConfig") { nativeId: NativeId, drmNativeId: NativeId?,
+            config: Map<String, Any>?, sourceRemoteControlConfig: Map<String, Any>?,
+            analyticsSourceMetadata: Map<String, Any>?, ->
+            initializeSource(nativeId, drmNativeId, config, sourceRemoteControlConfig, analyticsSourceMetadata)
         }
-    }
 
-    /**
-     * Removes the `Source` instance associated with `nativeId` from the internal sources.
-     * @param nativeId `Source` to be disposed.
-     */
-    @ReactMethod
-    fun destroy(nativeId: NativeId, promise: Promise) {
-        promise.unit.resolveOnUiThreadWithSource(nativeId) {
+        AsyncFunction("destroy") { nativeId: NativeId ->
             sources.remove(nativeId)
         }
-    }
 
-    /**
-     * Whether `nativeId` source is currently attached to a player instance.
-     * @param nativeId Source `nativeId`.
-     * @param promise: JS promise object.
-     */
-    @ReactMethod
-    fun isAttachedToPlayer(nativeId: NativeId, promise: Promise) {
-        promise.bool.resolveOnUiThreadWithSource(nativeId) {
-            isAttachedToPlayer
+        AsyncFunction("isAttachedToPlayer") { nativeId: NativeId ->
+            sources[nativeId]?.isAttachedToPlayer
         }
-    }
 
-    /**
-     * Whether `nativeId` source is currently active in a `Player`.
-     * @param nativeId Source `nativeId`.
-     * @param promise: JS promise object.
-     */
-    @ReactMethod
-    fun isActive(nativeId: NativeId, promise: Promise) {
-        promise.bool.resolveOnUiThreadWithSource(nativeId) {
-            isActive
+        AsyncFunction("isActive") { nativeId: NativeId ->
+            sources[nativeId]?.isActive
         }
-    }
 
-    /**
-     * The duration of `nativeId` source in seconds.
-     */
-    @ReactMethod
-    fun duration(nativeId: NativeId, promise: Promise) {
-        promise.double.resolveOnUiThreadWithSource(nativeId) {
-            duration
+        AsyncFunction("duration") { nativeId: NativeId ->
+            sources[nativeId]?.duration
         }
-    }
 
-    /**
-     * The current loading state of `nativeId` source.
-     */
-    @ReactMethod
-    fun loadingState(nativeId: NativeId, promise: Promise) {
-        promise.int.resolveOnUiThreadWithSource(nativeId) {
-            loadingState.ordinal
+        AsyncFunction("loadingState") { nativeId: NativeId ->
+            sources[nativeId]?.loadingState?.name
         }
-    }
 
-    /**
-     * Metadata for the currently loaded `nativeId` source.
-     */
-    @ReactMethod
-    fun getMetadata(nativeId: NativeId, promise: Promise) {
-        promise.map.nullable.resolveOnUiThreadWithSource(nativeId) {
-            config.metadata?.toReadableMap()
+        AsyncFunction("getMetadata") { nativeId: NativeId ->
+            sources[nativeId]?.config?.metadata
         }
-    }
 
-    /**
-     * Set the metadata for a loaded `nativeId` source.
-     */
-    @ReactMethod
-    fun setMetadata(nativeId: NativeId, metadata: ReadableMap?, promise: Promise) {
-        promise.unit.resolveOnUiThreadWithSource(nativeId) {
-            config.metadata = metadata?.toMap()
+        AsyncFunction("setMetadata") { nativeId: NativeId, metadata: Map<String, Any>? ->
+            sources[nativeId]?.config?.metadata = metadata?.mapValues { it.value.toString() }
         }
-    }
 
-    /**
-     * Returns the thumbnail image for the `Source` at a certain time.
-     * @param nativeId Target player id.
-     * @param time Playback time for the thumbnail.
-     */
-    @ReactMethod
-    fun getThumbnail(nativeId: NativeId, time: Double, promise: Promise) {
-        promise.map.nullable.resolveOnUiThreadWithSource(nativeId) {
-            getThumbnail(time)?.toJson()
+        AsyncFunction("getThumbnail") { nativeId: NativeId, time: Double ->
+            sources[nativeId]?.getThumbnail(time)?.toJson()
         }
     }
 
-    private inline fun <T> TPromise<T>.resolveOnUiThreadWithSource(
+    private fun initializeSource(
         nativeId: NativeId,
-        crossinline block: Source.() -> T,
-    ) = resolveOnUiThread { getSource(nativeId, this@SourceModule).block() }
+        drmNativeId: NativeId?,
+        config: Map<String, Any>?,
+        sourceRemoteControlConfig: Map<String, Any>?,
+        analyticsSourceMetadata: Map<String, Any>?,
+    ) {
+        if (sources.containsKey(nativeId)) {
+            return // Source already exists
+        }
+
+        val sourceConfig = config?.toSourceConfig()
+            ?: throw SourceException.InvalidSourceConfig()
+
+        // Get DRM config if provided
+        sourceConfig.drmConfig = appContext.registry.getModule<DrmModule>()?.getConfig(drmNativeId)
+
+        val sourceMetadata = analyticsSourceMetadata?.toAnalyticsSourceMetadata()
+        try {
+            sources[nativeId] = if (sourceMetadata != null) {
+                Source.create(sourceConfig, sourceMetadata)
+            } else {
+                Source.create(sourceConfig)
+            }
+        } catch (e: Exception) {
+            throw SourceException.SourceCreationFailed(e.message ?: "Unknown error")
+        }
+    }
+
+    // CRITICAL: This method must remain available for cross-module access
+    // Called by PlayerModule.loadSource()
+    fun getSourceOrNull(nativeId: NativeId): Source? = sources[nativeId]
+}
+
+// MARK: - Exception Definitions
+
+sealed class SourceException(message: String) : CodedException(message) {
+    class InvalidSourceConfig : SourceException("Invalid source configuration")
+    class SourceCreationFailed(reason: String) : SourceException("Could not create source: $reason")
 }

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

@@ -0,0 +1,44 @@
+package com.bitmovin.player.reactnative
+
+import com.bitmovin.player.api.buffer.BufferLevel
+import com.bitmovin.player.api.ui.PlayerViewConfig
+import com.bitmovin.player.api.ui.StyleConfig
+
+/**
+ * Represents the user interface type for the React Native player.
+ */
+enum class UserInterfaceType {
+    Subtitle,
+    Bitmovin,
+}
+
+/**
+ * Configuration wrapper for Picture-in-Picture functionality.
+ */
+data class PictureInPictureConfig(
+    val isEnabled: Boolean = false,
+)
+
+/**
+ * Wrapper for React Native player view configuration.
+ */
+data class RNPlayerViewConfigWrapper(
+    val playerViewConfig: PlayerViewConfig,
+    val pictureInPictureConfig: PictureInPictureConfig? = null,
+)
+
+/**
+ * Wrapper for React Native style configuration.
+ */
+data class RNStyleConfigWrapper(
+    val styleConfig: StyleConfig,
+    val userInterfaceType: UserInterfaceType,
+)
+
+/**
+ * Data class for buffer levels - used for exposing buffer information.
+ */
+data class RNBufferLevels(
+    val audio: BufferLevel,
+    val video: BufferLevel,
+)

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

@@ -1,21 +1,18 @@
 package com.bitmovin.player.reactnative
 
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReactMethod
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
 import java.util.UUID
 
-private const val MODULE_NAME = "UuidModule"
+/**
+ * Native module for easy and fast unique ID generation on JS side. Used to generate native instance IDs.
+ */
+class UuidModule : Module() {
+    override fun definition() = ModuleDefinition {
+        Name("UuidModule")
 
-class UuidModule(context: ReactApplicationContext) : BitmovinBaseModule(context) {
-    /**
-     * Exported JS module name.
-     */
-    override fun getName() = MODULE_NAME
-
-    /**
-     * Synchronously generate a random UUIDv4.
-     * @return Random UUID RFC 4122 version 4.
-     */
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    fun generate() = UUID.randomUUID().toString()
+        Function("generate") {
+            UUID.randomUUID().toString()
+        }
+    }
 }