@bluebillywig/react-native-bb-player 8.47.1 → 8.47.3

package/ios/BBPlayerModule.swift

@@ -1,13 +1,13 @@
 import Foundation
-import React
-import BBNativePlayerKit
+@preconcurrency import React
+@preconcurrency import BBNativePlayerKit
 
 /**
  * Global registry for BBPlayerView instances.
- * This is needed because the bridge.uiManager.view(forReactTag:) doesn't work
- * with the New Architecture (Fabric). Views register themselves when created.
+ * Needed because bridge.uiManager.view(forReactTag:) doesn't work
+ * with Fabric. Views register themselves when added to the window.
  */
-class BBPlayerViewRegistry: NSObject {
+final class BBPlayerViewRegistry: NSObject, @unchecked Sendable {
     static let shared = BBPlayerViewRegistry()
 
     private var views: [Int: BBPlayerView] = [:]
@@ -41,10 +41,10 @@ class BBPlayerViewRegistry: NSObject {
 /**
  * Native Module for BBPlayer commands.
  * Extends RCTEventEmitter to support module-level events (modal player).
- * This module looks up BBPlayerView instances by their React tag and dispatches commands to them.
+ * Looks up BBPlayerView instances by React tag and dispatches commands.
  */
 @objc(BBPlayerModule)
-class BBPlayerModule: RCTEventEmitter {
+class BBPlayerModule: RCTEventEmitter, @unchecked Sendable {
 
     private var modalPlayerView: BBNativePlayerView?
     private var modalDelegate: ModalPlayerDelegate?
@@ -79,150 +79,119 @@ class BBPlayerModule: RCTEventEmitter {
         hasListeners = false
     }
 
-    // MARK: - Helper to get view by tag
+    // MARK: - Helpers
 
     private func getView(_ reactTag: NSNumber) -> BBPlayerView? {
-        // First try the view registry (works with both old and new architecture)
         if let view = BBPlayerViewRegistry.shared.getView(tag: reactTag.intValue) {
             return view
         }
-
-        // Fallback to bridge.uiManager for old architecture
         if let bridge = self.bridge {
             if let view = bridge.uiManager.view(forReactTag: reactTag) as? BBPlayerView {
                 return view
             }
         }
-
         NSLog("BBPlayerModule: Could not find view with tag %@", reactTag)
         return nil
     }
 
+    /// Dispatch to main queue and enter @MainActor context.
+    private func onMainActor(_ work: @MainActor @Sendable @escaping () -> Void) {
+        DispatchQueue.main.async {
+            MainActor.assumeIsolated(work)
+        }
+    }
+
     // MARK: - Commands
 
     @objc func play(_ viewTag: NSNumber) {
-        DispatchQueue.main.async {
-            self.getView(viewTag)?.play()
-        }
+        onMainActor { self.getView(viewTag)?.play() }
     }
 
     @objc func pause(_ viewTag: NSNumber) {
-        DispatchQueue.main.async {
-            self.getView(viewTag)?.pause()
-        }
+        onMainActor { self.getView(viewTag)?.pause() }
     }
 
     @objc func seek(_ viewTag: NSNumber, position: NSNumber) {
-        DispatchQueue.main.async {
-            self.getView(viewTag)?.seek(position.intValue)
-        }
+        onMainActor { self.getView(viewTag)?.seek(position.intValue) }
     }
 
     @objc func seekRelative(_ viewTag: NSNumber, offsetSeconds: NSNumber) {
-        DispatchQueue.main.async {
-            self.getView(viewTag)?.seekRelative(offsetSeconds.doubleValue)
-        }
+        onMainActor { self.getView(viewTag)?.seekRelative(offsetSeconds.doubleValue) }
     }
 
     @objc func setMuted(_ viewTag: NSNumber, muted: Bool) {
-        DispatchQueue.main.async {
-            self.getView(viewTag)?.setMuted(muted)
-        }
+        onMainActor { self.getView(viewTag)?.setMuted(muted) }
     }
 
     @objc func setVolume(_ viewTag: NSNumber, volume: NSNumber) {
-        DispatchQueue.main.async {
-            self.getView(viewTag)?.setVolume(volume.doubleValue)
-        }
+        onMainActor { self.getView(viewTag)?.setVolume(volume.doubleValue) }
     }
 
     @objc func enterFullscreen(_ viewTag: NSNumber) {
-        DispatchQueue.main.async {
-            self.getView(viewTag)?.enterFullscreen()
-        }
+        onMainActor { self.getView(viewTag)?.enterFullscreen() }
     }
 
     @objc func enterFullscreenLandscape(_ viewTag: NSNumber) {
-        DispatchQueue.main.async {
-            self.getView(viewTag)?.enterFullscreenLandscape()
-        }
+        onMainActor { self.getView(viewTag)?.enterFullscreenLandscape() }
     }
 
     @objc func exitFullscreen(_ viewTag: NSNumber) {
-        DispatchQueue.main.async {
-            self.getView(viewTag)?.exitFullscreen()
-        }
+        onMainActor { self.getView(viewTag)?.exitFullscreen() }
     }
 
     @objc func collapse(_ viewTag: NSNumber) {
-        DispatchQueue.main.async {
-            self.getView(viewTag)?.collapse()
-        }
+        onMainActor { self.getView(viewTag)?.collapse() }
     }
 
     @objc func expand(_ viewTag: NSNumber) {
-        DispatchQueue.main.async {
-            self.getView(viewTag)?.expand()
-        }
+        onMainActor { self.getView(viewTag)?.expand() }
     }
 
     @objc func autoPlayNextCancel(_ viewTag: NSNumber) {
-        DispatchQueue.main.async {
-            self.getView(viewTag)?.autoPlayNextCancel()
-        }
+        onMainActor { self.getView(viewTag)?.autoPlayNextCancel() }
     }
 
     @objc func destroy(_ viewTag: NSNumber) {
-        DispatchQueue.main.async {
-            self.getView(viewTag)?.destroy()
-        }
+        onMainActor { self.getView(viewTag)?.destroy() }
     }
 
     @objc func showCastPicker(_ viewTag: NSNumber) {
+        onMainActor { self.getView(viewTag)?.showCastPicker() }
+    }
+
+    @objc func updatePlayout(_ viewTag: NSNumber, playoutJson: String) {
         DispatchQueue.main.async {
-            self.getView(viewTag)?.showCastPicker()
+            self.getView(viewTag)?.updatePlayout(playoutJson)
         }
     }
 
     @objc func loadWithClipId(_ viewTag: NSNumber, clipId: String?, initiator: String?, autoPlay: Bool, seekTo: NSNumber?, contextJson: String?) {
-        DispatchQueue.main.async {
-            self.getView(viewTag)?.loadWithClipId(clipId ?? "", initiator: initiator, autoPlay: autoPlay, seekTo: seekTo?.doubleValue, contextJson: contextJson)
-        }
+        onMainActor { self.getView(viewTag)?.loadWithClipId(clipId ?? "", initiator: initiator, autoPlay: autoPlay, seekTo: seekTo?.doubleValue, contextJson: contextJson) }
     }
 
     @objc func loadWithClipListId(_ viewTag: NSNumber, clipListId: String?, initiator: String?, autoPlay: Bool, seekTo: NSNumber?, contextJson: String?) {
-        DispatchQueue.main.async {
-            self.getView(viewTag)?.loadWithClipListId(clipListId ?? "", initiator: initiator, autoPlay: autoPlay, seekTo: seekTo?.doubleValue, contextJson: contextJson)
-        }
+        onMainActor { self.getView(viewTag)?.loadWithClipListId(clipListId ?? "", initiator: initiator, autoPlay: autoPlay, seekTo: seekTo?.doubleValue, contextJson: contextJson) }
     }
 
     @objc func loadWithProjectId(_ viewTag: NSNumber, projectId: String?, initiator: String?, autoPlay: Bool, seekTo: NSNumber?, contextJson: String?) {
-        DispatchQueue.main.async {
-            self.getView(viewTag)?.loadWithProjectId(projectId ?? "", initiator: initiator, autoPlay: autoPlay, seekTo: seekTo?.doubleValue, contextJson: contextJson)
-        }
+        onMainActor { self.getView(viewTag)?.loadWithProjectId(projectId ?? "", initiator: initiator, autoPlay: autoPlay, seekTo: seekTo?.doubleValue, contextJson: contextJson) }
     }
 
     @objc func loadWithClipJson(_ viewTag: NSNumber, clipJson: String?, initiator: String?, autoPlay: Bool, seekTo: NSNumber?, contextJson: String?) {
-        DispatchQueue.main.async {
-            self.getView(viewTag)?.loadWithClipJson(clipJson ?? "", initiator: initiator, autoPlay: autoPlay, seekTo: seekTo?.doubleValue, contextJson: contextJson)
-        }
+        onMainActor { self.getView(viewTag)?.loadWithClipJson(clipJson ?? "", initiator: initiator, autoPlay: autoPlay, seekTo: seekTo?.doubleValue, contextJson: contextJson) }
     }
 
     @objc func loadWithClipListJson(_ viewTag: NSNumber, clipListJson: String?, initiator: String?, autoPlay: Bool, seekTo: NSNumber?, contextJson: String?) {
-        DispatchQueue.main.async {
-            self.getView(viewTag)?.loadWithClipListJson(clipListJson ?? "", initiator: initiator, autoPlay: autoPlay, seekTo: seekTo?.doubleValue, contextJson: contextJson)
-        }
+        onMainActor { self.getView(viewTag)?.loadWithClipListJson(clipListJson ?? "", initiator: initiator, autoPlay: autoPlay, seekTo: seekTo?.doubleValue, contextJson: contextJson) }
     }
 
     @objc func loadWithProjectJson(_ viewTag: NSNumber, projectJson: String?, initiator: String?, autoPlay: Bool, seekTo: NSNumber?, contextJson: String?) {
-        DispatchQueue.main.async {
-            self.getView(viewTag)?.loadWithProjectJson(projectJson ?? "", initiator: initiator, autoPlay: autoPlay, seekTo: seekTo?.doubleValue, contextJson: contextJson)
-        }
+        onMainActor { self.getView(viewTag)?.loadWithProjectJson(projectJson ?? "", initiator: initiator, autoPlay: autoPlay, seekTo: seekTo?.doubleValue, contextJson: contextJson) }
     }
 
     @objc func loadWithJsonUrl(_ viewTag: NSNumber, jsonUrl: String?, autoPlay: Bool, contextJson: String?) {
         NSLog("BBPlayerModule.loadWithJsonUrl called - viewTag: %@, jsonUrl: %@, autoPlay: %d, context: %@", viewTag, jsonUrl ?? "nil", autoPlay, contextJson ?? "nil")
-        DispatchQueue.main.async {
+        onMainActor {
             let view = self.getView(viewTag)
             NSLog("BBPlayerModule.loadWithJsonUrl - view found: %@", view != nil ? "YES" : "NO")
             if let view = view, let url = jsonUrl {
@@ -235,7 +204,7 @@ class BBPlayerModule: RCTEventEmitter {
     }
 
     @objc func loadWithContentIdAndType(_ viewTag: NSNumber, contentId: String?, contentType: String?, autoPlay: Bool, contextJson: String?) {
-        DispatchQueue.main.async {
+        onMainActor {
             let view = self.getView(viewTag)
             guard let view = view, let id = contentId, let type = contentType else {
                 NSLog("BBPlayerModule.loadWithContentIdAndType - FAILED: view=%@, id=%@, type=%@",
@@ -247,101 +216,77 @@ class BBPlayerModule: RCTEventEmitter {
     }
 
     // MARK: - Getter methods with Promise support
+    // Note: nonisolated(unsafe) on resolver because RCTPromiseResolveBlock is a
+    // non-Sendable ObjC block, but RN guarantees safe cross-thread usage.
 
     @objc func getDuration(_ viewTag: NSNumber, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
-        DispatchQueue.main.async {
-            let duration = self.getView(viewTag)?.duration()
-            resolver(duration)
-        }
+        nonisolated(unsafe) let resolve = resolver
+        onMainActor { resolve(self.getView(viewTag)?.duration()) }
     }
 
     @objc func getMuted(_ viewTag: NSNumber, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
-        DispatchQueue.main.async {
-            let muted = self.getView(viewTag)?.muted()
-            resolver(muted)
-        }
+        nonisolated(unsafe) let resolve = resolver
+        onMainActor { resolve(self.getView(viewTag)?.muted()) }
     }
 
     @objc func getVolume(_ viewTag: NSNumber, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
-        DispatchQueue.main.async {
-            let volume = self.getView(viewTag)?.volume()
-            resolver(volume)
-        }
+        nonisolated(unsafe) let resolve = resolver
+        onMainActor { resolve(self.getView(viewTag)?.volume()) }
     }
 
     @objc func getPhase(_ viewTag: NSNumber, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
-        DispatchQueue.main.async {
-            let phase = self.getView(viewTag)?.phase()
-            resolver(phase)
-        }
+        nonisolated(unsafe) let resolve = resolver
+        onMainActor { resolve(self.getView(viewTag)?.phase()) }
     }
 
     @objc func getState(_ viewTag: NSNumber, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
-        DispatchQueue.main.async {
-            let state = self.getView(viewTag)?.state()
-            resolver(state)
-        }
+        nonisolated(unsafe) let resolve = resolver
+        onMainActor { resolve(self.getView(viewTag)?.state()) }
     }
 
     @objc func getMode(_ viewTag: NSNumber, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
-        DispatchQueue.main.async {
-            let mode = self.getView(viewTag)?.mode()
-            resolver(mode)
-        }
+        nonisolated(unsafe) let resolve = resolver
+        onMainActor { resolve(self.getView(viewTag)?.mode()) }
     }
 
     @objc func getClipData(_ viewTag: NSNumber, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
-        DispatchQueue.main.async {
-            let clipData = self.getView(viewTag)?.clipData()
-            resolver(clipData)
-        }
+        nonisolated(unsafe) let resolve = resolver
+        onMainActor { resolve(self.getView(viewTag)?.clipData()) }
     }
 
     @objc func getProjectData(_ viewTag: NSNumber, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
-        DispatchQueue.main.async {
-            let projectData = self.getView(viewTag)?.projectData()
-            resolver(projectData)
-        }
+        nonisolated(unsafe) let resolve = resolver
+        onMainActor { resolve(self.getView(viewTag)?.projectData()) }
     }
 
     @objc func getPlayoutData(_ viewTag: NSNumber, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
-        DispatchQueue.main.async {
-            let playoutData = self.getView(viewTag)?.playoutData()
-            resolver(playoutData)
-        }
+        nonisolated(unsafe) let resolve = resolver
+        onMainActor { resolve(self.getView(viewTag)?.playoutData()) }
     }
 
     @objc func setInView(_ viewTag: NSNumber, inView: Bool) {
-        DispatchQueue.main.async {
-            self.getView(viewTag)?.setInView(inView)
-        }
+        onMainActor { self.getView(viewTag)?.setInView(inView) }
     }
 
     @objc func getInView(_ viewTag: NSNumber, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
-        DispatchQueue.main.async {
-            let inView = self.getView(viewTag)?.inView()
-            resolver(inView)
-        }
+        nonisolated(unsafe) let resolve = resolver
+        onMainActor { resolve(self.getView(viewTag)?.inView()) }
     }
 
     @objc func getAdMediaWidth(_ viewTag: NSNumber, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
-        DispatchQueue.main.async {
-            let width = self.getView(viewTag)?.adMediaWidth()
-            resolver(width)
-        }
+        nonisolated(unsafe) let resolve = resolver
+        onMainActor { resolve(self.getView(viewTag)?.adMediaWidth()) }
     }
 
     @objc func getAdMediaHeight(_ viewTag: NSNumber, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
-        DispatchQueue.main.async {
-            let height = self.getView(viewTag)?.adMediaHeight()
-            resolver(height)
-        }
+        nonisolated(unsafe) let resolve = resolver
+        onMainActor { resolve(self.getView(viewTag)?.adMediaHeight()) }
     }
 
     // MARK: - Modal Player API
 
     @objc func presentModalPlayer(_ jsonUrl: String, optionsJson: String?, contextJson: String?) {
-        DispatchQueue.main.async {
+        onMainActor {
             // RCTPresentedViewController() can return nil with RCTReactNativeFactory (RN 0.83+).
             // Fallback to UIScene-based lookup to find the root view controller.
             guard let rootVC = RCTPresentedViewController()
@@ -371,14 +316,9 @@ class BBPlayerModule: RCTEventEmitter {
             }
             loadOptions["showBackArrow"] = options?["showBackArrow"] as? Bool ?? false
 
-            // When context has a cliplist (contextCollectionId), load clip by ID
-            // with cliplist context. ProgramController will swap to loading the
-            // cliplist and find the clip by ID (matching web standardplayer pattern).
-            // Deferred until apiReady to avoid racing with initial jsonUrl load.
             let collectionId = context?["contextCollectionId"] as? String
             let clipId = context?["contextEntityId"] as? String
 
-            // Create and present modal player using SDK factory method
             let playerView = BBNativePlayer.createModalPlayerView(uiViewContoller: rootVC, jsonUrl: jsonUrl, options: loadOptions)
 
             if let collectionId = collectionId, let clipId = clipId {
@@ -391,38 +331,16 @@ class BBPlayerModule: RCTEventEmitter {
                 }
             }
 
-            // Set up delegate for event forwarding
             let delegate = ModalPlayerDelegate(module: self)
             playerView.delegate = delegate
 
             self.modalPlayerView = playerView
             self.modalDelegate = delegate
-
-        }
-    }
-
-    private func extractIdFromUrl(_ url: String, pattern: String) -> String? {
-        do {
-            let regex = try NSRegularExpression(pattern: pattern, options: [])
-            let range = NSRange(url.startIndex..., in: url)
-            if let match = regex.firstMatch(in: url, options: [], range: range) {
-                for i in 1..<match.numberOfRanges {
-                    if let groupRange = Range(match.range(at: i), in: url) {
-                        let extracted = String(url[groupRange])
-                        if !extracted.isEmpty {
-                            return extracted
-                        }
-                    }
-                }
-            }
-        } catch {
-            NSLog("BBPlayerModule: Regex error: %@", error.localizedDescription)
         }
-        return nil
     }
 
     @objc func dismissModalPlayer() {
-        DispatchQueue.main.async {
+        onMainActor {
             self.modalPlayerView?.player.closeModalPlayer()
             self.modalPlayerView = nil
             self.modalDelegate = nil
@@ -446,7 +364,9 @@ class BBPlayerModule: RCTEventEmitter {
 
     // MARK: - Modal Player Delegate
 
+    @MainActor
     private class ModalPlayerDelegate: NSObject, BBNativePlayerViewDelegate {
+        // Module ref is @unchecked Sendable, safe to access from @MainActor
         weak var module: BBPlayerModule?
 
         init(module: BBPlayerModule) {

package/ios/BBPlayerView.swift

@@ -1,8 +1,9 @@
-import BBNativePlayerKit
+@preconcurrency import BBNativePlayerKit
+@preconcurrency import React
 import WebKit
-import bbnativeshared
+@preconcurrency import bbnativeshared
 import os
-import GoogleCast
+@preconcurrency import GoogleCast
 
 // MARK: - Logging Helper
 private enum LogLevel {
@@ -49,6 +50,8 @@ class BBPlayerView: UIView, BBNativePlayerViewDelegate {
   private var independentCastButton: GCKUICastButton?
   // Store parent view controller reference for SDK
   private weak var parentViewController: UIViewController?
+  // Cached tag for deinit (nonisolated(unsafe) because deinit is nonisolated in Swift 6)
+  nonisolated(unsafe) private var _cachedTag: Int?
 
   // MARK: - Props (set from React Native)
 
@@ -130,7 +133,9 @@ class BBPlayerView: UIView, BBNativePlayerViewDelegate {
 
       // Register with view registry for command dispatch (supports New Architecture)
       if let tag = self.reactTag {
-        BBPlayerViewRegistry.shared.register(self, tag: tag.intValue)
+        let tagInt = tag.intValue
+        _cachedTag = tagInt
+        BBPlayerViewRegistry.shared.register(self, tag: tagInt)
       }
 
       // Find the parent view controller from the responder chain
@@ -163,12 +168,11 @@ class BBPlayerView: UIView, BBNativePlayerViewDelegate {
   }
 
   deinit {
-    // Unregister from view registry
-    if let tag = self.reactTag {
-      BBPlayerViewRegistry.shared.unregister(tag: tag.intValue)
+    // Unregister from view registry using cached tag
+    // (deinit is nonisolated in Swift 6, can't access @MainActor properties)
+    if let tag = _cachedTag {
+      BBPlayerViewRegistry.shared.unregister(tag: tag)
     }
-    independentCastButton?.removeFromSuperview()
-    independentCastButton = nil
   }
 
 
@@ -577,6 +581,14 @@ class BBPlayerView: UIView, BBNativePlayerViewDelegate {
     // iOS SDK cleans up automatically when view is removed
   }
 
+  func updatePlayout(_ playoutJson: String) {
+    guard playerView != nil else {
+      NSLog("BBPlayerView.updatePlayout ERROR - playerView not initialized")
+      return
+    }
+    playerView?.player.updatePlayoutWithJson(playoutJson: playoutJson)
+  }
+
   func pause() {
     playerView?.player.pause()
   }