bitmovin-player-react-native 0.7.2 → 0.9.0

package/README.md

@@ -11,11 +11,6 @@ Official React Native bindings for Bitmovin's mobile Player SDKs.
 [![npm dt](https://img.shields.io/npm/dt/bitmovin-player-react-native.svg)](https://www.npmjs.com/package/bitmovin-player-react-native)
 
 > As the library is under active development, this means certain features from our native SDKs are not yet exposed through these React Native bindings.
-> See [Feature Support](#feature-support) for an overview of the supported features.
->
-> Not seeing the features you’re looking for?
-> We are accepting community pull requests to this open-source project so please feel free to contribute.
-> or let us know in [our community](https://community.bitmovin.com/c/requests/14) what features we should work on next.
 
 - [Bitmovin Player React Native](#bitmovin-player-react-native)
   - [Platform Support](#platform-support)
@@ -33,24 +28,14 @@ This library requires at least React Native 0.64+ and React 17+ to work properly
 - iOS 14.0+
 - tvOS 14.0+
 - Android API Level 21+
-- Android TV API Level 21+
+- Android TV API Level 24+
 - Fire TV FireOS 5.0+
 
 Please note that browsers and other browser-like environments such as webOS and Tizen are not supported. For more details regarding Bitmovin Player SDK platform and device support, please refer to the [Supported Platforms & Devices](https://developer.bitmovin.com/playback/docs/supported-platforms-devices-player) page of our documentation.
 
 ## Feature Support
 
-Features of the native mobile Player SDKs are progressively being implemented in this React Native library. The table below summarizes the current state of the main Player SDK features.
-
-| Feature                          | State                                     |
-| -------------------------------- | ----------------------------------------- |
-| Playback of DRM-protected assets | :white_check_mark: Available since v0.2.0 |
-| Subtitles & Captions             | :white_check_mark: Available since v0.2.0 |
-| Advertising                      | :white_check_mark: Available since v0.4.0 |
-| Analytics                        | :white_check_mark: Available since v0.5.0 |
-| Playlist API                     | :x: Not available                         |
-| Casting                          | :x: Not available                         |
-| Offline Playback                 | :x: Not available                         |
+Please refer to the [Features](https://developer.bitmovin.com/playback/docs/react-native-introduction#features) section of our documentation for an up-to-date list of supported Player features.
 
 ## Documentation
 

package/RNBitmovinPlayer.podspec

@@ -19,9 +19,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
   s.dependency "React-Core"
-  s.dependency "BitmovinPlayer", "3.41.0"
-  s.dependency "BitmovinAnalyticsCollector/Core", "2.9.4"
-  s.dependency "BitmovinAnalyticsCollector/BitmovinPlayer", "2.9.4"
-  s.ios.dependency "GoogleAds-IMA-iOS-SDK", "3.17.0"
-  s.tvos.dependency "GoogleAds-IMA-tvOS-SDK", "4.6.1"
+  s.dependency "BitmovinPlayer", "3.42.0"
+  s.ios.dependency "GoogleAds-IMA-iOS-SDK", "3.18.4"
+  s.tvos.dependency "GoogleAds-IMA-tvOS-SDK", "4.8.2"
 end

package/android/build.gradle

@@ -51,10 +51,10 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
-    implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.26.0'
+    implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.29.0'
     implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
     implementation 'com.bitmovin.analytics:collector-bitmovin-player:2.12.1'
-    implementation 'com.bitmovin.player:player:3.39.0'
+    implementation 'com.bitmovin.player:player:3.40.0'
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+' // From node_modules
 }

package/android/gradlew

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -133,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -197,6 +197,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

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

@@ -104,7 +104,7 @@ class AnalyticsModule(private val context: ReactApplicationContext) : ReactConte
      * @param json Custom data config json.
      */
     @ReactMethod
-    fun setCustomData(nativeId: NativeId, json: ReadableMap?) {
+    fun setCustomData(nativeId: NativeId, playerId: NativeId?, json: ReadableMap?) {
         uiManager()?.addUIBlock { _ ->
             JsonConverter.toAnalyticsCustomData(json)?.let {
                 collectors[nativeId]?.customData = it
@@ -118,7 +118,7 @@ class AnalyticsModule(private val context: ReactApplicationContext) : ReactConte
      * @param promise JS promise object.
      */
     @ReactMethod
-    fun getCustomData(nativeId: NativeId, promise: Promise) {
+    fun getCustomData(nativeId: NativeId, playerId: NativeId?, promise: Promise) {
         uiManager()?.addUIBlock { _ ->
             collectors[nativeId]?.let {
                 promise.resolve(JsonConverter.fromAnalyticsCustomData(it.customData))
@@ -126,6 +126,16 @@ class AnalyticsModule(private val context: ReactApplicationContext) : ReactConte
         }
     }
 
+    @ReactMethod
+    fun addSourceMetadata(nativeId: NativeId, playerId: NativeId?, json: ReadableMap?) {
+        uiManager()?.addUIBlock { _ ->
+            val playerSource = playerModule()?.getPlayer(playerId)?.source ?: return@addUIBlock
+            JsonConverter.toAnalyticsSourceMetadata(json)?.let { sourceMetadata ->
+                collectors[nativeId]?.addSourceMetadata(playerSource, sourceMetadata)
+            }
+        }
+    }
+
     /**
      * Gets the current user Id for a `BitmovinPlayerCollector` instance.
      * @param nativeId Native Id of the the collector instance.

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

@@ -82,6 +82,16 @@ private val EVENT_CLASS_TO_REACT_NATIVE_NAME_MAPPING_UI = mapOf<KClass<out Event
 @SuppressLint("ViewConstructor")
 class RNPlayerView(val context: ReactApplicationContext) : LinearLayout(context),
     LifecycleEventListener, View.OnLayoutChangeListener, RNPictureInPictureDelegate {
+
+    init {
+        // React Native has a bug that dynamically added views sometimes aren't laid out again properly.
+        // Since we dynamically add and remove SurfaceView under the hood this caused the player
+        // to suddenly not show the video anymore because SurfaceView was not laid out properly.
+        // Bitmovin player issue: https://github.com/bitmovin/bitmovin-player-react-native/issues/180
+        // React Native layout issue: https://github.com/facebook/react-native/issues/17968
+        getViewTreeObserver().addOnGlobalLayoutListener { requestLayout() }
+    }
+
     /**
      * Relays the provided set of events, emitted by the player, together with the associated name
      * to the `eventOutput` callback.

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

@@ -24,10 +24,11 @@ class RNPlayerViewManager(private val context: ReactApplicationContext) : Simple
     /**
      * Native component functions.
      */
-    enum class Commands {
-        ATTACH_PLAYER,
-        ATTACH_FULLSCREEN_BRIDGE,
-        SET_CUSTOM_MESSAGE_HANDLER_BRIDGE_ID,
+    enum class Commands(val command: String) {
+        ATTACH_PLAYER("attachPlayer"),
+        ATTACH_FULLSCREEN_BRIDGE("attachFullscreenBridge"),
+        SET_CUSTOM_MESSAGE_HANDLER_BRIDGE_ID("setCustomMessageHandlerBridgeId"),
+        SET_FULLSCREEN("setFullscreen");
     }
 
     /**
@@ -132,11 +133,9 @@ class RNPlayerViewManager(private val context: ReactApplicationContext) : Simple
      * to call 'functions' on them.
      * @return map between names (used in js) and command ids (used in native code).
      */
-    override fun getCommandsMap(): MutableMap<String, Int> = mutableMapOf(
-        "attachPlayer" to Commands.ATTACH_PLAYER.ordinal,
-        "attachFullscreenBridge" to Commands.ATTACH_FULLSCREEN_BRIDGE.ordinal,
-        "setCustomMessageHandlerBridgeId" to Commands.SET_CUSTOM_MESSAGE_HANDLER_BRIDGE_ID.ordinal,
-    )
+    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.
@@ -145,19 +144,23 @@ class RNPlayerViewManager(private val context: ReactApplicationContext) : Simple
      * @param args Arguments list sent from the js side.
      */
     override fun receiveCommand(view: RNPlayerView, commandId: String?, args: ReadableArray?) {
-        super.receiveCommand(view, commandId, args)
-        commandId?.toInt()?.let {
-            when (it) {
-                Commands.ATTACH_PLAYER.ordinal -> attachPlayer(view, args?.getString(1), args?.getMap(2))
-                Commands.ATTACH_FULLSCREEN_BRIDGE.ordinal -> args?.getString(1)?.let { fullscreenBridgeId ->
-                    attachFullscreenBridge(view, fullscreenBridgeId)
+        val command = commandId?.toInt()?.toCommand() ?: throw IllegalArgumentException(
+            "The received command is not supported by the Bitmovin Player View"
+        )
+        when (command) {
+            Commands.ATTACH_PLAYER -> attachPlayer(view, args?.getString(1), args?.getMap(2))
+            Commands.ATTACH_FULLSCREEN_BRIDGE -> args?.getString(1)?.let { fullscreenBridgeId ->
+                attachFullscreenBridge(view, fullscreenBridgeId)
+            }
+            Commands.SET_CUSTOM_MESSAGE_HANDLER_BRIDGE_ID -> {
+                args?.getString(1)?.let { customMessageHandlerBridgeId ->
+                    setCustomMessageHandlerBridgeId(view, customMessageHandlerBridgeId)
                 }
-                Commands.SET_CUSTOM_MESSAGE_HANDLER_BRIDGE_ID.ordinal -> {
-                    args?.getString(1)?.let { customMessageHandlerBridgeId ->
-                        setCustomMessageHandlerBridgeId(view, customMessageHandlerBridgeId)
-                    }
+            }
+            Commands.SET_FULLSCREEN -> {
+                args?.getBoolean(1)?.let { isFullscreen ->
+                    setFullscreen(view, isFullscreen)
                 }
-                else -> {}
             }
         }
     }
@@ -170,6 +173,20 @@ class RNPlayerViewManager(private val context: ReactApplicationContext) : Simple
         }
     }
 
+    private fun setFullscreen(view: RNPlayerView, isFullscreen: Boolean) {
+        if (view.playerView?.isFullscreen == isFullscreen) return
+
+        Handler(Looper.getMainLooper()).post {
+            with(view.playerView ?: return@post) {
+                if (isFullscreen) {
+                    enterFullscreen()
+                } else {
+                    exitFullscreen()
+                }
+            }
+        }
+    }
+
     private fun setCustomMessageHandlerBridgeId(view: RNPlayerView, customMessageHandlerBridgeId: NativeId) {
         this.customMessageHandlerBridgeId = customMessageHandlerBridgeId
         attachCustomMessageHandlerBridge(view)
@@ -223,3 +240,5 @@ class RNPlayerViewManager(private val context: ReactApplicationContext) : Simple
      */
     private fun getPlayerModule(): PlayerModule? = context.getModule()
 }
+
+private fun Int.toCommand(): RNPlayerViewManager.Commands? = RNPlayerViewManager.Commands.values().getOrNull(this)

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

@@ -1,6 +1,7 @@
 package com.bitmovin.player.reactnative.converter
 
 import com.bitmovin.analytics.BitmovinAnalyticsConfig
+import com.bitmovin.analytics.config.SourceMetadata
 import com.bitmovin.analytics.data.CustomData
 import com.bitmovin.player.api.DeviceDescription.DeviceName
 import com.bitmovin.player.api.DeviceDescription.ModelName
@@ -784,6 +785,9 @@ class JsonConverter {
                     customData.setProperty("customData${n}", customDataN)
                 }
             }
+            it.getString("experimentName")?.let { experimentName ->
+                customData.experimentName = experimentName
+            }
             customData
         }
 
@@ -800,9 +804,33 @@ class JsonConverter {
                     json.putString("customData${n}", customDataN)
                 }
             }
+            it.experimentName?.let { experimentName ->
+                json.putString("experimentName", experimentName)
+            }
             json
         }
 
+        @JvmStatic
+        fun toAnalyticsSourceMetadata(json: ReadableMap?): SourceMetadata? = json?.let {
+            val sourceMetadata = SourceMetadata(
+                    title = it.getString("title"),
+                    videoId = it.getString("videoId"),
+                    cdnProvider = it.getString("cdnProvider"),
+                    path = it.getString("path"),
+                    isLive = it.getBoolean("isLive")
+            )
+
+            for (n in 1..30) {
+                it.getString("customData${n}")?.let { customDataN ->
+                    sourceMetadata.setProperty("customData${n}", customDataN)
+                }
+            }
+            it.getString("experimentName")?.let { experimentName ->
+                sourceMetadata.experimentName = experimentName
+            }
+            sourceMetadata
+        }
+
         /**
          * Converts any `VideoQuality` value into its json representation.
          * @param videoQuality `VideoQuality` value.

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

@@ -66,6 +66,11 @@ class FullscreenHandlerModule(private val context: ReactApplicationContext) : Re
         this.fullscreenHandler[nativeId] = fullscreenHandler
     }
 
+    @ReactMethod
+    fun setIsFullscreenActive(nativeId: NativeId, isFullscreenActive: Boolean) {
+        fullscreenHandler[nativeId]?.isFullscreen = isFullscreenActive
+    }
+
     @ReactMethod
     fun destroy(nativeId: NativeId) {
         fullscreenHandler.remove(nativeId)

package/ios/AnalyticsModule.m

@@ -7,8 +7,9 @@ RCT_EXTERN_METHOD(destroy:(NSString *)nativeId)
 RCT_EXTERN_METHOD(attach:(NSString *)nativeId playerId:(NSString *)playerId)
 RCT_EXTERN_METHOD(detach:(NSString *)nativeId)
 RCT_EXTERN_METHOD(setCustomDataOnce:(NSString *)nativeId json:(nullable id)json)
-RCT_EXTERN_METHOD(setCustomData:(NSString *)nativeId json:(nullable id)json)
-RCT_EXTERN_METHOD(getCustomData:(NSString *)nativeId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(setCustomData:(NSString *)nativeId playerId:(nullable NSString *)playerId json:(nullable id)json)
+RCT_EXTERN_METHOD(getCustomData:(NSString *)nativeId playerId:(nullable NSString *)playerId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(getUserId:(NSString *)nativeId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(addSourceMetadata:(NSString *)nativeId playerId:(nullable NSString *)playerId json:(nullable id)json)
 
 @end

package/ios/AnalyticsModule.swift

@@ -1,5 +1,5 @@
 import BitmovinPlayer
-import BitmovinAnalyticsCollector
+import BitmovinCollector
 
 @objc(AnalyticsModule)
 class AnalyticsModule: NSObject, RCTBridgeModule {
@@ -118,37 +118,50 @@ class AnalyticsModule: NSObject, RCTBridgeModule {
     /**
      Sets the custom data config for a `BitmovinPlayerCollector` instance.
      - Parameter nativeId: Native Id of the collector instance.
+     - Parameter playerId: Native Id of the player instance.
      - Parameter json: Custom data config json.
      */
-    @objc(setCustomData:json:)
-    func setCustomData(_ nativeId: NativeId, json: Any?) {
+    @objc(setCustomData:playerId:json:)
+    func setCustomData(
+        _ nativeId: NativeId,
+        playerId: NativeId?,
+        json: Any?
+    ) {
         bridge.uiManager.addUIBlock { [weak self] _, _ in
             guard
                 let collector = self?.collectors[nativeId],
-                let customData = RCTConvert.analyticsCustomData(json)
+                let customData = RCTConvert.analyticsCustomData(json),
+                let playerId = playerId,
+                let player = self?.bridge[PlayerModule.self]?.retrieve(playerId),
+                let source = player.source
             else {
                 return
             }
-            collector.setCustomData(customData: customData)
+            collector.apply(customData: customData, for: source)
         }
     }
 
     /**
      Gets the current custom data config for a `BitmovinPlayerCollector` instance.
      - Parameter nativeId: Native Id of the the collector instance.
+     - Parameter playerId: Native Id of the player instance.
      - Parameter resolver: JS promise resolver.
      - Parameter rejecter: JS promise rejecter.
      */
-    @objc(getCustomData:resolver:rejecter:)
+    @objc(getCustomData:playerId:resolver:rejecter:)
     func getCustomData(
         _ nativeId: NativeId,
+        playerId: NativeId?,
         resolver resolve: @escaping RCTPromiseResolveBlock,
         rejecter reject: @escaping RCTPromiseRejectBlock
     ) {
         bridge.uiManager.addUIBlock { [weak self] _, _ in
             guard
                 let collector = self?.collectors[nativeId],
-                let customData = RCTConvert.toJson(analyticsCustomData: collector.getCustomData())
+                let playerId = playerId,
+                let player = self?.bridge[PlayerModule.self]?.retrieve(playerId),
+                let source = player.source,
+                let customData = RCTConvert.toJson(analyticsCustomData: collector.customData(for: source))
             else {
                 reject("[AnalyticsModule]", "Could not find analytics collector with ID (\(nativeId))", nil)
                 return
@@ -177,4 +190,30 @@ class AnalyticsModule: NSObject, RCTBridgeModule {
             resolve(collector.getUserId())
         }
     }
+
+    /**
+     Applies the source metadata for the current source via the `BitmovinPlayerCollector` instance.
+     - Parameter nativeId: Native Id of the collector instance.
+     - Parameter playerId: Native Id of the player instance.
+     - Parameter json: Custom data config json.
+     */
+    @objc(addSourceMetadata:playerId:json:)
+    func addSourceMetadata(
+        _ nativeId: NativeId,
+        playerId: NativeId?,
+        json: Any?
+    ) {
+        bridge.uiManager.addUIBlock { [weak self] _, _ in
+            guard
+                let collector = self?.collectors[nativeId],
+                let sourceMetadata = RCTConvert.analyticsSourceMetadata(json),
+                let playerId = playerId,
+                let player = self?.bridge[PlayerModule.self]?.retrieve(playerId),
+                let source = player.source
+            else {
+                return
+            }
+            collector.apply(sourceMetadata: sourceMetadata, for: source)
+        }
+    }
 }

package/ios/FullscreenHandlerModule.m

@@ -6,4 +6,5 @@ RCT_EXTERN_METHOD(destroy:(NSString *)nativeId)
 
 RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(onFullscreenChanged:(NSString *)nativeId isFullscreenEnabled:(BOOL)isFullscreenEnabled)
 RCT_EXTERN_METHOD(registerHandler:(NSString *)nativeId)
+RCT_EXTERN_METHOD(setIsFullscreenActive:(NSString *)nativeId isFullscreen:(BOOL)isFullscreen)
 @end

package/ios/FullscreenHandlerModule.swift

@@ -57,6 +57,11 @@ class FullscreenHandlerModule: NSObject, RCTBridgeModule {
         fullscreenHandlers[nativeId] = FullscreenHandlerBridge(nativeId, bridge: bridge)
     }
 
+    @objc(setIsFullscreenActive:isFullscreen:)
+    func setIsFullscreenActive(_ nativeId: NativeId, isFullscreen: Bool) {
+        fullscreenHandlers[nativeId]?.isFullscreen = isFullscreen
+    }
+
     func onFullscreenRequested(nativeId: NativeId) {
         fullscreenChangeDispatchGroup.enter()
         bridge.enqueueJSCall("FullscreenBridge-\(nativeId)", method: "enterFullscreen", args: []) {}

package/ios/RCTConvert+BitmovinPlayer.swift

@@ -1,6 +1,6 @@
 import Foundation
 import BitmovinPlayer
-import BitmovinAnalyticsCollector
+import BitmovinCollector
 
 extension RCTConvert {
     /**
@@ -72,6 +72,9 @@ extension RCTConvert {
         if let isUiEnabled = json["isUiEnabled"] as? Bool {
             styleConfig.isUiEnabled = isUiEnabled
         }
+        if let userInterfaceType = userInterfaceType(json["userInterfaceType"]) {
+            styleConfig.userInterfaceType = userInterfaceType
+        }
 #if !os(tvOS)
         if let playerUiCss = json["playerUiCss"] as? String {
             styleConfig.playerUiCss = RCTConvert.nsurl(playerUiCss)
@@ -614,11 +617,37 @@ extension RCTConvert {
         if let randomizeUserId = json["randomizeUserId"] as? Bool {
             config.randomizeUserId = randomizeUserId
         }
-        for n in 1..<30 {
-            if let customDataN = json["customData\(n)"] as? String {
-                config.setValue(customDataN, forKey: "customData\(n)")
-            }
-        }
+        config.customData1 = json["customData1"] as? String
+        config.customData2 = json["customData2"] as? String
+        config.customData3 = json["customData3"] as? String
+        config.customData4 = json["customData4"] as? String
+        config.customData5 = json["customData5"] as? String
+        config.customData6 = json["customData6"] as? String
+        config.customData7 = json["customData7"] as? String
+        config.customData8 = json["customData8"] as? String
+        config.customData9 = json["customData9"] as? String
+        config.customData10 = json["customData10"] as? String
+        config.customData11 = json["customData11"] as? String
+        config.customData12 = json["customData12"] as? String
+        config.customData13 = json["customData13"] as? String
+        config.customData14 = json["customData14"] as? String
+        config.customData15 = json["customData15"] as? String
+        config.customData16 = json["customData16"] as? String
+        config.customData17 = json["customData17"] as? String
+        config.customData18 = json["customData18"] as? String
+        config.customData19 = json["customData19"] as? String
+        config.customData20 = json["customData20"] as? String
+        config.customData21 = json["customData21"] as? String
+        config.customData22 = json["customData22"] as? String
+        config.customData23 = json["customData23"] as? String
+        config.customData24 = json["customData24"] as? String
+        config.customData25 = json["customData25"] as? String
+        config.customData26 = json["customData26"] as? String
+        config.customData27 = json["customData27"] as? String
+        config.customData28 = json["customData28"] as? String
+        config.customData29 = json["customData29"] as? String
+        config.customData30 = json["customData30"] as? String
+        config.experimentName = json["experimentName"] as? String
         return config
     }
 
@@ -631,13 +660,39 @@ extension RCTConvert {
         guard let json = json as? [String: Any?] else {
             return nil
         }
-        let customData = CustomData()
-        for n in 1..<30 {
-            if let customDataN = json["customData\(n)"] as? String {
-                customData.setValue(customDataN, forKey: "customData\(n)")
-            }
-        }
-        return customData
+        return CustomData(
+            customData1: json["customData1"] as? String,
+            customData2: json["customData2"] as? String,
+            customData3: json["customData3"] as? String,
+            customData4: json["customData4"] as? String,
+            customData5: json["customData5"] as? String,
+            customData6: json["customData6"] as? String,
+            customData7: json["customData7"] as? String,
+            customData8: json["customData8"] as? String,
+            customData9: json["customData9"] as? String,
+            customData10: json["customData10"] as? String,
+            customData11: json["customData11"] as? String,
+            customData12: json["customData12"] as? String,
+            customData13: json["customData13"] as? String,
+            customData14: json["customData14"] as? String,
+            customData15: json["customData15"] as? String,
+            customData16: json["customData16"] as? String,
+            customData17: json["customData17"] as? String,
+            customData18: json["customData18"] as? String,
+            customData19: json["customData19"] as? String,
+            customData20: json["customData20"] as? String,
+            customData21: json["customData21"] as? String,
+            customData22: json["customData22"] as? String,
+            customData23: json["customData23"] as? String,
+            customData24: json["customData24"] as? String,
+            customData25: json["customData25"] as? String,
+            customData26: json["customData26"] as? String,
+            customData27: json["customData27"] as? String,
+            customData28: json["customData28"] as? String,
+            customData29: json["customData29"] as? String,
+            customData30: json["customData30"] as? String,
+            experimentName: json["experimentName"] as? String
+        )
     }
 
     /**
@@ -650,13 +705,62 @@ extension RCTConvert {
             return nil
         }
         var json: [String: Any?] = [:]
-        for n in 1..<30 {
-            if let customDataN = analyticsCustomData.value(forKey: "customData\(n)") {
-                json["customData\(n)"] = customDataN
-            }
-        }
+        json["customData1"] = analyticsCustomData.customData1
+        json["customData2"] = analyticsCustomData.customData2
+        json["customData3"] = analyticsCustomData.customData3
+        json["customData4"] = analyticsCustomData.customData4
+        json["customData5"] = analyticsCustomData.customData5
+        json["customData6"] = analyticsCustomData.customData6
+        json["customData7"] = analyticsCustomData.customData7
+        json["customData8"] = analyticsCustomData.customData8
+        json["customData9"] = analyticsCustomData.customData9
+        json["customData10"] = analyticsCustomData.customData10
+        json["customData11"] = analyticsCustomData.customData11
+        json["customData12"] = analyticsCustomData.customData12
+        json["customData13"] = analyticsCustomData.customData13
+        json["customData14"] = analyticsCustomData.customData14
+        json["customData15"] = analyticsCustomData.customData15
+        json["customData16"] = analyticsCustomData.customData16
+        json["customData17"] = analyticsCustomData.customData17
+        json["customData18"] = analyticsCustomData.customData18
+        json["customData19"] = analyticsCustomData.customData19
+        json["customData20"] = analyticsCustomData.customData20
+        json["customData21"] = analyticsCustomData.customData21
+        json["customData22"] = analyticsCustomData.customData22
+        json["customData23"] = analyticsCustomData.customData23
+        json["customData24"] = analyticsCustomData.customData24
+        json["customData25"] = analyticsCustomData.customData25
+        json["customData26"] = analyticsCustomData.customData26
+        json["customData27"] = analyticsCustomData.customData27
+        json["customData28"] = analyticsCustomData.customData28
+        json["customData29"] = analyticsCustomData.customData29
+        json["customData30"] = analyticsCustomData.customData30
+        json["experimentName"] = analyticsCustomData.experimentName
         return json
     }
+
+    /**
+     Utility method to get an analytics `SourceMetadata` value from a JS object.
+     - Parameter json: JS object.
+     - Returns: The associated `SourceMetadata` value or nil.
+     */
+    static func analyticsSourceMetadata(_ json: Any?) -> SourceMetadata? {
+        guard let json = json as? [String: Any?] else {
+            return nil
+        }
+
+        let customData = analyticsCustomData(json)
+
+        return SourceMetadata(
+            videoId: json["videoId"] as? String,
+            title: json["title"] as? String,
+            path: json["path"] as? String,
+            isLive: json["isLive"] as? Bool,
+            cdnProvider: json["cdnProvider"] as? String,
+            customData: customData ?? CustomData()
+        )
+    }
+
     /**
      Utility method to compute a JS value from a `VideoQuality` object.
      - Parameter videoQuality `VideoQuality` object to be converted.
@@ -675,4 +779,23 @@ extension RCTConvert {
             "bitrate": videoQuality.bitrate,
         ]
     }
+
+    /**
+     Utility method to get a `UserInterfaceType` from a JS object.
+     - Parameter json: JS object
+     - Returns: The associated `UserInterfaceType` value or `nil`
+     */
+    static func userInterfaceType(_ json: Any?) -> UserInterfaceType? {
+        guard let json = json as? String else {
+            return .none
+        }
+        switch json {
+#if os(iOS)
+        case "Bitmovin": return .bitmovin
+#endif
+        case "System": return .system
+        case "Subtitle": return .subtitle
+        default: return nil
+        }
+    }
 }

package/ios/RNPlayerViewManager.m

@@ -56,5 +56,6 @@ RCT_EXPORT_VIEW_PROPERTY(onFullscreenExit, RCTBubblingEventBlock)
 RCT_EXTERN_METHOD(attachPlayer:(nonnull NSNumber *)viewId playerId:(NSString *)playerId playerConfig:(nullable NSDictionary *)playerConfig)
 RCT_EXTERN_METHOD(attachFullscreenBridge:(nonnull NSNumber *)viewId fullscreenBridgeId:(NSString *)fullscreenBridgeId)
 RCT_EXTERN_METHOD(setCustomMessageHandlerBridgeId:(nonnull NSNumber *)viewId customMessageHandlerBridgeId:(NSString *)fullscreenBridgeId)
+RCT_EXTERN_METHOD(setFullscreen:(nonnull NSNumber *)viewId isFullscreen:(BOOL)isFullscreen)
 
 @end