@bluebillywig/react-native-bb-player 8.42.15 → 8.45.0

package/ios/BBPlayerModule.swift

@@ -1,31 +1,100 @@
 import Foundation
 import React
+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.
+ */
+class BBPlayerViewRegistry: NSObject {
+    static let shared = BBPlayerViewRegistry()
+
+    private var views: [Int: BBPlayerView] = [:]
+    private let lock = NSLock()
+
+    private override init() {
+        super.init()
+    }
+
+    func register(_ view: BBPlayerView, tag: Int) {
+        lock.lock()
+        defer { lock.unlock() }
+        views[tag] = view
+        NSLog("BBPlayerViewRegistry: Registered view with tag %d (total: %d)", tag, views.count)
+    }
+
+    func unregister(tag: Int) {
+        lock.lock()
+        defer { lock.unlock() }
+        views.removeValue(forKey: tag)
+        NSLog("BBPlayerViewRegistry: Unregistered view with tag %d (total: %d)", tag, views.count)
+    }
+
+    func getView(tag: Int) -> BBPlayerView? {
+        lock.lock()
+        defer { lock.unlock() }
+        return views[tag]
+    }
+}
 
 /**
  * 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.
  */
 @objc(BBPlayerModule)
-class BBPlayerModule: NSObject {
+class BBPlayerModule: RCTEventEmitter {
 
-    @objc var bridge: RCTBridge?
+    private var modalPlayerView: BBNativePlayerView?
+    private var modalDelegate: ModalPlayerDelegate?
+    private var hasListeners = false
 
-    @objc static func requiresMainQueueSetup() -> Bool {
+    @objc override static func requiresMainQueueSetup() -> Bool {
         return true
     }
 
-    @objc static func moduleName() -> String {
+    @objc override static func moduleName() -> String! {
         return "BBPlayerModule"
     }
 
+    override func supportedEvents() -> [String]! {
+        return [
+            "modalPlayerDismissed",
+            "modalPlayerPlay",
+            "modalPlayerPause",
+            "modalPlayerEnded",
+            "modalPlayerError",
+            "modalPlayerApiReady",
+            "modalPlayerCanPlay",
+        ]
+    }
+
+    override func startObserving() {
+        hasListeners = true
+    }
+
+    override func stopObserving() {
+        hasListeners = false
+    }
+
     // MARK: - Helper to get view by tag
 
     private func getView(_ reactTag: NSNumber) -> BBPlayerView? {
-        guard let bridge = self.bridge else {
-            NSLog("BBPlayerModule: Bridge is nil")
-            return nil
+        // First try the view registry (works with both old and new architecture)
+        if let view = BBPlayerViewRegistry.shared.getView(tag: reactTag.intValue) {
+            return view
         }
-        return bridge.uiManager.view(forReactTag: reactTag) as? BBPlayerView
+
+        // 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
     }
 
     // MARK: - Commands
@@ -114,47 +183,52 @@ class BBPlayerModule: NSObject {
         }
     }
 
-    @objc func loadWithClipId(_ viewTag: NSNumber, clipId: String?, initiator: String?, autoPlay: Bool, seekTo: NSNumber?) {
+    @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)
+            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?) {
+    @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)
+            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?) {
+    @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)
+            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?) {
+    @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)
+            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?) {
+    @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)
+            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?) {
+    @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)
+            self.getView(viewTag)?.loadWithProjectJson(projectJson ?? "", initiator: initiator, autoPlay: autoPlay, seekTo: seekTo?.doubleValue, contextJson: contextJson)
         }
     }
 
-    @objc func loadWithJsonUrl(_ viewTag: NSNumber, jsonUrl: String?, autoPlay: Bool) {
+    @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 {
-            // Load new JSON URL - update the jsonUrl property and re-setup
-            if let view = self.getView(viewTag), let url = jsonUrl {
-                view.jsonUrl = url
+            let view = self.getView(viewTag)
+            NSLog("BBPlayerModule.loadWithJsonUrl - view found: %@", view != nil ? "YES" : "NO")
+            if let view = view, let url = jsonUrl {
+                NSLog("BBPlayerModule.loadWithJsonUrl - calling view.loadWithJsonUrl with url: %@", url)
+                view.loadWithJsonUrl(url, autoPlay: autoPlay, contextJson: contextJson)
+            } else {
+                NSLog("BBPlayerModule.loadWithJsonUrl - FAILED: view=%@, url=%@", view != nil ? "found" : "nil", jsonUrl ?? "nil")
             }
         }
     }
@@ -168,13 +242,6 @@ class BBPlayerModule: NSObject {
         }
     }
 
