react-native-theoplayer 7.4.0 → 7.5.1

package/CHANGELOG.md

@@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.1.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [7.5.1] - 24-06-20
+
+### Added
+
+- Added ad event support for custom SSAI integrations.
+
+## [7.5.0] - 24-06-18
+
+### Fixed
+
+- Fixed an issue where the Cast API wouldn't be initialized yet when in the `onPlayerReady` callback.
+- Added support for THEOplayer Android v7.6.0.
+
 ## [7.4.0] - 24-06-11
 
 ### Added

package/README.md

@@ -131,18 +131,18 @@ please reach out to us for support.
 The `react-native-theoplayer` package can be combined with any number of connectors to provide extra
 functionality. Currently, the following connectors are available:
 
-| Package name                                                                                                              | Purpose                                                  | Registry                                                                                                                                                      |
-| ------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [`@theoplayer/react-native-analytics-adobe`](https://github.com/THEOplayer/react-native-theoplayer-analytics)             | Adobe analytics connector                                | [![npm](https://img.shields.io/npm/v/@theoplayer/react-native-analytics-adobe)](https://www.npmjs.com/package/@theoplayer/react-native-analytics-adobe)       |
-| [`@theoplayer/react-native-analytics-agama`](https://github.com/THEOplayer/react-native-theoplayer-analytics)             | Agama analytics connector                                | [![npm](https://img.shields.io/npm/v/@theoplayer/react-native-analytics-agama)](https://www.npmjs.com/package/@theoplayer/react-native-analytics-agama)       |
-| [`@theoplayer/react-native-analytics-comscore`](https://github.com/THEOplayer/react-native-theoplayer-analytics)          | Comscore analytics connector                             | [![npm](https://img.shields.io/npm/v/@theoplayer/react-native-analytics-comscore)](https://www.npmjs.com/package/@theoplayer/react-native-analytics-comscore) |
-| [`@theoplayer/react-native-analytics-conviva`](https://github.com/THEOplayer/react-native-theoplayer-analytics)           | Conviva analytics connector                              | [![npm](https://img.shields.io/npm/v/@theoplayer/react-native-analytics-conviva)](https://www.npmjs.com/package/@theoplayer/react-native-analytics-conviva)   |
-| [`@theoplayer/react-native-analytics-mux`](https://github.com/THEOplayer/react-native-theoplayer-analytics)               | Mux analytics connector                                  | [![npm](https://img.shields.io/npm/v/@theoplayer/react-native-analytics-mux)](https://www.npmjs.com/package/@theoplayer/react-native-analytics-mux)           |
-| [`@theoplayer/react-native-analytics-nielsen`](https://github.com/THEOplayer/react-native-theoplayer-analytics)           | Nielsen analytics connector                              | [![npm](https://img.shields.io/npm/v/@theoplayer/react-native-analytics-nielsen)](https://www.npmjs.com/package/@theoplayer/react-native-analytics-nielsen)   |
-| [`@theoplayer/react-native-analytics-youbora`](https://github.com/THEOplayer/react-native-theoplayer-analytics)           | Youbora analytics connector                              | [![npm](https://img.shields.io/npm/v/@theoplayer/react-native-analytics-youbora)](https://www.npmjs.com/package/@theoplayer/react-native-analytics-youbora)   |
-| [`@theoplayer/react-native-drm`](https://github.com/THEOplayer/react-native-theoplayer-drm)                               | Content protection (DRM) connectors                      | [![npm](https://img.shields.io/npm/v/@theoplayer/react-native-drm)](https://www.npmjs.com/package/@theoplayer/react-native-drm)                               |
-| [`@theoplayer/react-native-ui`](https://github.com/THEOplayer/react-native-theoplayer-ui)                                 | React Native user interface                              | [![npm](https://img.shields.io/npm/v/@theoplayer/react-native-ui)](https://www.npmjs.com/package/@theoplayer/react-native-ui)                                 |
-| [`@theoplayer/react-native-connector-template`](https://github.com/THEOplayer/react-native-theoplayer-connector-template) | A template for<br/>`react-native-theoplayer` connectors. | [![npm](https://img.shields.io/npm/v/@theoplayer/react-native-connector-template)](https://www.npmjs.com/package/@theoplayer/react-native-connector-template) |
+| Connector                                                | npm package                                                                                                                                                                                                                                                         | Source                                                                                           |
+|----------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------|
+| Adobe analytics, implementing the Media Collections API  | [![%40theoplayer/react-native-analytics-adobe](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-analytics-adobe?label=%40theoplayer/react-native-analytics-adobe)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-analytics-adobe)             | [`Adobe`](https://github.com/THEOplayer/react-native-connectors/tree/main/adobe)                 |
+| Agama analytics                                          | [![%40theoplayer/react-native-analytics-agama](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-analytics-agama?label=%40theoplayer/react-native-analytics-agama)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-analytics-agama)             | [`Agama`](https://github.com/THEOplayer/react-native-connectors/tree/main/agama)                 |
+| Comscore analytics                                       | [![%40theoplayer/react-native-analytics-comscore](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-analytics-comscore?label=%40theoplayer/react-native-analytics-comscore)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-analytics-comscore) | [`Comscore`](https://github.com/THEOplayer/react-native-connectors/tree/main/comscore)           |
+| Conviva analytics                                        | [![%40theoplayer/react-native-analytics-conviva](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-analytics-conviva?label=%40theoplayer/react-native-analytics-conviva)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-analytics-conviva)     | [`Conviva`](https://github.com/THEOplayer/react-native-connectors/tree/main/conviva)             |
+| Mux analytics                                            | [![%40theoplayer/react-native-analytics-mux](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-analytics-mux?label=%40theoplayer/react-native-analytics-mux)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-analytics-mux)                     | [`Mux`](https://github.com/THEOplayer/react-native-connectors/tree/main/mux)                     |
+| Nielsen analytics                                        | [![%40theoplayer/react-native-analytics-nielsen](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-analytics-nielsen?label=%40theoplayer/react-native-analytics-nielsen)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-analytics-nielsen)     | [`Nielsen`](https://github.com/THEOplayer/react-native-connectors/tree/main/nielsen)             |
+| Youbora analytics                                        | [![%40theoplayer/react-native-analytics-youbora](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-analytics-youbora?label=%40theoplayer/react-native-analytics-youbora)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-analytics-youbora)     | [`Youbora`](https://github.com/THEOplayer/react-native-connectors/tree/main/youbora)             |
+| Content protection (DRM)                                 | [![%40theoplayer/react-native-drm](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-drm?label=%40theoplayer/react-native-drm)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-drm)                                                             | [`DRM`](https://github.com/THEOplayer/react-native-theoplayer-drm)                               |
+| React Native Open UI                                     | [![%40theoplayer/react-native-ui](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-ui?label=%40theoplayer/react-native-ui)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-ui)                                                                 | [`Open UI`](https://github.com/THEOplayer/react-native-theoplayer-ui)                            |
+| A template for<br/>`react-native-theoplayer` connectors. | [![%40theoplayer/react-native-connector-template](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-connector-template?label=%40theoplayer/react-native-connector-template)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-connector-template) | [`Connector template`](https://github.com/THEOplayer/react-native-theoplayer-connector-template) |
 
 ## Creating your first app
 

package/android/build.gradle

@@ -112,13 +112,14 @@ dependencies {
   implementation "androidx.appcompat:appcompat:${safeExtGet('appcompatVersion', '1.6.1')}"
   implementation "androidx.core:core-ktx:${safeExtGet('corektxVersion', '1.10.1')}"
 
-  // The minimum supported THEOplayer version is 7.0.0
-  def theoplayer_sdk_version = safeExtGet('THEOplayer_sdk', '[7.0.0, 8.0.0)')
+  // The minimum supported THEOplayer version is 7.6.0
+  def theoplayer_sdk_version = safeExtGet('THEOplayer_sdk', '[7.6.0, 8.0.0)')
+  def theoplayer_mediasession_version = safeExtGet('THEOplayer_mediasession', '[7.5.0, 8.0.0)')
 
   println("Using THEOplayer (${versionString(theoplayer_sdk_version)})")
   implementation "com.theoplayer.theoplayer-sdk-android:core:${theoplayer_sdk_version}"
-  implementation "com.theoplayer.theoplayer-sdk-android:ads-wrapper:7.0.0"
-  implementation "com.theoplayer.android-connector:mediasession:${theoplayer_sdk_version}"
+  implementation "com.theoplayer.theoplayer-sdk-android:ads-wrapper:7.6.1"
+  implementation "com.theoplayer.android-connector:mediasession:${theoplayer_mediasession_version}"
 
   if (enabledGoogleIMA) {
     println('Enable THEOplayer IMA extension.')

package/android/local/com/theoplayer/theoplayer-sdk-android/ads-wrapper/{7.0.0/ads-wrapper-7.0.0.pom → 7.6.1/ads-wrapper-7.6.1.pom}

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>7.0.0</modelVersion>
+  <modelVersion>7.6.1</modelVersion>
   <groupId>com.theoplayer.theoplayer-sdk-android</groupId>
   <artifactId>ads-wrapper</artifactId>
-  <version>7.0.0</version>
+  <version>7.6.1</version>
   <packaging>aar</packaging>
 </project>

package/android/local/com/theoplayer/theoplayer-sdk-android/ads-wrapper/maven-metadata-local.xml

@@ -3,11 +3,11 @@
   <groupId>com.theoplayer.theoplayer-sdk-android</groupId>
   <artifactId>ads-wrapper</artifactId>
   <versioning>
-    <latest>7.0.0</latest>
-    <release>7.0.0</release>
+    <latest>7.6.1</latest>
+    <release>7.6.1</release>
     <versions>
-      <version>7.0.0</version>
+      <version>7.6.1</version>
     </versions>
-    <lastUpdated>20240425153844</lastUpdated>
+    <lastUpdated>20240620111503</lastUpdated>
   </versioning>
 </metadata>

package/android/src/main/java/com/theoplayer/PlayerEventEmitter.kt

@@ -652,15 +652,14 @@ class PlayerEventEmitter internal constructor(
       )
     }
 
-    // Attach AdStateHolder
-    if (BuildConfig.EXTENSION_ADS) {
-      adEventAdapter = AdEventAdapter(playerView.adsApi,
-        object : AdEventEmitter {
-          override fun emit(payload: WritableMap?) {
-            receiveEvent(EVENT_AD_EVENT, payload)
-          }
-        })
-    }
+    // Attach ad event adapter
+    adEventAdapter = AdEventAdapter(playerView.adsApi,
+      object : AdEventEmitter {
+        override fun emit(payload: WritableMap?) {
+          receiveEvent(EVENT_AD_EVENT, payload)
+        }
+      })
+
     if (BuildConfig.EXTENSION_CAST) {
       castEventAdapter = playerView.castApi?.let {
         CastEventAdapter(it, object : CastEventAdapter.Emitter {

package/android/src/main/java/com/theoplayer/ReactTHEOplayerView.kt

@@ -54,9 +54,7 @@ class ReactTHEOplayerView(private val reactContext: ThemedReactContext) :
       reactContext,
       PlayerConfigAdapter(configProps)
     ).apply {
-      if (BuildConfig.EXTENSION_ADS) {
-        adsApi.initialize(player, imaIntegration, daiIntegration)
-      }
+      adsApi.initialize(player, imaIntegration, daiIntegration)
       val layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
       playerView.layoutParams = layoutParams
       (playerView.parent as? ViewGroup)?.removeView(playerView)

package/android/src/main/java/com/theoplayer/ads/AdAdapter.kt

@@ -16,6 +16,7 @@ import java.lang.Exception
 
 private const val PROP_AD_SYSTEM = "adSystem"
 private const val PROP_AD_INTEGRATION = "integration"
+private const val PROP_AD_CUSTOM_INTEGRATION = "customIntegration"
 private const val PROP_AD_TYPE = "type"
 private const val PROP_AD_ID = "id"
 private const val PROP_AD_BREAK = "adBreak"
@@ -208,6 +209,10 @@ object AdAdapter {
         return AdIntegrationKind.from(ad.getString(PROP_AD_INTEGRATION))
       }
 
+      override fun getCustomIntegration(): String? {
+        return ad.getString(PROP_AD_CUSTOM_INTEGRATION)
+      }
+
       override fun getImaAd(): com.google.ads.interactivemedia.v3.api.Ad {
         return parseImaAd(ad)
       }
@@ -279,6 +284,10 @@ object AdAdapter {
       override fun getIntegration(): AdIntegrationKind {
         return AdIntegrationKind.from(adBreak.getString(PROP_ADBREAK_INTEGRATION))
       }
+
+      override fun getCustomIntegration(): String? {
+        return adBreak.getString(PROP_AD_CUSTOM_INTEGRATION)
+      }
     }
   }
 

package/android/src/main/java/com/theoplayer/ads/AdEventAdapter.kt

@@ -13,33 +13,13 @@ import com.theoplayer.android.api.ads.ima.GoogleImaAdEventType
 import com.theoplayer.android.api.ads.wrapper.AdEventListener
 import com.theoplayer.android.api.event.EventType
 import com.theoplayer.android.api.event.ads.AdEvent
+import com.theoplayer.android.api.event.ads.AdsEventTypes
 import java.util.*
 
 private const val EVENT_PROP_AD = "ad"
 private const val EVENT_PROP_TYPE = "type"
 private const val EVENT_PROP_SUBTYPE = "subType"
 
-private val ALL_AD_EVENTS = arrayOf(
-  GoogleImaAdEventType.LOADED,
-  GoogleImaAdEventType.AD_BREAK_STARTED,
-  GoogleImaAdEventType.STARTED,
-  GoogleImaAdEventType.FIRST_QUARTILE,
-  GoogleImaAdEventType.MIDPOINT,
-  GoogleImaAdEventType.THIRD_QUARTILE,
-  GoogleImaAdEventType.COMPLETED,
-  GoogleImaAdEventType.AD_BREAK_ENDED,
-  GoogleImaAdEventType.SKIPPED,
-  GoogleImaAdEventType.AD_ERROR,
-  GoogleImaAdEventType.AD_BUFFERING,
-  GoogleImaAdEventType.AD_BREAK_FETCH_ERROR,
-  GoogleImaAdEventType.CONTENT_PAUSE_REQUESTED,
-  GoogleImaAdEventType.CONTENT_RESUME_REQUESTED,
-  GoogleImaAdEventType.CLICKED,
-  GoogleImaAdEventType.TAPPED,
-  GoogleImaAdEventType.ICON_TAPPED,
-  GoogleImaAdEventType.ICON_FALLBACK_IMAGE_CLOSED,
-)
-
 class AdEventAdapter(private val adsApi: AdsApiWrapper, eventEmitter: AdEventEmitter) {
   private val eventListener: AdEventListener
 
@@ -71,9 +51,7 @@ class AdEventAdapter(private val adsApi: AdsApiWrapper, eventEmitter: AdEventEmi
         eventEmitter.emit(payload)
       }
     }
-    for (eventType in ALL_AD_EVENTS) {
-      adsApi.addEventListener(eventType, eventListener)
-    }
+    adsApi.addAllEventsListener(eventListener)
   }
 
   companion object {
@@ -123,33 +101,36 @@ class AdEventAdapter(private val adsApi: AdsApiWrapper, eventEmitter: AdEventEmi
     }
 
     private fun mapAdType(eventType: EventType<*>): String {
-      return when (eventType as GoogleImaAdEventType) {
-        GoogleImaAdEventType.LOADED -> "adloaded"
-        GoogleImaAdEventType.STARTED -> "adbegin"
-        GoogleImaAdEventType.FIRST_QUARTILE -> "adfirstquartile"
-        GoogleImaAdEventType.MIDPOINT -> "admidpoint"
-        GoogleImaAdEventType.THIRD_QUARTILE -> "adthirdquartile"
-        GoogleImaAdEventType.COMPLETED -> "adend"
-        GoogleImaAdEventType.SKIPPED -> "adskip"
-        GoogleImaAdEventType.AD_ERROR -> "aderror"
+      return when (eventType) {
+        GoogleImaAdEventType.LOADED, AdsEventTypes.AD_LOADED -> "adloaded"
+        GoogleImaAdEventType.STARTED, AdsEventTypes.AD_BEGIN -> "adbegin"
+        GoogleImaAdEventType.FIRST_QUARTILE, AdsEventTypes.AD_FIRST_QUARTILE -> "adfirstquartile"
+        GoogleImaAdEventType.MIDPOINT, AdsEventTypes.AD_MIDPOINT -> "admidpoint"
+        GoogleImaAdEventType.THIRD_QUARTILE, AdsEventTypes.AD_THIRD_QUARTILE -> "adthirdquartile"
+        GoogleImaAdEventType.COMPLETED, AdsEventTypes.AD_END -> "adend"
+        GoogleImaAdEventType.SKIPPED, AdsEventTypes.AD_SKIP -> "adskip"
+        GoogleImaAdEventType.AD_ERROR, AdsEventTypes.AD_ERROR -> "aderror"
         GoogleImaAdEventType.AD_BUFFERING -> "adbuffering"
         GoogleImaAdEventType.CONTENT_PAUSE_REQUESTED -> "adbreakbegin"
         GoogleImaAdEventType.CONTENT_RESUME_REQUESTED -> "adbreakend"
-        GoogleImaAdEventType.AD_BREAK_STARTED -> "adbreakbegin"
-        GoogleImaAdEventType.AD_BREAK_ENDED -> "adbreakend"
+        GoogleImaAdEventType.AD_BREAK_STARTED, AdsEventTypes.AD_BREAK_BEGIN -> "adbreakbegin"
+        GoogleImaAdEventType.AD_BREAK_ENDED, AdsEventTypes.AD_BREAK_END -> "adbreakend"
         GoogleImaAdEventType.AD_BREAK_FETCH_ERROR -> "aderror"
         GoogleImaAdEventType.CLICKED -> "adclicked"
         GoogleImaAdEventType.TAPPED -> "adtapped"
         GoogleImaAdEventType.ICON_TAPPED -> "adicontapped"
         GoogleImaAdEventType.ICON_FALLBACK_IMAGE_CLOSED -> "adiconfallbackimageclosed"
-        else -> eventType.getName().lowercase(Locale.getDefault())
+        AdsEventTypes.ADD_AD -> "addad"
+        AdsEventTypes.AD_IMPRESSION -> "adimpression"
+        AdsEventTypes.ADD_AD_BREAK -> "addadbreak"
+        AdsEventTypes.REMOVE_AD_BREAK -> "removeadbreak"
+        AdsEventTypes.AD_BREAK_CHANGE -> "adbreakchange"
+        else -> eventType.name.lowercase(Locale.getDefault())
       }
     }
   }
 
   fun destroy() {
-    for (eventType in ALL_AD_EVENTS) {
-      adsApi.removeEventListener(eventType, eventListener)
-    }
+    adsApi.removeAllEventsListener(eventListener)
   }
 }

package/android/src/main/java/com/theoplayer/source/GoogleDaiSourceAdapter.kt

@@ -0,0 +1,34 @@
+package com.theoplayer.source
+
+import com.google.gson.Gson
+import com.theoplayer.BuildConfig
+import com.theoplayer.android.api.error.ErrorCode
+import com.theoplayer.android.api.error.THEOplayerException
+import com.theoplayer.android.api.source.GoogleDaiTypedSource
+import com.theoplayer.android.api.source.TypedSource
+import com.theoplayer.android.api.source.ssai.dai.GoogleDaiLiveConfiguration
+import com.theoplayer.android.api.source.ssai.dai.GoogleDaiVodConfiguration
+import org.json.JSONObject
+
+private const val PROP_AVAILABILITY_TYPE = "availabilityType"
+private const val AVAILABILITY_TYPE_VOD = "vod"
+private const val ERROR_DAI_NOT_ENABLED = "Google DAI support not enabled."
+
+@Throws(THEOplayerException::class)
+fun googleDaiBuilderFromJson(builder: TypedSource.Builder, json: JSONObject): TypedSource.Builder {
+  // Check whether the integration was enabled
+  if (!BuildConfig.EXTENSION_GOOGLE_DAI) {
+    throw THEOplayerException(ErrorCode.AD_ERROR, ERROR_DAI_NOT_ENABLED)
+  }
+  // We need to create a new builder as the player SDK checks for:
+  // typedSource is GoogleDaiTypedSource
+  return if (json.optString(PROP_AVAILABILITY_TYPE) == AVAILABILITY_TYPE_VOD) {
+    GoogleDaiTypedSource.Builder(
+      Gson().fromJson(json.toString(), GoogleDaiVodConfiguration::class.java)
+    )
+  } else {
+    GoogleDaiTypedSource.Builder(
+      Gson().fromJson(json.toString(), GoogleDaiLiveConfiguration::class.java)
+    )
+  }
+}

package/android/src/main/java/com/theoplayer/source/SSAIAdapterRegistry.kt

@@ -0,0 +1,51 @@
+package com.theoplayer.source
+
+import android.text.TextUtils
+import com.theoplayer.android.api.error.ErrorCode
+import com.theoplayer.android.api.error.THEOplayerException
+import com.theoplayer.android.api.source.SourceType
+import com.theoplayer.android.api.source.TypedSource
+import org.json.JSONObject
+
+typealias CustomSSAIAdapter = (json: JSONObject, currentBuilder: TypedSource.Builder) -> TypedSource.Builder
+
+private const val ERROR_UNSUPPORTED_SSAI_INTEGRATION = "Unsupported SSAI integration"
+private const val ERROR_MISSING_SSAI_INTEGRATION = "Missing SSAI integration"
+private const val PROP_INTEGRATION = "integration"
+
+object SSAIAdapterRegistry {
+  private val _adapters: MutableMap<String, CustomSSAIAdapter> = HashMap()
+
+  fun register(integration: String, adapter: CustomSSAIAdapter) {
+    _adapters[integration] = adapter
+  }
+
+  fun hasIntegration(integration: String): Boolean {
+    return _adapters[integration] != null
+  }
+
+  fun typedSourceBuilderFromJson(json: JSONObject, currentBuilder: TypedSource.Builder, sourceType: SourceType?): TypedSource.Builder {
+    // Check for valid SsaiIntegration
+    val ssaiIntegrationStr = json.optString(PROP_INTEGRATION)
+
+    // Check for valid `integration` property, which is mandatory.
+    if (TextUtils.isEmpty(ssaiIntegrationStr)) {
+      throw THEOplayerException(ErrorCode.AD_ERROR, ERROR_MISSING_SSAI_INTEGRATION)
+    }
+
+    // Check for known SsaiIntegration
+    if (!hasIntegration(ssaiIntegrationStr)) {
+      throw THEOplayerException(
+        ErrorCode.AD_ERROR,
+        "$ERROR_UNSUPPORTED_SSAI_INTEGRATION: $ssaiIntegrationStr"
+      )
+    }
+
+    // Prefer DASH if SSAI type not specified
+    if (sourceType == null) {
+      currentBuilder.type(SourceType.DASH)
+    }
+
+    return _adapters[ssaiIntegrationStr]?.invoke(json, currentBuilder) ?: currentBuilder
+  }
+}

package/android/src/main/java/com/theoplayer/source/SourceAdapter.kt

@@ -2,11 +2,9 @@ package com.theoplayer.source
 
 import android.text.TextUtils
 import android.util.Log
-import com.facebook.react.bridge.Arguments
 import com.google.gson.Gson
 import com.theoplayer.android.api.error.THEOplayerException
 import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.bridge.WritableArray
 import com.facebook.react.bridge.WritableMap
 import com.theoplayer.android.api.source.SourceDescription
 import com.theoplayer.android.api.source.TypedSource
@@ -14,10 +12,6 @@ import com.theoplayer.android.api.source.metadata.MetadataDescription
 import com.theoplayer.android.api.source.addescription.AdDescription
 import com.theoplayer.android.api.source.TextTrackDescription
 import com.theoplayer.android.api.source.SourceType
-import com.theoplayer.android.api.source.ssai.SsaiIntegration
-import com.theoplayer.android.api.source.GoogleDaiTypedSource
-import com.theoplayer.android.api.source.ssai.dai.GoogleDaiVodConfiguration
-import com.theoplayer.android.api.source.ssai.dai.GoogleDaiLiveConfiguration
 import com.theoplayer.android.api.source.hls.HlsPlaybackConfiguration
 import com.theoplayer.android.api.event.ads.AdIntegrationKind
 import com.theoplayer.android.api.source.addescription.GoogleImaAdDescription
@@ -55,19 +49,26 @@ private const val PROP_INTEGRATION = "integration"
 private const val PROP_TEXT_TRACKS = "textTracks"
 private const val PROP_POSTER = "poster"
 private const val PROP_ADS = "ads"
-private const val PROP_AVAILABILITY_TYPE = "availabilityType"
 private const val PROP_DASH = "dash"
 private const val PROP_DASH_IGNORE_AVAILABILITYWINDOW = "ignoreAvailabilityWindow"
-private const val ERROR_DAI_NOT_ENABLED = "Google DAI support not enabled."
-private const val ERROR_UNSUPPORTED_SSAI_INTEGRATION = "Unsupported SSAI integration"
-private const val ERROR_MISSING_SSAI_INTEGRATION = "Missing SSAI integration"
 private const val ERROR_IMA_NOT_ENABLED = "Google IMA support not enabled."
 private const val ERROR_UNSUPPORTED_CSAI_INTEGRATION = "Unsupported CSAI integration"
 private const val ERROR_MISSING_CSAI_INTEGRATION = "Missing CSAI integration"
 
+private const val PROP_SSAI_INTEGRATION_GOOGLE_DAI = "google-dai"
+
 class SourceAdapter {
   private val gson = Gson()
 
+  companion object {
+    init {
+      // Register default SSAI adapter for Google DAI.
+      SSAIAdapterRegistry.register(PROP_SSAI_INTEGRATION_GOOGLE_DAI) { json, currentBuilder ->
+        googleDaiBuilderFromJson(currentBuilder, json)
+      }
+    }
+  }
+
   @Throws(THEOplayerException::class)
   fun parseSourceFromJS(source: ReadableMap?): SourceDescription? {
     if (source == null) {
@@ -83,17 +84,11 @@ class SourceAdapter {
       val jsonSources = jsonSourceObject.optJSONArray(PROP_SOURCES)
       if (jsonSources != null) {
         for (i in 0 until jsonSources.length()) {
-          val typedSource = parseTypedSource(jsonSources[i] as JSONObject)
-          if (typedSource != null) {
-            typedSources.add(typedSource)
-          }
+          typedSources.add(parseTypedSource(jsonSources[i] as JSONObject))
         }
       } else {
         val jsonSource = jsonSourceObject.optJSONObject(PROP_SOURCES) ?: return null
-        val typedSource = parseTypedSource(jsonSource)
-        if (typedSource != null) {
-          typedSources.add(typedSource)
-        }
+        typedSources.add(parseTypedSource(jsonSource))
       }
 
       // poster
@@ -142,48 +137,13 @@ class SourceAdapter {
   }
 
   @Throws(THEOplayerException::class)
-  private fun parseTypedSource(jsonTypedSource: JSONObject): TypedSource? {
+  private fun parseTypedSource(jsonTypedSource: JSONObject): TypedSource {
     try {
       var tsBuilder = TypedSource.Builder(jsonTypedSource.optString(PROP_SRC))
       val sourceType = parseSourceType(jsonTypedSource)
       if (jsonTypedSource.has(PROP_SSAI)) {
         val ssaiJson = jsonTypedSource.getJSONObject(PROP_SSAI)
-
-        // Check for valid SsaiIntegration
-        val ssaiIntegrationStr = ssaiJson.optString(PROP_INTEGRATION)
-        if (!TextUtils.isEmpty(ssaiIntegrationStr)) {
-          val ssaiIntegration = SsaiIntegration.from(ssaiIntegrationStr)
-            ?: throw THEOplayerException(
-              ErrorCode.AD_ERROR,
-              "$ERROR_UNSUPPORTED_SSAI_INTEGRATION: $ssaiIntegrationStr"
-            )
-          when (ssaiIntegration) {
-            SsaiIntegration.GOOGLE_DAI -> {
-              if (!BuildConfig.EXTENSION_GOOGLE_DAI) {
-                throw THEOplayerException(ErrorCode.AD_ERROR, ERROR_DAI_NOT_ENABLED)
-              }
-              tsBuilder = if (ssaiJson.optString(PROP_AVAILABILITY_TYPE) == "vod") {
-                GoogleDaiTypedSource.Builder(
-                  gson.fromJson(ssaiJson.toString(), GoogleDaiVodConfiguration::class.java)
-                )
-              } else {
-                GoogleDaiTypedSource.Builder(
-                  gson.fromJson(ssaiJson.toString(), GoogleDaiLiveConfiguration::class.java)
-                )
-              }
-              // Prefer DASH if not SSAI type specified
-              if (sourceType == null) {
-                tsBuilder.type(SourceType.DASH)
-              }
-            }
-            else -> throw THEOplayerException(
-              ErrorCode.AD_ERROR,
-              "$ERROR_UNSUPPORTED_SSAI_INTEGRATION: $ssaiIntegrationStr"
-            )
-          }
-        } else {
-          throw THEOplayerException(ErrorCode.AD_ERROR, ERROR_MISSING_SSAI_INTEGRATION)
-        }
+        tsBuilder = SSAIAdapterRegistry.typedSourceBuilderFromJson(ssaiJson, tsBuilder, sourceType)
       }
       if (sourceType != null) {
         tsBuilder.type(sourceType)
@@ -216,10 +176,13 @@ class SourceAdapter {
         }
       }
       return tsBuilder.build()
-    } catch (e: JSONException) {
-      e.printStackTrace()
+    } catch (e: THEOplayerException) {
+      // Rethrow THEOplayerException
+      throw e
+    } catch (e: Exception) {
+      // Wrap exception
+      throw THEOplayerException(ErrorCode.SOURCE_INVALID, "Invalid source: ${e.message}")
     }
-    return null
   }
 
   @Throws(THEOplayerException::class)
@@ -281,12 +244,14 @@ class SourceAdapter {
         AdIntegrationKind.GOOGLE_IMA -> parseImaAdFromJS(
           jsonAdDescription
         )
+
         AdIntegrationKind.DEFAULT -> {
           throw THEOplayerException(
             ErrorCode.AD_ERROR,
             "$ERROR_UNSUPPORTED_CSAI_INTEGRATION: $integrationKindStr"
           )
         }
+
         else -> {
           throw THEOplayerException(
             ErrorCode.AD_ERROR,

package/lib/commonjs/api/source/ads/barrel.js

@@ -14,17 +14,6 @@ Object.keys(_Ads).forEach(function (key) {
     }
   });
 });
-var _FreeWheelAdDescription = require("./FreeWheelAdDescription");
-Object.keys(_FreeWheelAdDescription).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _FreeWheelAdDescription[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _FreeWheelAdDescription[key];
-    }
-  });
-});
 var _IMAAdDescription = require("./IMAAdDescription");
 Object.keys(_IMAAdDescription).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -36,17 +25,6 @@ Object.keys(_IMAAdDescription).forEach(function (key) {
     }
   });
 });
-var _SpotXAdDescription = require("./SpotXAdDescription");
-Object.keys(_SpotXAdDescription).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _SpotXAdDescription[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _SpotXAdDescription[key];
-    }
-  });
-});
 var _THEOplayerAdDescription = require("./THEOplayerAdDescription");
 Object.keys(_THEOplayerAdDescription).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/lib/commonjs/api/source/ads/barrel.js.map

@@ -1 +1 @@
-{"version":3,"names":["_Ads","require","Object","keys","forEach","key","exports","defineProperty","enumerable","get","_FreeWheelAdDescription","_IMAAdDescription","_SpotXAdDescription","_THEOplayerAdDescription","_barrel"],"sourceRoot":"../../../../../src","sources":["api/source/ads/barrel.ts"],"mappings":";;;;;AAAA,IAAAA,IAAA,GAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAH,IAAA,EAAAI,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAL,IAAA,CAAAK,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAT,IAAA,CAAAK,GAAA;IAAA;EAAA;AAAA;AACA,IAAAK,uBAAA,GAAAT,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAO,uBAAA,EAAAN,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAK,uBAAA,CAAAL,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAC,uBAAA,CAAAL,GAAA;IAAA;EAAA;AAAA;AACA,IAAAM,iBAAA,GAAAV,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAQ,iBAAA,EAAAP,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAM,iBAAA,CAAAN,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAE,iBAAA,CAAAN,GAAA;IAAA;EAAA;AAAA;AACA,IAAAO,mBAAA,GAAAX,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAS,mBAAA,EAAAR,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAO,mBAAA,CAAAP,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAG,mBAAA,CAAAP,GAAA;IAAA;EAAA;AAAA;AACA,IAAAQ,wBAAA,GAAAZ,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAU,wBAAA,EAAAT,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAQ,wBAAA,CAAAR,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAI,wBAAA,CAAAR,GAAA;IAAA;EAAA;AAAA;AACA,IAAAS,OAAA,GAAAb,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAW,OAAA,EAAAV,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAS,OAAA,CAAAT,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAK,OAAA,CAAAT,GAAA;IAAA;EAAA;AAAA","ignoreList":[]}
+{"version":3,"names":["_Ads","require","Object","keys","forEach","key","exports","defineProperty","enumerable","get","_IMAAdDescription","_THEOplayerAdDescription","_barrel"],"sourceRoot":"../../../../../src","sources":["api/source/ads/barrel.ts"],"mappings":";;;;;AAAA,IAAAA,IAAA,GAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAH,IAAA,EAAAI,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAL,IAAA,CAAAK,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAT,IAAA,CAAAK,GAAA;IAAA;EAAA;AAAA;AACA,IAAAK,iBAAA,GAAAT,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAO,iBAAA,EAAAN,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAK,iBAAA,CAAAL,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAC,iBAAA,CAAAL,GAAA;IAAA;EAAA;AAAA;AACA,IAAAM,wBAAA,GAAAV,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAQ,wBAAA,EAAAP,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAM,wBAAA,CAAAN,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAE,wBAAA,CAAAN,GAAA;IAAA;EAAA;AAAA;AACA,IAAAO,OAAA,GAAAX,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAS,OAAA,EAAAR,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAO,OAAA,CAAAP,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAG,OAAA,CAAAP,GAAA;IAAA;EAAA;AAAA","ignoreList":[]}

package/lib/commonjs/api/source/ads/ssai/barrel.js

@@ -14,17 +14,6 @@ Object.keys(_GoogleDAIConfiguration).forEach(function (key) {
     }
   });
 });
-var _ImagineServerSideAdInsertionConfiguration = require("./ImagineServerSideAdInsertionConfiguration");
-Object.keys(_ImagineServerSideAdInsertionConfiguration).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _ImagineServerSideAdInsertionConfiguration[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _ImagineServerSideAdInsertionConfiguration[key];
-    }
-  });
-});
 var _ServerSideAdInsertionConfiguration = require("./ServerSideAdInsertionConfiguration");
 Object.keys(_ServerSideAdInsertionConfiguration).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -36,15 +25,4 @@ Object.keys(_ServerSideAdInsertionConfiguration).forEach(function (key) {
     }
   });
 });
-var _YospaceServerSideAdInsertionConfiguration = require("./YospaceServerSideAdInsertionConfiguration");
-Object.keys(_YospaceServerSideAdInsertionConfiguration).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _YospaceServerSideAdInsertionConfiguration[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _YospaceServerSideAdInsertionConfiguration[key];
-    }
-  });
-});
 //# sourceMappingURL=barrel.js.map

package/lib/commonjs/api/source/ads/ssai/barrel.js.map

@@ -1 +1 @@
-{"version":3,"names":["_GoogleDAIConfiguration","require","Object","keys","forEach","key","exports","defineProperty","enumerable","get","_ImagineServerSideAdInsertionConfiguration","_ServerSideAdInsertionConfiguration","_YospaceServerSideAdInsertionConfiguration"],"sourceRoot":"../../../../../../src","sources":["api/source/ads/ssai/barrel.ts"],"mappings":";;;;;AAAA,IAAAA,uBAAA,GAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAH,uBAAA,EAAAI,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAL,uBAAA,CAAAK,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAT,uBAAA,CAAAK,GAAA;IAAA;EAAA;AAAA;AACA,IAAAK,0CAAA,GAAAT,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAO,0CAAA,EAAAN,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAK,0CAAA,CAAAL,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAC,0CAAA,CAAAL,GAAA;IAAA;EAAA;AAAA;AACA,IAAAM,mCAAA,GAAAV,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAQ,mCAAA,EAAAP,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAM,mCAAA,CAAAN,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAE,mCAAA,CAAAN,GAAA;IAAA;EAAA;AAAA;AACA,IAAAO,0CAAA,GAAAX,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAS,0CAAA,EAAAR,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAO,0CAAA,CAAAP,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAG,0CAAA,CAAAP,GAAA;IAAA;EAAA;AAAA","ignoreList":[]}
+{"version":3,"names":["_GoogleDAIConfiguration","require","Object","keys","forEach","key","exports","defineProperty","enumerable","get","_ServerSideAdInsertionConfiguration"],"sourceRoot":"../../../../../../src","sources":["api/source/ads/ssai/barrel.ts"],"mappings":";;;;;AAAA,IAAAA,uBAAA,GAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAH,uBAAA,EAAAI,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAL,uBAAA,CAAAK,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAT,uBAAA,CAAAK,GAAA;IAAA;EAAA;AAAA;AACA,IAAAK,mCAAA,GAAAT,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAO,mCAAA,EAAAN,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAK,mCAAA,CAAAL,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAC,mCAAA,CAAAL,GAAA;IAAA;EAAA;AAAA","ignoreList":[]}

package/lib/commonjs/internal/THEOplayerView.js

@@ -75,8 +75,9 @@ class THEOplayerView extends _react.PureComponent {
       version,
       state
     } = event.nativeEvent;
-    this._facade.initializeFromNativePlayer_(version, state);
-    this.props.onPlayerReady?.(this._facade);
+    this._facade.initializeFromNativePlayer_(version, state).then(() => {
+      this.props.onPlayerReady?.(this._facade);
+    });
   };
   _onSourceChange = () => {
     this.reset();