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.
Files changed (254) hide show
  1. package/CHANGELOG.md +38 -0
  2. package/README.md +69 -0
  3. package/android/build.gradle +3 -2
  4. package/android/gradle/wrapper/gradle-wrapper.jar +0 -0
  5. package/android/gradle/wrapper/gradle-wrapper.properties +1 -1
  6. package/android/gradlew +176 -110
  7. package/android/gradlew.bat +23 -18
  8. package/android/src/main/java/com/theoplayer/PlayerConfigAdapter.kt +6 -0
  9. package/android/src/main/java/com/theoplayer/PlayerEventEmitter.kt +2 -2
  10. package/android/src/main/java/com/theoplayer/ReactTHEOplayerContext.kt +37 -8
  11. package/android/src/main/java/com/theoplayer/ReactTHEOplayerPackage.kt +3 -0
  12. package/android/src/main/java/com/theoplayer/ReactTHEOplayerView.kt +51 -3
  13. package/android/src/main/java/com/theoplayer/ads/AdEventAdapter.kt +4 -0
  14. package/android/src/main/java/com/theoplayer/ads/AdsModule.kt +6 -6
  15. package/android/src/main/java/com/theoplayer/drm/ContentProtectionAdapter.kt +17 -5
  16. package/android/src/main/java/com/theoplayer/drm/ContentProtectionModule.kt +61 -7
  17. package/android/src/main/java/com/theoplayer/drm/ProxyContentProtectionIntegration.kt +12 -5
  18. package/android/src/main/java/com/theoplayer/drm/ProxyContentProtectionIntegrationFactory.kt +3 -1
  19. package/android/src/main/java/com/theoplayer/integration/Integration.kt +72 -0
  20. package/android/src/main/java/com/theoplayer/integration/IntegrationRegistration.kt +68 -0
  21. package/android/src/main/java/com/theoplayer/integration/PlayerFacade.kt +187 -0
  22. package/android/src/main/java/com/theoplayer/integration/PlayerFacadeAdState.kt +19 -0
  23. package/android/src/main/java/com/theoplayer/integration/PlayerFacadeAds.kt +73 -0
  24. package/android/src/main/java/com/theoplayer/integration/PlayerFacadeAdsBridge.kt +112 -0
  25. package/android/src/main/java/com/theoplayer/integration/PlayerFacadeEventSubscription.kt +11 -0
  26. package/android/src/main/java/com/theoplayer/integration/PlayerFacadeEvents.kt +139 -0
  27. package/android/src/main/java/com/theoplayer/metrics/MetricsModule.kt +37 -0
  28. package/android/src/main/java/com/theoplayer/theoads/THEOadsModule.kt +1 -1
  29. package/android/src/main/java/com/theoplayer/theolive/EndpointAdapter.kt +33 -0
  30. package/android/src/test/java/com/theoplayer/integration/PlayerFacadeAdsBridgeTest.kt +250 -0
  31. package/android/src/test/java/com/theoplayer/integration/PlayerFacadeConfigurationTest.kt +30 -0
  32. package/android/src/test/java/com/theoplayer/integration/PlayerFacadeTest.kt +507 -0
  33. package/android/src/test/java/com/theoplayer/integration/PlayerFacadeTestHost.kt +104 -0
  34. package/ios/THEOplayerRCTBridge.m +19 -0
  35. package/ios/THEOplayerRCTPlayerAPI.swift +31 -0
  36. package/ios/Theoplayer-Bridging-Header.h +0 -1
  37. package/ios/contentprotection/THEOplayerRCTContentProtectionAPI.swift +39 -9
  38. package/ios/contentprotection/THEOplayerRCTContentProtectionAggregator.swift +15 -11
  39. package/ios/contentprotection/THEOplayerRCTProxyContentProtectionIntegration.swift +12 -7
  40. package/ios/metrics/THEOplayerRCTMetricsAPI.swift +31 -0
  41. package/ios/theolive/THEOplayerRCTTHEOliveEventAdapter.swift +21 -0
  42. package/lib/commonjs/api/barrel.js +31 -20
  43. package/lib/commonjs/api/barrel.js.map +1 -1
  44. package/lib/commonjs/api/metrics/MetricsAPI.js +2 -0
  45. package/lib/commonjs/api/metrics/MetricsAPI.js.map +1 -0
  46. package/lib/commonjs/api/metrics/barrel.js +17 -0
  47. package/lib/commonjs/api/metrics/barrel.js.map +1 -0
  48. package/lib/commonjs/api/player/Integration.js +2 -0
  49. package/lib/commonjs/api/player/Integration.js.map +1 -0
  50. package/lib/commonjs/api/player/PlayerEventMap.js +1 -1
  51. package/lib/commonjs/api/player/THEOplayer.js.map +1 -1
  52. package/lib/commonjs/api/player/barrel.js +11 -0
  53. package/lib/commonjs/api/player/barrel.js.map +1 -1
  54. package/lib/commonjs/api/track/MediaTrack.js +16 -0
  55. package/lib/commonjs/api/track/MediaTrack.js.map +1 -1
  56. package/lib/commonjs/internal/THEOplayerView.js +2 -0
  57. package/lib/commonjs/internal/THEOplayerView.js.map +1 -1
  58. package/lib/commonjs/internal/THEOplayerView.web.js +3 -1
  59. package/lib/commonjs/internal/THEOplayerView.web.js.map +1 -1
  60. package/lib/commonjs/internal/adapter/DefaultNativePlayerState.js +1 -0
  61. package/lib/commonjs/internal/adapter/DefaultNativePlayerState.js.map +1 -1
  62. package/lib/commonjs/internal/adapter/THEOplayerAdapter.js +18 -0
  63. package/lib/commonjs/internal/adapter/THEOplayerAdapter.js.map +1 -1
  64. package/lib/commonjs/internal/adapter/THEOplayerWebAdapter.js +21 -4
  65. package/lib/commonjs/internal/adapter/THEOplayerWebAdapter.js.map +1 -1
  66. package/lib/commonjs/internal/adapter/WebEventForwarder.js +62 -11
  67. package/lib/commonjs/internal/adapter/WebEventForwarder.js.map +1 -1
  68. package/lib/commonjs/internal/adapter/metrics/MetricsNativeAdapter.js +18 -0
  69. package/lib/commonjs/internal/adapter/metrics/MetricsNativeAdapter.js.map +1 -0
  70. package/lib/commonjs/internal/adapter/metrics/MetricsWebAdapter.js +16 -0
  71. package/lib/commonjs/internal/adapter/metrics/MetricsWebAdapter.js.map +1 -0
  72. package/lib/commonjs/internal/adapter/web/IntegrationRegistration.js +6 -0
  73. package/lib/commonjs/internal/adapter/web/IntegrationRegistration.js.map +1 -0
  74. package/lib/commonjs/internal/adapter/web/PlayerFacade.js +258 -0
  75. package/lib/commonjs/internal/adapter/web/PlayerFacade.js.map +1 -0
  76. package/lib/commonjs/internal/adapter/web/PlayerFacadeAPI.js +6 -0
  77. package/lib/commonjs/internal/adapter/web/PlayerFacadeAPI.js.map +1 -0
  78. package/lib/commonjs/internal/adapter/web/PlayerFacadeAdsEvents.js +114 -0
  79. package/lib/commonjs/internal/adapter/web/PlayerFacadeAdsEvents.js.map +1 -0
  80. package/lib/commonjs/internal/adapter/web/PlayerFacadeIntegration.js +6 -0
  81. package/lib/commonjs/internal/adapter/web/PlayerFacadeIntegration.js.map +1 -0
  82. package/lib/commonjs/internal/adapter/web/PlayerFacadeTypes.js +6 -0
  83. package/lib/commonjs/internal/adapter/web/PlayerFacadeTypes.js.map +1 -0
  84. package/lib/commonjs/internal/drm/ContentProtectionRegistry.js +38 -12
  85. package/lib/commonjs/internal/drm/ContentProtectionRegistry.js.map +1 -1
  86. package/lib/commonjs/manifest.json +1 -1
  87. package/lib/commonjs/plugins/typedoc-platform-icons/package-lock.json +200 -58
  88. package/lib/commonjs/plugins/typedoc-platform-icons/package.json +1 -1
  89. package/lib/commonjs/plugins/typedoc-platform-icons/tsconfig.json +2 -1
  90. package/lib/module/api/barrel.js +1 -0
  91. package/lib/module/api/barrel.js.map +1 -1
  92. package/lib/module/api/metrics/MetricsAPI.js +2 -0
  93. package/lib/module/api/metrics/MetricsAPI.js.map +1 -0
  94. package/lib/module/api/metrics/barrel.js +4 -0
  95. package/lib/module/api/metrics/barrel.js.map +1 -0
  96. package/lib/module/api/player/Integration.js +2 -0
  97. package/lib/module/api/player/Integration.js.map +1 -0
  98. package/lib/module/api/player/PlayerEventMap.js +1 -1
  99. package/lib/module/api/player/THEOplayer.js.map +1 -1
  100. package/lib/module/api/player/barrel.js +1 -0
  101. package/lib/module/api/player/barrel.js.map +1 -1
  102. package/lib/module/api/track/MediaTrack.js +16 -0
  103. package/lib/module/api/track/MediaTrack.js.map +1 -1
  104. package/lib/module/internal/THEOplayerView.js +2 -0
  105. package/lib/module/internal/THEOplayerView.js.map +1 -1
  106. package/lib/module/internal/THEOplayerView.web.js +3 -1
  107. package/lib/module/internal/THEOplayerView.web.js.map +1 -1
  108. package/lib/module/internal/adapter/DefaultNativePlayerState.js +1 -0
  109. package/lib/module/internal/adapter/DefaultNativePlayerState.js.map +1 -1
  110. package/lib/module/internal/adapter/THEOplayerAdapter.js +18 -0
  111. package/lib/module/internal/adapter/THEOplayerAdapter.js.map +1 -1
  112. package/lib/module/internal/adapter/THEOplayerWebAdapter.js +21 -4
  113. package/lib/module/internal/adapter/THEOplayerWebAdapter.js.map +1 -1
  114. package/lib/module/internal/adapter/WebEventForwarder.js +62 -11
  115. package/lib/module/internal/adapter/WebEventForwarder.js.map +1 -1
  116. package/lib/module/internal/adapter/metrics/MetricsNativeAdapter.js +13 -0
  117. package/lib/module/internal/adapter/metrics/MetricsNativeAdapter.js.map +1 -0
  118. package/lib/module/internal/adapter/metrics/MetricsWebAdapter.js +11 -0
  119. package/lib/module/internal/adapter/metrics/MetricsWebAdapter.js.map +1 -0
  120. package/lib/module/internal/adapter/web/IntegrationRegistration.js +4 -0
  121. package/lib/module/internal/adapter/web/IntegrationRegistration.js.map +1 -0
  122. package/lib/module/internal/adapter/web/PlayerFacade.js +253 -0
  123. package/lib/module/internal/adapter/web/PlayerFacade.js.map +1 -0
  124. package/lib/module/internal/adapter/web/PlayerFacadeAPI.js +4 -0
  125. package/lib/module/internal/adapter/web/PlayerFacadeAPI.js.map +1 -0
  126. package/lib/module/internal/adapter/web/PlayerFacadeAdsEvents.js +109 -0
  127. package/lib/module/internal/adapter/web/PlayerFacadeAdsEvents.js.map +1 -0
  128. package/lib/module/internal/adapter/web/PlayerFacadeIntegration.js +4 -0
  129. package/lib/module/internal/adapter/web/PlayerFacadeIntegration.js.map +1 -0
  130. package/lib/module/internal/adapter/web/PlayerFacadeTypes.js +4 -0
  131. package/lib/module/internal/adapter/web/PlayerFacadeTypes.js.map +1 -0
  132. package/lib/module/internal/drm/ContentProtectionRegistry.js +38 -12
  133. package/lib/module/internal/drm/ContentProtectionRegistry.js.map +1 -1
  134. package/lib/module/manifest.json +1 -1
  135. package/lib/module/plugins/typedoc-platform-icons/package-lock.json +200 -58
  136. package/lib/module/plugins/typedoc-platform-icons/package.json +1 -1
  137. package/lib/module/plugins/typedoc-platform-icons/tsconfig.json +2 -1
  138. package/lib/typescript/__tests__/ContentProtectionRegistry.test.d.ts +2 -0
  139. package/lib/typescript/__tests__/ContentProtectionRegistry.test.d.ts.map +1 -0
  140. package/lib/typescript/__tests__/PlayerFacade.test.d.ts +2 -0
  141. package/lib/typescript/__tests__/PlayerFacade.test.d.ts.map +1 -0
  142. package/lib/typescript/__tests__/PlayerFacadeWebAdapter.test.d.ts +2 -0
  143. package/lib/typescript/__tests__/PlayerFacadeWebAdapter.test.d.ts.map +1 -0
  144. package/lib/typescript/__tests__/index.test.d.ts +13 -0
  145. package/lib/typescript/__tests__/index.test.d.ts.map +1 -1
  146. package/lib/typescript/api/THEOplayerView.d.ts +4 -0
  147. package/lib/typescript/api/THEOplayerView.d.ts.map +1 -1
  148. package/lib/typescript/api/barrel.d.ts +1 -0
  149. package/lib/typescript/api/barrel.d.ts.map +1 -1
  150. package/lib/typescript/api/config/PlayerConfiguration.d.ts +15 -0
  151. package/lib/typescript/api/config/PlayerConfiguration.d.ts.map +1 -1
  152. package/lib/typescript/api/error/ChromecastError.d.ts +2 -2
  153. package/lib/typescript/api/event/AdEvent.d.ts +1 -1
  154. package/lib/typescript/api/metrics/MetricsAPI.d.ts +21 -0
  155. package/lib/typescript/api/metrics/MetricsAPI.d.ts.map +1 -0
  156. package/lib/typescript/api/metrics/barrel.d.ts +2 -0
  157. package/lib/typescript/api/metrics/barrel.d.ts.map +1 -0
  158. package/lib/typescript/api/player/Integration.d.ts +88 -0
  159. package/lib/typescript/api/player/Integration.d.ts.map +1 -0
  160. package/lib/typescript/api/player/PlayerEventMap.d.ts +1 -1
  161. package/lib/typescript/api/player/THEOplayer.d.ts +19 -0
  162. package/lib/typescript/api/player/THEOplayer.d.ts.map +1 -1
  163. package/lib/typescript/api/player/barrel.d.ts +1 -0
  164. package/lib/typescript/api/player/barrel.d.ts.map +1 -1
  165. package/lib/typescript/api/theoads/interstitial/Interstitial.d.ts +1 -1
  166. package/lib/typescript/api/theolive/TheoLiveEndpoint.d.ts +23 -5
  167. package/lib/typescript/api/theolive/TheoLiveEndpoint.d.ts.map +1 -1
  168. package/lib/typescript/api/theolive/WebrtcOptions.d.ts +1 -1
  169. package/lib/typescript/api/track/MediaTrack.d.ts +21 -4
  170. package/lib/typescript/api/track/MediaTrack.d.ts.map +1 -1
  171. package/lib/typescript/internal/adapter/DefaultNativePlayerState.d.ts +1 -0
  172. package/lib/typescript/internal/adapter/DefaultNativePlayerState.d.ts.map +1 -1
  173. package/lib/typescript/internal/adapter/NativePlayerState.d.ts +1 -0
  174. package/lib/typescript/internal/adapter/NativePlayerState.d.ts.map +1 -1
  175. package/lib/typescript/internal/adapter/THEOplayerAdapter.d.ts +6 -1
  176. package/lib/typescript/internal/adapter/THEOplayerAdapter.d.ts.map +1 -1
  177. package/lib/typescript/internal/adapter/THEOplayerWebAdapter.d.ts +6 -1
  178. package/lib/typescript/internal/adapter/THEOplayerWebAdapter.d.ts.map +1 -1
  179. package/lib/typescript/internal/adapter/WebEventForwarder.d.ts +3 -0
  180. package/lib/typescript/internal/adapter/WebEventForwarder.d.ts.map +1 -1
  181. package/lib/typescript/internal/adapter/metrics/MetricsNativeAdapter.d.ts +7 -0
  182. package/lib/typescript/internal/adapter/metrics/MetricsNativeAdapter.d.ts.map +1 -0
  183. package/lib/typescript/internal/adapter/metrics/MetricsWebAdapter.d.ts +8 -0
  184. package/lib/typescript/internal/adapter/metrics/MetricsWebAdapter.d.ts.map +1 -0
  185. package/lib/typescript/internal/adapter/web/IntegrationRegistration.d.ts +53 -0
  186. package/lib/typescript/internal/adapter/web/IntegrationRegistration.d.ts.map +1 -0
  187. package/lib/typescript/internal/adapter/web/PlayerFacade.d.ts +26 -0
  188. package/lib/typescript/internal/adapter/web/PlayerFacade.d.ts.map +1 -0
  189. package/lib/typescript/internal/adapter/web/PlayerFacadeAPI.d.ts +33 -0
  190. package/lib/typescript/internal/adapter/web/PlayerFacadeAPI.d.ts.map +1 -0
  191. package/lib/typescript/internal/adapter/web/PlayerFacadeAdsEvents.d.ts +21 -0
  192. package/lib/typescript/internal/adapter/web/PlayerFacadeAdsEvents.d.ts.map +1 -0
  193. package/lib/typescript/internal/adapter/web/PlayerFacadeIntegration.d.ts +43 -0
  194. package/lib/typescript/internal/adapter/web/PlayerFacadeIntegration.d.ts.map +1 -0
  195. package/lib/typescript/internal/adapter/web/PlayerFacadeTypes.d.ts +13 -0
  196. package/lib/typescript/internal/adapter/web/PlayerFacadeTypes.d.ts.map +1 -0
  197. package/lib/typescript/internal/drm/ContentProtectionRegistry.d.ts +3 -1
  198. package/lib/typescript/internal/drm/ContentProtectionRegistry.d.ts.map +1 -1
  199. package/lib/typescript/internal/drm/NativeContentProtectionEvent.d.ts +5 -0
  200. package/lib/typescript/internal/drm/NativeContentProtectionEvent.d.ts.map +1 -1
  201. package/package.json +5 -6
  202. package/react-native-theoplayer.podspec +7 -7
  203. package/src/__tests__/ContentProtectionRegistry.test.ts +239 -0
  204. package/src/__tests__/PlayerFacade.test.ts +579 -0
  205. package/src/__tests__/PlayerFacadeWebAdapter.test.ts +193 -0
  206. package/src/__tests__/index.test.tsx +15 -1
  207. package/src/api/THEOplayerView.ts +5 -0
  208. package/src/api/barrel.ts +1 -0
  209. package/src/api/config/PlayerConfiguration.ts +16 -0
  210. package/src/api/error/ChromecastError.ts +2 -2
  211. package/src/api/event/AdEvent.ts +1 -1
  212. package/src/api/metrics/MetricsAPI.ts +20 -0
  213. package/src/api/metrics/barrel.ts +1 -0
  214. package/src/api/player/Integration.ts +97 -0
  215. package/src/api/player/PlayerEventMap.ts +1 -1
  216. package/src/api/player/THEOplayer.ts +21 -0
  217. package/src/api/player/barrel.ts +1 -0
  218. package/src/api/theoads/interstitial/Interstitial.ts +1 -1
  219. package/src/api/theolive/TheoLiveEndpoint.ts +24 -5
  220. package/src/api/theolive/WebrtcOptions.ts +1 -1
  221. package/src/api/track/MediaTrack.ts +21 -4
  222. package/src/internal/THEOplayerView.tsx +2 -2
  223. package/src/internal/THEOplayerView.web.tsx +2 -2
  224. package/src/internal/adapter/DefaultNativePlayerState.ts +1 -0
  225. package/src/internal/adapter/NativePlayerState.ts +1 -0
  226. package/src/internal/adapter/THEOplayerAdapter.ts +24 -0
  227. package/src/internal/adapter/THEOplayerWebAdapter.ts +27 -4
  228. package/src/internal/adapter/WebEventForwarder.ts +74 -13
  229. package/src/internal/adapter/metrics/MetricsNativeAdapter.ts +12 -0
  230. package/src/internal/adapter/metrics/MetricsWebAdapter.ts +14 -0
  231. package/src/internal/adapter/web/IntegrationRegistration.ts +57 -0
  232. package/src/internal/adapter/web/PlayerFacade.ts +281 -0
  233. package/src/internal/adapter/web/PlayerFacadeAPI.ts +35 -0
  234. package/src/internal/adapter/web/PlayerFacadeAdsEvents.ts +119 -0
  235. package/src/internal/adapter/web/PlayerFacadeIntegration.ts +45 -0
  236. package/src/internal/adapter/web/PlayerFacadeTypes.ts +14 -0
  237. package/src/internal/drm/ContentProtectionRegistry.ts +35 -17
  238. package/src/internal/drm/NativeContentProtectionEvent.ts +5 -0
  239. package/src/manifest.json +1 -1
  240. package/src/plugins/typedoc-platform-icons/package-lock.json +200 -58
  241. package/src/plugins/typedoc-platform-icons/package.json +1 -1
  242. package/src/plugins/typedoc-platform-icons/tsconfig.json +2 -1
  243. package/lib/typescript/plugins/expo/Common.d.ts +0 -13
  244. package/lib/typescript/plugins/expo/Common.d.ts.map +0 -1
  245. package/lib/typescript/plugins/expo/withCustomPod.d.ts +0 -2
  246. package/lib/typescript/plugins/expo/withCustomPod.d.ts.map +0 -1
  247. package/lib/typescript/plugins/expo/withTHEOplayer.d.ts +0 -4
  248. package/lib/typescript/plugins/expo/withTHEOplayer.d.ts.map +0 -1
  249. package/lib/typescript/plugins/expo/withTHEOplayerAndroid.d.ts +0 -4
  250. package/lib/typescript/plugins/expo/withTHEOplayerAndroid.d.ts.map +0 -1
  251. package/lib/typescript/plugins/expo/withTHEOplayerIOS.d.ts +0 -4
  252. package/lib/typescript/plugins/expo/withTHEOplayerIOS.d.ts.map +0 -1
  253. package/lib/typescript/plugins/typedoc-platform-icons/src/index.d.ts +0 -3
  254. package/lib/typescript/plugins/typedoc-platform-icons/src/index.d.ts.map +0 -1