-    @objc func getCurrentTime(_ viewTag: NSNumber, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
-        DispatchQueue.main.async {
-            let currentTime = self.getView(viewTag)?.currentTime()
-            resolver(currentTime)
-        }
-    }
-
     @objc func getMuted(_ viewTag: NSNumber, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
         DispatchQueue.main.async {
             let muted = self.getView(viewTag)?.muted()
@@ -230,4 +297,99 @@ class BBPlayerModule: NSObject {
             resolver(playoutData)
         }
     }
+
+    // MARK: - Modal Player API
+
+    @objc func presentModalPlayer(_ jsonUrl: String, optionsJson: String?) {
+        DispatchQueue.main.async {
+            guard let rootVC = RCTPresentedViewController() else {
+                NSLog("BBPlayerModule: No root view controller found")
+                return
+            }
+
+            // Parse options from JSON string
+            var options: [String: Any]? = nil
+            if let json = optionsJson, let data = json.data(using: .utf8) {
+                options = try? JSONSerialization.jsonObject(with: data) as? [String: Any]
+            }
+
+            // Create modal player via native SDK
+            let playerView = BBNativePlayer.createModalPlayerView(
+                uiViewContoller: rootVC,
+                jsonUrl: jsonUrl,
+                options: options
+            )
+
+            // Set up delegate for event forwarding
+            let delegate = ModalPlayerDelegate(module: self)
+            playerView.delegate = delegate
+
+            self.modalPlayerView = playerView
+            self.modalDelegate = delegate
+
+            NSLog("BBPlayerModule: Modal player presented with URL: %@", jsonUrl)
+        }
+    }
+
+    @objc func dismissModalPlayer() {
+        DispatchQueue.main.async {
+            self.modalPlayerView?.player.closeModalPlayer()
+            self.modalPlayerView = nil
+            self.modalDelegate = nil
+        }
+    }
+
+    @objc override func addListener(_ eventName: String) {
+        // Required for RCTEventEmitter
+    }
+
+    @objc override func removeListeners(_ count: Double) {
+        // Required for RCTEventEmitter
+    }
+
+    private func emitEvent(_ name: String, body: Any? = nil) {
+        if hasListeners {
+            sendEvent(withName: name, body: body)
+        }
+    }
+
+    // MARK: - Modal Player Delegate
+
+    private class ModalPlayerDelegate: NSObject, BBNativePlayerViewDelegate {
+        weak var module: BBPlayerModule?
+
+        init(module: BBPlayerModule) {
+            self.module = module
+        }
+
+        func bbNativePlayerView(didTriggerPlay playerView: BBNativePlayerView) {
+            module?.emitEvent("modalPlayerPlay")
+        }
+
+        func bbNativePlayerView(didTriggerPause playerView: BBNativePlayerView) {
+            module?.emitEvent("modalPlayerPause")
+        }
+
+        func bbNativePlayerView(didTriggerEnded playerView: BBNativePlayerView) {
+            module?.emitEvent("modalPlayerEnded")
+        }
+
+        func bbNativePlayerView(playerView: BBNativePlayerView, didFailWithError error: String?) {
+            module?.emitEvent("modalPlayerError", body: ["error": error ?? "Unknown error"])
+        }
+
+        func bbNativePlayerView(didTriggerApiReady playerView: BBNativePlayerView) {
+            module?.emitEvent("modalPlayerApiReady")
+        }
+
+        func bbNativePlayerView(didTriggerCanPlay playerView: BBNativePlayerView) {
+            module?.emitEvent("modalPlayerCanPlay")
+        }
+
+        func bbNativePlayerView(didCloseModalPlayer playerView: BBNativePlayerView) {
+            module?.emitEvent("modalPlayerDismissed")
+            module?.modalPlayerView = nil
+            module?.modalDelegate = nil
+        }
+    }
 }

package/ios/BBPlayerView.swift

