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

package/ios/RNPlayerViewManager.swift

@@ -1,216 +1,102 @@
-import BitmovinPlayer
-import Foundation
-
-@objc(RNPlayerViewManager)
-public class RNPlayerViewManager: RCTViewManager {
-    /// Initialize module on main thread.
-    override public static func requiresMainQueueSetup() -> Bool {
-        true
-    }
-
-    /// `UIView` factory function. It gets called for each `<NativePlayerView />` component
-    /// from React.
-    override public func view() -> UIView! { // swiftlint:disable:this implicitly_unwrapped_optional
-        RNPlayerView()
-    }
-
-    private var customMessageHandlerBridgeId: NativeId?
-
-    /**
-     Sets the `Player` instance for the view with `viewId` inside RN's `UIManager` registry.
-     - Parameter viewId: `RNPlayerView` id inside `UIManager`'s registry.
-     - Parameter playerId: `Player` instance id inside `PlayerModule`'s registry.
-     */
-    @objc
-    func attachPlayer(_ viewId: NSNumber, playerId: NativeId, playerConfig: NSDictionary?) {
-        bridge.uiManager.addUIBlock { [weak self] _, views in
-            guard
-                let self,
-                let view = views?[viewId] as? RNPlayerView,
-                let player = self.getPlayerModule()?.retrieve(playerId)
-            else {
-                return
-            }
-            let playerViewConfig = RCTConvert.rnPlayerViewConfig(view.config)
-
-            if let userInterfaceConfig = maybeCreateUserInterfaceConfig(
-                styleConfig: player.config.styleConfig,
-                playerViewConfig: playerViewConfig
-            ) {
-              player.config.styleConfig.userInterfaceConfig = userInterfaceConfig
-            }
-
-            let previousPictureInPictureAvailableValue: Bool
-            if let playerView = view.playerView {
-                playerView.player = player
-                previousPictureInPictureAvailableValue = playerView.isPictureInPictureAvailable
-            } else {
-                view.playerView = PlayerView(
-                    player: player,
-                    frame: view.bounds,
-                    playerViewConfig: playerViewConfig?.playerViewConfig ?? PlayerViewConfig()
+import ExpoModulesCore
+
+public class RNPlayerViewManager: Module {
+    // swiftlint:disable:next function_body_length
+    public func definition() -> ModuleDefinition {
+        Name("RNPlayerViewManager")
+
+        View(RNPlayerView.self) {
+            Prop("config") { (view: RNPlayerView, playerInfo: [String: Any]?) in
+                let playerId = playerInfo?["playerId"] as? NativeId
+                let playerViewConfigWrapper = RCTConvert
+                    .rnPlayerViewConfig(playerInfo?["playerViewConfig"] as? [String: Any])
+                let customMessageHandlerBridgeId = playerInfo?["customMessageHandlerBridgeId"] as? NativeId
+                view.attachPlayer(
+                    playerId: playerId,
+                    playerViewConfigWrapper: playerViewConfigWrapper,
+                    customMessageHandlerBridgeId: customMessageHandlerBridgeId
                 )
-                previousPictureInPictureAvailableValue = false
             }
-            player.add(listener: view)
-            view.playerView?.add(listener: view)
-
-            self.maybeEmitPictureInPictureAvailabilityEvent(
-                for: view,
-                previousState: previousPictureInPictureAvailableValue
+            Prop("scalingMode") { (view: RNPlayerView, scalingMode: String?) in
+                view.setScalingMode(scalingMode: scalingMode)
+            }
+            Prop("isFullscreenRequested") { (view: RNPlayerView, isFullscreenRequested: Bool) in
+                view.setFullscreenRequested(isFullscreen: isFullscreenRequested)
+            }
+            Prop("isPictureInPictureRequested") { (view: RNPlayerView, isPictureInPictureRequested: Bool) in
+                view.setPictureInPicture(enterPictureInPicture: isPictureInPictureRequested)
+            }
+            Prop("fullscreenBridgeId") { (view: RNPlayerView, fullscreenBridgeId: String) in
+                view.attachFullscreenBridge(fullscreenBridgeId: fullscreenBridgeId)
+            }
+
+            Events(
+                "onBmpEvent",
+                "onBmpPlayerActive",
+                "onBmpPlayerError",
+                "onBmpPlayerWarning",
+                "onBmpDestroy",
+                "onBmpMuted",
+                "onBmpUnmuted",
+                "onBmpReady",
+                "onBmpPaused",
+                "onBmpPlay",
+                "onBmpPlaying",
+                "onBmpPlaybackFinished",
+                "onBmpSeek",
+                "onBmpSeeked",
+                "onBmpTimeShift",
+                "onBmpTimeShifted",
+                "onBmpStallStarted",
+                "onBmpStallEnded",
+                "onBmpTimeChanged",
+                "onBmpSourceLoad",
+                "onBmpSourceLoaded",
+                "onBmpSourceUnloaded",
+                "onBmpSourceError",
+                "onBmpSourceWarning",
+                "onBmpAudioAdded",
+                "onBmpAudioRemoved",
+                "onBmpAudioChanged",
+                "onBmpSubtitleAdded",
+                "onBmpSubtitleRemoved",
+                "onBmpSubtitleChanged",
+                "onBmpDownloadFinished",
+                "onBmpPictureInPictureEnter",
+                "onBmpPictureInPictureEntered",
+                "onBmpPictureInPictureExit",
+                "onBmpPictureInPictureExited",
+                "onBmpAdBreakFinished",
+                "onBmpAdBreakStarted",
+                "onBmpAdClicked",
+                "onBmpAdError",
+                "onBmpAdFinished",
+                "onBmpAdManifestLoad",
+                "onBmpAdManifestLoaded",
+                "onBmpAdQuartile",
+                "onBmpAdScheduled",
+                "onBmpAdSkipped",
+                "onBmpAdStarted",
+                "onBmpVideoDownloadQualityChanged",
+                "onBmpVideoPlaybackQualityChanged",
+                "onBmpFullscreenEnabled",
+                "onBmpFullscreenDisabled",
+                "onBmpFullscreenEnter",
+                "onBmpFullscreenExit",
+                "onBmpCastAvailable",
+                "onBmpCastPaused",
+                "onBmpCastPlaybackFinished",
+                "onBmpCastPlaying",
+                "onBmpCastStarted",
+                "onBmpCastStart",
+                "onBmpCastStopped",
+                "onBmpCastTimeUpdated",
+                "onBmpCastWaitingForDevice",
+                "onBmpPictureInPictureAvailabilityChanged",
+                "onBmpPlaybackSpeedChanged",
+                "onBmpCueEnter",
+                "onBmpCueExit"
             )
         }
     }
-
-    private func maybeCreateUserInterfaceConfig(
-        styleConfig: StyleConfig,
-        playerViewConfig: RNPlayerViewConfig?
-    ) -> UserInterfaceConfig? {
-#if os(iOS)
-        if styleConfig.userInterfaceType == .bitmovin {
-            let bitmovinUserInterfaceConfig = styleConfig
-                .userInterfaceConfig as? BitmovinUserInterfaceConfig ?? BitmovinUserInterfaceConfig()
-
-            if let uiConfig = playerViewConfig?.uiConfig {
-                bitmovinUserInterfaceConfig
-                    .playbackSpeedSelectionEnabled = uiConfig.playbackSpeedSelectionEnabled
-                bitmovinUserInterfaceConfig.uiManagerFactoryFunction = uiConfig.uiManagerFactoryFunction
-            }
-            if let hideFirstFrame = playerViewConfig?.hideFirstFrame {
-                bitmovinUserInterfaceConfig.hideFirstFrame = hideFirstFrame
-            }
-
-            if let customMessageHandlerBridgeId = self.customMessageHandlerBridgeId,
-               let customMessageHandlerBridge = self.bridge[CustomMessageHandlerModule.self]?
-                .retrieve(customMessageHandlerBridgeId) {
-                bitmovinUserInterfaceConfig.customMessageHandler = customMessageHandlerBridge.customMessageHandler
-            }
-
-            return bitmovinUserInterfaceConfig
-        }
-#endif
-        if styleConfig.userInterfaceType == .system {
-            let systemUserInterfaceConfig = styleConfig
-                .userInterfaceConfig as? SystemUserInterfaceConfig ?? SystemUserInterfaceConfig()
-
-            if let hideFirstFrame = playerViewConfig?.hideFirstFrame {
-                systemUserInterfaceConfig.hideFirstFrame = hideFirstFrame
-            }
-
-            return systemUserInterfaceConfig
-        }
-
-        return nil
-    }
-
-    @objc
-    func attachFullscreenBridge(_ viewId: NSNumber, fullscreenBridgeId: NativeId) {
-        bridge.uiManager.addUIBlock { [weak self] _, views in
-            guard
-                let view = views?[viewId] as? RNPlayerView,
-                let fullscreenBridge = self?.getFullscreenHandlerModule()?.retrieve(fullscreenBridgeId)
-            else {
-                return
-            }
-            guard let playerView = view.playerView else {
-                return
-            }
-
-            playerView.fullscreenHandler = fullscreenBridge
-        }
-    }
-
-    @objc
-    func setCustomMessageHandlerBridgeId(_ viewId: NSNumber, customMessageHandlerBridgeId: NativeId) {
-        self.customMessageHandlerBridgeId = customMessageHandlerBridgeId
-    }
-
-    @objc
-    func setFullscreen(_ viewId: NSNumber, isFullscreen: Bool) {
-        bridge.uiManager.addUIBlock { [weak self] _, views in
-            guard
-                let self,
-                let view = views?[viewId] as? RNPlayerView,
-                let playerView = view.playerView else {
-                return
-            }
-            guard playerView.isFullscreen != isFullscreen else {
-                return
-            }
-            if isFullscreen {
-                playerView.enterFullscreen()
-            } else {
-                playerView.exitFullscreen()
-            }
-        }
-    }
-
-    @objc
-    func setPictureInPicture(_ viewId: NSNumber, enterPictureInPicture: Bool) {
-        bridge.uiManager.addUIBlock { [weak self] _, views in
-            guard
-                let self,
-                let view = views?[viewId] as? RNPlayerView,
-                let playerView = view.playerView else {
-                return
-            }
-            guard playerView.isPictureInPicture != enterPictureInPicture else {
-                return
-            }
-            if enterPictureInPicture {
-                playerView.enterPictureInPicture()
-            } else {
-                playerView.exitPictureInPicture()
-            }
-        }
-    }
-
-    @objc
-    func setScalingMode(_ viewId: NSNumber, scalingMode: String) {
-        bridge.uiManager.addUIBlock { [weak self] _, views in
-            guard
-                let self,
-                let view = views?[viewId] as? RNPlayerView
-            else {
-                return
-            }
-            guard let playerView = view.playerView else {
-                return
-            }
-            switch scalingMode {
-            case "Zoom":
-                playerView.scalingMode = .zoom
-            case "Stretch":
-                playerView.scalingMode = .stretch
-            case "Fit":
-                playerView.scalingMode = .fit
-            default:
-                break
-            }
-        }
-    }
-
-    /// Fetches the initialized `PlayerModule` instance on RN's bridge object.
-    private func getPlayerModule() -> PlayerModule? {
-        bridge.module(for: PlayerModule.self) as? PlayerModule
-    }
-
-    /// Fetches the initialized `FullscreenHandlerModule` instance on RN's bridge object.
-    private func getFullscreenHandlerModule() -> FullscreenHandlerModule? {
-        bridge.module(for: FullscreenHandlerModule.self) as? FullscreenHandlerModule
-    }
-
-    @MainActor
-    private func maybeEmitPictureInPictureAvailabilityEvent(for view: RNPlayerView, previousState: Bool) {
-        guard let playerView = view.playerView,
-              playerView.isPictureInPictureAvailable != previousState else {
-            return
-        }
-        let event: [AnyHashable: Any] = [
-            "isPictureInPictureAvailable": playerView.isPictureInPictureAvailable,
-            "name": "onPictureInPictureAvailabilityChanged",
-            "timestamp": Date().timeIntervalSince1970
-        ]
-        view.onBmpPictureInPictureAvailabilityChanged?(event)
-    }
 }

package/ios/Registry.swift

@@ -1,5 +1,5 @@
 /// Represents the `UUID` string used as index for a certain registry object.
-internal typealias NativeId = String
+public typealias NativeId = String
 
 /// Represents an in memory storage facility that associates an object of type `T` with a certain `NativeId`.
-internal typealias Registry<T> = [NativeId: T]
+public typealias Registry<T> = [NativeId: T]

package/ios/ResultWaiter.swift

@@ -0,0 +1,66 @@
+import Foundation
+
+/// A thread-safe manager that lets native code block until JavaScript
+/// (or any other async source) supplies a result identified by an `Int` ID.
+///
+///     let (id, wait) = boolWaiter.make(timeout: 0.25)
+///     sendEvent("…", ["id": id])
+///     let answer = wait() ?? false   // falls back on timeout
+///
+internal final class ResultWaiter<Value> {
+    // MARK: – private backing storage
+    private struct Entry {
+        let semaphore: DispatchSemaphore
+        var value: Value?
+    }
+
+    private let queue = DispatchQueue(label: "ResultWaiter.storage", attributes: .concurrent)
+    private var next: Int32 = 0
+    private var table: [Int: Entry] = [:]
+
+    /// Registers a new waiter and returns (id, waitClosure).
+    /// `wait()` returns `nil` if the timeout elapses first.
+    func make(timeout: TimeInterval) -> (id: Int, wait: () -> Value?) {
+        let sema   = DispatchSemaphore(value: 0)
+        let id     = Int(OSAtomicIncrement32(&next))
+
+        // store entry
+        queue.async(flags: .barrier) { self.table[id] = Entry(semaphore: sema, value: nil) }
+
+        // closure that the caller will execute later
+        let waitClosure = { [weak self] () -> Value? in
+            _ = sema.wait(timeout: .now() + timeout)   // block caller’s thread
+            guard let self else { return nil }
+            defer { self.remove(id) }                  // clean-up once we’re done
+            return self.value(for: id)
+        }
+
+        return (id, waitClosure)
+    }
+
+    /// Completes the waiter with `value`; no-ops if the ID is unknown.
+    func complete(id: Int, with value: Value) {
+        queue.async(flags: .barrier) {
+            guard var entry = self.table[id] else { return }
+            entry.value = value
+            self.table[id] = entry
+            entry.semaphore.signal()
+        }
+    }
+
+    func removeAll() {
+        queue.async(flags: .barrier) { self.table.removeAll() }
+    }
+
+    // MARK: – helpers ----------------------------------------------------------
+
+    private func value(for id: Int) -> Value? {
+        var value: Value?
+        queue.sync { value = self.table[id]?.value }
+        return value
+    }
+
+    private func remove(_ id: Int) {
+        queue.async(flags: .barrier) { self.table[id] = nil }
+    }
+}