react-native-theoplayer 11.7.0 → 11.9.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 (152) hide show
  1. package/CHANGELOG.md +34 -0
  2. package/android/build.gradle +4 -2
  3. package/android/gradle/wrapper/gradle-wrapper.jar +0 -0
  4. package/android/gradle/wrapper/gradle-wrapper.properties +1 -1
  5. package/android/gradlew +176 -110
  6. package/android/gradlew.bat +23 -18
  7. package/android/src/main/java/com/theoplayer/ads/AdAdapter.kt +33 -7
  8. package/android/src/main/java/com/theoplayer/ads/AdEventAdapter.kt +8 -1
  9. package/android/src/main/java/com/theoplayer/drm/ContentProtectionAdapter.kt +24 -5
  10. package/android/src/main/java/com/theoplayer/drm/ContentProtectionModule.kt +61 -7
  11. package/android/src/main/java/com/theoplayer/drm/ProxyContentProtectionIntegration.kt +12 -5
  12. package/android/src/main/java/com/theoplayer/drm/ProxyContentProtectionIntegrationFactory.kt +3 -1
  13. package/android/src/main/java/com/theoplayer/source/SourceAdapter.kt +23 -0
  14. package/android/src/main/java/com/theoplayer/theolive/EndpointAdapter.kt +33 -0
  15. package/android/src/main/java/com/theoplayer/util/BridgeUtils.kt +4 -4
  16. package/android/src/test/java/com/theoplayer/ads/AdAdapterCustomDataTest.kt +144 -0
  17. package/ios/THEOplayerRCTBridge.m +7 -0
  18. package/ios/THEOplayerRCTMainEventHandler.swift +27 -1
  19. package/ios/THEOplayerRCTPlayerAPI.swift +20 -0
  20. package/ios/ads/THEOplayerRCTAdAdapter.swift +14 -3
  21. package/ios/ads/THEOplayerRCTAdsNative.swift +4 -0
  22. package/ios/contentprotection/THEOplayerRCTContentProtectionAPI.swift +39 -9
  23. package/ios/contentprotection/THEOplayerRCTContentProtectionAggregator.swift +15 -11
  24. package/ios/contentprotection/THEOplayerRCTProxyContentProtectionIntegration.swift +12 -7
  25. package/ios/theolive/THEOplayerRCTTHEOliveEventAdapter.swift +21 -0
  26. package/lib/commonjs/api/player/PlayerEventMap.js +1 -1
  27. package/lib/commonjs/api/source/abr/SourceAbrConfiguration.js +2 -0
  28. package/lib/commonjs/api/source/abr/SourceAbrConfiguration.js.map +1 -0
  29. package/lib/commonjs/api/source/abr/barrel.js +17 -0
  30. package/lib/commonjs/api/source/abr/barrel.js.map +1 -0
  31. package/lib/commonjs/api/source/barrel.js +18 -7
  32. package/lib/commonjs/api/source/barrel.js.map +1 -1
  33. package/lib/commonjs/internal/adapter/DefaultNativePlayerState.js +1 -0
  34. package/lib/commonjs/internal/adapter/DefaultNativePlayerState.js.map +1 -1
  35. package/lib/commonjs/internal/adapter/THEOplayerAdapter.js +9 -0
  36. package/lib/commonjs/internal/adapter/THEOplayerAdapter.js.map +1 -1
  37. package/lib/commonjs/internal/adapter/THEOplayerWebAdapter.js +13 -1
  38. package/lib/commonjs/internal/adapter/THEOplayerWebAdapter.js.map +1 -1
  39. package/lib/commonjs/internal/adapter/WebEventForwarder.js +61 -10
  40. package/lib/commonjs/internal/adapter/WebEventForwarder.js.map +1 -1
  41. package/lib/commonjs/internal/adapter/event/native/NativeTheoLiveEvent.js +2 -2
  42. package/lib/commonjs/internal/adapter/event/native/NativeTheoLiveEvent.js.map +1 -1
  43. package/lib/commonjs/internal/drm/ContentProtectionRegistry.js +38 -12
  44. package/lib/commonjs/internal/drm/ContentProtectionRegistry.js.map +1 -1
  45. package/lib/commonjs/manifest.json +1 -1
  46. package/lib/commonjs/plugins/typedoc-platform-icons/package-lock.json +200 -58
  47. package/lib/commonjs/plugins/typedoc-platform-icons/package.json +1 -1
  48. package/lib/commonjs/plugins/typedoc-platform-icons/tsconfig.json +2 -1
  49. package/lib/module/api/player/PlayerEventMap.js +1 -1
  50. package/lib/module/api/source/abr/SourceAbrConfiguration.js +2 -0
  51. package/lib/module/api/source/abr/SourceAbrConfiguration.js.map +1 -0
  52. package/lib/module/api/source/abr/barrel.js +4 -0
  53. package/lib/module/api/source/abr/barrel.js.map +1 -0
  54. package/lib/module/api/source/barrel.js +1 -0
  55. package/lib/module/api/source/barrel.js.map +1 -1
  56. package/lib/module/internal/adapter/DefaultNativePlayerState.js +1 -0
  57. package/lib/module/internal/adapter/DefaultNativePlayerState.js.map +1 -1
  58. package/lib/module/internal/adapter/THEOplayerAdapter.js +9 -0
  59. package/lib/module/internal/adapter/THEOplayerAdapter.js.map +1 -1
  60. package/lib/module/internal/adapter/THEOplayerWebAdapter.js +13 -1
  61. package/lib/module/internal/adapter/THEOplayerWebAdapter.js.map +1 -1
  62. package/lib/module/internal/adapter/WebEventForwarder.js +61 -10
  63. package/lib/module/internal/adapter/WebEventForwarder.js.map +1 -1
  64. package/lib/module/internal/adapter/event/native/NativeTheoLiveEvent.js +2 -2
  65. package/lib/module/internal/adapter/event/native/NativeTheoLiveEvent.js.map +1 -1
  66. package/lib/module/internal/drm/ContentProtectionRegistry.js +38 -12
  67. package/lib/module/internal/drm/ContentProtectionRegistry.js.map +1 -1
  68. package/lib/module/manifest.json +1 -1
  69. package/lib/module/plugins/typedoc-platform-icons/package-lock.json +200 -58
  70. package/lib/module/plugins/typedoc-platform-icons/package.json +1 -1
  71. package/lib/module/plugins/typedoc-platform-icons/tsconfig.json +2 -1
  72. package/lib/typescript/__tests__/ContentProtectionRegistry.test.d.ts +2 -0
  73. package/lib/typescript/__tests__/ContentProtectionRegistry.test.d.ts.map +1 -0
  74. package/lib/typescript/__tests__/NativeTheoLiveEvent.test.d.ts +2 -0
  75. package/lib/typescript/__tests__/NativeTheoLiveEvent.test.d.ts.map +1 -0
  76. package/lib/typescript/api/ads/Ad.d.ts +9 -0
  77. package/lib/typescript/api/ads/Ad.d.ts.map +1 -1
  78. package/lib/typescript/api/ads/AdBreak.d.ts +9 -0
  79. package/lib/typescript/api/ads/AdBreak.d.ts.map +1 -1
  80. package/lib/typescript/api/error/ChromecastError.d.ts +2 -2
  81. package/lib/typescript/api/player/PlayerEventMap.d.ts +1 -1
  82. package/lib/typescript/api/player/THEOplayer.d.ts +11 -0
  83. package/lib/typescript/api/player/THEOplayer.d.ts.map +1 -1
  84. package/lib/typescript/api/source/SourceDescription.d.ts +7 -0
  85. package/lib/typescript/api/source/SourceDescription.d.ts.map +1 -1
  86. package/lib/typescript/api/source/abr/SourceAbrConfiguration.d.ts +27 -0
  87. package/lib/typescript/api/source/abr/SourceAbrConfiguration.d.ts.map +1 -0
  88. package/lib/typescript/api/source/abr/barrel.d.ts +2 -0
  89. package/lib/typescript/api/source/abr/barrel.d.ts.map +1 -0
  90. package/lib/typescript/api/source/barrel.d.ts +1 -0
  91. package/lib/typescript/api/source/barrel.d.ts.map +1 -1
  92. package/lib/typescript/api/theoads/interstitial/Interstitial.d.ts +1 -1
  93. package/lib/typescript/api/theolive/TheoLiveEndpoint.d.ts +23 -5
  94. package/lib/typescript/api/theolive/TheoLiveEndpoint.d.ts.map +1 -1
  95. package/lib/typescript/api/theolive/WebrtcOptions.d.ts +1 -1
  96. package/lib/typescript/internal/adapter/DefaultNativePlayerState.d.ts +1 -0
  97. package/lib/typescript/internal/adapter/DefaultNativePlayerState.d.ts.map +1 -1
  98. package/lib/typescript/internal/adapter/NativePlayerState.d.ts +1 -0
  99. package/lib/typescript/internal/adapter/NativePlayerState.d.ts.map +1 -1
  100. package/lib/typescript/internal/adapter/THEOplayerAdapter.d.ts +2 -0
  101. package/lib/typescript/internal/adapter/THEOplayerAdapter.d.ts.map +1 -1
  102. package/lib/typescript/internal/adapter/THEOplayerWebAdapter.d.ts +2 -0
  103. package/lib/typescript/internal/adapter/THEOplayerWebAdapter.d.ts.map +1 -1
  104. package/lib/typescript/internal/adapter/WebEventForwarder.d.ts +3 -0
  105. package/lib/typescript/internal/adapter/WebEventForwarder.d.ts.map +1 -1
  106. package/lib/typescript/internal/adapter/web/PlayerFacadeAdsEvents.d.ts +2 -2
  107. package/lib/typescript/internal/adapter/web/PlayerFacadeAdsEvents.d.ts.map +1 -1
  108. package/lib/typescript/internal/drm/ContentProtectionRegistry.d.ts +3 -1
  109. package/lib/typescript/internal/drm/ContentProtectionRegistry.d.ts.map +1 -1
  110. package/lib/typescript/internal/drm/NativeContentProtectionEvent.d.ts +5 -0
  111. package/lib/typescript/internal/drm/NativeContentProtectionEvent.d.ts.map +1 -1
  112. package/package.json +5 -6
  113. package/react-native-theoplayer.podspec +6 -6
  114. package/src/__tests__/ContentProtectionRegistry.test.ts +239 -0
  115. package/src/__tests__/NativeTheoLiveEvent.test.ts +82 -0
  116. package/src/__tests__/PlayerFacadeWebAdapter.test.ts +13 -0
  117. package/src/api/ads/Ad.ts +10 -0
  118. package/src/api/ads/AdBreak.ts +10 -0
  119. package/src/api/error/ChromecastError.ts +2 -2
  120. package/src/api/player/PlayerEventMap.ts +1 -1
  121. package/src/api/player/THEOplayer.ts +12 -0
  122. package/src/api/source/SourceDescription.ts +8 -0
  123. package/src/api/source/abr/SourceAbrConfiguration.ts +27 -0
  124. package/src/api/source/abr/barrel.ts +1 -0
  125. package/src/api/source/barrel.ts +1 -0
  126. package/src/api/theoads/interstitial/Interstitial.ts +1 -1
  127. package/src/api/theolive/TheoLiveEndpoint.ts +24 -5
  128. package/src/api/theolive/WebrtcOptions.ts +1 -1
  129. package/src/internal/adapter/DefaultNativePlayerState.ts +1 -0
  130. package/src/internal/adapter/NativePlayerState.ts +1 -0
  131. package/src/internal/adapter/THEOplayerAdapter.ts +11 -0
  132. package/src/internal/adapter/THEOplayerWebAdapter.ts +15 -1
  133. package/src/internal/adapter/WebEventForwarder.ts +69 -10
  134. package/src/internal/adapter/event/native/NativeTheoLiveEvent.ts +2 -2
  135. package/src/internal/drm/ContentProtectionRegistry.ts +35 -17
  136. package/src/internal/drm/NativeContentProtectionEvent.ts +5 -0
  137. package/src/manifest.json +1 -1
  138. package/src/plugins/typedoc-platform-icons/package-lock.json +200 -58
  139. package/src/plugins/typedoc-platform-icons/package.json +1 -1
  140. package/src/plugins/typedoc-platform-icons/tsconfig.json +2 -1
  141. package/lib/typescript/plugins/expo/Common.d.ts +0 -13
  142. package/lib/typescript/plugins/expo/Common.d.ts.map +0 -1
  143. package/lib/typescript/plugins/expo/withCustomPod.d.ts +0 -2
  144. package/lib/typescript/plugins/expo/withCustomPod.d.ts.map +0 -1
  145. package/lib/typescript/plugins/expo/withTHEOplayer.d.ts +0 -4
  146. package/lib/typescript/plugins/expo/withTHEOplayer.d.ts.map +0 -1
  147. package/lib/typescript/plugins/expo/withTHEOplayerAndroid.d.ts +0 -4
  148. package/lib/typescript/plugins/expo/withTHEOplayerAndroid.d.ts.map +0 -1
  149. package/lib/typescript/plugins/expo/withTHEOplayerIOS.d.ts +0 -4
  150. package/lib/typescript/plugins/expo/withTHEOplayerIOS.d.ts.map +0 -1
  151. package/lib/typescript/plugins/typedoc-platform-icons/src/index.d.ts +0 -3
  152. package/lib/typescript/plugins/typedoc-platform-icons/src/index.d.ts.map +0 -1