@@ -42,16 +42,9 @@ class BBPlayerView: UIView, BBNativePlayerViewDelegate {
   private var playerView: BBNativePlayerView?
   private var hasSetup: Bool = false
 
-  // Timer for periodic time updates (opt-in for performance)
-  private var timeUpdateTimer: Timer?
   private var isPlaying: Bool = false
   private var currentDuration: Double = 0.0
-  private var lastKnownTime: Double = 0.0
-  private var playbackStartTimestamp: CFTimeInterval = 0
-  private var lastEmittedTime: Double = 0.0
   private var isInFullscreen: Bool = false
-  private var backgroundObserver: NSObjectProtocol?
-  private var foregroundObserver: NSObjectProtocol?
   // Independent Google Cast button for showing the cast picker
   private var independentCastButton: GCKUICastButton?
   // Store parent view controller reference for SDK
@@ -71,18 +64,6 @@ class BBPlayerView: UIView, BBNativePlayerViewDelegate {
     }
   }
 
-  @objc var enableTimeUpdates: Bool = false {
-    didSet {
-      log("Time updates \(enableTimeUpdates ? "enabled" : "disabled")")
-
-      if !enableTimeUpdates && timeUpdateTimer != nil {
-        stopTimeUpdates()
-      } else if enableTimeUpdates && isPlaying && timeUpdateTimer == nil {
-        startTimeUpdates()
-      }
-    }
-  }
-
   // MARK: - Event handlers (RCTDirectEventBlock)
 
   @objc var onDidFailWithError: RCTDirectEventBlock?
