react-native-theoplayer 11.6.0 → 11.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +38 -0
- package/README.md +69 -0
- package/android/build.gradle +3 -2
- package/android/gradle/wrapper/gradle-wrapper.jar +0 -0
- package/android/gradle/wrapper/gradle-wrapper.properties +1 -1
- package/android/gradlew +176 -110
- package/android/gradlew.bat +23 -18
- package/android/src/main/java/com/theoplayer/PlayerConfigAdapter.kt +6 -0
- package/android/src/main/java/com/theoplayer/PlayerEventEmitter.kt +2 -2
- package/android/src/main/java/com/theoplayer/ReactTHEOplayerContext.kt +37 -8
- package/android/src/main/java/com/theoplayer/ReactTHEOplayerPackage.kt +3 -0
- package/android/src/main/java/com/theoplayer/ReactTHEOplayerView.kt +51 -3
- package/android/src/main/java/com/theoplayer/ads/AdEventAdapter.kt +4 -0
- package/android/src/main/java/com/theoplayer/ads/AdsModule.kt +6 -6
- package/android/src/main/java/com/theoplayer/drm/ContentProtectionAdapter.kt +17 -5
- package/android/src/main/java/com/theoplayer/drm/ContentProtectionModule.kt +61 -7
- package/android/src/main/java/com/theoplayer/drm/ProxyContentProtectionIntegration.kt +12 -5
- package/android/src/main/java/com/theoplayer/drm/ProxyContentProtectionIntegrationFactory.kt +3 -1
- package/android/src/main/java/com/theoplayer/integration/Integration.kt +72 -0
- package/android/src/main/java/com/theoplayer/integration/IntegrationRegistration.kt +68 -0
- package/android/src/main/java/com/theoplayer/integration/PlayerFacade.kt +187 -0
- package/android/src/main/java/com/theoplayer/integration/PlayerFacadeAdState.kt +19 -0
- package/android/src/main/java/com/theoplayer/integration/PlayerFacadeAds.kt +73 -0
- package/android/src/main/java/com/theoplayer/integration/PlayerFacadeAdsBridge.kt +112 -0
- package/android/src/main/java/com/theoplayer/integration/PlayerFacadeEventSubscription.kt +11 -0
- package/android/src/main/java/com/theoplayer/integration/PlayerFacadeEvents.kt +139 -0
- package/android/src/main/java/com/theoplayer/metrics/MetricsModule.kt +37 -0
- package/android/src/main/java/com/theoplayer/theoads/THEOadsModule.kt +1 -1
- package/android/src/main/java/com/theoplayer/theolive/EndpointAdapter.kt +33 -0
- package/android/src/test/java/com/theoplayer/integration/PlayerFacadeAdsBridgeTest.kt +250 -0
- package/android/src/test/java/com/theoplayer/integration/PlayerFacadeConfigurationTest.kt +30 -0
- package/android/src/test/java/com/theoplayer/integration/PlayerFacadeTest.kt +507 -0
- package/android/src/test/java/com/theoplayer/integration/PlayerFacadeTestHost.kt +104 -0
- package/ios/THEOplayerRCTBridge.m +19 -0
- package/ios/THEOplayerRCTPlayerAPI.swift +31 -0
- package/ios/Theoplayer-Bridging-Header.h +0 -1
- package/ios/contentprotection/THEOplayerRCTContentProtectionAPI.swift +39 -9
- package/ios/contentprotection/THEOplayerRCTContentProtectionAggregator.swift +15 -11
- package/ios/contentprotection/THEOplayerRCTProxyContentProtectionIntegration.swift +12 -7
- package/ios/metrics/THEOplayerRCTMetricsAPI.swift +31 -0
- package/ios/theolive/THEOplayerRCTTHEOliveEventAdapter.swift +21 -0
- package/lib/commonjs/api/barrel.js +31 -20
- package/lib/commonjs/api/barrel.js.map +1 -1
- package/lib/commonjs/api/metrics/MetricsAPI.js +2 -0
- package/lib/commonjs/api/metrics/MetricsAPI.js.map +1 -0
- package/lib/commonjs/api/metrics/barrel.js +17 -0
- package/lib/commonjs/api/metrics/barrel.js.map +1 -0
- package/lib/commonjs/api/player/Integration.js +2 -0
- package/lib/commonjs/api/player/Integration.js.map +1 -0
- package/lib/commonjs/api/player/PlayerEventMap.js +1 -1
- package/lib/commonjs/api/player/THEOplayer.js.map +1 -1
- package/lib/commonjs/api/player/barrel.js +11 -0
- package/lib/commonjs/api/player/barrel.js.map +1 -1
- package/lib/commonjs/api/track/MediaTrack.js +16 -0
- package/lib/commonjs/api/track/MediaTrack.js.map +1 -1
- package/lib/commonjs/internal/THEOplayerView.js +2 -0
- package/lib/commonjs/internal/THEOplayerView.js.map +1 -1
- package/lib/commonjs/internal/THEOplayerView.web.js +3 -1
- package/lib/commonjs/internal/THEOplayerView.web.js.map +1 -1
- package/lib/commonjs/internal/adapter/DefaultNativePlayerState.js +1 -0
- package/lib/commonjs/internal/adapter/DefaultNativePlayerState.js.map +1 -1
- package/lib/commonjs/internal/adapter/THEOplayerAdapter.js +18 -0
- package/lib/commonjs/internal/adapter/THEOplayerAdapter.js.map +1 -1
- package/lib/commonjs/internal/adapter/THEOplayerWebAdapter.js +21 -4
- package/lib/commonjs/internal/adapter/THEOplayerWebAdapter.js.map +1 -1
- package/lib/commonjs/internal/adapter/WebEventForwarder.js +62 -11
- package/lib/commonjs/internal/adapter/WebEventForwarder.js.map +1 -1
- package/lib/commonjs/internal/adapter/metrics/MetricsNativeAdapter.js +18 -0
- package/lib/commonjs/internal/adapter/metrics/MetricsNativeAdapter.js.map +1 -0
- package/lib/commonjs/internal/adapter/metrics/MetricsWebAdapter.js +16 -0
- package/lib/commonjs/internal/adapter/metrics/MetricsWebAdapter.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/IntegrationRegistration.js +6 -0
- package/lib/commonjs/internal/adapter/web/IntegrationRegistration.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacade.js +258 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacade.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeAPI.js +6 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeAPI.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeAdsEvents.js +114 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeAdsEvents.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeIntegration.js +6 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeIntegration.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeTypes.js +6 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeTypes.js.map +1 -0
- package/lib/commonjs/internal/drm/ContentProtectionRegistry.js +38 -12
- package/lib/commonjs/internal/drm/ContentProtectionRegistry.js.map +1 -1
- package/lib/commonjs/manifest.json +1 -1
- package/lib/commonjs/plugins/typedoc-platform-icons/package-lock.json +200 -58
- package/lib/commonjs/plugins/typedoc-platform-icons/package.json +1 -1
- package/lib/commonjs/plugins/typedoc-platform-icons/tsconfig.json +2 -1
- package/lib/module/api/barrel.js +1 -0
- package/lib/module/api/barrel.js.map +1 -1
- package/lib/module/api/metrics/MetricsAPI.js +2 -0
- package/lib/module/api/metrics/MetricsAPI.js.map +1 -0
- package/lib/module/api/metrics/barrel.js +4 -0
- package/lib/module/api/metrics/barrel.js.map +1 -0
- package/lib/module/api/player/Integration.js +2 -0
- package/lib/module/api/player/Integration.js.map +1 -0
- package/lib/module/api/player/PlayerEventMap.js +1 -1
- package/lib/module/api/player/THEOplayer.js.map +1 -1
- package/lib/module/api/player/barrel.js +1 -0
- package/lib/module/api/player/barrel.js.map +1 -1
- package/lib/module/api/track/MediaTrack.js +16 -0
- package/lib/module/api/track/MediaTrack.js.map +1 -1
- package/lib/module/internal/THEOplayerView.js +2 -0
- package/lib/module/internal/THEOplayerView.js.map +1 -1
- package/lib/module/internal/THEOplayerView.web.js +3 -1
- package/lib/module/internal/THEOplayerView.web.js.map +1 -1
- package/lib/module/internal/adapter/DefaultNativePlayerState.js +1 -0
- package/lib/module/internal/adapter/DefaultNativePlayerState.js.map +1 -1
- package/lib/module/internal/adapter/THEOplayerAdapter.js +18 -0
- package/lib/module/internal/adapter/THEOplayerAdapter.js.map +1 -1
- package/lib/module/internal/adapter/THEOplayerWebAdapter.js +21 -4
- package/lib/module/internal/adapter/THEOplayerWebAdapter.js.map +1 -1
- package/lib/module/internal/adapter/WebEventForwarder.js +62 -11
- package/lib/module/internal/adapter/WebEventForwarder.js.map +1 -1
- package/lib/module/internal/adapter/metrics/MetricsNativeAdapter.js +13 -0
- package/lib/module/internal/adapter/metrics/MetricsNativeAdapter.js.map +1 -0
- package/lib/module/internal/adapter/metrics/MetricsWebAdapter.js +11 -0
- package/lib/module/internal/adapter/metrics/MetricsWebAdapter.js.map +1 -0
- package/lib/module/internal/adapter/web/IntegrationRegistration.js +4 -0
- package/lib/module/internal/adapter/web/IntegrationRegistration.js.map +1 -0
- package/lib/module/internal/adapter/web/PlayerFacade.js +253 -0
- package/lib/module/internal/adapter/web/PlayerFacade.js.map +1 -0
- package/lib/module/internal/adapter/web/PlayerFacadeAPI.js +4 -0
- package/lib/module/internal/adapter/web/PlayerFacadeAPI.js.map +1 -0
- package/lib/module/internal/adapter/web/PlayerFacadeAdsEvents.js +109 -0
- package/lib/module/internal/adapter/web/PlayerFacadeAdsEvents.js.map +1 -0
- package/lib/module/internal/adapter/web/PlayerFacadeIntegration.js +4 -0
- package/lib/module/internal/adapter/web/PlayerFacadeIntegration.js.map +1 -0
- package/lib/module/internal/adapter/web/PlayerFacadeTypes.js +4 -0
- package/lib/module/internal/adapter/web/PlayerFacadeTypes.js.map +1 -0
- package/lib/module/internal/drm/ContentProtectionRegistry.js +38 -12
- package/lib/module/internal/drm/ContentProtectionRegistry.js.map +1 -1
- package/lib/module/manifest.json +1 -1
- package/lib/module/plugins/typedoc-platform-icons/package-lock.json +200 -58
- package/lib/module/plugins/typedoc-platform-icons/package.json +1 -1
- package/lib/module/plugins/typedoc-platform-icons/tsconfig.json +2 -1
- package/lib/typescript/__tests__/ContentProtectionRegistry.test.d.ts +2 -0
- package/lib/typescript/__tests__/ContentProtectionRegistry.test.d.ts.map +1 -0
- package/lib/typescript/__tests__/PlayerFacade.test.d.ts +2 -0
- package/lib/typescript/__tests__/PlayerFacade.test.d.ts.map +1 -0
- package/lib/typescript/__tests__/PlayerFacadeWebAdapter.test.d.ts +2 -0
- package/lib/typescript/__tests__/PlayerFacadeWebAdapter.test.d.ts.map +1 -0
- package/lib/typescript/__tests__/index.test.d.ts +13 -0
- package/lib/typescript/__tests__/index.test.d.ts.map +1 -1
- package/lib/typescript/api/THEOplayerView.d.ts +4 -0
- package/lib/typescript/api/THEOplayerView.d.ts.map +1 -1
- package/lib/typescript/api/barrel.d.ts +1 -0
- package/lib/typescript/api/barrel.d.ts.map +1 -1
- package/lib/typescript/api/config/PlayerConfiguration.d.ts +15 -0
- package/lib/typescript/api/config/PlayerConfiguration.d.ts.map +1 -1
- package/lib/typescript/api/error/ChromecastError.d.ts +2 -2
- package/lib/typescript/api/event/AdEvent.d.ts +1 -1
- package/lib/typescript/api/metrics/MetricsAPI.d.ts +21 -0
- package/lib/typescript/api/metrics/MetricsAPI.d.ts.map +1 -0
- package/lib/typescript/api/metrics/barrel.d.ts +2 -0
- package/lib/typescript/api/metrics/barrel.d.ts.map +1 -0
- package/lib/typescript/api/player/Integration.d.ts +88 -0
- package/lib/typescript/api/player/Integration.d.ts.map +1 -0
- package/lib/typescript/api/player/PlayerEventMap.d.ts +1 -1
- package/lib/typescript/api/player/THEOplayer.d.ts +19 -0
- package/lib/typescript/api/player/THEOplayer.d.ts.map +1 -1
- package/lib/typescript/api/player/barrel.d.ts +1 -0
- package/lib/typescript/api/player/barrel.d.ts.map +1 -1
- package/lib/typescript/api/theoads/interstitial/Interstitial.d.ts +1 -1
- package/lib/typescript/api/theolive/TheoLiveEndpoint.d.ts +23 -5
- package/lib/typescript/api/theolive/TheoLiveEndpoint.d.ts.map +1 -1
- package/lib/typescript/api/theolive/WebrtcOptions.d.ts +1 -1
- package/lib/typescript/api/track/MediaTrack.d.ts +21 -4
- package/lib/typescript/api/track/MediaTrack.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/DefaultNativePlayerState.d.ts +1 -0
- package/lib/typescript/internal/adapter/DefaultNativePlayerState.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/NativePlayerState.d.ts +1 -0
- package/lib/typescript/internal/adapter/NativePlayerState.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/THEOplayerAdapter.d.ts +6 -1
- package/lib/typescript/internal/adapter/THEOplayerAdapter.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/THEOplayerWebAdapter.d.ts +6 -1
- package/lib/typescript/internal/adapter/THEOplayerWebAdapter.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/WebEventForwarder.d.ts +3 -0
- package/lib/typescript/internal/adapter/WebEventForwarder.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/metrics/MetricsNativeAdapter.d.ts +7 -0
- package/lib/typescript/internal/adapter/metrics/MetricsNativeAdapter.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/metrics/MetricsWebAdapter.d.ts +8 -0
- package/lib/typescript/internal/adapter/metrics/MetricsWebAdapter.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/IntegrationRegistration.d.ts +53 -0
- package/lib/typescript/internal/adapter/web/IntegrationRegistration.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/PlayerFacade.d.ts +26 -0
- package/lib/typescript/internal/adapter/web/PlayerFacade.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeAPI.d.ts +33 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeAPI.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeAdsEvents.d.ts +21 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeAdsEvents.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeIntegration.d.ts +43 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeIntegration.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeTypes.d.ts +13 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeTypes.d.ts.map +1 -0
- package/lib/typescript/internal/drm/ContentProtectionRegistry.d.ts +3 -1
- package/lib/typescript/internal/drm/ContentProtectionRegistry.d.ts.map +1 -1
- package/lib/typescript/internal/drm/NativeContentProtectionEvent.d.ts +5 -0
- package/lib/typescript/internal/drm/NativeContentProtectionEvent.d.ts.map +1 -1
- package/package.json +5 -6
- package/react-native-theoplayer.podspec +7 -7
- package/src/__tests__/ContentProtectionRegistry.test.ts +239 -0
- package/src/__tests__/PlayerFacade.test.ts +579 -0
- package/src/__tests__/PlayerFacadeWebAdapter.test.ts +193 -0
- package/src/__tests__/index.test.tsx +15 -1
- package/src/api/THEOplayerView.ts +5 -0
- package/src/api/barrel.ts +1 -0
- package/src/api/config/PlayerConfiguration.ts +16 -0
- package/src/api/error/ChromecastError.ts +2 -2
- package/src/api/event/AdEvent.ts +1 -1
- package/src/api/metrics/MetricsAPI.ts +20 -0
- package/src/api/metrics/barrel.ts +1 -0
- package/src/api/player/Integration.ts +97 -0
- package/src/api/player/PlayerEventMap.ts +1 -1
- package/src/api/player/THEOplayer.ts +21 -0
- package/src/api/player/barrel.ts +1 -0
- package/src/api/theoads/interstitial/Interstitial.ts +1 -1
- package/src/api/theolive/TheoLiveEndpoint.ts +24 -5
- package/src/api/theolive/WebrtcOptions.ts +1 -1
- package/src/api/track/MediaTrack.ts +21 -4
- package/src/internal/THEOplayerView.tsx +2 -2
- package/src/internal/THEOplayerView.web.tsx +2 -2
- package/src/internal/adapter/DefaultNativePlayerState.ts +1 -0
- package/src/internal/adapter/NativePlayerState.ts +1 -0
- package/src/internal/adapter/THEOplayerAdapter.ts +24 -0
- package/src/internal/adapter/THEOplayerWebAdapter.ts +27 -4
- package/src/internal/adapter/WebEventForwarder.ts +74 -13
- package/src/internal/adapter/metrics/MetricsNativeAdapter.ts +12 -0
- package/src/internal/adapter/metrics/MetricsWebAdapter.ts +14 -0
- package/src/internal/adapter/web/IntegrationRegistration.ts +57 -0
- package/src/internal/adapter/web/PlayerFacade.ts +281 -0
- package/src/internal/adapter/web/PlayerFacadeAPI.ts +35 -0
- package/src/internal/adapter/web/PlayerFacadeAdsEvents.ts +119 -0
- package/src/internal/adapter/web/PlayerFacadeIntegration.ts +45 -0
- package/src/internal/adapter/web/PlayerFacadeTypes.ts +14 -0
- package/src/internal/drm/ContentProtectionRegistry.ts +35 -17
- package/src/internal/drm/NativeContentProtectionEvent.ts +5 -0
- package/src/manifest.json +1 -1
- package/src/plugins/typedoc-platform-icons/package-lock.json +200 -58
- package/src/plugins/typedoc-platform-icons/package.json +1 -1
- package/src/plugins/typedoc-platform-icons/tsconfig.json +2 -1
- package/lib/typescript/plugins/expo/Common.d.ts +0 -13
- package/lib/typescript/plugins/expo/Common.d.ts.map +0 -1
- package/lib/typescript/plugins/expo/withCustomPod.d.ts +0 -2
- package/lib/typescript/plugins/expo/withCustomPod.d.ts.map +0 -1
- package/lib/typescript/plugins/expo/withTHEOplayer.d.ts +0 -4
- package/lib/typescript/plugins/expo/withTHEOplayer.d.ts.map +0 -1
- package/lib/typescript/plugins/expo/withTHEOplayerAndroid.d.ts +0 -4
- package/lib/typescript/plugins/expo/withTHEOplayerAndroid.d.ts.map +0 -1
- package/lib/typescript/plugins/expo/withTHEOplayerIOS.d.ts +0 -4
- package/lib/typescript/plugins/expo/withTHEOplayerIOS.d.ts.map +0 -1
- package/lib/typescript/plugins/typedoc-platform-icons/src/index.d.ts +0 -3
- package/lib/typescript/plugins/typedoc-platform-icons/src/index.d.ts.map +0 -1
|
@@ -0,0 +1,507 @@
|
|
|
1
|
+
package com.theoplayer.integration
|
|
2
|
+
|
|
3
|
+
import com.theoplayer.android.api.ads.Ad
|
|
4
|
+
import com.theoplayer.android.api.ads.AdBreak
|
|
5
|
+
import com.theoplayer.android.api.event.EventListener
|
|
6
|
+
import com.theoplayer.android.api.event.ads.*
|
|
7
|
+
import com.theoplayer.android.api.event.player.*
|
|
8
|
+
import com.theoplayer.android.api.source.addescription.GoogleImaAdDescription
|
|
9
|
+
import java.io.Closeable
|
|
10
|
+
import org.junit.Assert.*
|
|
11
|
+
import org.junit.Test
|
|
12
|
+
|
|
13
|
+
class PlayerFacadeTest {
|
|
14
|
+
private val adBreak = facadeStub<AdBreak> { method, _ -> if (method == "getId") "break" else null }
|
|
15
|
+
private val ad = facadeStub<Ad> { method, _ ->
|
|
16
|
+
when (method) {
|
|
17
|
+
"getId" -> "ad"
|
|
18
|
+
"getType" -> "linear"
|
|
19
|
+
"getAdBreak" -> adBreak
|
|
20
|
+
else -> null
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
private val adBegin = facadeEvent<AdBeginEvent>(AdsEventTypes.AD_BEGIN, ad)
|
|
24
|
+
private val adEnd = facadeEvent<AdEndEvent>(AdsEventTypes.AD_END, ad)
|
|
25
|
+
private val timeUpdate = facadeEvent<TimeUpdateEvent>(PlayerEventTypes.TIMEUPDATE)
|
|
26
|
+
private val pause = facadeEvent<PauseEvent>(PlayerEventTypes.PAUSE)
|
|
27
|
+
private val destroy = facadeEvent<DestroyEvent>(PlayerEventTypes.DESTROY)
|
|
28
|
+
|
|
29
|
+
@Test fun optInLeavesOriginalPlayerUntouchedWhenDisabled() {
|
|
30
|
+
val host = PlayerFacadeTestHost()
|
|
31
|
+
assertSame(host.player, PlayerFacade.create(host.player, false))
|
|
32
|
+
assertEquals(0, host.adsReads)
|
|
33
|
+
assertTrue(host.adListeners.isEmpty())
|
|
34
|
+
assertTrue(host.playerListeners.isEmpty())
|
|
35
|
+
val facade = PlayerFacade.create(host.player, true) as PlayerFacade
|
|
36
|
+
assertSame(host.player, facade.contentPlayer)
|
|
37
|
+
facade.close()
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
@Test fun delegatesWithoutRegistrationAndKeepsStableAdsIdentity() {
|
|
41
|
+
val host = PlayerFacadeTestHost()
|
|
42
|
+
val facade = PlayerFacade(host.player)
|
|
43
|
+
host.playingAds = true
|
|
44
|
+
host.currentAds = listOf(ad)
|
|
45
|
+
host.currentBreak = adBreak
|
|
46
|
+
assertEquals(123.0, facade.currentTime, 0.0)
|
|
47
|
+
assertSame(facade.ads, facade.ads)
|
|
48
|
+
assertEquals(listOf(ad), facade.ads.currentAds)
|
|
49
|
+
assertSame(adBreak, facade.ads.currentAdBreak)
|
|
50
|
+
assertTrue(facade.ads.isPlaying)
|
|
51
|
+
var received: AdBeginEvent? = null
|
|
52
|
+
facade.ads.addEventListener(AdsEventTypes.AD_BEGIN) { received = it }
|
|
53
|
+
host.emitAd(adBegin)
|
|
54
|
+
assertSame(adBegin, received)
|
|
55
|
+
facade.close()
|
|
56
|
+
assertTrue(host.adListeners.values.all { it.isEmpty() })
|
|
57
|
+
assertTrue(host.playerListeners.values.all { it.isEmpty() })
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
@Test fun defaultIntegrationDelegatesAllPlaybackOperationsAndNativeAdEvents() {
|
|
61
|
+
val host = PlayerFacadeTestHost()
|
|
62
|
+
val facade = PlayerFacade(host.player)
|
|
63
|
+
facade.registerIntegration(object : Integration {})
|
|
64
|
+
assertEquals(123.0, facade.currentTime, 0.0)
|
|
65
|
+
assertEquals(600.0, facade.duration, 0.0)
|
|
66
|
+
assertTrue(facade.isPaused)
|
|
67
|
+
assertFalse(facade.isSeeking)
|
|
68
|
+
assertFalse(facade.isMuted)
|
|
69
|
+
assertEquals(0.8, facade.volume, 0.0)
|
|
70
|
+
facade.currentTime = 5.0
|
|
71
|
+
facade.play()
|
|
72
|
+
facade.pause()
|
|
73
|
+
facade.isMuted = true
|
|
74
|
+
facade.volume = 0.4
|
|
75
|
+
facade.ads.skip()
|
|
76
|
+
assertEquals(listOf("setCurrentTime", "play", "pause", "setMuted", "setVolume", "skip"), host.commands)
|
|
77
|
+
var count = 0
|
|
78
|
+
facade.ads.addEventListener(AdsEventTypes.AD_BEGIN) { count++ }
|
|
79
|
+
host.emitAd(adBegin)
|
|
80
|
+
assertEquals(1, count)
|
|
81
|
+
facade.close()
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
@Test fun invalidIntegrationTimeFallsBackToContent() {
|
|
85
|
+
val facade = PlayerFacade(PlayerFacadeTestHost().player)
|
|
86
|
+
var time: Double? = 7.5
|
|
87
|
+
val source = facade.registerIntegration(object : Integration { override fun getCurrentTime() = time })
|
|
88
|
+
assertEquals(7.5, facade.currentTime, 0.0)
|
|
89
|
+
for (invalid in listOf(null, Double.NaN, Double.POSITIVE_INFINITY, -1.0)) {
|
|
90
|
+
time = invalid
|
|
91
|
+
assertEquals(123.0, facade.currentTime, 0.0)
|
|
92
|
+
}
|
|
93
|
+
time = 0.0
|
|
94
|
+
assertEquals(0.0, facade.currentTime, 0.0)
|
|
95
|
+
source.close()
|
|
96
|
+
assertEquals(123.0, facade.currentTime, 0.0)
|
|
97
|
+
facade.close()
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
@Test fun integrationOverridesPlaybackSeekingAndAudioWithNullAndFalseFallbacks() {
|
|
101
|
+
val host = PlayerFacadeTestHost()
|
|
102
|
+
val facade = PlayerFacade(host.player)
|
|
103
|
+
val integration = object : Integration {
|
|
104
|
+
var active = true
|
|
105
|
+
var time = 7.5
|
|
106
|
+
var paused = false
|
|
107
|
+
var muted = true
|
|
108
|
+
var volume = 0.3
|
|
109
|
+
var duration = Double.POSITIVE_INFINITY
|
|
110
|
+
override fun getCurrentTime(): Double? = if (active) time else null
|
|
111
|
+
override fun getDuration(): Double? = if (active) duration else null
|
|
112
|
+
override fun isPaused(): Boolean? = if (active) paused else null
|
|
113
|
+
override fun isSeeking(): Boolean? = if (active) true else null
|
|
114
|
+
override fun getMuted(): Boolean? = if (active) muted else null
|
|
115
|
+
override fun getVolume(): Double? = if (active) volume else null
|
|
116
|
+
override fun setCurrentTime(currentTime: Double): Boolean { if (active) time = currentTime; return active }
|
|
117
|
+
override fun play(): Boolean { if (active) paused = false; return active }
|
|
118
|
+
override fun pause(): Boolean { if (active) paused = true; return active }
|
|
119
|
+
override fun setMuted(muted: Boolean): Boolean { if (active) this.muted = muted; return active }
|
|
120
|
+
override fun setVolume(volume: Double): Boolean { if (active) this.volume = volume; return active }
|
|
121
|
+
}
|
|
122
|
+
val registration = facade.registerIntegration(integration)
|
|
123
|
+
assertEquals(7.5, facade.currentTime, 0.0)
|
|
124
|
+
assertEquals(Double.POSITIVE_INFINITY, facade.duration, 0.0)
|
|
125
|
+
integration.duration = Double.NaN
|
|
126
|
+
assertTrue(facade.duration.isNaN())
|
|
127
|
+
assertFalse(facade.isPaused)
|
|
128
|
+
assertTrue(facade.isSeeking)
|
|
129
|
+
assertTrue(facade.isMuted)
|
|
130
|
+
assertEquals(0.3, facade.volume, 0.0)
|
|
131
|
+
facade.currentTime = 12.0
|
|
132
|
+
facade.pause()
|
|
133
|
+
assertTrue(facade.isPaused)
|
|
134
|
+
facade.play()
|
|
135
|
+
assertFalse(facade.isPaused)
|
|
136
|
+
facade.isMuted = false
|
|
137
|
+
facade.volume = 0.4
|
|
138
|
+
assertEquals(12.0, integration.time, 0.0)
|
|
139
|
+
assertFalse(integration.muted)
|
|
140
|
+
assertEquals(0.4, integration.volume, 0.0)
|
|
141
|
+
assertTrue(host.commands.isEmpty())
|
|
142
|
+
integration.active = false
|
|
143
|
+
assertEquals(123.0, facade.currentTime, 0.0)
|
|
144
|
+
assertEquals(600.0, facade.duration, 0.0)
|
|
145
|
+
assertTrue(facade.isPaused)
|
|
146
|
+
assertFalse(facade.isSeeking)
|
|
147
|
+
assertFalse(facade.isMuted)
|
|
148
|
+
assertEquals(0.8, facade.volume, 0.0)
|
|
149
|
+
facade.currentTime = 50.0
|
|
150
|
+
facade.play()
|
|
151
|
+
facade.pause()
|
|
152
|
+
facade.isMuted = true
|
|
153
|
+
facade.volume = 0.6
|
|
154
|
+
assertEquals(listOf("setCurrentTime", "play", "pause", "setMuted", "setVolume"), host.commands)
|
|
155
|
+
integration.active = true
|
|
156
|
+
registration.close()
|
|
157
|
+
assertEquals(50.0, facade.currentTime, 0.0)
|
|
158
|
+
assertFalse(facade.isSeeking)
|
|
159
|
+
assertTrue(facade.isMuted)
|
|
160
|
+
assertEquals(0.6, facade.volume, 0.0)
|
|
161
|
+
facade.close()
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
@Test fun integrationOwnsAdStateAndDispatchNeverReconstructsLifecycle() {
|
|
165
|
+
val host = PlayerFacadeTestHost()
|
|
166
|
+
host.currentBreak = adBreak
|
|
167
|
+
val facade = PlayerFacade(host.player)
|
|
168
|
+
var state: PlayerFacadeAdState? = PlayerFacadeAdState(false, emptyList(), null)
|
|
169
|
+
val registration = facade.registerIntegration(object : Integration { override fun getAdState() = state })
|
|
170
|
+
assertNull(facade.ads.currentAdBreak)
|
|
171
|
+
registration.dispatchEvent(adBegin)
|
|
172
|
+
assertFalse(facade.ads.isPlaying)
|
|
173
|
+
assertTrue(facade.ads.currentAds.isEmpty())
|
|
174
|
+
state = PlayerFacadeAdState(true, listOf(ad), adBreak)
|
|
175
|
+
for (event in listOf(adEnd, facadeEvent<AdSkipEvent>(AdsEventTypes.AD_SKIP, ad), facadeEvent<AdBreakEndEvent>(AdsEventTypes.AD_BREAK_END, adBreak))) {
|
|
176
|
+
registration.dispatchEvent(event)
|
|
177
|
+
assertTrue(facade.ads.isPlaying)
|
|
178
|
+
assertEquals(listOf(ad), facade.ads.currentAds)
|
|
179
|
+
assertSame(adBreak, facade.ads.currentAdBreak)
|
|
180
|
+
}
|
|
181
|
+
state = null
|
|
182
|
+
assertFalse(facade.ads.isPlaying)
|
|
183
|
+
assertSame(adBreak, facade.ads.currentAdBreak)
|
|
184
|
+
facade.close()
|
|
185
|
+
}
|
|
186
|
+
|
|
187
|
+
@Test fun stableAdsDelegatesControlsAndMigratesExistingListeners() {
|
|
188
|
+
val host = PlayerFacadeTestHost()
|
|
189
|
+
val integrated = PlayerFacadeTestHost()
|
|
190
|
+
integrated.playingAds = true
|
|
191
|
+
integrated.currentAds = listOf(ad)
|
|
192
|
+
integrated.scheduledAds.add(ad)
|
|
193
|
+
val facade = PlayerFacade(host.player)
|
|
194
|
+
val ads = facade.ads
|
|
195
|
+
var count = 0
|
|
196
|
+
val listener = EventListener<AdBeginEvent> { count++ }
|
|
197
|
+
ads.addEventListener(AdsEventTypes.AD_BEGIN, listener)
|
|
198
|
+
ads.addEventListener(AdsEventTypes.AD_BEGIN, listener)
|
|
199
|
+
@Suppress("UNCHECKED_CAST")
|
|
200
|
+
val queuedNative = host.adListeners[AdsEventTypes.AD_BEGIN]!!.single() as EventListener<AdBeginEvent>
|
|
201
|
+
val source = facade.registerIntegration(object : Integration {
|
|
202
|
+
override val ads = integrated.ads
|
|
203
|
+
override fun getAdState() = PlayerFacadeAdState(false, emptyList(), adBreak)
|
|
204
|
+
override fun shouldConsumeAdEvent(event: AdEvent<*>) = true
|
|
205
|
+
})
|
|
206
|
+
assertSame(ads, facade.ads)
|
|
207
|
+
assertTrue(ads.isPlaying)
|
|
208
|
+
assertEquals(listOf(ad), ads.currentAds)
|
|
209
|
+
assertNull(ads.currentAdBreak)
|
|
210
|
+
assertSame(integrated.scheduledAds, ads.scheduledAds)
|
|
211
|
+
assertTrue(host.adListeners.values.all { it.isEmpty() })
|
|
212
|
+
queuedNative.handleEvent(adBegin)
|
|
213
|
+
assertEquals(0, count)
|
|
214
|
+
ads.skip()
|
|
215
|
+
ads.schedule(GoogleImaAdDescription.Builder("test-ad-tag").build())
|
|
216
|
+
assertEquals(listOf("skip", "schedule"), integrated.commands)
|
|
217
|
+
assertTrue(host.commands.isEmpty())
|
|
218
|
+
integrated.emitAd(adBegin)
|
|
219
|
+
assertEquals(1, count)
|
|
220
|
+
@Suppress("UNCHECKED_CAST")
|
|
221
|
+
val queuedIntegration = integrated.adListeners[AdsEventTypes.AD_BEGIN]!!.single() as EventListener<AdBeginEvent>
|
|
222
|
+
source.close()
|
|
223
|
+
assertTrue(integrated.adListeners.values.all { it.isEmpty() })
|
|
224
|
+
queuedIntegration.handleEvent(adBegin)
|
|
225
|
+
assertEquals(1, count)
|
|
226
|
+
assertFalse(ads.isPlaying)
|
|
227
|
+
ads.skip()
|
|
228
|
+
assertEquals(listOf("skip"), host.commands)
|
|
229
|
+
host.emitAd(adBegin)
|
|
230
|
+
assertEquals(2, count)
|
|
231
|
+
ads.removeEventListener(AdsEventTypes.AD_BEGIN, listener)
|
|
232
|
+
host.emitAd(adBegin)
|
|
233
|
+
assertEquals(2, count)
|
|
234
|
+
facade.close()
|
|
235
|
+
}
|
|
236
|
+
|
|
237
|
+
@Test fun nativeAdFilteringDecidesOnceForAllListenersAndSyntheticEventsBypassIt() {
|
|
238
|
+
val host = PlayerFacadeTestHost()
|
|
239
|
+
val facade = PlayerFacade(host.player)
|
|
240
|
+
var decisions = 0
|
|
241
|
+
var count = 0
|
|
242
|
+
val registration = facade.registerIntegration(object : Integration {
|
|
243
|
+
override fun shouldConsumeAdEvent(event: AdEvent<*>) = ++decisions == 1
|
|
244
|
+
})
|
|
245
|
+
facade.ads.addEventListener(AdsEventTypes.AD_BEGIN) { count++ }
|
|
246
|
+
facade.ads.addEventListener(AdsEventTypes.AD_BEGIN) { count++ }
|
|
247
|
+
host.emitAd(adBegin)
|
|
248
|
+
assertEquals(0, count)
|
|
249
|
+
assertEquals(1, decisions)
|
|
250
|
+
host.emitAd(adBegin)
|
|
251
|
+
assertEquals(2, count)
|
|
252
|
+
registration.dispatchEvent(adBegin)
|
|
253
|
+
assertEquals(4, count)
|
|
254
|
+
assertEquals(2, decisions)
|
|
255
|
+
facade.close()
|
|
256
|
+
}
|
|
257
|
+
|
|
258
|
+
@Test fun registrationDuringNativeAdsIsAllowedButConcurrentIntegrationsAreRejected() {
|
|
259
|
+
val host = PlayerFacadeTestHost()
|
|
260
|
+
host.playingAds = true
|
|
261
|
+
host.currentBreak = adBreak
|
|
262
|
+
val facade = PlayerFacade(host.player)
|
|
263
|
+
val source = facade.registerIntegration(object : Integration {})
|
|
264
|
+
assertTrue(facade.ads.isPlaying)
|
|
265
|
+
assertThrows(IllegalStateException::class.java) { facade.registerIntegration(object : Integration {}) }
|
|
266
|
+
source.close()
|
|
267
|
+
facade.registerIntegration(object : Integration {})
|
|
268
|
+
facade.close()
|
|
269
|
+
assertThrows(IllegalStateException::class.java) { facade.registerIntegration(object : Integration {}) }
|
|
270
|
+
}
|
|
271
|
+
|
|
272
|
+
@Test fun failedRegistrationRestoresAllNativeAdsSubscriptions() {
|
|
273
|
+
val host = PlayerFacadeTestHost()
|
|
274
|
+
val integrated = PlayerFacadeTestHost()
|
|
275
|
+
integrated.failAdSubscription = AdsEventTypes.AD_END
|
|
276
|
+
val facade = PlayerFacade(host.player)
|
|
277
|
+
var count = 0
|
|
278
|
+
facade.ads.addEventListener(AdsEventTypes.AD_BEGIN) { count++ }
|
|
279
|
+
facade.ads.addEventListener(AdsEventTypes.AD_END) { count++ }
|
|
280
|
+
assertThrows(IllegalStateException::class.java) { facade.registerIntegration(object : Integration { override val ads = integrated.ads }) }
|
|
281
|
+
assertTrue(integrated.adListeners.values.all { it.isEmpty() })
|
|
282
|
+
host.emitAd(adBegin)
|
|
283
|
+
host.emitAd(adEnd)
|
|
284
|
+
assertEquals(2, count)
|
|
285
|
+
facade.registerIntegration(object : Integration {})
|
|
286
|
+
facade.close()
|
|
287
|
+
}
|
|
288
|
+
|
|
289
|
+
@Test fun typedInterceptionDecidesOnceForAllConsumersButLeavesRawEventsUntouched() {
|
|
290
|
+
val host = PlayerFacadeTestHost()
|
|
291
|
+
val facade = PlayerFacade(host.player)
|
|
292
|
+
val registration = facade.registerIntegration(object : Integration {})
|
|
293
|
+
var decisions = 0
|
|
294
|
+
var raw = 0
|
|
295
|
+
var visible = 0
|
|
296
|
+
host.player.addEventListener(PlayerEventTypes.TIMEUPDATE) { raw++ }
|
|
297
|
+
facade.addEventListener(PlayerEventTypes.TIMEUPDATE) { visible++ }
|
|
298
|
+
facade.addEventListener(PlayerEventTypes.TIMEUPDATE) { visible++ }
|
|
299
|
+
val remove = registration.interceptPlayerEvent(PlayerEventTypes.TIMEUPDATE) { decisions++; true }
|
|
300
|
+
host.emitPlayer(timeUpdate)
|
|
301
|
+
assertEquals(1, raw)
|
|
302
|
+
assertEquals(0, visible)
|
|
303
|
+
assertEquals(1, decisions)
|
|
304
|
+
registration.dispatchEvent(timeUpdate)
|
|
305
|
+
assertEquals(2, visible)
|
|
306
|
+
assertEquals(1, raw)
|
|
307
|
+
remove.close()
|
|
308
|
+
remove.close()
|
|
309
|
+
host.emitPlayer(timeUpdate)
|
|
310
|
+
assertEquals(2, raw)
|
|
311
|
+
assertEquals(4, visible)
|
|
312
|
+
assertEquals(1, decisions)
|
|
313
|
+
facade.close()
|
|
314
|
+
}
|
|
315
|
+
|
|
316
|
+
@Test fun typeSpecificInterceptorsObserveEventsWithoutConsumersAndDetachExplicitly() {
|
|
317
|
+
val host = PlayerFacadeTestHost()
|
|
318
|
+
val facade = PlayerFacade(host.player)
|
|
319
|
+
val registration = facade.registerIntegration(object : Integration {})
|
|
320
|
+
var decisions = 0
|
|
321
|
+
val remove = registration.interceptPlayerEvent(PlayerEventTypes.PAUSE) { decisions++; false }
|
|
322
|
+
host.emitPlayer(pause)
|
|
323
|
+
assertEquals(1, decisions)
|
|
324
|
+
remove.close()
|
|
325
|
+
assertTrue(host.playerListeners[PlayerEventTypes.PAUSE]!!.isEmpty())
|
|
326
|
+
host.emitPlayer(pause)
|
|
327
|
+
assertEquals(1, decisions)
|
|
328
|
+
facade.close()
|
|
329
|
+
}
|
|
330
|
+
|
|
331
|
+
@Test fun catchAllInterceptionCoversFutureSubscriptionsAfterSpecificInterceptors() {
|
|
332
|
+
val host = PlayerFacadeTestHost()
|
|
333
|
+
val facade = PlayerFacade(host.player)
|
|
334
|
+
val registration = facade.registerIntegration(object : Integration {})
|
|
335
|
+
val seen = mutableListOf<String>()
|
|
336
|
+
var removeLater = Closeable {}
|
|
337
|
+
registration.interceptPlayerEvent(PlayerEventTypes.TIMEUPDATE) { seen.add("specific"); false }
|
|
338
|
+
val remove = registration.interceptPlayerEvents { seen.add("all"); removeLater.close(); true }
|
|
339
|
+
removeLater = registration.interceptPlayerEvents { seen.add("removed"); false }
|
|
340
|
+
facade.addEventListener(PlayerEventTypes.TIMEUPDATE) { seen.add("time") }
|
|
341
|
+
facade.addEventListener(PlayerEventTypes.PAUSE) { seen.add("pause") }
|
|
342
|
+
host.emitPlayer(timeUpdate)
|
|
343
|
+
host.emitPlayer(pause)
|
|
344
|
+
assertEquals(listOf("specific", "all", "all"), seen)
|
|
345
|
+
registration.dispatchEvent(pause)
|
|
346
|
+
assertEquals("pause", seen.last())
|
|
347
|
+
registration.close()
|
|
348
|
+
host.emitPlayer(pause)
|
|
349
|
+
assertEquals("all", seen.last())
|
|
350
|
+
remove.close()
|
|
351
|
+
host.emitPlayer(pause)
|
|
352
|
+
assertEquals("pause", seen.last())
|
|
353
|
+
facade.close()
|
|
354
|
+
}
|
|
355
|
+
|
|
356
|
+
@Test fun queuedEventsCanDrainAfterUnregisteringWithoutConsumingLaterUserEvents() {
|
|
357
|
+
val host = PlayerFacadeTestHost()
|
|
358
|
+
val facade = PlayerFacade(host.player)
|
|
359
|
+
val registration = facade.registerIntegration(object : Integration {})
|
|
360
|
+
var pending = true
|
|
361
|
+
var visible = 0
|
|
362
|
+
facade.addEventListener(PlayerEventTypes.PAUSE) { visible++ }
|
|
363
|
+
var remove = Closeable {}
|
|
364
|
+
remove = registration.interceptPlayerEvent(PlayerEventTypes.PAUSE) {
|
|
365
|
+
val consumed = pending
|
|
366
|
+
pending = false
|
|
367
|
+
remove.close()
|
|
368
|
+
consumed
|
|
369
|
+
}
|
|
370
|
+
registration.close()
|
|
371
|
+
registration.interceptPlayerEvent(PlayerEventTypes.PAUSE) { fail("closed registration installed interceptor"); true }
|
|
372
|
+
registration.interceptPlayerEvents { fail("closed registration installed catch-all interceptor"); true }
|
|
373
|
+
host.emitPlayer(pause)
|
|
374
|
+
assertEquals(0, visible)
|
|
375
|
+
host.emitPlayer(pause)
|
|
376
|
+
assertEquals(1, visible)
|
|
377
|
+
facade.close()
|
|
378
|
+
}
|
|
379
|
+
|
|
380
|
+
@Test fun playerAndAdvertisingEventsUseSeparateSurfacesAndPreserveNativePayloads() {
|
|
381
|
+
val host = PlayerFacadeTestHost()
|
|
382
|
+
val facade = PlayerFacade(host.player)
|
|
383
|
+
val registration = facade.registerIntegration(object : Integration { override fun getCurrentTime() = 7.5 })
|
|
384
|
+
val players = mutableListOf<PlayerEvent<*>>()
|
|
385
|
+
val ads = mutableListOf<AdEvent<*>>()
|
|
386
|
+
var raw = 0
|
|
387
|
+
host.player.addEventListener(PlayerEventTypes.TIMEUPDATE) { raw++ }
|
|
388
|
+
facade.addEventListener(PlayerEventTypes.TIMEUPDATE) { players.add(it) }
|
|
389
|
+
facade.ads.addEventListener(AdsEventTypes.AD_BEGIN) { ads.add(it) }
|
|
390
|
+
facade.ads.addEventListener(AdsEventTypes.AD_CLICKED) { ads.add(it) }
|
|
391
|
+
host.emitPlayer(timeUpdate)
|
|
392
|
+
assertSame(timeUpdate, players.single())
|
|
393
|
+
assertEquals(123.0, (players.single() as TimeUpdateEvent).currentTime, 0.0)
|
|
394
|
+
assertEquals(7.5, facade.currentTime, 0.0)
|
|
395
|
+
registration.dispatchPlayerEvent(timeUpdate)
|
|
396
|
+
registration.dispatchEvent(timeUpdate)
|
|
397
|
+
assertEquals(3, players.size)
|
|
398
|
+
assertEquals(1, raw)
|
|
399
|
+
registration.dispatchEvent(adBegin)
|
|
400
|
+
val clicked = facadeEvent<AdClickedEvent>(AdsEventTypes.AD_CLICKED, ad)
|
|
401
|
+
registration.dispatchEvent(clicked)
|
|
402
|
+
assertEquals(listOf(adBegin, clicked), ads)
|
|
403
|
+
assertEquals(3, players.size)
|
|
404
|
+
facade.close()
|
|
405
|
+
}
|
|
406
|
+
|
|
407
|
+
@Test fun staleRegistrationCannotEmitOrCloseReplacement() {
|
|
408
|
+
val host = PlayerFacadeTestHost()
|
|
409
|
+
val facade = PlayerFacade(host.player)
|
|
410
|
+
val old = facade.registerIntegration(object : Integration {})
|
|
411
|
+
var count = 0
|
|
412
|
+
facade.addEventListener(PlayerEventTypes.TIMEUPDATE) { count++ }
|
|
413
|
+
facade.ads.addEventListener(AdsEventTypes.AD_BEGIN) { count++ }
|
|
414
|
+
old.close()
|
|
415
|
+
val current = facade.registerIntegration(object : Integration { override fun getCurrentTime() = 2.0 })
|
|
416
|
+
old.dispatchEvent(adBegin)
|
|
417
|
+
old.dispatchEvent(timeUpdate)
|
|
418
|
+
old.close()
|
|
419
|
+
assertEquals(0, count)
|
|
420
|
+
assertEquals(2.0, facade.currentTime, 0.0)
|
|
421
|
+
current.dispatchEvent(adBegin)
|
|
422
|
+
current.dispatchPlayerEvent(timeUpdate)
|
|
423
|
+
assertEquals(2, count)
|
|
424
|
+
facade.close()
|
|
425
|
+
current.dispatchEvent(adBegin)
|
|
426
|
+
current.dispatchEvent(timeUpdate)
|
|
427
|
+
current.close()
|
|
428
|
+
facade.close()
|
|
429
|
+
assertEquals(2, count)
|
|
430
|
+
}
|
|
431
|
+
|
|
432
|
+
@Test fun dispatchHonorsListenerRemovalUnregisterAndCloseDuringDelivery() {
|
|
433
|
+
for (native in listOf(false, true)) for (isAd in listOf(false, true)) for (action in listOf("remove", "unregister", "close")) {
|
|
434
|
+
val host = PlayerFacadeTestHost()
|
|
435
|
+
val facade = PlayerFacade(host.player)
|
|
436
|
+
val registration = facade.registerIntegration(object : Integration {})
|
|
437
|
+
val seen = mutableListOf<String>()
|
|
438
|
+
val adSecond = EventListener<AdBeginEvent> { seen.add("second") }
|
|
439
|
+
val playerSecond = EventListener<TimeUpdateEvent> { seen.add("second") }
|
|
440
|
+
val first = {
|
|
441
|
+
seen.add("first")
|
|
442
|
+
when (action) {
|
|
443
|
+
"remove" -> if (isAd) facade.ads.removeEventListener(AdsEventTypes.AD_BEGIN, adSecond) else facade.removeEventListener(PlayerEventTypes.TIMEUPDATE, playerSecond)
|
|
444
|
+
"unregister" -> registration.close()
|
|
445
|
+
else -> facade.close()
|
|
446
|
+
}
|
|
447
|
+
}
|
|
448
|
+
if (isAd) {
|
|
449
|
+
facade.ads.addEventListener(AdsEventTypes.AD_BEGIN) { first() }
|
|
450
|
+
facade.ads.addEventListener(AdsEventTypes.AD_BEGIN, adSecond)
|
|
451
|
+
if (native) host.emitAd(adBegin) else registration.dispatchEvent(adBegin)
|
|
452
|
+
} else {
|
|
453
|
+
facade.addEventListener(PlayerEventTypes.TIMEUPDATE) { first() }
|
|
454
|
+
facade.addEventListener(PlayerEventTypes.TIMEUPDATE, playerSecond)
|
|
455
|
+
if (native) host.emitPlayer(timeUpdate) else registration.dispatchEvent(timeUpdate)
|
|
456
|
+
}
|
|
457
|
+
val expected = if (native && !isAd && action == "unregister") listOf("first", "second") else listOf("first")
|
|
458
|
+
assertEquals("native=$native, isAd=$isAd, action=$action", expected, seen)
|
|
459
|
+
facade.close()
|
|
460
|
+
}
|
|
461
|
+
}
|
|
462
|
+
|
|
463
|
+
@Test fun nativeDestructionAlwaysClosesFacadeEvenWhenConsumedOrListenerThrows() {
|
|
464
|
+
for (mode in listOf("forward", "consume", "throw")) {
|
|
465
|
+
val host = PlayerFacadeTestHost()
|
|
466
|
+
val facade = PlayerFacade(host.player)
|
|
467
|
+
val registration = facade.registerIntegration(object : Integration {})
|
|
468
|
+
var count = 0
|
|
469
|
+
facade.addEventListener(PlayerEventTypes.DESTROY) {
|
|
470
|
+
count++
|
|
471
|
+
if (mode == "throw") throw IllegalStateException("listener failed")
|
|
472
|
+
}
|
|
473
|
+
facade.ads.addEventListener(AdsEventTypes.AD_BEGIN) {}
|
|
474
|
+
registration.interceptPlayerEvents { mode == "consume" }
|
|
475
|
+
if (mode == "throw") assertThrows(IllegalStateException::class.java) { host.emitPlayer(destroy) } else host.emitPlayer(destroy)
|
|
476
|
+
assertEquals(if (mode == "consume") 0 else 1, count)
|
|
477
|
+
assertTrue(host.playerListeners.values.all { it.isEmpty() })
|
|
478
|
+
assertTrue(host.adListeners.values.all { it.isEmpty() })
|
|
479
|
+
assertThrows(IllegalStateException::class.java) { facade.registerIntegration(object : Integration {}) }
|
|
480
|
+
assertThrows(IllegalStateException::class.java) { facade.addEventListener(PlayerEventTypes.PAUSE) {} }
|
|
481
|
+
assertThrows(IllegalStateException::class.java) { facade.ads.addEventListener(AdsEventTypes.AD_BEGIN) {} }
|
|
482
|
+
}
|
|
483
|
+
}
|
|
484
|
+
|
|
485
|
+
@Test fun listenerDeduplicationRemovalAndQueuedDeliveryAfterCloseAreSafe() {
|
|
486
|
+
val host = PlayerFacadeTestHost()
|
|
487
|
+
val facade = PlayerFacade(host.player)
|
|
488
|
+
var count = 0
|
|
489
|
+
val listener = EventListener<TimeUpdateEvent> { count++ }
|
|
490
|
+
facade.addEventListener(PlayerEventTypes.TIMEUPDATE, listener)
|
|
491
|
+
facade.addEventListener(PlayerEventTypes.TIMEUPDATE, listener)
|
|
492
|
+
host.emitPlayer(timeUpdate)
|
|
493
|
+
assertEquals(1, count)
|
|
494
|
+
@Suppress("UNCHECKED_CAST")
|
|
495
|
+
val queued = host.playerListeners[PlayerEventTypes.TIMEUPDATE]!!.single() as EventListener<TimeUpdateEvent>
|
|
496
|
+
facade.removeEventListener(PlayerEventTypes.TIMEUPDATE, listener)
|
|
497
|
+
queued.handleEvent(timeUpdate)
|
|
498
|
+
assertEquals(1, count)
|
|
499
|
+
facade.addEventListener(PlayerEventTypes.TIMEUPDATE, listener)
|
|
500
|
+
queued.handleEvent(timeUpdate)
|
|
501
|
+
assertEquals(1, count)
|
|
502
|
+
facade.close()
|
|
503
|
+
queued.handleEvent(timeUpdate)
|
|
504
|
+
assertEquals(1, count)
|
|
505
|
+
assertTrue(host.playerListeners.values.all { it.isEmpty() })
|
|
506
|
+
}
|
|
507
|
+
}
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
package com.theoplayer.integration
|
|
2
|
+
|
|
3
|
+
import com.theoplayer.android.api.ads.Ad
|
|
4
|
+
import com.theoplayer.android.api.ads.AdBreak
|
|
5
|
+
import com.theoplayer.android.api.ads.Ads
|
|
6
|
+
import com.theoplayer.android.api.event.Event
|
|
7
|
+
import com.theoplayer.android.api.event.EventListener
|
|
8
|
+
import com.theoplayer.android.api.event.EventType
|
|
9
|
+
import com.theoplayer.android.api.player.Player
|
|
10
|
+
import java.lang.reflect.Proxy
|
|
11
|
+
import java.util.Date
|
|
12
|
+
|
|
13
|
+
internal class PlayerFacadeTestHost {
|
|
14
|
+
val adListeners = linkedMapOf<EventType<*>, MutableSet<EventListener<*>>>()
|
|
15
|
+
val playerListeners = linkedMapOf<EventType<*>, MutableSet<EventListener<*>>>()
|
|
16
|
+
var currentTime = 123.0
|
|
17
|
+
var duration = 600.0
|
|
18
|
+
var paused = true
|
|
19
|
+
var seeking = false
|
|
20
|
+
var muted = false
|
|
21
|
+
var volume = 0.8
|
|
22
|
+
var adsReads = 0
|
|
23
|
+
var playingAds = false
|
|
24
|
+
var currentAds = emptyList<Ad>()
|
|
25
|
+
var currentBreak: AdBreak? = null
|
|
26
|
+
var failAdSubscription: EventType<*>? = null
|
|
27
|
+
val scheduledAds = mutableListOf<Ad>()
|
|
28
|
+
val commands = mutableListOf<String>()
|
|
29
|
+
val ads = facadeStub<Ads> { method, args ->
|
|
30
|
+
when (method) {
|
|
31
|
+
"isPlaying" -> playingAds
|
|
32
|
+
"getCurrentAds" -> currentAds
|
|
33
|
+
"getCurrentAdBreak" -> currentBreak
|
|
34
|
+
"getScheduledAds" -> scheduledAds
|
|
35
|
+
"addEventListener" -> {
|
|
36
|
+
add(adListeners, args)
|
|
37
|
+
check(args!![0] != failAdSubscription) { "subscription failed" }
|
|
38
|
+
null
|
|
39
|
+
}
|
|
40
|
+
"removeEventListener" -> remove(adListeners, args)
|
|
41
|
+
"skip", "schedule", "registerServerSideIntegration" -> { commands.add(method); null }
|
|
42
|
+
else -> null
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
val player = facadeStub<Player> { method, args ->
|
|
46
|
+
when (method) {
|
|
47
|
+
"getAds" -> { adsReads++; ads }
|
|
48
|
+
"getCurrentTime" -> currentTime
|
|
49
|
+
"getDuration" -> duration
|
|
50
|
+
"isPaused" -> paused
|
|
51
|
+
"isSeeking" -> seeking
|
|
52
|
+
"isMuted" -> muted
|
|
53
|
+
"getVolume" -> volume
|
|
54
|
+
"addEventListener" -> add(playerListeners, args)
|
|
55
|
+
"removeEventListener" -> remove(playerListeners, args)
|
|
56
|
+
"setCurrentTime" -> { commands.add(method); currentTime = args!![0] as Double; null }
|
|
57
|
+
"setMuted" -> { commands.add(method); muted = args!![0] as Boolean; null }
|
|
58
|
+
"setVolume" -> { commands.add(method); volume = args!![0] as Double; null }
|
|
59
|
+
"play" -> { commands.add(method); paused = false; null }
|
|
60
|
+
"pause" -> { commands.add(method); paused = true; null }
|
|
61
|
+
else -> null
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
private fun add(listeners: MutableMap<EventType<*>, MutableSet<EventListener<*>>>, args: Array<out Any?>?): Any? {
|
|
66
|
+
listeners.getOrPut(args!![0] as EventType<*>) { linkedSetOf() }.add(args[1] as EventListener<*>)
|
|
67
|
+
return null
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
private fun remove(listeners: MutableMap<EventType<*>, MutableSet<EventListener<*>>>, args: Array<out Any?>?): Any? {
|
|
71
|
+
listeners[args!![0]]?.remove(args[1])
|
|
72
|
+
return null
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
fun emitPlayer(event: Event<*>) = emit(playerListeners, event)
|
|
76
|
+
fun emitAd(event: Event<*>) = emit(adListeners, event)
|
|
77
|
+
|
|
78
|
+
private fun emit(listeners: Map<EventType<*>, Set<EventListener<*>>>, event: Event<*>) {
|
|
79
|
+
listeners[event.type]?.toList()?.forEach {
|
|
80
|
+
@Suppress("UNCHECKED_CAST")
|
|
81
|
+
(it as EventListener<Event<*>>).handleEvent(event)
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
internal inline fun <reified T> facadeStub(crossinline call: (String, Array<out Any?>?) -> Any?): T =
|
|
87
|
+
Proxy.newProxyInstance(T::class.java.classLoader, arrayOf(T::class.java)) { proxy, method, args ->
|
|
88
|
+
when (method.name) {
|
|
89
|
+
"equals" -> proxy === args?.get(0)
|
|
90
|
+
"hashCode" -> System.identityHashCode(proxy)
|
|
91
|
+
"toString" -> T::class.java.simpleName
|
|
92
|
+
else -> call(method.name, args)
|
|
93
|
+
}
|
|
94
|
+
} as T
|
|
95
|
+
|
|
96
|
+
internal inline fun <reified T> facadeEvent(type: EventType<*>, payload: Any? = null): T = facadeStub { method, _ ->
|
|
97
|
+
when (method) {
|
|
98
|
+
"getType" -> type
|
|
99
|
+
"getAd", "getAdBreak" -> payload
|
|
100
|
+
"getCurrentTime" -> 123.0
|
|
101
|
+
"getDate" -> Date(0)
|
|
102
|
+
else -> null
|
|
103
|
+
}
|
|
104
|
+
}
|
|
@@ -99,6 +99,13 @@ RCT_EXTERN_METHOD(setPresentationMode:(nonnull NSNumber *)node
|
|
|
99
99
|
RCT_EXTERN_METHOD(setAspectRatio:(nonnull NSNumber *)node
|
|
100
100
|
ratio:(nonnull NSString *)ratio)
|
|
101
101
|
|
|
102
|
+
RCT_EXTERN_METHOD(setManageContentMatching:(nonnull NSNumber *)node
|
|
103
|
+
enable:(BOOL)enable)
|
|
104
|
+
|
|
105
|
+
RCT_EXTERN_METHOD(getManageContentMatching:(nonnull NSNumber *)node
|
|
106
|
+
resolver:(RCTPromiseResolveBlock)resolve
|
|
107
|
+
rejecter:(RCTPromiseRejectBlock)reject)
|
|
108
|
+
|
|
102
109
|
RCT_EXTERN_METHOD(setPipConfig:(nonnull NSNumber *)node
|
|
103
110
|
pipConfig:(NSDictionary)pipConfig)
|
|
104
111
|
|
|
@@ -183,6 +190,18 @@ RCT_EXTERN_METHOD(removeAllFriendlyObstructions:(nonnull NSNumber *)node)
|
|
|
183
190
|
|
|
184
191
|
@end
|
|
185
192
|
|
|
193
|
+
// ----------------------------------------------------------------------------
|
|
194
|
+
// Metrics Module
|
|
195
|
+
// ----------------------------------------------------------------------------
|
|
196
|
+
|
|
197
|
+
@interface RCT_EXTERN_REMAP_MODULE(THEORCTMetricsModule, THEOplayerRCTMetricsAPI, NSObject)
|
|
198
|
+
|
|
199
|
+
RCT_EXTERN_METHOD(currentBandwidthEstimate:(nonnull NSNumber *)node
|
|
200
|
+
resolver:(RCTPromiseResolveBlock)resolve
|
|
201
|
+
rejecter:(RCTPromiseRejectBlock)reject)
|
|
202
|
+
|
|
203
|
+
@end
|
|
204
|
+
|
|
186
205
|
// ----------------------------------------------------------------------------
|
|
187
206
|
// ContentProtection Module
|
|
188
207
|
// ----------------------------------------------------------------------------
|
|
@@ -22,6 +22,9 @@ let TTS_PROP_COLOR_G = "g"
|
|
|
22
22
|
let TTS_PROP_COLOR_B = "b"
|
|
23
23
|
let TTS_PROP_COLOR_A = "a"
|
|
24
24
|
|
|
25
|
+
let ERROR_CODE_PLAYER_ACCESS_FAILURE = "player_access_failure"
|
|
26
|
+
let ERROR_MESSAGE_PLAYER_ACCESS_FAILURE = "Could not access THEOplayer"
|
|
27
|
+
|
|
25
28
|
@objc(THEOplayerRCTPlayerAPI)
|
|
26
29
|
class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
|
|
27
30
|
@objc var bridge: RCTBridge!
|
|
@@ -203,6 +206,34 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
|
|
|
203
206
|
}
|
|
204
207
|
}
|
|
205
208
|
|
|
209
|
+
@objc(setManageContentMatching:enable:)
|
|
210
|
+
func setManageContentMatching(_ node: NSNumber, enable: Bool) -> Void {
|
|
211
|
+
#if os(tvOS)
|
|
212
|
+
withViewAndPlayer(node) { _, player in
|
|
213
|
+
if player.manageContentMatching != enable {
|
|
214
|
+
if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Changing TheoPlayer's manageContentMatching to \(enable)") }
|
|
215
|
+
player.manageContentMatching = enable
|
|
216
|
+
}
|
|
217
|
+
}
|
|
218
|
+
#endif
|
|
219
|
+
}
|
|
220
|
+
|
|
221
|
+
// Not used by the THEOplayerAdapter, which reads the value from its cached player state.
|
|
222
|
+
// This getter exists for the e2e test app, allowing it to verify that the value was
|
|
223
|
+
// effectively applied on the native player.
|
|
224
|
+
@objc(getManageContentMatching:resolver:rejecter:)
|
|
225
|
+
func getManageContentMatching(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
|
|
226
|
+
#if os(tvOS)
|
|
227
|
+
withViewAndPlayer(node) { _, player in
|
|
228
|
+
resolve(player.manageContentMatching)
|
|
229
|
+
} onFailure: {
|
|
230
|
+
reject(ERROR_CODE_PLAYER_ACCESS_FAILURE, ERROR_MESSAGE_PLAYER_ACCESS_FAILURE, nil)
|
|
231
|
+
}
|
|
232
|
+
#else
|
|
233
|
+
resolve(false)
|
|
234
|
+
#endif
|
|
235
|
+
}
|
|
236
|
+
|
|
206
237
|
@objc(setPipConfig:pipConfig:)
|
|
207
238
|
func setPipConfig(_ node: NSNumber, pipConfig: NSDictionary) -> Void {
|
|
208
239
|
withView(node) { theView in
|