@@ -34,6 +34,7 @@ let PROP_ADBREAK_MAX_REMAINING_DURATION: String = "maxRemainingDuration"
34
34
  let PROP_ADBREAK_ADS: String = "ads"
35
35
  let PROP_ADBREAK_INTEGRATION: String = "integration"
36
36
  let PROP_ADBREAK_CUSTOM_INTEGRATION: String = "customIntegration"
37
+ let PROP_CUSTOM_DATA: String = "customData"
37
38
  let PROP_COMPANION_AD_SLOT_ID: String = "adSlotId"
38
39
  let PROP_COMPANION_ALT_TEXT: String = "altText"
39
40
  let PROP_COMPANION_CLICK_THROUGH: String = "clickThrough"
@@ -49,6 +50,9 @@ class THEOplayerRCTAdAdapter {
49
50
  if let customIntegration = ad.customIntegration {
50
51
  adData[PROP_AD_CUSTOM_INTEGRATION] = customIntegration
51
52
  }
53
+ if let customData = ad.customData {
54
+ adData[PROP_CUSTOM_DATA] = customData
55
+ }
52
56
  adData[PROP_AD_TYPE] = ad.type
53
57
  if let adId = ad.id {
54
58
  adData[PROP_AD_ID] = adId
@@ -134,7 +138,7 @@ class THEOplayerRCTAdAdapter {
134
138
  return nil
135
139
  }
136
140
 
137
- return NativeLinearGoogleImaAd(adBreak: THEOplayerRCTAdAdapter.toAdBreak(adBreakData: adData[PROP_AD_BREAK] as? [String:Any]),
141
+ let ad = NativeLinearGoogleImaAd(adBreak: THEOplayerRCTAdAdapter.toAdBreak(adBreakData: adData[PROP_AD_BREAK] as? [String:Any]),
138
142
  companions: THEOplayerRCTAdAdapter.toCompanionAds(companiondAdsData: adData[PROP_AD_COMPANIONS] as? [[String : Any]]),
139
143
  type: (adData[PROP_AD_TYPE] as? String) ?? "",
140
144
  id: adData[PROP_AD_ID] as? String,
@@ -155,6 +159,8 @@ class THEOplayerRCTAdAdapter {
155
159
  vastMediaBitrate: (adData[PROP_GOOGLE_AD_BITRATE] as? Int) ?? 0,
156
160
  universalAdIds: THEOplayerRCTAdAdapter.toUniversalAdIds(universalAdIdsData: adData[PROP_AD_UNIVERSAL_AD_IDS] as? [[String:Any]]),
157
161
  traffickingParameters: "") // TODO
162
+ ad.customData = adData[PROP_CUSTOM_DATA] as? [String: Any]
163
+ return ad
158
164
  }
159
165
 
160
166
  private class func toUniversalAdIds(universalAdIdsData: [[String:Any]]?) -> [THEOplayerSDK.UniversalAdId] {
@@ -178,8 +184,11 @@ class THEOplayerRCTAdAdapter {
178
184
  adBreakData[PROP_ADBREAK_MAX_DURATION] = adBreak.maxDuration
179
185
  adBreakData[PROP_ADBREAK_TIME_OFFSET] = adBreak.timeOffset
180
186
  adBreakData[PROP_ADBREAK_MAX_REMAINING_DURATION] = adBreak.maxRemainingDuration
181
- adBreakData[PROP_ADBREAK_INTEGRATION] = adBreak.integration
187
+ adBreakData[PROP_ADBREAK_INTEGRATION] = adBreak.integration._rawValue
182
188
  adBreakData[PROP_ADBREAK_CUSTOM_INTEGRATION] = adBreak.customIntegration
189
+ if let customData = adBreak.customData {
190
+ adBreakData[PROP_CUSTOM_DATA] = customData
191
+ }
183
192
  // process adds when adbreak contains them
184
193
  if !adBreak.ads.isEmpty {
185
194
  var adList: [[String:Any]] = []
@@ -205,13 +214,15 @@ class THEOplayerRCTAdAdapter {
205
214
  }
206
215
  }
207
216
 
208
- return NativeAdBreak(ads: ads,
217
+ let adBreak = NativeAdBreak(ads: ads,
209
218
  id: adBreakData[PROP_ADBREAK_ID] as? String,
210
219
  maxDuration: lround((adBreakData[PROP_ADBREAK_MAX_DURATION] as? Double) ?? 0),
211
220
  maxRemainingDuration: (adBreakData[PROP_ADBREAK_MAX_REMAINING_DURATION] as? Double) ?? 0,
212
221
  timeOffset: lround((adBreakData[PROP_ADBREAK_TIME_OFFSET] as? Double) ?? 0),
213
222
  integration: THEOplayerRCTTypeUtils.adIntegrationKind((adBreakData[PROP_ADBREAK_INTEGRATION] as? String) ?? ""),
214
223
  customIntegration: adBreakData[PROP_ADBREAK_CUSTOM_INTEGRATION] as? String)
224
+ adBreak.customData = adBreakData[PROP_CUSTOM_DATA] as? [String: Any]
225
+ return adBreak
215
226
  }
216
227
 
217
228
  class func defaultAdBreak() -> NativeAdBreak {
@@ -30,6 +30,8 @@ class NativeAd: THEOplayerSDK.Ad {
30
30
  var clickThrough: String? = nil
31
31
  /**The type of custom ad integration.*/
32
32
  var customIntegration: String? = nil
33
+ /** Additional integration-specific data associated with this ad.*/
34
+ var customData: [String: Any]? = nil
33
35
 
34
36
  init(adBreak: AdBreak, companions: [THEOplayerSDK.CompanionAd], type: String, id: String? = nil, skipOffset: Int? = nil, resourceURI: String? = nil, width: Int? = nil, height: Int? = nil, isSlate: Bool = false, integration: THEOplayerSDK.AdIntegrationKind, duration: Int? = 0, clickThrough: String?, customIntegration: String?) {
35
37
  self.adBreak = adBreak
@@ -134,6 +136,8 @@ class NativeAdBreak: THEOplayerSDK.AdBreak {
134
136
  - For other integrations, this may be `nil`.
135
137
  */
136
138
  var id: String? = nil
139
+ /** Additional integration-specific data associated with this ad break.*/
140
+ var customData: [String: Any]? = nil
137
141
 
138
142
  init(ads: [Ad], id: String? = nil, maxDuration: Int, maxRemainingDuration: Double, timeOffset: Int, integration: THEOplayerSDK.AdIntegrationKind, customIntegration: String? = nil) {
139
143
  self.ads = ads
@@ -9,6 +9,7 @@ import THEOplayerSDK
9
9
 
10
10
  let CPI_EVENT_PROP_REQUEST_ID: String = "requestId"
11
11
  let CPI_EVENT_PROP_INTEGRATION_ID: String = "integrationId"
12
+ let CPI_EVENT_PROP_INTEGRATION_INSTANCE_ID: String = "integrationInstanceId"
12
13
  let CPI_EVENT_PROP_KEYSYSTEM_ID: String = "keySystemId"
13
14
  let CPI_EVENT_PROP_DRM_CONFIG: String = "drmConfig"
14
15
  let CPI_EVENT_PROP_FAIRPLAY_SKD_URL: String = "fairplaySkdUrl"
@@ -28,6 +29,7 @@ class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
28
29
  private var requestTimers: THEOplayerRCTSafeMap<String, Timer> = THEOplayerRCTSafeMap<String, Timer>() // [requestId : Timer]
29
30
  private var requestIntegrationIds: THEOplayerRCTSafeMap<String, String> = THEOplayerRCTSafeMap<String, String>() // [requestId : integrationId]
30
31
  private var requestKeySystemIds: THEOplayerRCTSafeMap<String, String> = THEOplayerRCTSafeMap<String, String>() // [requestId : keySystemId]
32
+ private var requestIntegrationInstanceIds: THEOplayerRCTSafeMap<String, String> = THEOplayerRCTSafeMap<String, String>() // [requestId : integrationInstanceId]
31
33
 
32
34
  override static func moduleName() -> String! {
33
35
  return "THEORCTContentProtectionModule"
@@ -43,7 +45,8 @@ class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
43
45
  "onCertificateResponse",
44
46
  "onLicenseRequest",
45
47
  "onLicenseResponse",
46
- "onExtractFairplayContentId"
48
+ "onExtractFairplayContentId",
49
+ "onIntegrationDisposed"
47
50
  ]
48
51
  }
49
52
 
@@ -55,13 +58,14 @@ class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
55
58
  }
56
59
 
57
60
  // MARK: Module actions
58
- func handleBuildIntegration(integrationId: String, keySystemId: String, drmConfig: DRMConfiguration, completion: @escaping (Bool) -> Void) {
61
+ func handleBuildIntegration(integrationId: String, keySystemId: String, integrationInstanceId: String, drmConfig: DRMConfiguration, completion: @escaping (Bool) -> Void) {
59
62
  if DEBUG_CONTENT_PROTECTION_API { print(CPI_TAG, "handleBuildIntegration.") }
60
63
  let requestId = UUID().uuidString
61
64
  self.buildIntegrationCompletions[requestId] = completion
62
65
  self.sendEvent(withName: "onBuildIntegration",
63
66
  body: THEOplayerRCTContentProtectionAggregator.aggregateDrmConfiguration(integrationId: integrationId,
64
67
  keySystemId: keySystemId,
68
+ integrationInstanceId: integrationInstanceId,
65
69
  requestId: requestId,
66
70
  drmConfig: drmConfig))
67
71
  self.requestTimers[requestId] = Timer.scheduledTimer(withTimeInterval: BRIDGE_REQUEST_TIMEOUT, repeats: false, block: { t in
@@ -71,15 +75,17 @@ class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
71
75
  })
72
76
  }
73
77
 
74
- func handleCertificateRequest(integrationId: String, keySystemId: String, certificateRequest: CertificateRequest, completion: @escaping (Data?, Error?) -> Void) {
78
+ func handleCertificateRequest(integrationId: String, keySystemId: String, integrationInstanceId: String, certificateRequest: CertificateRequest, completion: @escaping (Data?, Error?) -> Void) {
75
79
  if DEBUG_CONTENT_PROTECTION_API { print(CPI_TAG, "handleCertificateRequest.") }
76
80
  let requestId = UUID().uuidString
77
81
  self.requestIntegrationIds[requestId] = integrationId
78
82
  self.requestKeySystemIds[requestId] = keySystemId
83
+ self.requestIntegrationInstanceIds[requestId] = integrationInstanceId
79
84
  self.certificateRequestCompletions[requestId] = completion
80
85
  self.sendEvent(withName: "onCertificateRequest",
81
86
  body: THEOplayerRCTContentProtectionAggregator.aggregateCertificateRequest(integrationId: integrationId,
82
87
  keySystemId: keySystemId,
88
+ integrationInstanceId: integrationInstanceId,
83
89
  requestId: requestId,
84
90
  certificateRequest: certificateRequest))
85
91
  self.requestTimers[requestId] = Timer.scheduledTimer(withTimeInterval: BRIDGE_REQUEST_TIMEOUT, repeats: false, block: { t in
@@ -87,17 +93,19 @@ class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
87
93
  self.invalidateRequestWithId(requestId)
88
94
  _ = self.requestIntegrationIds.removeValue(forKey: requestId)
89
95
  _ = self.requestKeySystemIds.removeValue(forKey: requestId)
96
+ _ = self.requestIntegrationInstanceIds.removeValue(forKey: requestId)
90
97
  _ = self.certificateRequestCompletions.removeValue(forKey: requestId)
91
98
  })
92
99
  }
93
100
 
94
- func handleCertificateResponse(integrationId: String, keySystemId: String, certificateResponse: CertificateResponse, completion: @escaping (Data?, Error?) -> Void) {
101
+ func handleCertificateResponse(integrationId: String, keySystemId: String, integrationInstanceId: String, certificateResponse: CertificateResponse, completion: @escaping (Data?, Error?) -> Void) {
95
102
  if DEBUG_CONTENT_PROTECTION_API { print(CPI_TAG, "handleCertificateResponse.") }
96
103
  let requestId = UUID().uuidString
97
104
  self.certificateResponseCompletions[requestId] = completion
98
105
  self.sendEvent(withName: "onCertificateResponse",
99
106
  body: THEOplayerRCTContentProtectionAggregator.aggregateCertificateResponse(integrationId: integrationId,
100
107
  keySystemId: keySystemId,
108
+ integrationInstanceId: integrationInstanceId,
101
109
  requestId: requestId,
102
110
  certificateResponse: certificateResponse))
103
111
  self.requestTimers[requestId] = Timer.scheduledTimer(withTimeInterval: BRIDGE_REQUEST_TIMEOUT, repeats: false, block: { t in
@@ -107,15 +115,17 @@ class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
107
115
  })
108
116
  }
109
117
 
110
- func handleLicenseRequest(integrationId: String, keySystemId: String, licenseRequest: LicenseRequest, completion: @escaping (Data?, Error?) -> Void) {
118
+ func handleLicenseRequest(integrationId: String, keySystemId: String, integrationInstanceId: String, licenseRequest: LicenseRequest, completion: @escaping (Data?, Error?) -> Void) {
111
119
  if DEBUG_CONTENT_PROTECTION_API { print(CPI_TAG, "handleLicenseRequest.") }
112
120
  let requestId = UUID().uuidString
113
121
  self.requestIntegrationIds[requestId] = integrationId
114
122
  self.requestKeySystemIds[requestId] = keySystemId
123
+ self.requestIntegrationInstanceIds[requestId] = integrationInstanceId
115
124
  self.licenseRequestCompletions[requestId] = completion
116
125
  self.sendEvent(withName: "onLicenseRequest",
117
126
  body: THEOplayerRCTContentProtectionAggregator.aggregateLicenseRequest(integrationId: integrationId,
118
127
  keySystemId: keySystemId,
128
+ integrationInstanceId: integrationInstanceId,
119
129
  requestId: requestId,
120
130
  licenseRequest: licenseRequest))
121
131
  self.requestTimers[requestId] = Timer.scheduledTimer(withTimeInterval: BRIDGE_REQUEST_TIMEOUT, repeats: false, block: { t in
@@ -123,17 +133,19 @@ class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
123
133
  self.invalidateRequestWithId(requestId)
124
134
  _ = self.requestIntegrationIds.removeValue(forKey: requestId)
125
135
  _ = self.requestKeySystemIds.removeValue(forKey: requestId)
136
+ _ = self.requestIntegrationInstanceIds.removeValue(forKey: requestId)
126
137
  _ = self.licenseRequestCompletions.removeValue(forKey: requestId)
127
138
  })
128
139
  }
129
140
 
130
- func handleLicenseResponse(integrationId: String, keySystemId: String, licenseResponse: LicenseResponse, completion: @escaping (Data?, Error?) -> Void) {
141
+ func handleLicenseResponse(integrationId: String, keySystemId: String, integrationInstanceId: String, licenseResponse: LicenseResponse, completion: @escaping (Data?, Error?) -> Void) {
131
142
  if DEBUG_CONTENT_PROTECTION_API { print(CPI_TAG, "handleLicenseResponse.") }
132
143
  let requestId = UUID().uuidString
133
144
  self.licenseResponseCompletions[requestId] = completion
134
145
  self.sendEvent(withName: "onLicenseResponse",
135
146
  body: THEOplayerRCTContentProtectionAggregator.aggregateLicenseResponse(integrationId: integrationId,
136
147
  keySystemId: keySystemId,
148
+ integrationInstanceId: integrationInstanceId,
137
149
  requestId: requestId,
138
150
  licenseResponse: licenseResponse))
139
151
  self.requestTimers[requestId] = Timer.scheduledTimer(withTimeInterval: BRIDGE_REQUEST_TIMEOUT, repeats: false, block: { t in
@@ -143,13 +155,14 @@ class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
143
155
  })
144
156
  }
145
157
 
146
- func handleExtractFairplayContentId(integrationId: String, keySystemId: String, skdUrl: String, completion: @escaping (String, Error?) -> Void) {
158
+ func handleExtractFairplayContentId(integrationId: String, keySystemId: String, integrationInstanceId: String, skdUrl: String, completion: @escaping (String, Error?) -> Void) {
147
159
  if DEBUG_CONTENT_PROTECTION_API { print(CPI_TAG, "handleExtractFairplayContentId.") }
148
160
  let requestId = UUID().uuidString
149
161
  self.extractFairplayCompletions[requestId] = completion
150
162
  self.sendEvent(withName: "onExtractFairplayContentId", body: [
151
163
  CPI_EVENT_PROP_INTEGRATION_ID: integrationId,
152
164
  CPI_EVENT_PROP_KEYSYSTEM_ID: keySystemId,
165
+ CPI_EVENT_PROP_INTEGRATION_INSTANCE_ID: integrationInstanceId,
153
166
  CPI_EVENT_PROP_REQUEST_ID: requestId,
154
167
  CPI_EVENT_PROP_FAIRPLAY_SKD_URL: skdUrl
155
168
  ])
@@ -160,6 +173,15 @@ class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
160
173
  })
161
174
  }
162
175
 
176
+ func handleIntegrationDisposed(integrationId: String, keySystemId: String, integrationInstanceId: String) {
177
+ if DEBUG_CONTENT_PROTECTION_API { print(CPI_TAG, "handleIntegrationDisposed \(integrationInstanceId).") }
178
+ self.sendEvent(withName: "onIntegrationDisposed", body: [
179
+ CPI_EVENT_PROP_INTEGRATION_ID: integrationId,
180
+ CPI_EVENT_PROP_KEYSYSTEM_ID: keySystemId,
181
+ CPI_EVENT_PROP_INTEGRATION_INSTANCE_ID: integrationInstanceId
182
+ ])
183
+ }
184
+
163
185
  // MARK: Incoming JS Notifications
164
186
  @objc(registerContentProtectionIntegration:keySystemId:)
165
187
  func registerContentProtectionIntegration(_ integrationId: String, keySystemId: String) -> Void {
@@ -203,6 +225,7 @@ class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
203
225
  let url = URL(string: urlString),
204
226
  let method = result["method"] as? String,
205
227
  let headers = result["headers"] as? [String:String] {
228
+ let integrationInstanceId = self.requestIntegrationInstanceIds.removeValue(forKey: requestId) ?? ""
206
229
  var bodyData: Data?
207
230
  if let base64body = result["base64body"] as? String {
208
231
  bodyData = Data(base64Encoded: base64body, options: .ignoreUnknownCharacters)
@@ -219,7 +242,7 @@ class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
219
242
  if DEBUG_CONTENT_PROTECTION_API {print(CPI_TAG, "Certificate request success: statusCode = \(statusCode)") }
220
243
  let certificateRequest = CertificateRequest(url: urlString, method: method, headers: headers, body: bodyData)
221
244
  let certificateResponse = CertificateResponse(certificateRequest: certificateRequest, url: urlString, status: statusCode, statusText: "", headers: responseHeaders, body: data ?? Data())
222
- self.handleCertificateResponse(integrationId: integrationId, keySystemId: keySystemId, certificateResponse: certificateResponse) { data, error in
245
+ self.handleCertificateResponse(integrationId: integrationId, keySystemId: keySystemId, integrationInstanceId: integrationInstanceId, certificateResponse: certificateResponse) { data, error in
223
246
  completion(data, error)
224
247
  }
225
248
  }
@@ -234,6 +257,9 @@ class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
234
257
  if DEBUG_CONTENT_PROTECTION_API { print(CPI_TAG, "onCertificateRequestProcessedAsCertificate.") }
235
258
  if let requestId = result["requestId"] as? String,
236
259
  let completion = self.certificateRequestCompletions.removeValue(forKey: requestId) {
260
+ _ = self.requestIntegrationIds.removeValue(forKey: requestId)
261
+ _ = self.requestKeySystemIds.removeValue(forKey: requestId)
262
+ _ = self.requestIntegrationInstanceIds.removeValue(forKey: requestId)
237
263
  var bodyData = Data()
238
264
  if let base64body = result["base64body"] as? String {
239
265
  bodyData = Data(base64Encoded: base64body, options: .ignoreUnknownCharacters) ?? Data()
@@ -272,6 +298,7 @@ class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
272
298
  let url = URL(string: urlString),
273
299
  let method = result["method"] as? String,
274
300
  let headers = result["headers"] as? [String:String] {
301
+ let integrationInstanceId = self.requestIntegrationInstanceIds.removeValue(forKey: requestId) ?? ""
275
302
  var bodyData: Data?
276
303
  if let base64body = result["base64body"] as? String {
277
304
  bodyData = Data(base64Encoded: base64body, options: .ignoreUnknownCharacters)
@@ -288,7 +315,7 @@ class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
288
315
  if DEBUG_CONTENT_PROTECTION_API {print(CPI_TAG, "License request success: statusCode = \(statusCode)") }
289
316
  let licenseRequest = LicenseRequest(url: urlString, method: method, headers: headers, body: bodyData, fairplaySkdUrl: nil, useCredentials: false)
290
317
  let licenseResponse = LicenseResponse(licenseRequest: licenseRequest, url: urlString, status: statusCode, statusText: "", headers: responseHeaders, body: data ?? Data())
291
- self.handleLicenseResponse(integrationId: integrationId, keySystemId: keySystemId, licenseResponse: licenseResponse) { data, error in
318
+ self.handleLicenseResponse(integrationId: integrationId, keySystemId: keySystemId, integrationInstanceId: integrationInstanceId, licenseResponse: licenseResponse) { data, error in
292
319
  completion(data, error)
293
320
  }
294
321
  }
@@ -303,6 +330,9 @@ class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
303
330
  if DEBUG_CONTENT_PROTECTION_API { print(CPI_TAG, "onLicenseRequestProcessedAsLicense.") }
304
331
  if let requestId = result["requestId"] as? String,
305
332
  let completion = self.licenseRequestCompletions.removeValue(forKey: requestId) {
333
+ _ = self.requestIntegrationIds.removeValue(forKey: requestId)
334
+ _ = self.requestKeySystemIds.removeValue(forKey: requestId)
335
+ _ = self.requestIntegrationInstanceIds.removeValue(forKey: requestId)
306
336
  var bodyData = Data()
307
337
  if let base64body = result["base64body"] as? String {
308
338
  bodyData = Data(base64Encoded: base64body, options: .ignoreUnknownCharacters) ?? Data()
@@ -5,6 +5,7 @@ import THEOplayerSDK
5
5
 
6
6
  let DRM_PROP_INTEGRATION: String = "integration"
7
7
  let DRM_PROP_INTEGRATION_ID: String = "integrationId"
8
+ let DRM_PROP_INTEGRATION_INSTANCE_ID: String = "integrationInstanceId"
8
9
  let DRM_PROP_REQUEST_ID: String = "requestId"
9
10
  let DRM_PROP_KEYSYSTEM_ID: String = "keySystemId"
10
11
  let DRM_PROP_DRM_CONFIG: String = "drmConfig"
@@ -27,8 +28,8 @@ let CPI_AGGREGATOR_TAG: String = "[ContentProtectionAggregator]"
27
28
 
28
29
  class THEOplayerRCTContentProtectionAggregator {
29
30
 
30
- class func aggregateDrmConfiguration(integrationId: String, keySystemId: String, requestId: String, drmConfig: THEOplayerSDK.DRMConfiguration) -> [String:Any] {
31
- var aggregatedData: [String:Any] = THEOplayerRCTContentProtectionAggregator.bridgeData(integrationId: integrationId, keySystemId: keySystemId, requestId: requestId)
31
+ class func aggregateDrmConfiguration(integrationId: String, keySystemId: String, integrationInstanceId: String, requestId: String, drmConfig: THEOplayerSDK.DRMConfiguration) -> [String:Any] {
32
+ var aggregatedData: [String:Any] = THEOplayerRCTContentProtectionAggregator.bridgeData(integrationId: integrationId, keySystemId: keySystemId, integrationInstanceId: integrationInstanceId, requestId: requestId)
32
33
 
33
34
  var aggregatedDrmConfig: [String:Any] = [:]
34
35
  aggregatedDrmConfig[DRM_PROP_INTEGRATION] = drmConfig.customIntegrationId ?? "unknown"
@@ -51,8 +52,8 @@ class THEOplayerRCTContentProtectionAggregator {
51
52
  return aggregatedData
52
53
  }
53
54
 
54
- class func aggregateCertificateRequest(integrationId: String, keySystemId: String, requestId: String, certificateRequest: THEOplayerSDK.Request) -> [String:Any] {
55
- var aggregatedData: [String:Any] = THEOplayerRCTContentProtectionAggregator.bridgeData(integrationId: integrationId, keySystemId: keySystemId, requestId: requestId)
55
+ class func aggregateCertificateRequest(integrationId: String, keySystemId: String, integrationInstanceId: String, requestId: String, certificateRequest: THEOplayerSDK.Request) -> [String:Any] {
56
+ var aggregatedData: [String:Any] = THEOplayerRCTContentProtectionAggregator.bridgeData(integrationId: integrationId, keySystemId: keySystemId, integrationInstanceId: integrationInstanceId, requestId: requestId)
56
57
  aggregatedData[DRM_PROP_URL] = certificateRequest.url
57
58
  aggregatedData[DRM_PROP_METHOD] = certificateRequest.method
58
59
  aggregatedData[DRM_PROP_HEADERS] = certificateRequest.headers
@@ -62,22 +63,23 @@ class THEOplayerRCTContentProtectionAggregator {
62
63
  return aggregatedData
63
64
  }
64
65
 
65
- class func aggregateCertificateResponse(integrationId: String, keySystemId: String, requestId: String, certificateResponse: THEOplayerSDK.Response) -> [String:Any] {
66
- var aggregatedData: [String:Any] = THEOplayerRCTContentProtectionAggregator.bridgeData(integrationId: integrationId, keySystemId: keySystemId, requestId: requestId)
66
+ class func aggregateCertificateResponse(integrationId: String, keySystemId: String, integrationInstanceId: String, requestId: String, certificateResponse: THEOplayerSDK.Response) -> [String:Any] {
67
+ var aggregatedData: [String:Any] = THEOplayerRCTContentProtectionAggregator.bridgeData(integrationId: integrationId, keySystemId: keySystemId, integrationInstanceId: integrationInstanceId, requestId: requestId)
67
68
  aggregatedData[DRM_PROP_URL] = certificateResponse.url
68
69
  aggregatedData[DRM_PROP_STATUS] = certificateResponse.status
69
70
  aggregatedData[DRM_PROP_STATUS_TEXT] = certificateResponse.statusText
70
71
  aggregatedData[DRM_PROP_HEADERS] = certificateResponse.headers
71
72
  aggregatedData[DRM_PROP_REQUEST] = THEOplayerRCTContentProtectionAggregator.aggregateCertificateRequest(integrationId:integrationId,
72
73
  keySystemId:keySystemId,
74
+ integrationInstanceId: integrationInstanceId,
73
75
  requestId: requestId,
74
76
  certificateRequest: certificateResponse.request)
75
77
  aggregatedData[DRM_PROP_BASE64_BODY] = certificateResponse.body.base64EncodedString()
76
78
  return aggregatedData
77
79
  }
78
80
 
79
- class func aggregateLicenseRequest(integrationId: String, keySystemId: String, requestId: String, licenseRequest: THEOplayerSDK.Request) -> [String:Any] {
80
- var aggregatedData: [String:Any] = THEOplayerRCTContentProtectionAggregator.bridgeData(integrationId: integrationId, keySystemId: keySystemId, requestId: requestId)
81
+ class func aggregateLicenseRequest(integrationId: String, keySystemId: String, integrationInstanceId: String, requestId: String, licenseRequest: THEOplayerSDK.Request) -> [String:Any] {
82
+ var aggregatedData: [String:Any] = THEOplayerRCTContentProtectionAggregator.bridgeData(integrationId: integrationId, keySystemId: keySystemId, integrationInstanceId: integrationInstanceId, requestId: requestId)
81
83
  aggregatedData[DRM_PROP_URL] = licenseRequest.url
82
84
  aggregatedData[DRM_PROP_METHOD] = licenseRequest.method
83
85
  aggregatedData[DRM_PROP_HEADERS] = licenseRequest.headers
@@ -88,24 +90,26 @@ class THEOplayerRCTContentProtectionAggregator {
88
90
  return aggregatedData
89
91
  }
90
92
 
91
- class func aggregateLicenseResponse(integrationId: String, keySystemId: String, requestId: String, licenseResponse: THEOplayerSDK.Response) -> [String:Any] {
92
- var aggregatedData: [String:Any] = THEOplayerRCTContentProtectionAggregator.bridgeData(integrationId: integrationId, keySystemId: keySystemId, requestId: requestId)
93
+ class func aggregateLicenseResponse(integrationId: String, keySystemId: String, integrationInstanceId: String, requestId: String, licenseResponse: THEOplayerSDK.Response) -> [String:Any] {
94
+ var aggregatedData: [String:Any] = THEOplayerRCTContentProtectionAggregator.bridgeData(integrationId: integrationId, keySystemId: keySystemId, integrationInstanceId: integrationInstanceId, requestId: requestId)
93
95
  aggregatedData[DRM_PROP_URL] = licenseResponse.url
94
96
  aggregatedData[DRM_PROP_STATUS] = licenseResponse.status
95
97
  aggregatedData[DRM_PROP_STATUS_TEXT] = licenseResponse.statusText
96
98
  aggregatedData[DRM_PROP_HEADERS] = licenseResponse.headers
97
99
  aggregatedData[DRM_PROP_REQUEST] = THEOplayerRCTContentProtectionAggregator.aggregateLicenseRequest(integrationId:integrationId,
98
100
  keySystemId:keySystemId,
101
+ integrationInstanceId: integrationInstanceId,
99
102
  requestId: requestId,
100
103
  licenseRequest: licenseResponse.request)
101
104
  aggregatedData[DRM_PROP_BASE64_BODY] = licenseResponse.body.base64EncodedString()
102
105
  return aggregatedData
103
106
  }
104
107
 
105
- private class func bridgeData(integrationId: String, keySystemId: String, requestId: String) -> [String:Any] {
108
+ private class func bridgeData(integrationId: String, keySystemId: String, integrationInstanceId: String, requestId: String) -> [String:Any] {
106
109
  var aggregatedData: [String:Any] = [:]
107
110
  aggregatedData[DRM_PROP_REQUEST_ID] = requestId
108
111
  aggregatedData[DRM_PROP_INTEGRATION_ID] = integrationId
112
+ aggregatedData[DRM_PROP_INTEGRATION_INSTANCE_ID] = integrationInstanceId
109
113
  aggregatedData[DRM_PROP_KEYSYSTEM_ID] = keySystemId
110
114
  return aggregatedData
111
115
  }
@@ -21,16 +21,17 @@ class THEOplayerRCTProxyContentProtectionIntegration: THEOplayerSDK.ContentProte
21
21
  private weak var contentProtectionAPI: THEOplayerRCTContentProtectionAPI?
22
22
  private var integrationId: String!
23
23
  private var keySystemId: String!
24
+ private var integrationInstanceId: String = UUID().uuidString
24
25
  private var drmConfig: THEOplayerSDK.DRMConfiguration
25
26
  private var certificateResponseFinal = false
26
27
  private var licenseResponseFinal = false
27
-
28
+
28
29
  init(contentProtectionAPI: THEOplayerRCTContentProtectionAPI?, integrationId: String, keySystemId: String, drmConfig: THEOplayerSDK.DRMConfiguration) {
29
30
  self.contentProtectionAPI = contentProtectionAPI
30
31
  self.integrationId = integrationId
31
32
  self.keySystemId = keySystemId
32
33
  self.drmConfig = drmConfig
33
- self.contentProtectionAPI?.handleBuildIntegration(integrationId: integrationId, keySystemId: keySystemId, drmConfig: drmConfig, completion: { success in
34
+ self.contentProtectionAPI?.handleBuildIntegration(integrationId: integrationId, keySystemId: keySystemId, integrationInstanceId: self.integrationInstanceId, drmConfig: drmConfig, completion: { success in
34
35
  if success {
35
36
  print(PROXY_INTEGRATION_TAG, "Successfully created a THEOplayer ContentProtectionIntegration for \(integrationId) - \(keySystemId)")
36
37
  } else {
@@ -38,6 +39,10 @@ class THEOplayerRCTProxyContentProtectionIntegration: THEOplayerSDK.ContentProte
38
39
  }
39
40
  })
40
41
  }
42
+
43
+ deinit {
44
+ self.contentProtectionAPI?.handleIntegrationDisposed(integrationId: self.integrationId, keySystemId: self.keySystemId, integrationInstanceId: self.integrationInstanceId)
45
+ }
41
46
 
42
47
  func onCertificateRequest(request: CertificateRequest, callback: CertificateRequestCallback) {
43
48
  if DEBUG_CONTENT_PROTECTION_API { print(PROXY_INTEGRATION_TAG, "THEOplayer triggered an onCertificateRequest") }
@@ -45,7 +50,7 @@ class THEOplayerRCTProxyContentProtectionIntegration: THEOplayerSDK.ContentProte
45
50
  let processedLocally = self.handleCertificateRequestLocally(drmConfig: drmConfig, callback: callback)
46
51
  if !processedLocally {
47
52
  if DEBUG_CONTENT_PROTECTION_API { print(PROXY_INTEGRATION_TAG, "Handling certificate request through content protection integration.") }
48
- self.contentProtectionAPI?.handleCertificateRequest(integrationId: self.integrationId, keySystemId: self.keySystemId, certificateRequest: request) { certificateData, error in
53
+ self.contentProtectionAPI?.handleCertificateRequest(integrationId: self.integrationId, keySystemId: self.keySystemId, integrationInstanceId: self.integrationInstanceId, certificateRequest: request) { certificateData, error in
49
54
  if let error = error {
50
55
  callback.error(error: error)
51
56
  return
@@ -67,7 +72,7 @@ class THEOplayerRCTProxyContentProtectionIntegration: THEOplayerSDK.ContentProte
67
72
  callback.respond(certificate: response.body)
68
73
  } else {
69
74
  if DEBUG_CONTENT_PROTECTION_API { print(PROXY_INTEGRATION_TAG, "Certificate response was not final, processing...") }
70
- self.contentProtectionAPI?.handleCertificateResponse(integrationId: self.integrationId, keySystemId: self.keySystemId, certificateResponse: response) { certificateData, error in
75
+ self.contentProtectionAPI?.handleCertificateResponse(integrationId: self.integrationId, keySystemId: self.keySystemId, integrationInstanceId: self.integrationInstanceId, certificateResponse: response) { certificateData, error in
71
76
  if let error = error {
72
77
  callback.error(error: error)
73
78
  return
@@ -85,7 +90,7 @@ class THEOplayerRCTProxyContentProtectionIntegration: THEOplayerSDK.ContentProte
85
90
  func onLicenseRequest(request: LicenseRequest, callback: LicenseRequestCallback) {
86
91
  if DEBUG_CONTENT_PROTECTION_API { print(PROXY_INTEGRATION_TAG, "THEOplayer triggered an onLicenseRequest") }
87
92
  self.licenseResponseFinal = false
88
- self.contentProtectionAPI?.handleLicenseRequest(integrationId: self.integrationId, keySystemId: self.keySystemId, licenseRequest: request) { licenseData, error in
93
+ self.contentProtectionAPI?.handleLicenseRequest(integrationId: self.integrationId, keySystemId: self.keySystemId, integrationInstanceId: self.integrationInstanceId, licenseRequest: request) { licenseData, error in
89
94
  if let error = error {
90
95
  callback.error(error: error)
91
96
  return
@@ -106,7 +111,7 @@ class THEOplayerRCTProxyContentProtectionIntegration: THEOplayerSDK.ContentProte
106
111
  callback.respond(license: response.body)
107
112
  } else {
108
113
  if DEBUG_CONTENT_PROTECTION_API { print(PROXY_INTEGRATION_TAG, "License response was not final, processing...") }
109
- self.contentProtectionAPI?.handleLicenseResponse(integrationId: self.integrationId, keySystemId: self.keySystemId, licenseResponse: response) { licenseData, error in
114
+ self.contentProtectionAPI?.handleLicenseResponse(integrationId: self.integrationId, keySystemId: self.keySystemId, integrationInstanceId: self.integrationInstanceId, licenseResponse: response) { licenseData, error in
110
115
  if let error = error {
111
116
  callback.error(error: error)
112
117
  return
@@ -123,7 +128,7 @@ class THEOplayerRCTProxyContentProtectionIntegration: THEOplayerSDK.ContentProte
123
128
 
124
129
  func onExtractFairplayContentId(skdUrl: String, callback: ExtractContentIdCallback) {
125
130
  if DEBUG_CONTENT_PROTECTION_API { print(PROXY_INTEGRATION_TAG, "THEOplayer triggered an extractFairplayContentId") }
126
- self.contentProtectionAPI?.handleExtractFairplayContentId(integrationId: self.integrationId, keySystemId: self.keySystemId, skdUrl: skdUrl) { contentId, error in
131
+ self.contentProtectionAPI?.handleExtractFairplayContentId(integrationId: self.integrationId, keySystemId: self.keySystemId, integrationInstanceId: self.integrationInstanceId, skdUrl: skdUrl) { contentId, error in
127
132
  if let error = error {
128
133
  print(PROXY_INTEGRATION_TAG, "We encountered an issue while extracting the fairplay contentId: \(error.localizedDescription)")
129
134
  callback.error(error: error)
@@ -7,6 +7,10 @@ import THEOplayerSDK
7
7
  import THEOplayerTHEOliveIntegration
8
8
  #endif
9
9
 
10
+ let PROP_ENDPOINT_SRC: String = "src"
11
+ let PROP_ENDPOINT_SRC_TYPE: String = "srcType"
12
+ let PROP_ENDPOINT_PROVIDER: String = "provider"
13
+ let PROP_ENDPOINT_AD_SYSTEM: String = "adSystem"
10
14
  let PROP_ENDPOINT_HESP_SRC: String = "hespSrc"
11
15
  let PROP_ENDPOINT_HLS_SRC: String = "hlsSrc"
12
16
  let PROP_ENDPOINT_HLS_MPEG_TS_SRC: String = "hlsMpegTsSrc"
@@ -69,6 +73,23 @@ class THEOplayerRCTTHEOliveEventAdapter {
69
73
  }
70
74
  endpointData[PROP_ENDPOINT_WEIGHT] = endpoint.weight
71
75
  endpointData[PROP_ENDPOINT_PRIORITY] = endpoint.priority
76
+ switch endpoint.src {
77
+ case .url(let url):
78
+ endpointData[PROP_ENDPOINT_SRC] = url
79
+ case .millicast(let millicastSrc):
80
+ endpointData[PROP_ENDPOINT_SRC] = millicastSrc.toJSONEncodableDictionary()
81
+ case nil:
82
+ break
83
+ }
84
+ if let srcType = endpoint.srcType {
85
+ endpointData[PROP_ENDPOINT_SRC_TYPE] = srcType
86
+ }
87
+ if let provider = endpoint.provider {
88
+ endpointData[PROP_ENDPOINT_PROVIDER] = provider
89
+ }
90
+ if let adSystem = endpoint.adSystem {
91
+ endpointData[PROP_ENDPOINT_AD_SYSTEM] = adSystem
92
+ }
72
93
  return endpointData
73
94
  }
74
95
 
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.PlayerEventType = void 0;
7
7
  /**
8
- * The event types dispatched by the {@link Player}.
8
+ * The event types dispatched by the {@link react-native-theoplayer!THEOplayer}.
9
9
  *
10
10
  * @category Player
11
11
  * @category Events
@@ -0,0 +1,2 @@
1
+ "use strict";
2
+ //# sourceMappingURL=SourceAbrConfiguration.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"names":[],"sourceRoot":"../../../../../src","sources":["api/source/abr/SourceAbrConfiguration.ts"],"mappings":"","ignoreList":[]}
@@ -0,0 +1,17 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ var _SourceAbrConfiguration = require("./SourceAbrConfiguration");
7
+ Object.keys(_SourceAbrConfiguration).forEach(function (key) {
8
+ if (key === "default" || key === "__esModule") return;
9
+ if (key in exports && exports[key] === _SourceAbrConfiguration[key]) return;
10
+ Object.defineProperty(exports, key, {
11
+ enumerable: true,
12
+ get: function () {
13
+ return _SourceAbrConfiguration[key];
14
+ }
15
+ });
16
+ });
17
+ //# sourceMappingURL=barrel.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"names":["_SourceAbrConfiguration","require","Object","keys","forEach","key","exports","defineProperty","enumerable","get"],"sourceRoot":"../../../../../src","sources":["api/source/abr/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","ignoreList":[]}
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- var _barrel = require("./ads/barrel");
6
+ var _barrel = require("./abr/barrel");
7
7
  Object.keys(_barrel).forEach(function (key) {
8
8
  if (key === "default" || key === "__esModule") return;
9
9
  if (key in exports && exports[key] === _barrel[key]) return;
@@ -14,7 +14,7 @@ Object.keys(_barrel).forEach(function (key) {
14
14
  }
15
15
  });
16
16
  });
17
- var _barrel2 = require("./analytics/barrel");
17
+ var _barrel2 = require("./ads/barrel");
18
18
  Object.keys(_barrel2).forEach(function (key) {
19
19
  if (key === "default" || key === "__esModule") return;
20
20
  if (key in exports && exports[key] === _barrel2[key]) return;
@@ -25,7 +25,7 @@ Object.keys(_barrel2).forEach(function (key) {
25
25
  }
26
26
  });
27
27
  });
28
- var _barrel3 = require("./drm/barrel");
28
+ var _barrel3 = require("./analytics/barrel");
29
29
  Object.keys(_barrel3).forEach(function (key) {
30
30
  if (key === "default" || key === "__esModule") return;
31
31
  if (key in exports && exports[key] === _barrel3[key]) return;
@@ -36,7 +36,7 @@ Object.keys(_barrel3).forEach(function (key) {
36
36
  }
37
37
  });
38
38
  });
39
- var _barrel4 = require("./dash/barrel");
39
+ var _barrel4 = require("./drm/barrel");
40
40
  Object.keys(_barrel4).forEach(function (key) {
41
41
  if (key === "default" || key === "__esModule") return;
42
42
  if (key in exports && exports[key] === _barrel4[key]) return;
@@ -47,7 +47,7 @@ Object.keys(_barrel4).forEach(function (key) {
47
47
  }
48
48
  });
49
49
  });
50
- var _barrel5 = require("./hls/barrel");
50
+ var _barrel5 = require("./dash/barrel");
51
51
  Object.keys(_barrel5).forEach(function (key) {
52
52
  if (key === "default" || key === "__esModule") return;
53
53
  if (key in exports && exports[key] === _barrel5[key]) return;
@@ -58,7 +58,7 @@ Object.keys(_barrel5).forEach(function (key) {
58
58
  }
59
59
  });
60
60
  });
61
- var _barrel6 = require("./latency/barrel");
61
+ var _barrel6 = require("./hls/barrel");
62
62
  Object.keys(_barrel6).forEach(function (key) {
63
63
  if (key === "default" || key === "__esModule") return;
64
64
  if (key in exports && exports[key] === _barrel6[key]) return;
@@ -69,7 +69,7 @@ Object.keys(_barrel6).forEach(function (key) {
69
69
  }
70
70
  });
71
71
  });
72
- var _barrel7 = require("./metadata/barrel");
72
+ var _barrel7 = require("./latency/barrel");
73
73
  Object.keys(_barrel7).forEach(function (key) {
74
74
  if (key === "default" || key === "__esModule") return;
75
75
  if (key in exports && exports[key] === _barrel7[key]) return;
@@ -80,6 +80,17 @@ Object.keys(_barrel7).forEach(function (key) {
80
80
  }
81
81
  });
82
82
  });
83
+ var _barrel8 = require("./metadata/barrel");
84
+ Object.keys(_barrel8).forEach(function (key) {
85
+ if (key === "default" || key === "__esModule") return;
86
+ if (key in exports && exports[key] === _barrel8[key]) return;
87
+ Object.defineProperty(exports, key, {
88
+ enumerable: true,
89
+ get: function () {
90
+ return _barrel8[key];
91
+ }
92
+ });
93
+ });
83
94
  var _SourceDescription = require("./SourceDescription");
84
95
  Object.keys(_SourceDescription).forEach(function (key) {
85
96
  if (key === "default" || key === "__esModule") return;
@@ -1 +1 @@
1
- {"version":3,"names":["_barrel","require","Object","keys","forEach","key","exports","defineProperty","enumerable","get","_barrel2","_barrel3","_barrel4","_barrel5","_barrel6","_barrel7","_SourceDescription"],"sourceRoot":"../../../../src","sources":["api/source/barrel.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_barrel","require","Object","keys","forEach","key","exports","defineProperty","enumerable","get","_barrel2","_barrel3","_barrel4","_barrel5","_barrel6","_barrel7","_barrel8","_SourceDescription"],"sourceRoot":"../../../../src","sources":["api/source/barrel.ts"],"mappings":"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","ignoreList":[]}