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

package/ios/BBPlayerModule.swift

@@ -1,6 +1,42 @@
 import Foundation
 import React
 
+/**
+ * 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.
  * This module looks up BBPlayerView instances by their React tag and dispatches commands to them.
@@ -21,11 +57,20 @@ class BBPlayerModule: NSObject {
     // 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
@@ -151,10 +196,15 @@ class BBPlayerModule: NSObject {
     }
 
     @objc func loadWithJsonUrl(_ viewTag: NSNumber, jsonUrl: String?, autoPlay: Bool) {
+        NSLog("BBPlayerModule.loadWithJsonUrl called - viewTag: %@, jsonUrl: %@, autoPlay: %d", viewTag, jsonUrl ?? "nil", autoPlay)
         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)
+            } else {
+                NSLog("BBPlayerModule.loadWithJsonUrl - FAILED: view=%@, url=%@", view != nil ? "found" : "nil", jsonUrl ?? "nil")
             }
         }
     }

package/ios/BBPlayerView.swift

@@ -148,6 +148,11 @@ class BBPlayerView: UIView, BBNativePlayerViewDelegate {
       self.layer.drawsAsynchronously = true
       self.isOpaque = true
 
+      // Register with view registry for command dispatch (supports New Architecture)
+      if let tag = self.reactTag {
+        BBPlayerViewRegistry.shared.register(self, tag: tag.intValue)
+      }
+
       setupAppLifecycleObservers()
 
       // Find the parent view controller from the responder chain
@@ -170,6 +175,11 @@ class BBPlayerView: UIView, BBNativePlayerViewDelegate {
     } else {
       log("BBPlayerView.didMoveToWindow - view removed from window, isInFullscreen: \(isInFullscreen)")
 
+      // Unregister from view registry when removed from window (unless in fullscreen)
+      if !isInFullscreen, let tag = self.reactTag {
+        BBPlayerViewRegistry.shared.unregister(tag: tag.intValue)
+      }
+
       if !isInFullscreen {
         stopTimeUpdates()
       }
@@ -203,6 +213,10 @@ class BBPlayerView: UIView, BBNativePlayerViewDelegate {
   }
 
   deinit {
+    // Unregister from view registry
+    if let tag = self.reactTag {
+      BBPlayerViewRegistry.shared.unregister(tag: tag.intValue)
+    }
     stopTimeUpdates()
     removeAppLifecycleObservers()
     independentCastButton?.removeFromSuperview()
@@ -714,6 +728,100 @@ class BBPlayerView: UIView, BBNativePlayerViewDelegate {
     playerView?.player.loadWithProjectJson(projectJson: projectJson, initiator: initiator, autoPlay: autoPlay, seekTo: seekTo as NSNumber?)
   }
 
+  /**
+   * 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) {
+    NSLog("BBPlayerView.loadWithJsonUrl called - url: %@, autoPlay: %d", url, autoPlay)
+    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"
+
+    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)
+      } 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)
+      } 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)
+      } 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() {
     log("showCastPicker called")
 

package/ios/BBPlayerViewManager.swift

@@ -146,6 +146,14 @@ class BBPlayerViewManager: RCTViewManager {
         }
     }
 
+    @objc func loadWithJsonUrl(_ reactTag: NSNumber, jsonUrl: String?, autoPlay: Bool) {
+        DispatchQueue.main.async {
+            if let url = jsonUrl {
+                self.getView(reactTag)?.loadWithJsonUrl(url, autoPlay: autoPlay)
+            }
+        }
+    }
+
     // Note: loadWithShortsId is NOT supported on BBPlayerView.
     // For Shorts playback, use the BBShortsView component instead.
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bluebillywig/react-native-bb-player",
-  "version": "8.42.15",
+  "version": "8.44.0",
   "description": "Blue Billywig Native Video Player for React Native - iOS AVPlayer and Android ExoPlayer integration",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",