@@ -5,14 +5,25 @@ import com.facebook.react.bridge.WritableMap
5
5
  import com.theoplayer.android.api.theolive.ContentProtectionConfiguration
6
6
  import com.theoplayer.android.api.theolive.Endpoint
7
7
  import com.theoplayer.android.api.theolive.EndpointMillicastSource
8
+ import com.theoplayer.android.api.theolive.EndpointSource
8
9
  import com.theoplayer.android.api.theolive.FairPlayConfiguration
9
10
  import com.theoplayer.android.api.theolive.KeySystemConfiguration
11
+ import com.theoplayer.android.api.theolive.PlayoutDelay
12
+ import com.theoplayer.android.api.theolive.WebRTCOptions
10
13
 
14
+ private const val PROP_SRC = "src"
15
+ private const val PROP_SRC_TYPE = "srcType"
16
+ private const val PROP_PROVIDER = "provider"
17
+ private const val PROP_AD_SYSTEM = "adSystem"
11
18
  private const val PROP_MILLICAST_SRC = "millicastSrc"
12
19
  private const val PROP_MILLICAST_NAME = "name"
13
20
  private const val PROP_MILLICAST_ACCOUNTID = "accountId"
14
21
  private const val PROP_MILLICAST_SUBSCRIBER_TOKEN ="subscriberToken"
