bitmovin-player-react-native 0.44.1-alpha.0 → 1.0.0-alpha.0

package/ios/DrmModule.swift

@@ -1,207 +1,69 @@
 import BitmovinPlayer
+import ExpoModulesCore
 
-@objc(DrmModule)
-public class DrmModule: NSObject, RCTBridgeModule {
-    // swiftlint:disable:next implicitly_unwrapped_optional
-    @objc public var bridge: RCTBridge!
-
-    /// In-memory mapping from `nativeId`s to `FairplayConfig` instances.
+public class DrmModule: Module {
     private var drmConfigs: Registry<FairplayConfig> = [:]
+    private let waiter = ResultWaiter<String>()
 
-    // swiftlint:disable:next implicitly_unwrapped_optional
-    public static func moduleName() -> String! {
-        "DrmModule"
-    }
-
-    public static func requiresMainQueueSetup() -> Bool {
-        true
-    }
-
-    // swiftlint:disable:next implicitly_unwrapped_optional
-    public var methodQueue: DispatchQueue! {
-        bridge.uiManager.methodQueue
-    }
-
-    /**
-     Creates a new `FairplayConfig` instance inside the internal drmConfigs using the provided `config` object.
-     - Parameter nativeId: ID to associate with the `FairplayConfig` instance.
-     - Returns: The associated `FairplayConfig` instance or `nil`.
-     */
-    @objc
-    func retrieve(_ nativeId: NativeId) -> FairplayConfig? {
-        drmConfigs[nativeId]
-    }
+    public func definition() -> ModuleDefinition {
+        Name("DrmModule")
 
-    /**
-     Creates a new `FairplayConfig` instance inside the internal drmConfigs using the provided `config` object.
-     - Parameter nativeId: ID to associate with the `FairplayConfig` instance.
-     - Parameter config: `DrmConfig` object received from JS.
-     */
-    @objc(initWithConfig:config:)
-    func initWithConfig(_ nativeId: NativeId, config: Any?) {
-        bridge.uiManager.addUIBlock { [weak self] _, _ in
-            guard
-                self?.drmConfigs[nativeId] == nil,
-                let fairplayConfig = RCTConvert.drmConfig(config).fairplay
-            else {
-                return
-            }
-            self?.drmConfigs[nativeId] = fairplayConfig
-            self?.initConfigBlocks(nativeId, config)
+        OnDestroy {
+            drmConfigs.removeAll()
+            waiter.removeAll()
         }
-    }
-
-    /**
-     Removes the `FairplayConfig` instance associated with `nativeId` from `drmConfigs`
-     and all data produced during preparation hooks.
-     - Parameter nativeId Instance to be disposed.
-     */
-    @objc(destroy:)
-    func destroy(_ nativeId: NativeId) {
-        // Remove FairplayConfig instance from drmConfigs
-        drmConfigs.removeValue(forKey: nativeId)
-        // Remove any value that might be produced by DRM hooks
-        preparedCertificates.removeValue(forKey: nativeId)
-        preparedMessages.removeValue(forKey: nativeId)
-        preparedSyncMessages.removeValue(forKey: nativeId)
-        preparedLicenses.removeValue(forKey: nativeId)
-        preparedLicenseServerUrls.removeValue(forKey: nativeId)
-        preparedContentIds.removeValue(forKey: nativeId)
-    }
-
-    // MARK: - Config blocks.
-
-    /// Mapping between an object's `nativeId` and the value that'll be returned by its `prepareCertificate` callback.
-    var preparedCertificates: Registry<String> = [:]
-    /// Mapping between an object's `nativeId` and the value that'll be returned by its `prepareMessage` callback.
-    var preparedMessages: Registry<String> = [:]
-    /// Mapping between an object's `nativeId` and the value that'll be returned by its `prepareMessage` callback.
-    var preparedSyncMessages: Registry<String> = [:]
-    /// Mapping between an object's `nativeId` and the value that'll be returned by its `prepareLicense` callback.
-    var preparedLicenses: Registry<String> = [:]
-    /// Mapping between an object's `nativeId` and the value that'll be returned
-    /// by its `prepareLicenseServerUrl` callback.
-    var preparedLicenseServerUrls: Registry<String> = [:]
-    /// Mapping between an object's `nativeId` and the value that'll be returned by its `prepareContentId` callback.
-    var preparedContentIds: Registry<String> = [:]
 
-    /**
-     Function called from JS to store the computed `prepareCertificate` return value for `nativeId`.
-
-     Note this function is **synchronous** and **blocks** the JS thread.
-     It's important that it stays this way, otherwise we wouldn't be able to return
-     the computed JS message from inside the `fairplayConfig.prepareCertificate` Swift closure.
-     
-     Also, since RN has some limitations regarding the definition of sync JS methods from Swift,
-     it's necessary to add a return type and a return
-     value (even if it's a void method like in this case) or a crash happens.
-     So the type `Any?` and return value `nil` were used here (it could be any value).
-     */
-    @objc(setPreparedCertificate:certificate:)
-    func setPreparedCertificate(_ nativeId: NativeId, certificate: String) -> Any? {
-        preparedCertificates[nativeId] = certificate
-        return nil
-    }
-
-    /**
-     Function called from JS to store the computed `prepareMessage` return value for `nativeId`.
-
-     Note this function is **synchronous** and **blocks** the JS thread.
-     It's important that it stays this way, otherwise we wouldn't be able to return
-     the computed JS message from inside the `fairplayConfig.prepareMessage` Swift closure.
-     
-     Also, since RN has some limitations regarding the definition of sync JS methods from Swift,
-     it's necessary to add a return type and a return
-     value (even if it's a void method like in this case) or a crash happens.
-     So the type `Any?` and return value `nil` were used here (it could be any value).
-     */
-    @objc(setPreparedMessage:message:)
-    func setPreparedMessage(_ nativeId: NativeId, message: String) -> Any? {
-        preparedMessages[nativeId] = message
-        return nil
-    }
-
-    /**
-     Function called from JS to store the computed `prepareSyncMessage` return value for `nativeId`.
-
-     Note this function is **synchronous** and **blocks** the JS thread.
-     It's important that it stays this way, otherwise we wouldn't be able to return
-     the computed JS message from inside the `fairplayConfig.prepareSyncMessage` Swift closure.
-     
-     Also, since RN has some limitations regarding the definition of sync JS methods from Swift,
-     it's necessary to add a return type and a return
-     value (even if it's a void method like in this case) or a crash happens.
-     So the type `Any?` and return value `nil` were used here (it could be any value).
-     */
-    @objc(setPreparedSyncMessage:syncMessage:)
-    func setPreparedSyncMessage(_ nativeId: NativeId, syncMessage: String) -> Any? {
-        preparedSyncMessages[nativeId] = syncMessage
-        return nil
+        Events(
+            "onPrepareCertificate",
+            "onPrepareMessage",
+            "onPrepareSyncMessage",
+            "onPrepareLicense",
+            "onPrepareLicenseServerUrl",
+            "onPrepareContentId"
+        )
+        AsyncFunction("initializeWithConfig") { [weak self] (nativeId: NativeId, config: [String: Any]) in
+            self?.initializeWithConfig(nativeId: nativeId, config: config)
+        }
+        AsyncFunction("destroy") { [weak self] (nativeId: NativeId) in
+            self?.destroy(nativeId: nativeId)
+        }
+        AsyncFunction("setPreparedCertificate") { [weak self] (id: Int, certificate: String?) in
+            self?.waiter.complete(id: id, with: certificate ?? "")
+        }
+        AsyncFunction("setPreparedMessage") { [weak self] (id: Int, message: String?) in
+            self?.waiter.complete(id: id, with: message ?? "")
+        }
+        AsyncFunction("setPreparedSyncMessage") { [weak self] (id: Int, syncMessage: String?) in
+            self?.waiter.complete(id: id, with: syncMessage ?? "")
+        }
+        AsyncFunction("setPreparedLicense") { [weak self] (id: Int, license: String?) in
+            self?.waiter.complete(id: id, with: license ?? "")
+        }
+        AsyncFunction("setPreparedLicenseServerUrl") { [weak self] (id: Int, url: String?) in
+            self?.waiter.complete(id: id, with: url ?? "")
+        }
+        AsyncFunction("setPreparedContentId") { [weak self] (id: Int, contentId: String?) in
+            self?.waiter.complete(id: id, with: contentId ?? "")
+        }
     }
 
-    /**
-     Function called from JS to store the computed `prepareLicense` return value for `nativeId`.
-
-     Note this function is **synchronous** and **blocks** the JS thread.
-     It's important that it stays this way, otherwise we wouldn't be able to return
-     the computed JS message from inside the `fairplayConfig.prepareLicense` Swift closure.
-     
-     Also, since RN has some limitations regarding the definition of sync JS methods from Swift,
-     it's necessary to add a return type and a return value
-     (even if it's a void method like in this case) or a crash happens.
-     So the type `Any?` and return value `nil` were used here (it could be any value).
-     */
-    @objc(setPreparedLicense:license:)
-    func setPreparedLicense(_ nativeId: NativeId, license: String) -> Any? {
-        preparedLicenses[nativeId] = license
-        return nil
+    private func initializeWithConfig(nativeId: NativeId, config: [String: Any]) {
+        if self.drmConfigs[nativeId] == nil, let fairplayConfig = RCTConvert.drmConfig(config).fairplay {
+            self.drmConfigs[nativeId] = fairplayConfig
+            self.initConfigBlocks(nativeId, config)
+        }
     }
 
-    /**
-     Function called from JS to store the computed `prepareLicenseServerUrl` return value for `nativeId`.
-
-     Note this function is **synchronous** and **blocks** the JS thread.
-     It's important that it stays this way, otherwise we wouldn't be able to return
-     the computed JS message from inside the `fairplayConfig.prepareLicenseServerUrl` Swift closure.
-     
-     Also, since RN has some limitations regarding the definition of sync JS methods from Swift,
-     it's necessary to add a return type and a return value
-     (even if it's a void method like in this case) or a crash happens.
-     So the type `Any?` and return value `nil` were used here (it could be any value).
-     */
-    @objc(setPreparedLicenseServerUrl:url:)
-    func setPreparedLicenseServerUrl(_ nativeId: NativeId, url: String) -> Any? {
-        preparedLicenseServerUrls[nativeId] = url
-        return nil
+    private func destroy(nativeId: NativeId) {
+        self.drmConfigs.removeValue(forKey: nativeId)
     }
 
-    /**
-     Function called from JS to store the computed `prepareContentId` return value for `nativeId`.
-
-     Note this function is **synchronous** and **blocks** the JS thread.
-     It's important that it stays this way, otherwise we wouldn't be able to return
-     the computed JS message from inside the `fairplayConfig.prepareContentId` Swift closure.
-     
-     Also, since RN has some limitations regarding the definition of sync JS methods from Swift,
-     it's necessary to add a return type and a return value
-     (even if it's a void method like in this case) or a crash happens.
-     So the type `Any?` and return value `nil` were used here (it could be any value).
-     */
-    @objc(setPreparedContentId:contentId:)
-    func setPreparedContentId(_ nativeId: NativeId, contentId: String) -> Any? {
-        preparedContentIds[nativeId] = contentId
-        return nil
+    func retrieve(_ nativeId: NativeId) -> FairplayConfig? {
+        drmConfigs[nativeId]
     }
 
-    /**
-     Initialize all configuration blocks in `FairplayConfig` applying the designated
-     JS functions according to it's JS instance config.
-
-     - Parameter nativeId: Instance nativeId.
-     - Parameter config: FairPlay config object sent from JS.
-     */
-    private func initConfigBlocks(_ nativeId: NativeId, _ config: Any?) {
-        if let json = config as? [String: Any], let fairplayJson = json["fairplay"] as? [String: Any] {
+    private func initConfigBlocks(_ nativeId: NativeId, _ config: [String: Any]) {
+        if let fairplayJson = config["fairplay"] as? [String: Any] {
             initPrepareCertificate(nativeId, fairplayJson: fairplayJson)
             initPrepareMessage(nativeId, fairplayJson: fairplayJson)
             initPrepareSyncMessage(nativeId, fairplayJson: fairplayJson)
@@ -211,253 +73,117 @@ public class DrmModule: NSObject, RCTBridgeModule {
         }
     }
 
-    /**
-     Initialize the `prepareCertificate` block in the `FairplayConfig` associated with `nativeId`.
-
-     - Parameter nativeId - Instance nativeId.
-     - Parameter config: FairPlay config object sent from JS.
-     */
     private func initPrepareCertificate(_ nativeId: NativeId, fairplayJson: [String: Any]) {
-        guard let fairplayConfig = drmConfigs[nativeId] else {
-            return
-        }
-        if fairplayJson["prepareCertificate"] != nil {
+        if fairplayJson["prepareCertificate"] != nil, let fairplayConfig = drmConfigs[nativeId] {
             fairplayConfig.prepareCertificate = { [weak self] data in
                 self?.prepareCertificateFromJS(nativeId, data) ?? data
             }
         }
     }
 
-    /**
-     Initialize the `prepareMessage` block in the `FairplayConfig` associated with `nativeId`.
-
-     - Parameter nativeId - Instance nativeId.
-     - Parameter config: FairPlay config object sent from JS.
-     */
     private func initPrepareMessage(_ nativeId: NativeId, fairplayJson: [String: Any]) {
-        guard let fairplayConfig = drmConfigs[nativeId] else {
-            return
-        }
-        if fairplayJson["prepareMessage"] != nil {
+        if fairplayJson["prepareMessage"] != nil, let fairplayConfig = drmConfigs[nativeId] {
             fairplayConfig.prepareMessage = { [weak self] spcData, assetId in
                 self?.prepareMessageFromJS(nativeId, spcData, assetId) ?? spcData
             }
         }
     }
 
-    /**
-     Initialize the `prepareSyncMessage` block in the `FairplayConfig` associated with `nativeId`.
-
-     - Parameter nativeId - Instance nativeId.
-     - Parameter config: FairPlay config object sent from JS.
-     */
     private func initPrepareSyncMessage(_ nativeId: NativeId, fairplayJson: [String: Any]) {
-        guard let fairplayConfig = drmConfigs[nativeId] else {
-            return
-        }
-        if fairplayJson["prepareSyncMessage"] != nil {
+        if fairplayJson["prepareSyncMessage"] != nil, let fairplayConfig = drmConfigs[nativeId] {
             fairplayConfig.prepareSyncMessage = { [weak self] syncSpcData, assetId in
                 self?.prepareSyncMessageFromJS(nativeId, syncSpcData, assetId) ?? syncSpcData
             }
         }
     }
 
-    /**
-     Initialize the `prepareLicense` block in the `FairplayConfig` associated with `nativeId`.
-
-     - Parameter nativeId - Instance nativeId.
-     - Parameter config: FairPlay config object sent from JS.
-     */
     private func initPrepareLicense(_ nativeId: NativeId, fairplayJson: [String: Any]) {
-        guard let fairplayConfig = drmConfigs[nativeId] else {
-            return
-        }
-        if fairplayJson["prepareLicense"] != nil {
+        if fairplayJson["prepareLicense"] != nil, let fairplayConfig = drmConfigs[nativeId] {
             fairplayConfig.prepareLicense = { [weak self] data in
                 self?.prepareLicenseFromJS(nativeId, data) ?? data
             }
         }
     }
 
-    /**
-     Initialize the `prepareLicenseServerUrl` block in the `FairplayConfig` associated with `nativeId`.
-
-     - Parameter nativeId - Instance nativeId.
-     - Parameter config: FairPlay config object sent from JS.
-     */
     private func initPrepareLicenseServerUrl(_ nativeId: NativeId, fairplayJson: [String: Any]) {
-        guard let fairplayConfig = drmConfigs[nativeId] else {
-            return
-        }
-        if fairplayJson["prepareLicenseServerUrl"] != nil {
+        if fairplayJson["prepareLicenseServerUrl"] != nil, let fairplayConfig = drmConfigs[nativeId] {
             fairplayConfig.prepareLicenseServerUrl = { [weak self] url in
                 self?.prepareLicenseServerUrlFromJS(nativeId, url) ?? url
             }
         }
     }
 
-    /**
-     Initialize the `prepareContentId` block in the `FairplayConfig` associated with `nativeId`.
-
-     - Parameter nativeId - Instance nativeId.
-     - Parameter config: FairPlay config object sent from JS.
-     */
     private func initPrepareContentId(_ nativeId: NativeId, fairplayJson: [String: Any]) {
-        guard let fairplayConfig = drmConfigs[nativeId] else {
-            return
-        }
-        if fairplayJson["prepareContentId"] != nil {
+        if fairplayJson["prepareContentId"] != nil, let fairplayConfig = drmConfigs[nativeId] {
             fairplayConfig.prepareContentId = { [weak self] contentId in
                 self?.prepareContentIdFromJS(nativeId, contentId) ?? contentId
             }
         }
     }
 
-    /**
-     Defines the body of a `prepareCertificate` block in `FairplayConfig`.
-     Used to sync Native->JS and JS->Native calls during `prepareCertificate` execution.
-
-     - Parameter nativeId: Instance nativeId.
-     - Parameter data: Certificate data received from `prepareCertificate`.
-     - Returns: JS prepared certificate value.
-     */
     private func prepareCertificateFromJS(_ nativeId: NativeId, _ data: Data) -> Data {
-        // Setup dispatch group
-        let dispatchGroup = DispatchGroup()
-        dispatchGroup.enter()
-        // Enqueue `onPrepareCertificate` method to be executed on the JS DRM object and in the JS thread.
-        bridge.enqueueJSCall("DRM-\(nativeId)", method: "onPrepareCertificate", args: [data.base64EncodedString()]) {
-            // Leave dispatch group when call to JS object finishes.
-            dispatchGroup.leave()
-        }
-        // Wait for JS `onPrepareCertificate` to finish its execution.
-        dispatchGroup.wait()
-        // Return value stored by `onPrepareCertificate`.
-        return Data(base64Encoded: preparedCertificates[nativeId] ?? "") ?? data
+        let (id, wait) = waiter.make(timeout: 0.25)
+        sendEvent("onPrepareCertificate", [
+            "nativeId": nativeId,
+            "id": id,
+            "certificate": data.base64EncodedString()
+        ])
+        let result = wait() ?? data.base64EncodedString()
+        return Data(base64Encoded: result) ?? data
     }
 
-    /**
-     Defines the body of a `prepareMessage` block in `FairplayConfig`.
-     Used to sync Native->JS and JS->Native calls during `prepareMessage` execution.
-
-     - Parameter nativeId: Instance nativeId.
-     - Parameter data: SPC data received from `prepareMessage`.
-     - Parameter assetID: Asset ID value received from `prepareMessage`.
-     - Returns: JS prepared message value.
-     */
     private func prepareMessageFromJS(_ nativeId: NativeId, _ data: Data, _ assetId: String) -> Data {
-        // Setup dispatch group
-        let dispatchGroup = DispatchGroup()
-        dispatchGroup.enter()
-        // Enqueue `onPrepareMessage` method to be executed on the JS DRM object and in the JS thread.
-        bridge.enqueueJSCall(
-            "DRM-\(nativeId)",
-            method: "onPrepareMessage",
-            args: [data.base64EncodedString(), assetId]
-        ) {
-            // Leave dispatch group when call to JS object finishes.
-            dispatchGroup.leave()
-        }
-        // Wait for JS `onPrepareMessage` to finish its execution.
-        dispatchGroup.wait()
-        // Return value stored by `onPrepareMessage`.
-        return Data(base64Encoded: preparedMessages[nativeId] ?? "") ?? data
+        let (id, wait) = waiter.make(timeout: 0.25)
+        sendEvent("onPrepareMessage", [
+            "nativeId": nativeId,
+            "id": id,
+            "message": data.base64EncodedString(),
+            "assetId": assetId
+        ])
+        let result = wait() ?? data.base64EncodedString()
+        return Data(base64Encoded: result) ?? data
     }
 
-    /**
-     Defines the body of a `prepareSyncMessage` block in `FairplayConfig`.
-     Used to sync Native->JS and JS->Native calls during `prepareSyncMessage` execution.
-
-     - Parameter nativeId: Instance nativeId.
-     - Parameter data: Sync SPC data received from `prepareSyncMessage`.
-     - Parameter assetID: Asset ID value received from `prepareSyncMessage`.
-     - Returns: JS prepared sync message value.
-     */
     private func prepareSyncMessageFromJS(_ nativeId: NativeId, _ data: Data, _ assetId: String) -> Data {
-        // Setup dispatch group
-        let dispatchGroup = DispatchGroup()
-        dispatchGroup.enter()
-        // Enqueue `onPrepareMessage` method to be executed on the JS DRM object and in the JS thread.
-        bridge.enqueueJSCall(
-            "DRM-\(nativeId)",
-            method: "onPrepareSyncMessage",
-            args: [data.base64EncodedString(), assetId]
-        ) {
-            // Leave dispatch group when call to JS object finishes.
-            dispatchGroup.leave()
-        }
-        // Wait for JS `onPrepareMessage` to finish its execution.
-        dispatchGroup.wait()
-        // Return value stored by `onPrepareMessage`.
-        return Data(base64Encoded: preparedSyncMessages[nativeId] ?? "") ?? data
+        let (id, wait) = waiter.make(timeout: 0.25)
+        sendEvent("onPrepareSyncMessage", [
+            "nativeId": nativeId,
+            "id": id,
+            "syncMessage": data.base64EncodedString(),
+            "assetId": assetId
+        ])
+        let result = wait() ?? data.base64EncodedString()
+        return Data(base64Encoded: result) ?? data
     }
 
-    /**
-     Defines the body of a `prepareLicense` block in `FairplayConfig`.
-     Used to sync Native->JS and JS->Native calls during `prepareLicense` execution.
-
-     - Parameter nativeId: Instance nativeId.
-     - Parameter data: License data received from `prepareLicense`.
-     - Returns: JS prepared license value.
-     */
     private func prepareLicenseFromJS(_ nativeId: NativeId, _ data: Data) -> Data {
-        // Setup dispatch group
-        let dispatchGroup = DispatchGroup()
-        dispatchGroup.enter()
-        // Enqueue `onPrepareLicense` method to be executed on the JS DRM object and in the JS thread.
-        bridge.enqueueJSCall("DRM-\(nativeId)", method: "onPrepareLicense", args: [data.base64EncodedString()]) {
-            // Leave dispatch group when call to JS object finishes.
-            dispatchGroup.leave()
-        }
-        // Wait for JS `onPrepareLicense` to finish its execution.
-        dispatchGroup.wait()
-        // Return value stored by `onPrepareLicense`.
-        return Data(base64Encoded: preparedLicenses[nativeId] ?? "") ?? data
+        let (id, wait) = waiter.make(timeout: 0.25)
+        sendEvent("onPrepareLicense", [
+            "nativeId": nativeId,
+            "id": id,
+            "license": data.base64EncodedString()
+        ])
+        let result = wait() ?? data.base64EncodedString()
+        return Data(base64Encoded: result) ?? data
     }
 
-    /**
-     Defines the body of a `prepareLicenseServerUrl` block in `FairplayConfig`.
-     Used to sync Native->JS and JS->Native calls during `prepareLicenseServerUrl` execution.
-
-     - Parameter nativeId: Instance nativeId.
-     - Parameter url: License server url string received from `prepareLicenseServerUrl`.
-     - Returns: JS prepared license server url value.
-     */
     private func prepareLicenseServerUrlFromJS(_ nativeId: NativeId, _ url: String) -> String {
-        // Setup dispatch group
-        let dispatchGroup = DispatchGroup()
-        dispatchGroup.enter()
-        // Enqueue `onPrepareLicenseServerUrl` method to be executed on the JS DRM object and in the JS thread.
-        bridge.enqueueJSCall("DRM-\(nativeId)", method: "onPrepareLicenseServerUrl", args: [url]) {
-            // Leave dispatch group when call to JS object finishes.
-            dispatchGroup.leave()
-        }
-        // Wait for JS `onPrepareLicenseServerUrl` to finish its execution.
-        dispatchGroup.wait()
-        // Return value stored by `onPrepareLicenseServerUrl`.
-        return preparedLicenseServerUrls[nativeId] ?? url
+        let (id, wait) = waiter.make(timeout: 0.25)
+        sendEvent("onPrepareLicenseServerUrl", [
+            "nativeId": nativeId,
+            "id": id,
+            "licenseServerUrl": url
+        ])
+        return wait() ?? url
     }
 
-    /**
-     Defines the body of a `prepareContentId` block in `FairplayConfig`.
-     Used to sync Native->JS and JS->Native calls during `prepareContentId` execution.
-
-     - Parameter nativeId: Instance nativeId.
-     - Parameter contentId: The extracted contentId received from `prepareContentId`.
-     - Returns: JS prepared contentId.
-     */
     private func prepareContentIdFromJS(_ nativeId: NativeId, _ contentId: String) -> String {
-        // Setup dispatch group
-        let dispatchGroup = DispatchGroup()
-        dispatchGroup.enter()
-        // Enqueue `onPrepareContentId` method to be executed on the JS DRM object and in the JS thread.
-        bridge.enqueueJSCall("DRM-\(nativeId)", method: "onPrepareContentId", args: [contentId]) {
-            // Leave dispatch group when call to JS object finishes.
-            dispatchGroup.leave()
-        }
-        // Wait for JS `onPrepareContentId` to finish its execution.
-        dispatchGroup.wait()
-        // Return value stored by `onPrepareContentId`.
-        return preparedContentIds[nativeId] ?? contentId
+        let (id, wait) = waiter.make(timeout: 0.25)
+        sendEvent("onPrepareContentId", [
+            "nativeId": nativeId,
+            "id": id,
+            "contentId": contentId
+        ])
+        return wait() ?? contentId
     }
 }

package/ios/Event+JSON.swift

@@ -447,6 +447,7 @@ extension CueExitEvent: JsonConvertible {
 }
 
 extension PlayerActiveEvent: DefaultJsonConvertibleEvent {}
+extension PlayerInactiveEvent: DefaultJsonConvertibleEvent {}
 extension DestroyEvent: DefaultJsonConvertibleEvent {}
 extension MutedEvent: DefaultJsonConvertibleEvent {}
 extension UnmutedEvent: DefaultJsonConvertibleEvent {}

package/ios/FullscreenHandlerBridge.swift

@@ -1,14 +1,19 @@
 import BitmovinPlayer
+import ExpoModulesCore
 
 internal class FullscreenHandlerBridge: NSObject, FullscreenHandler {
-    var isFullscreen = false
+    nonisolated let isFullscreenValueBox = LockedBox(value: false)
+
+    var isFullscreen: Bool {
+        isFullscreenValueBox.value
+    }
 
     private let nativeId: NativeId
-    private let bridge: RCTBridge
+    private let moduleRegistry: ModuleRegistry?
 
-    init(_ nativeId: NativeId, bridge: RCTBridge) {
+    init(_ nativeId: NativeId, moduleRegistry: ModuleRegistry?) {
         self.nativeId = nativeId
-        self.bridge = bridge
+        self.moduleRegistry = moduleRegistry
         super.init()
     }
 
@@ -16,6 +21,7 @@ internal class FullscreenHandlerBridge: NSObject, FullscreenHandler {
         guard let fullscreenHandlerModule = getFullscreenHandlerModule() else {
             return
         }
+        // We need to set the fullscreen state before notifying the module,
         fullscreenHandlerModule.onFullscreenRequested(nativeId: nativeId)
     }
 
@@ -23,11 +29,12 @@ internal class FullscreenHandlerBridge: NSObject, FullscreenHandler {
         guard let fullscreenHandlerModule = getFullscreenHandlerModule() else {
             return
         }
+        // We need to set the fullscreen state before notifying the module,
         fullscreenHandlerModule.onFullscreenExitRequested(nativeId: nativeId)
     }
 
     /// Fetches the initialized `FullscreenHandlerModule` instance on RN's bridge object.
     private func getFullscreenHandlerModule() -> FullscreenHandlerModule? {
-        bridge.module(for: FullscreenHandlerModule.self) as? FullscreenHandlerModule
+        moduleRegistry?.get(FullscreenHandlerModule.self)
     }
 }