react-native-theoplayer 2.12.0 → 2.13.0

package/CHANGELOG.md

@@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.1.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [2.13.0] - 23-09-15
+
+### Fixed
+
+- Fixed an issue where setting a new source on iOS, during DRM handling, would crash the application due to unsafe array access by different threads.
+
+## [2.12.1] - 23-09-14
+
+### Fixed
+
+- Fixed an issue on Android where the player SDK dependency could resolve to version 6.+.
+- Fixed an issue on iOS where the player integration dependencies could resolve to version 6.+.
+
 ## [2.12.0] - 23-09-04
 
 ### Added

package/README.md

@@ -9,9 +9,9 @@ This projects falls under the license as defined in https://github.com/THEOplaye
 ## Table of Contents
 
 1. [Overview](#overview)
-1. [How to use these guides](#how-to-use-these-guides)
-1. [Prerequisites](#prerequisites)
-2. [Getting Started](#getting-started)
+2. [How to use these guides](#how-to-use-these-guides)
+3. [Prerequisites](#prerequisites)
+4. [Getting Started](#getting-started)
 
 ## Overview
 
@@ -58,9 +58,11 @@ functionality. Currently, the following connectors are available:
 | Package name                                                                                                              | Purpose                                              | Registry                                                                                                                                                      |
 |---------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | [`@theoplayer/react-native-analytics-adobe`](https://github.com/THEOplayer/react-native-theoplayer-analytics)             | Adobe analytics connector                            | [![npm](https://img.shields.io/npm/v/@theoplayer/react-native-analytics-adobe)](https://www.npmjs.com/package/@theoplayer/react-native-analytics-adobe)       |
+| [`@theoplayer/react-native-analytics-agama`](https://github.com/THEOplayer/react-native-theoplayer-analytics)             | Agama analytics connector                            | [![npm](https://img.shields.io/npm/v/@theoplayer/react-native-analytics-agama)](https://www.npmjs.com/package/@theoplayer/react-native-analytics-agama)       |
 | [`@theoplayer/react-native-analytics-comscore`](https://github.com/THEOplayer/react-native-theoplayer-analytics)          | Comscore analytics connector                         | [![npm](https://img.shields.io/npm/v/@theoplayer/react-native-analytics-comscore)](https://www.npmjs.com/package/@theoplayer/react-native-analytics-comscore) |
 | [`@theoplayer/react-native-analytics-conviva`](https://github.com/THEOplayer/react-native-theoplayer-analytics)           | Conviva analytics connector                          | [![npm](https://img.shields.io/npm/v/@theoplayer/react-native-analytics-conviva)](https://www.npmjs.com/package/@theoplayer/react-native-analytics-conviva)   |
 | [`@theoplayer/react-native-analytics-nielsen`](https://github.com/THEOplayer/react-native-theoplayer-analytics)           | Nielsen analytics connector                          | [![npm](https://img.shields.io/npm/v/@theoplayer/react-native-analytics-nielsen)](https://www.npmjs.com/package/@theoplayer/react-native-analytics-nielsen)   |
+| [`@theoplayer/react-native-analytics-youbora`](https://github.com/THEOplayer/react-native-theoplayer-analytics)           | Youbora analytics connector                          | [![npm](https://img.shields.io/npm/v/@theoplayer/react-native-analytics-youbora)](https://www.npmjs.com/package/@theoplayer/react-native-analytics-youbora)   |
 | [`@theoplayer/react-native-drm`](https://github.com/THEOplayer/react-native-theoplayer-drm)                               | Content protection (DRM) connectors                  | [![npm](https://img.shields.io/npm/v/@theoplayer/react-native-drm)](https://www.npmjs.com/package/@theoplayer/react-native-drm)                               |
 | [`@theoplayer/react-native-ui`](https://github.com/THEOplayer/react-native-theoplayer-ui)                                 | React Native user interface                          | [![npm](https://img.shields.io/npm/v/@theoplayer/react-native-ui)](https://www.npmjs.com/package/@theoplayer/react-native-ui)                                 |
 | [`@theoplayer/react-native-connector-template`](https://github.com/THEOplayer/react-native-theoplayer-connector-template) | A template for `react-native-theoplayer` connectors. | [![npm](https://img.shields.io/npm/v/@theoplayer/react-native-connector-template)](https://www.npmjs.com/package/@theoplayer/react-native-connector-template) |

package/android/build.gradle

@@ -105,8 +105,8 @@ dependencies {
   implementation "com.theoplayer.theoplayer-sdk-android:ads-wrapper:4.8.0"
   implementation "androidx.appcompat:appcompat:1.4.+"
 
-  // The minimum supported version is 5.0.1
-  def theoplayer_sdk_version = safeExtGet('THEOplayer_sdk', '[5.0.1,)')
+  // The minimum supported version is 5.10.0
+  def theoplayer_sdk_version = safeExtGet('THEOplayer_sdk', '[5.10,6.0)')
 
 //  def theoplayer_mediasession_version = safeExtGet('THEOplayer_mediasession', theoplayer_sdk_version)
   def theoplayer_mediasession_version = "5.2.0-local"

package/ios/THEOplayerRCTBridge.m

@@ -3,7 +3,6 @@
 //  Theoplayer
 //
 //  Created by William van Haevre on 14/01/2022.
-//  Copyright © 2022 Facebook. All rights reserved.
 //
 
 #import <React/RCTViewManager.h>

package/ios/THEOplayerRCTNetworkUtils.swift

@@ -2,8 +2,6 @@
 //  THEOplayerRCTNetworkUtils.swift
 //  Theoplayer
 //
-//  Created by William van Haevre on 14/11/2022.
-//
 
 import Foundation
 

package/ios/THEOplayerRCTPrintUtils.swift

@@ -2,9 +2,6 @@
 //  Printing.swift
 //  THEOliveSDK
 //
-//  Created by William van Haevre on 21/06/2021.
-//
-
 import Foundation
 
 class PrintUtils {

package/ios/THEOplayerRCTViewManager.swift

@@ -2,9 +2,6 @@
 //  THEOplayerRCTViewManager.swift
 //  Theoplayer
 //
-//  Created by William van Haevre on 14/01/2022.
-//  Copyright © 2022 Facebook. All rights reserved.
-//
 
 import Foundation
 import UIKit

package/ios/ads/THEOplayerRCTAdsAPI.swift

@@ -2,10 +2,6 @@
 //  THEOplayerRCTAdsAPI.swift
 //  Theoplayer
 //
-//  Created by William van Haevre on 09/09/2022.
-//  Copyright © 2022 Facebook. All rights reserved.
-//
-
 import Foundation
 import UIKit
 #if canImport(THEOplayerGoogleIMAIntegration)

package/ios/casting/THEOplayerRCTCastAPI.swift

@@ -2,9 +2,6 @@
 //  THEOplayerRCTAdsAPI.swift
 //  Theoplayer
 //
-//  Created by William van Haevre on 09/09/2022.
-//  Copyright © 2022 Facebook. All rights reserved.
-//
 
 import Foundation
 

package/ios/contentprotection/THEOplayerRCTContentProtectionAPI.swift

@@ -2,9 +2,6 @@
 //  THEOplayerRCTContentProtectionAPI.swift
 //  Theoplayer
 //
-//  Created by William van Haevre on 09/09/2022.
-//  Copyright © 2022 Facebook. All rights reserved.
-//
 
 import Foundation
 import UIKit
@@ -22,16 +19,15 @@ let BRIDGE_REQUEST_TIMEOUT = 10.0
 @objc(THEOplayerRCTContentProtectionAPI)
 class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
     
-    private var buildIntegrationCompletions: [String:(Bool) -> Void] = [:]                              // [requestId : completion]
-    private var certificateRequestCompletions: [String:(Data?, Error?) -> Void] = [:]                   // [requestId : completion]
-    private var certificateResponseCompletions: [String:(Data?, Error?) -> Void] = [:]                  // [requestId : completion]
-    private var licenseRequestCompletions: [String:(Data?, Error?) -> Void] = [:]                       // [requestId : completion]
-    private var licenseResponseCompletions: [String:(Data?, Error?) -> Void] = [:]                      // [requestId : completion]
-    private var extractFairplayCompletions: [String:(String, Error?) -> Void] = [:]                     // [requestId : completion]
-    private var requestTimers: [String:Timer] = [:]                                                     // [requestId : Timer]
-    private var requestIntegrationIds: [String:String] = [:]                                            // [requestId : integrationId]
-    private var requestKeySystemIds: [String:String] = [:]                                              // [requestId : keySystemId]
-    
+    private var buildIntegrationCompletions: THEOplayerRCTSafeMap<String, (Bool) -> Void> = THEOplayerRCTSafeMap<String, (Bool) -> Void>()                          // [requestId : completion]
+    private var certificateRequestCompletions:  THEOplayerRCTSafeMap<String, (Data?, Error?) -> Void> = THEOplayerRCTSafeMap<String, (Data?, Error?) -> Void>()     // [requestId : completion]
+    private var certificateResponseCompletions:  THEOplayerRCTSafeMap<String, (Data?, Error?) -> Void> = THEOplayerRCTSafeMap<String, (Data?, Error?) -> Void>()    // [requestId : completion]
+    private var licenseRequestCompletions:  THEOplayerRCTSafeMap<String, (Data?, Error?) -> Void> = THEOplayerRCTSafeMap<String, (Data?, Error?) -> Void>()         // [requestId : completion]
+    private var licenseResponseCompletions:  THEOplayerRCTSafeMap<String, (Data?, Error?) -> Void> = THEOplayerRCTSafeMap<String, (Data?, Error?) -> Void>()        // [requestId : completion]
+    private var extractFairplayCompletions:  THEOplayerRCTSafeMap<String, (String, Error?) -> Void> = THEOplayerRCTSafeMap<String, (String, Error?) -> Void>()      // [requestId : completion]
+    private var requestTimers:  THEOplayerRCTSafeMap<String, Timer> = THEOplayerRCTSafeMap<String, Timer>()                                                         // [requestId : Timer]
+    private var requestIntegrationIds:  THEOplayerRCTSafeMap<String, String> = THEOplayerRCTSafeMap<String, String>()                                               // [requestId : integrationId]
+    private var requestKeySystemIds:  THEOplayerRCTSafeMap<String, String> = THEOplayerRCTSafeMap<String, String>()                                                 // [requestId : keySystemId]
     
     override static func moduleName() -> String! {
         return "ContentProtectionModule"
@@ -54,7 +50,7 @@ class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
     private func invalidateRequestWithId(_ requestId: String) {
         if let timer = self.requestTimers[requestId] {
             timer.invalidate()
-            self.requestTimers.removeValue(forKey: requestId)
+            _ = self.requestTimers.removeValue(forKey: requestId)
         }
     }
     
@@ -71,7 +67,7 @@ class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
         self.requestTimers[requestId] = Timer.scheduledTimer(withTimeInterval: BRIDGE_REQUEST_TIMEOUT, repeats: false, block: { t in
             if DEBUG_CONTENT_PROTECTION_API { print(CPI_TAG, "Build timeout reached: removing completion for request with Id \(requestId)") }
             self.invalidateRequestWithId(requestId)
-            self.buildIntegrationCompletions.removeValue(forKey: requestId)
+            _ = self.buildIntegrationCompletions.removeValue(forKey: requestId)
         })
     }
     
@@ -89,9 +85,9 @@ class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
         self.requestTimers[requestId] = Timer.scheduledTimer(withTimeInterval: BRIDGE_REQUEST_TIMEOUT, repeats: false, block: { t in
             if DEBUG_CONTENT_PROTECTION_API { print(CPI_TAG, "onCertificateRequest timeout reached: removing completion for request with Id \(requestId)") }
             self.invalidateRequestWithId(requestId)
-            self.requestIntegrationIds.removeValue(forKey: requestId)
-            self.requestKeySystemIds.removeValue(forKey: requestId)
-            self.certificateRequestCompletions.removeValue(forKey: requestId)
+            _ = self.requestIntegrationIds.removeValue(forKey: requestId)
+            _ = self.requestKeySystemIds.removeValue(forKey: requestId)
+            _ = self.certificateRequestCompletions.removeValue(forKey: requestId)
         })
     }
     
@@ -107,7 +103,7 @@ class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
         self.requestTimers[requestId] = Timer.scheduledTimer(withTimeInterval: BRIDGE_REQUEST_TIMEOUT, repeats: false, block: { t in
             if DEBUG_CONTENT_PROTECTION_API { print(CPI_TAG, "onCertificateResponse timeout reached: removing completion for request with Id \(requestId)") }
             self.invalidateRequestWithId(requestId)
-            self.certificateResponseCompletions.removeValue(forKey: requestId)
+            _ = self.certificateResponseCompletions.removeValue(forKey: requestId)
         })
     }
     
@@ -125,9 +121,9 @@ class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
         self.requestTimers[requestId] = Timer.scheduledTimer(withTimeInterval: BRIDGE_REQUEST_TIMEOUT, repeats: false, block: { t in
             if DEBUG_CONTENT_PROTECTION_API { print(CPI_TAG, "onLicenseRequest timeout reached: removing completion for request with Id \(requestId)") }
             self.invalidateRequestWithId(requestId)
-            self.requestIntegrationIds.removeValue(forKey: requestId)
-            self.requestKeySystemIds.removeValue(forKey: requestId)
-            self.licenseRequestCompletions.removeValue(forKey: requestId)
+            _ = self.requestIntegrationIds.removeValue(forKey: requestId)
+            _ = self.requestKeySystemIds.removeValue(forKey: requestId)
+            _ = self.licenseRequestCompletions.removeValue(forKey: requestId)
         })
     }
     
@@ -143,7 +139,7 @@ class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
         self.requestTimers[requestId] = Timer.scheduledTimer(withTimeInterval: BRIDGE_REQUEST_TIMEOUT, repeats: false, block: { t in
             if DEBUG_CONTENT_PROTECTION_API { print(CPI_TAG, "onLicenseResponse timeout reached: removing completion for request with Id \(requestId)") }
             self.invalidateRequestWithId(requestId)
-            self.licenseResponseCompletions.removeValue(forKey: requestId)
+            _ = self.licenseResponseCompletions.removeValue(forKey: requestId)
         })
     }
     
@@ -160,7 +156,7 @@ class THEOplayerRCTContentProtectionAPI: RCTEventEmitter {
         self.requestTimers[requestId] = Timer.scheduledTimer(withTimeInterval: BRIDGE_REQUEST_TIMEOUT, repeats: false, block: { t in
             if DEBUG_CONTENT_PROTECTION_API { print(CPI_TAG, "Fairplay contentId extraction timeout reached: removing completion for request with Id \(requestId)") }
             self.invalidateRequestWithId(requestId)
-            self.extractFairplayCompletions.removeValue(forKey: requestId)
+            _ = self.extractFairplayCompletions.removeValue(forKey: requestId)
         })
     }
     

package/ios/contentprotection/THEOplayerRCTProxyContentProtectionIntegration.swift

@@ -2,8 +2,6 @@
 //  THEOplayerRCTContentProtectionIntegration.swift
 //  Theoplayer
 //
-//  Created by William van Haevre on 28/10/2022.
-//
 
 import Foundation
 import THEOplayerSDK

package/ios/contentprotection/THEOplayerRCTProxyContentProtectionIntegrationFactory.swift

@@ -2,8 +2,6 @@
 //  THEOplayerRCTContentProtectionIntegrationFactory.swift
 //  Theoplayer
 //
-//  Created by William van Haevre on 28/10/2022.
-//
 
 import Foundation
 import THEOplayerSDK

package/ios/contentprotection/THEOplayerRCTSafeMap.swift

@@ -0,0 +1,64 @@
+//
+//  THEOplayerRCTSafeMap.swift
+//  Theoplayer
+//
+
+import Foundation
+
+class THEOplayerRCTSafeMap<K: Hashable,V>: Collection {
+    private var unsafeMap: [K: V]
+    private let concurrentQueue = DispatchQueue(label: "Safe Queue", attributes: .concurrent)
+    
+    var startIndex: Dictionary<K, V>.Index {
+        self.concurrentQueue.sync {
+            return self.unsafeMap.startIndex
+        }
+    }
+    
+    var endIndex: Dictionary<K, V>.Index {
+        self.concurrentQueue.sync {
+            return self.unsafeMap.endIndex
+        }
+    }
+    
+    init(dict: [K: V] = [K: V]()) {
+        self.unsafeMap = dict
+    }
+    
+    func index(after i: Dictionary<K, V>.Index) -> Dictionary<K, V>.Index {
+        self.concurrentQueue.sync {
+            return self.unsafeMap.index(after: i)
+        }
+    }
+    
+    subscript(key: K) -> V? {
+        set(newValue) {
+            self.concurrentQueue.sync(flags: .barrier) {[weak self] in
+                self?.unsafeMap[key] = newValue
+            }
+        }
+        get {
+            self.concurrentQueue.sync {
+                return self.unsafeMap[key]
+            }
+        }
+    }
+    
+    subscript(index: Dictionary<K, V>.Index) -> Dictionary<K, V>.Element {
+        self.concurrentQueue.sync {
+            return self.unsafeMap[index]
+        }
+    }
+    
+    func removeValue(forKey key: K) -> V? {
+        self.concurrentQueue.sync(flags: .barrier) {[weak self] in
+            return self?.unsafeMap.removeValue(forKey: key)
+        }
+    }
+    
+    func removeAll() {
+        self.concurrentQueue.sync(flags: .barrier) {[weak self] in
+            self?.unsafeMap.removeAll()
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-theoplayer",
-  "version": "2.12.0",
+  "version": "2.13.0",
   "description": "A THEOplayer video component for react-native.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/react-native-theoplayer.podspec

@@ -36,18 +36,18 @@ Pod::Spec.new do |s|
     }
   else 
   	puts "Using THEOplayer-core SDK"
-    s.dependency "THEOplayerSDK-core", "~> 5.9"
+    s.dependency "THEOplayerSDK-core", "~> 5.11"
     if theofeatures.include?("GOOGLE_IMA") 
 	  puts "Adding THEOplayer-Integration-GoogleIMA"
-      s.dependency "THEOplayer-Integration-GoogleIMA"
+      s.dependency "THEOplayer-Integration-GoogleIMA", "~> 5.11"
     end
     if theofeatures.include?("CHROMECAST")
 	  puts "Adding THEOplayer-Integration-GoogleCast"
-      s.ios.dependency "THEOplayer-Integration-GoogleCast"
+      s.ios.dependency "THEOplayer-Integration-GoogleCast", "~> 5.11"
     end
     if theofeatures.include?("SIDELOADED_TEXTTRACKS") 
 	  puts "Adding THEOplayer-Connector-SideloadedSubtitle"
-      s.dependency "THEOplayer-Connector-SideloadedSubtitle"
+      s.dependency "THEOplayer-Connector-SideloadedSubtitle", "~> 5.11"
     end
   end