15
22
  private const val PROP_MILLICAST_DIRECTOR_URL = "directorUrl"
23
+ private const val PROP_MILLICAST_WEBRTC = "webrtc"
24
+ private const val PROP_PLAYOUT_DELAY_MS = "playoutDelayMs"
25
+ private const val PROP_PLAYOUT_DELAY_MINIMUM = "minimum"
26
+ private const val PROP_PLAYOUT_DELAY_MAXIMUM = "maximum"
16
27
  private const val PROP_HESP_SRC = "hespSrc"
17
28
  private const val PROP_HLS_SRC = "hlsSrc"
18
29
  private const val PROP_HLS_MPEG_TS_SRC = "hlsMpegTsSrc"
@@ -32,12 +43,26 @@ private const val PROP_CERTIFICATE_URL = "certificateUrl"
32
43
 
33
44
  object EndpointAdapter {
34
45
 
46
+ private fun fromPlayoutDelay(playoutDelay: PlayoutDelay): WritableMap {
47
+ return Arguments.createMap().apply {
48
+ putInt(PROP_PLAYOUT_DELAY_MINIMUM, playoutDelay.minimum)
49
+ putInt(PROP_PLAYOUT_DELAY_MAXIMUM, playoutDelay.maximum)
50
+ }
51
+ }
52
+
53
+ private fun fromWebrtcOptions(webrtc: WebRTCOptions): WritableMap {
54
+ return Arguments.createMap().apply {
55
+ webrtc.playoutDelayMs?.let { putMap(PROP_PLAYOUT_DELAY_MS, fromPlayoutDelay(it)) }
56
+ }
57
+ }
58
+
35
59
  fun fromEndPointMillicastSource(millicastSource: EndpointMillicastSource): WritableMap {
36
60
  return Arguments.createMap().apply {
37
61
  putString(PROP_MILLICAST_NAME , millicastSource.name)
38
62
  putString(PROP_MILLICAST_ACCOUNTID, millicastSource.accountId)
39
63
  millicastSource.directorUrl?.let { putString(PROP_MILLICAST_DIRECTOR_URL, it) }
40
64
  millicastSource.subscriberToken?.let { putString(PROP_MILLICAST_SUBSCRIBER_TOKEN, it) }
65
+ millicastSource.webrtc?.let { putMap(PROP_MILLICAST_WEBRTC, fromWebrtcOptions(it)) }
41
66
  }
42
67
  }
43
68
 
@@ -50,12 +75,20 @@ object EndpointAdapter {
50
75
  endPoint.adSrc?.let { putString(PROP_AD_SRC, it) }
51
76
  endPoint.daiAssetKey?.let { putString(PROP_DAI_ASSET_KEY, it) }
52
77
  endPoint.cdn?.let { putString(PROP_CDN, it) }
78
+ endPoint.provider?.let { putString(PROP_PROVIDER, it) }
79
+ endPoint.adSystem?.let { putString(PROP_AD_SYSTEM, it) }
53
80
  endPoint.targetLatency?.let { putDouble(PROP_TARGET_LATENCY, it) }
54
81
  putInt(PROP_WEIGHT, endPoint.weight)
55
82
  putInt(PROP_PRIORITY, endPoint.priority)
56
83
  endPoint.contentProtection?.let {
57
84
  putMap(PROP_CONTENT_PROTECTION, fromContentProtection(it))
58
85
  }
86
+ when (val src = endPoint.src) {
87
+ is EndpointSource.Url -> putString(PROP_SRC, src.value)
88
+ is EndpointSource.Millicast -> putMap(PROP_SRC, fromEndPointMillicastSource(src.source))
89
+ null -> Unit
90
+ }
91
+ endPoint.srcType?.let { putString(PROP_SRC_TYPE, it) }
59
92
  }
60
93
  }