@@ -123,7 +104,6 @@ class BBPlayerView: UIView, BBNativePlayerViewDelegate {
   @objc var onDidTriggerViewFinished: RCTDirectEventBlock?
   @objc var onDidTriggerViewStarted: RCTDirectEventBlock?
   @objc var onDidTriggerVolumeChange: RCTDirectEventBlock?
-  @objc var onDidTriggerTimeUpdate: RCTDirectEventBlock?
   @objc var onDidTriggerApiReady: RCTDirectEventBlock?
 
   override var intrinsicContentSize: CGSize {
@@ -148,7 +128,10 @@ class BBPlayerView: UIView, BBNativePlayerViewDelegate {
       self.layer.drawsAsynchronously = true
       self.isOpaque = true
 
-      setupAppLifecycleObservers()
+      // Register with view registry for command dispatch (supports New Architecture)
+      if let tag = self.reactTag {
+        BBPlayerViewRegistry.shared.register(self, tag: tag.intValue)
+      }
 
       // Find the parent view controller from the responder chain
       var responder = self.next
@@ -170,87 +153,24 @@ class BBPlayerView: UIView, BBNativePlayerViewDelegate {
     } else {
       log("BBPlayerView.didMoveToWindow - view removed from window, isInFullscreen: \(isInFullscreen)")
 
-      if !isInFullscreen {
-        stopTimeUpdates()
+      // Unregister from view registry when removed from window (unless in fullscreen)
+      if !isInFullscreen, let tag = self.reactTag {
+        BBPlayerViewRegistry.shared.unregister(tag: tag.intValue)
       }
-    }
-  }
 
-  // Start periodic time updates (1x per second, only if enabled)
-  private func startTimeUpdates() {
-    guard enableTimeUpdates, timeUpdateTimer == nil else { return }
-
-    timeUpdateTimer = Timer.scheduledTimer(withTimeInterval: 1.0, repeats: true) { [weak self] _ in
-      guard let self = self, self.isPlaying else { return }
-
-      let elapsedSeconds = CACurrentMediaTime() - self.playbackStartTimestamp
-      let estimatedTime = self.lastKnownTime + elapsedSeconds
-      let currentTime = min(estimatedTime, self.currentDuration)
-
-      if self.currentDuration > 0 && abs(currentTime - self.lastEmittedTime) >= 0.5 {
-        self.lastEmittedTime = currentTime
-        self.onDidTriggerTimeUpdate?([
-          "currentTime": currentTime,
-          "duration": self.currentDuration
-        ])
-      }
+      // No cleanup needed when not in fullscreen
     }
   }
 
-  private func stopTimeUpdates() {
-    timeUpdateTimer?.invalidate()
-    timeUpdateTimer = nil
-  }
-
   deinit {
-    stopTimeUpdates()
-    removeAppLifecycleObservers()
+    // Unregister from view registry
+    if let tag = self.reactTag {
+      BBPlayerViewRegistry.shared.unregister(tag: tag.intValue)
+    }
     independentCastButton?.removeFromSuperview()
     independentCastButton = nil
   }
 
-  // MARK: - App Lifecycle Management
-
-  private func setupAppLifecycleObservers() {
-    guard backgroundObserver == nil else { return }
-
-    backgroundObserver = NotificationCenter.default.addObserver(
-      forName: UIApplication.didEnterBackgroundNotification,
-      object: nil,
-      queue: .main
-    ) { [weak self] _ in
-      guard let self = self else { return }
-      if self.isPlaying {
-        self.lastKnownTime = self.calculateCurrentTime()
-      }
-      self.stopTimeUpdates()
-      log("Timer paused - app entered background", level: .debug)
-    }
-
-    foregroundObserver = NotificationCenter.default.addObserver(
-      forName: UIApplication.willEnterForegroundNotification,
-      object: nil,
-      queue: .main
-    ) { [weak self] _ in
-      guard let self = self else { return }
-      if self.isPlaying && self.enableTimeUpdates {
-        self.playbackStartTimestamp = CACurrentMediaTime()
-        self.startTimeUpdates()
-        log("Timer resumed - app entered foreground", level: .debug)
-      }
-    }
-  }
-
-  private func removeAppLifecycleObservers() {
-    if let observer = backgroundObserver {
-      NotificationCenter.default.removeObserver(observer)
-      backgroundObserver = nil
-    }
-    if let observer = foregroundObserver {
-      NotificationCenter.default.removeObserver(observer)
-      foregroundObserver = nil
-    }
-  }
 
   // MARK: - Player Setup (Simplified - no intermediate view controller)
 
@@ -395,7 +315,6 @@ class BBPlayerView: UIView, BBNativePlayerViewDelegate {
 
   func bbNativePlayerView(didTriggerEnded playerView: BBNativePlayerView) {
     isPlaying = false
-    stopTimeUpdates()
     onDidTriggerEnded?([:])
   }
 
@@ -437,7 +356,6 @@ class BBPlayerView: UIView, BBNativePlayerViewDelegate {
 
   func bbNativePlayerView(didTriggerPause playerView: BBNativePlayerView) {
     isPlaying = false
-    stopTimeUpdates()
     onDidTriggerPause?([:])
   }
 
@@ -451,10 +369,6 @@ class BBPlayerView: UIView, BBNativePlayerViewDelegate {
 
   func bbNativePlayerView(didTriggerPlaying playerView: BBNativePlayerView) {
     isPlaying = true
-    playbackStartTimestamp = CACurrentMediaTime()
-    lastEmittedTime = 0.0
-    lastKnownTime = calculateCurrentTime()
-    startTimeUpdates()
     onDidTriggerPlaying?([:])
   }
 
@@ -486,9 +400,6 @@ class BBPlayerView: UIView, BBNativePlayerViewDelegate {
   }
 
   func bbNativePlayerView(playerView: BBNativePlayerView, didTriggerSeeked seekOffset: Double) {
-    lastKnownTime = seekOffset
-    playbackStartTimestamp = CACurrentMediaTime()
-    lastEmittedTime = 0.0
     onDidTriggerSeeked?(["payload": seekOffset as Any])
   }
 
@@ -543,18 +454,6 @@ class BBPlayerView: UIView, BBNativePlayerViewDelegate {
     addSubview(castButton)
   }
 
-  // MARK: - Private Helper Methods
-
-  private func calculateCurrentTime() -> Double {
-    if isPlaying && playbackStartTimestamp > 0 {
-      let elapsedSeconds = CACurrentMediaTime() - playbackStartTimestamp
-      let estimatedTime = lastKnownTime + elapsedSeconds
-      return min(estimatedTime, currentDuration)
-    } else {
-      return lastKnownTime
-    }
-  }
-
   // MARK: - Public API Methods
 
   func adMediaHeight() -> Int? {
@@ -573,10 +472,6 @@ class BBPlayerView: UIView, BBNativePlayerViewDelegate {
     return nil
   }
 
-  func currentTime() -> Double? {
-    return calculateCurrentTime()
-  }
-
   func duration() -> Double? {
     return playerView?.player.duration
   }
@@ -677,9 +572,7 @@ class BBPlayerView: UIView, BBNativePlayerViewDelegate {
   }
 
   func seekRelative(_ offsetInSeconds: Double) {
-    let currentTime = calculateCurrentTime()
-    let newPosition = max(0, min(currentDuration, currentTime + offsetInSeconds))
-    playerView?.player.seek(offsetInSeconds: newPosition as NSNumber)
+    playerView?.player.seekRelative(offsetInSeconds: offsetInSeconds as NSNumber)
   }
 
   func setMuted(_ muted: Bool) {
@@ -690,28 +583,144 @@ class BBPlayerView: UIView, BBNativePlayerViewDelegate {
     playerView?.setApiProperty(property: .volume, value: Float(volume))
   }
 
-  func loadWithClipId(_ clipId: String, initiator: String?, autoPlay: Bool?, seekTo: Double?) {
-    playerView?.player.loadWithClipId(clipId: clipId, initiator: initiator, autoPlay: autoPlay, seekTo: seekTo as NSNumber?)
+  // Helper to parse context JSON into a dictionary for the native SDK
+  private func parseContext(_ contextJson: String?) -> [String: Any]? {
+    guard let jsonString = contextJson, !jsonString.isEmpty else { return nil }
+    guard let data = jsonString.data(using: .utf8) else { return nil }
+    do {
+      if let dict = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+        return dict
+      }
+    } catch {
+      log("Failed to parse context JSON: \(error)", level: .warning)
+    }
+    return nil
+  }
+
+  func loadWithClipId(_ clipId: String, initiator: String?, autoPlay: Bool?, seekTo: Double?, contextJson: String? = nil) {
+    let context = parseContext(contextJson)
+    playerView?.player.loadWithClipId(clipId: clipId, initiator: initiator, autoPlay: autoPlay, seekTo: seekTo as NSNumber?, context: context)
   }
 
-  func loadWithClipListId(_ clipListId: String, initiator: String?, autoPlay: Bool?, seekTo: Double?) {
-    playerView?.player.loadWithClipListId(clipListId: clipListId, initiator: initiator, autoPlay: autoPlay, seekTo: seekTo as NSNumber?)
+  func loadWithClipListId(_ clipListId: String, initiator: String?, autoPlay: Bool?, seekTo: Double?, contextJson: String? = nil) {
+    let context = parseContext(contextJson)
+    playerView?.player.loadWithClipListId(clipListId: clipListId, initiator: initiator, autoPlay: autoPlay, seekTo: seekTo as NSNumber?, context: context)
   }
 
-  func loadWithProjectId(_ projectId: String, initiator: String?, autoPlay: Bool?, seekTo: Double?) {
-    playerView?.player.loadWithProjectId(projectId: projectId, initiator: initiator, autoPlay: autoPlay, seekTo: seekTo as NSNumber?)
+  func loadWithProjectId(_ projectId: String, initiator: String?, autoPlay: Bool?, seekTo: Double?, contextJson: String? = nil) {
+    let context = parseContext(contextJson)
+    playerView?.player.loadWithProjectId(projectId: projectId, initiator: initiator, autoPlay: autoPlay, seekTo: seekTo as NSNumber?, context: context)
   }
 
-  func loadWithClipJson(_ clipJson: String, initiator: String?, autoPlay: Bool?, seekTo: Double?) {
-    playerView?.player.loadWithClipJson(clipJson: clipJson, initiator: initiator, autoPlay: autoPlay, seekTo: seekTo as NSNumber?)
+  func loadWithClipJson(_ clipJson: String, initiator: String?, autoPlay: Bool?, seekTo: Double?, contextJson: String? = nil) {
+    let context = parseContext(contextJson)
+    playerView?.player.loadWithClipJson(clipJson: clipJson, initiator: initiator, autoPlay: autoPlay, seekTo: seekTo as NSNumber?, context: context)
   }
 
-  func loadWithClipListJson(_ clipListJson: String, initiator: String?, autoPlay: Bool?, seekTo: Double?) {
-    playerView?.player.loadWithClipListJson(clipListJson: clipListJson, initiator: initiator, autoPlay: autoPlay, seekTo: seekTo as NSNumber?)
+  func loadWithClipListJson(_ clipListJson: String, initiator: String?, autoPlay: Bool?, seekTo: Double?, contextJson: String? = nil) {
+    let context = parseContext(contextJson)
+    playerView?.player.loadWithClipListJson(clipListJson: clipListJson, initiator: initiator, autoPlay: autoPlay, seekTo: seekTo as NSNumber?, context: context)
   }
 
-  func loadWithProjectJson(_ projectJson: String, initiator: String?, autoPlay: Bool?, seekTo: Double?) {
-    playerView?.player.loadWithProjectJson(projectJson: projectJson, initiator: initiator, autoPlay: autoPlay, seekTo: seekTo as NSNumber?)
+  func loadWithProjectJson(_ projectJson: String, initiator: String?, autoPlay: Bool?, seekTo: Double?, contextJson: String? = nil) {
+    let context = parseContext(contextJson)
+    playerView?.player.loadWithProjectJson(projectJson: projectJson, initiator: initiator, autoPlay: autoPlay, seekTo: seekTo as NSNumber?, context: context)
+  }
+
+  /**
+   * Load content from a JSON URL into the existing player.
+   * Extracts IDs from the URL and uses the native SDK's loadWithXxxId methods.
+   * This is more reliable than parsing JSON because the SDK handles all the loading internally.
+   *
+   * Note: Shorts URLs (/sh/{id}.json) are NOT supported here - use BBShortsView instead.
+   */
+  func loadWithJsonUrl(_ url: String, autoPlay: Bool, contextJson: String? = nil) {
+    NSLog("BBPlayerView.loadWithJsonUrl called - url: %@, autoPlay: %d, context: %@", url, autoPlay, contextJson ?? "nil")
+    guard playerView != nil else {
+      NSLog("BBPlayerView.loadWithJsonUrl ERROR - playerView not initialized")
+      return
+    }
+
+    NSLog("BBPlayerView.loadWithJsonUrl - playerView exists, parsing URL")
+
+    // Extract ID from URL patterns like:
+    // /c/{id}.json or /mediaclip/{id}.json -> clip ID
+    // /l/{id}.json or /mediacliplist/{id}.json -> clip list ID
+    // /pj/{id}.json or /project/{id}.json -> project ID
+
+    let clipIdPattern = "/c/([0-9]+)\\.json|/mediaclip/([0-9]+)"
+    let clipListIdPattern = "/l/([0-9]+)\\.json|/mediacliplist/([0-9]+)"
+    let projectIdPattern = "/pj/([0-9]+)\\.json|/project/([0-9]+)"
+    let shortsIdPattern = "/sh/([0-9]+)\\.json"
+
+    let context = parseContext(contextJson)
+
+    if let shortsMatch = url.range(of: shortsIdPattern, options: .regularExpression) {
+      // Shorts require a separate BBShortsView component
+      log("ERROR - Shorts URLs are not supported in BBPlayerView. Use BBShortsView instead.", level: .error)
+      onDidFailWithError?(["payload": "Shorts URLs are not supported in BBPlayerView. Use BBShortsView instead."])
+      return
+    }
+
+    if let match = url.range(of: clipListIdPattern, options: .regularExpression) {
+      // Extract the cliplist ID
+      if let clipListId = extractIdFromUrl(url, pattern: clipListIdPattern) {
+        NSLog("BBPlayerView.loadWithJsonUrl - Loading ClipList by ID: %@", clipListId)
+        playerView?.player.loadWithClipListId(clipListId: clipListId, initiator: "external", autoPlay: autoPlay, seekTo: nil, context: context)
+      } else {
+        NSLog("BBPlayerView.loadWithJsonUrl ERROR - Failed to extract cliplist ID from URL: %@", url)
+      }
+      return
+    }
+
+    if let match = url.range(of: projectIdPattern, options: .regularExpression) {
+      // Extract the project ID
+      if let projectId = extractIdFromUrl(url, pattern: projectIdPattern) {
+        NSLog("BBPlayerView.loadWithJsonUrl - Loading Project by ID: %@", projectId)
+        playerView?.player.loadWithProjectId(projectId: projectId, initiator: "external", autoPlay: autoPlay, seekTo: nil, context: context)
+      } else {
+        NSLog("BBPlayerView.loadWithJsonUrl ERROR - Failed to extract project ID from URL: %@", url)
+      }
+      return
+    }
+
+    if let match = url.range(of: clipIdPattern, options: .regularExpression) {
+      // Extract the clip ID
+      if let clipId = extractIdFromUrl(url, pattern: clipIdPattern) {
+        NSLog("BBPlayerView.loadWithJsonUrl - Loading Clip by ID: %@", clipId)
+        playerView?.player.loadWithClipId(clipId: clipId, initiator: "external", autoPlay: autoPlay, seekTo: nil, context: context)
+      } else {
+        NSLog("BBPlayerView.loadWithJsonUrl ERROR - Failed to extract clip ID from URL: %@", url)
+      }
+      return
+    }
+
+    NSLog("BBPlayerView.loadWithJsonUrl ERROR - Unknown URL format, cannot extract ID: %@", url)
+    onDidFailWithError?(["payload": "Cannot load content: unsupported URL format"])
+  }
+
+  /**
+   * Helper to extract numeric ID from URL using regex pattern with capture groups
+   */
+  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) {
+        // Try each capture group (pattern has multiple alternatives with |)
+        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 {
+      log("ERROR - Regex error: \(error)", level: .error)
+    }
+    return nil
   }
 
   func showCastPicker() {