61
94
 
@@ -0,0 +1,250 @@
1
+ package com.theoplayer.integration
2
+
3
+ import com.google.ads.interactivemedia.v3.api.AdError
4
+ import com.theoplayer.android.api.ads.Ad
5
+ import com.theoplayer.android.api.ads.AdBreak
6
+ import com.theoplayer.android.api.ads.dai.GoogleDaiIntegration
7
+ import com.theoplayer.android.api.ads.ima.GoogleImaAdEvent
8
+ import com.theoplayer.android.api.ads.ima.GoogleImaAdEventType
9
+ import com.theoplayer.android.api.ads.ima.GoogleImaIntegration
10
+ import com.theoplayer.android.api.ads.wrapper.AdEventListener
11
+ import com.theoplayer.android.api.ads.wrapper.AdsApiWrapper
12
+ import com.theoplayer.android.api.event.EventType
13
+ import com.theoplayer.android.api.event.ads.*
14
+ import com.theoplayer.android.api.event.player.DestroyEvent
15
+ import com.theoplayer.android.api.event.player.PlayerEventTypes
16
+ import com.theoplayer.android.api.player.Player
17
+ import com.theoplayer.android.api.source.GoogleDaiTypedSource
18
+ import com.theoplayer.android.api.source.SourceDescription
19
+ import com.theoplayer.android.api.source.ssai.dai.GoogleDaiVodConfiguration
20
+ import com.theoplayer.android.api.source.addescription.GoogleImaAdDescription
21
+ import org.junit.Assert.*
22
+ import org.junit.Test
23
+
24
+ class PlayerFacadeAdsBridgeTest {
25
+ private val host = PlayerFacadeTestHost()
26
+ private val facade = PlayerFacade(host.player)
27
+ private val nativeApi = AdsApiWrapper()
28
+ private val bridge = PlayerFacadeAdsBridge(nativeApi)
29
+ private val received = mutableListOf<Pair<EventType<*>?, Any?>>()
30
+ private val listener = object : AdEventListener {
31
+ override fun <E : AdEvent<*>?> onAdEvent(type: EventType<E>?, ad: Ad?, adData: Map<String, String>?, adError: AdError?) {
32
+ received.add(type to ad)
33
+ }
34
+ override fun <E : AdEvent<*>?> onAdBreakEvent(type: EventType<E>?, adBreak: AdBreak?, adData: Map<String, String>?, adError: AdError?) {
35
+ received.add(type to adBreak)
36
+ }
37
+ }
38
+ private val adBreak = facadeStub<AdBreak> { method, _ -> if (method == "getId") "break" else null }
39
+ private val ad = facadeStub<Ad> { method, _ -> if (method == "getAdBreak") adBreak else null }
40
+
41
+ private fun initialize(imaSource: Boolean = true) {
42
+ bridge.initialize(facade, facadeStub<GoogleImaIntegration> { _, _ -> null }, null)
43
+ nativeApi.addAllEventsListener(listener)
44
+ nativeApi.addEventListener(AdsEventTypes.AD_CLICKED, listener)
45
+ nativeApi.addEventListener(AdsEventTypes.AD_TAPPED, listener)
46
+ bridge.setSource(if (imaSource) SourceDescription.Builder("test-content")
47
+ .ads(GoogleImaAdDescription.Builder("test-ad-tag").build()).build() else null)
48
+ }
49
+
50
+ @Test fun genericIntegrationStateNeverEntersNativeImaCasts() {
51
+ initialize()
52
+ var state: PlayerFacadeAdState? = PlayerFacadeAdState(true, listOf(ad), adBreak)
53
+ val registration = facade.registerIntegration(object : Integration { override fun getAdState() = state })
54
+ assertEquals(listOf(ad), bridge.currentAds)
55
+ assertSame(adBreak, bridge.currentAdBreak)
56
+ assertTrue(bridge.isPlaying)
57
+ assertEquals(emptyList<Ad>(), nativeApi.currentAds)
58
+ state = state!!.copy(currentAdBreak = null)
59
+ assertNull(bridge.currentAdBreak)
60
+ state = null
61
+ assertEquals(nativeApi.currentAds, bridge.currentAds)
62
+ registration.close()
63
+ assertEquals(nativeApi.currentAds, bridge.currentAds)
64
+ bridge.destroy()
65
+ facade.close()
66
+ }
67
+
68
+ @Test fun genericEventsAndClicksReachNativeSinkWithPlainAndImaSources() {
69
+ for (ima in listOf(false, true)) {
70
+ if (ima) initialize() else initialize(false)
71
+ val registration = facade.registerIntegration(object : Integration {})
72
+ registration.dispatchEvent(facadeEvent<AdBeginEvent>(AdsEventTypes.AD_BEGIN, ad))
73
+ registration.dispatchEvent(facadeEvent<AdClickedEvent>(AdsEventTypes.AD_CLICKED, ad))
74
+ registration.dispatchEvent(facadeEvent<AdTappedEvent>(AdsEventTypes.AD_TAPPED, ad))
75
+ registration.dispatchEvent(facadeEvent<AdBreakBeginEvent>(AdsEventTypes.AD_BREAK_BEGIN, adBreak))
76
+ assertEquals(listOf(AdsEventTypes.AD_BEGIN to ad, AdsEventTypes.AD_CLICKED to ad, AdsEventTypes.AD_TAPPED to ad, AdsEventTypes.AD_BREAK_BEGIN to adBreak), received)
77
+ registration.close()
78
+ bridge.destroy()
79
+ nativeApi.removeAllEventsListener(listener)
80
+ nativeApi.removeEventListener(AdsEventTypes.AD_CLICKED, listener)
81
+ nativeApi.removeEventListener(AdsEventTypes.AD_TAPPED, listener)
82
+ received.clear()
83
+ }
84
+ facade.close()
85
+ }
86
+
87
+ @Test fun nativeImaFilteringRunsOnceAndIntegrationImaEventsBypassIt() {
88
+ initialize()
89
+ var consume = true
90
+ var decisions = 0
91
+ var publicEvents = 0
92
+ val registration = facade.registerIntegration(object : Integration {
93
+ override fun shouldConsumeAdEvent(event: AdEvent<*>): Boolean { decisions++; return consume }
94
+ })
95
+ facade.ads.addEventListener(GoogleImaAdEventType.STARTED) { publicEvents++ }
96
+ val event = facadeStub<GoogleImaAdEvent> { method, _ ->
97
+ when (method) {
98
+ "getType" -> GoogleImaAdEventType.STARTED
99
+ "getAdData" -> emptyMap<String, String>()
100
+ else -> null
101
+ }
102
+ }
103
+ host.emitAd(event)
104
+ assertEquals(1, decisions)
105
+ assertTrue(received.isEmpty())
106
+ assertEquals(0, publicEvents)
107
+ consume = false
108
+ host.emitAd(event)
109
+ assertEquals(2, decisions)
110
+ assertEquals(listOf(GoogleImaAdEventType.STARTED to null), received)
111
+ registration.dispatchEvent(event)
112
+ assertEquals(2, decisions)
113
+ assertEquals(2, received.size)
114
+ assertEquals(2, publicEvents)
115
+ registration.close()
116
+ host.emitAd(event)
117
+ assertEquals(3, received.size)
118
+ assertEquals(2, decisions)
119
+ bridge.destroy()
120
+ facade.close()
121
+ }
122
+
123
+ @Test fun nativeWrapperKeepsRawClockAndStateDespiteIntegrationOverrides() {
124
+ initialize()
125
+ val registration = facade.registerIntegration(object : Integration { override fun getCurrentTime() = 2.0 })
126
+ val field = AdsApiWrapper::class.java.getDeclaredField("player").apply { isAccessible = true }
127
+ val backing = field.get(nativeApi) as Player
128
+ assertEquals(123.0, backing.currentTime, 0.0)
129
+ assertEquals(2.0, facade.currentTime, 0.0)
130
+ assertSame(host.ads.currentAds, backing.ads.currentAds)
131
+ registration.close()
132
+ bridge.destroy()
133
+ facade.close()
134
+ }
135
+
136
+ @Test fun customAdsControlsSchedulesAndEventsReturnToNativeAfterClose() {
137
+ initialize()
138
+ val custom = PlayerFacadeTestHost()
139
+ custom.scheduledAds.addAll(listOf(ad, ad))
140
+ custom.currentAds = listOf(ad)
141
+ custom.currentBreak = adBreak
142
+ custom.playingAds = true
143
+ val registration = facade.registerIntegration(object : Integration { override val ads = custom.ads })
144
+ assertEquals(listOf(ad), bridge.currentAds)
145
+ assertEquals(listOf(adBreak), bridge.scheduledAdBreaks)
146
+ assertSame(adBreak, bridge.currentAdBreak)
147
+ assertTrue(bridge.isPlaying)
148
+ bridge.skip()
149
+ bridge.schedule(GoogleImaAdDescription.Builder("test-ad-tag").build())
150
+ assertEquals(listOf("skip", "schedule"), custom.commands)
151
+ assertTrue(host.commands.isEmpty())
152
+ custom.emitAd(facadeEvent<AdBeginEvent>(AdsEventTypes.AD_BEGIN, ad))
153
+ assertEquals(listOf(AdsEventTypes.AD_BEGIN to ad), received)
154
+ registration.close()
155
+ assertTrue(custom.adListeners.values.all { it.isEmpty() })
156
+ bridge.skip()
157
+ assertEquals(listOf("skip"), host.commands)
158
+ assertEquals(nativeApi.scheduledAdBreaks, bridge.scheduledAdBreaks)
159
+ assertFalse(bridge.isPlaying)
160
+ assertTrue(bridge.currentAds.isEmpty())
161
+ bridge.destroy()
162
+ assertTrue(host.adListeners.values.all { it.isEmpty() })
163
+ facade.close()
164
+ }
165
+
166
+ @Test fun nullAdDescriptionsNeverReachNativeOrIntegrationScheduling() {
167
+ initialize()
168
+ bridge.schedule(null)
169
+ assertTrue(host.commands.isEmpty())
170
+ val custom = PlayerFacadeTestHost()
171
+ val registration = facade.registerIntegration(object : Integration { override val ads = custom.ads })
172
+ bridge.schedule(null)
173
+ assertTrue(custom.commands.isEmpty())
174
+ assertTrue(received.isEmpty())
175
+ registration.close()
176
+ bridge.destroy()
177
+ facade.close()
178
+ }
179
+
180
+ @Test fun nestedSyntheticDispatchDoesNotChangeNativeEventOrigin() {
181
+ initialize()
182
+ val registration = facade.registerIntegration(object : Integration {})
183
+ facade.ads.addEventListener(AdsEventTypes.AD_BEGIN) {
184
+ registration.dispatchEvent(facadeEvent<AdClickedEvent>(AdsEventTypes.AD_CLICKED, ad))
185
+ }
186
+ host.emitAd(facadeEvent<AdBeginEvent>(AdsEventTypes.AD_BEGIN, ad))
187
+ assertEquals(listOf(AdsEventTypes.AD_CLICKED to ad), received)
188
+ bridge.destroy()
189
+ facade.close()
190
+ }
191
+
192
+ @Test fun bridgeWithoutFacadePreservesNativeWrapperBehavior() {
193
+ bridge.initialize(host.player, null, null)
194
+ bridge.setSource(null)
195
+ host.currentAds = listOf(ad)
196
+ assertEquals(nativeApi.currentAds, bridge.currentAds)
197
+ assertEquals(nativeApi.currentAdBreak, bridge.currentAdBreak)
198
+ assertEquals(nativeApi.scheduledAdBreaks, bridge.scheduledAdBreaks)
199
+ bridge.skip()
200
+ assertEquals(listOf("skip"), host.commands)
201
+ bridge.destroy()
202
+ facade.close()
203
+ }
204
+
205
+ @Test fun daiSourceKeepsNativeFallbackAndAcceptsGenericIntegrationEvents() {
206
+ val dai = facadeStub<GoogleDaiIntegration> { method, _ -> if (method == "getCuePoints") emptyList<Any>() else null }
207
+ bridge.initialize(facade, null, dai)
208
+ nativeApi.addAllEventsListener(listener)
209
+ val config = GoogleDaiVodConfiguration("google-dai", contentSourceID = "test-content", videoID = "test-video")
210
+ bridge.setSource(SourceDescription.Builder(GoogleDaiTypedSource.Builder(config).build()).build())
211
+ assertEquals(nativeApi.scheduledAdBreaks, bridge.scheduledAdBreaks)
212
+ assertFalse(bridge.isPlaying)
213
+ val registration = facade.registerIntegration(object : Integration {
214
+ override fun getAdState() = PlayerFacadeAdState(true, listOf(ad), adBreak)
215
+ })
216
+ registration.dispatchEvent(facadeEvent<AdBeginEvent>(AdsEventTypes.AD_BEGIN, ad))
217
+ assertEquals(listOf(AdsEventTypes.AD_BEGIN to ad), received)
218
+ assertEquals(listOf(ad), bridge.currentAds)
219
+ registration.close()
220
+ assertEquals(nativeApi.currentAds, bridge.currentAds)
221
+ assertEquals(nativeApi.scheduledAdBreaks, bridge.scheduledAdBreaks)
222
+ bridge.destroy()
223
+ facade.close()
224
+ }
225
+
226
+ @Test fun destroyingContentNotifiesFacadeBeforeClosingAndAlwaysCleansUp() {
227
+ for (mode in listOf("event", "no-event", "throw", "listener-throws", "consumed")) {
228
+ val content = PlayerFacadeTestHost()
229
+ val player = PlayerFacade(content.player)
230
+ val registration = player.registerIntegration(object : Integration {})
231
+ var notified = 0
232
+ player.addEventListener(PlayerEventTypes.DESTROY) {
233
+ notified++
234
+ if (mode == "listener-throws") throw IllegalStateException("listener failed")
235
+ }
236
+ if (mode == "consumed") registration.interceptPlayerEvents { true }
237
+ val destroy = {
238
+ player.destroyContent {
239
+ if (mode == "throw") throw IllegalStateException("destroy failed")
240
+ if (mode != "no-event") content.emitPlayer(facadeEvent<DestroyEvent>(PlayerEventTypes.DESTROY))
241
+ }
242
+ }
243
+ if (mode == "throw" || mode == "listener-throws") assertThrows(IllegalStateException::class.java) { destroy() } else destroy()
244
+ assertEquals(if (mode == "event" || mode == "listener-throws") 1 else 0, notified)
245
+ assertThrows(IllegalStateException::class.java) { player.registerIntegration(object : Integration {}) }
246
+ assertTrue(content.playerListeners.values.all { it.isEmpty() })
247
+ }
248
+ facade.close()
249
+ }
250
+ }
@@ -0,0 +1,30 @@
1
+ package com.theoplayer.integration
2
+
3
+ import com.facebook.react.bridge.JavaOnlyMap
4
+ import com.theoplayer.PlayerConfigAdapter
5
+ import org.junit.Assert.*
6
+ import org.junit.Test
7
+
8
+ class PlayerFacadeConfigurationTest {
9
+ @Test fun facadeOptInDefaultsOffAndLeavesOriginalPlayerUntouched() {
10
+ for (props in listOf(null, JavaOnlyMap(), JavaOnlyMap.of("usePlayerFacade", false), JavaOnlyMap.of("usePlayerFacade", null))) {
11
+ val host = PlayerFacadeTestHost()
12
+ val enabled = PlayerConfigAdapter(props).usePlayerFacade()
13
+ assertFalse(enabled)
14
+ assertSame(host.player, PlayerFacade.create(host.player, enabled))
15
+ assertEquals(0, host.adsReads)
16
+ assertTrue(host.adListeners.isEmpty())
17
+ assertTrue(host.playerListeners.isEmpty())
18
+ }
19
+ }
20
+
21
+ @Test fun optInCreatesFacadeBeforeRegistrationAndExposesContentPlayer() {
22
+ val host = PlayerFacadeTestHost()
23
+ val enabled = PlayerConfigAdapter(JavaOnlyMap.of("usePlayerFacade", true)).usePlayerFacade()
24
+ assertTrue(enabled)
25
+ val player = PlayerFacade.create(host.player, enabled) as PlayerFacade
26
+ assertSame(host.player, player.contentPlayer)
27
+ assertNotSame(host.player, player)
28
+ player.close()
29
+ }
30
+ }