@bluebillywig/react-native-bb-player 8.46.0 → 8.47.0

package/android/src/main/java/com/bluebillywig/bbplayer/BBPlayerView.kt

@@ -293,74 +293,95 @@ class BBPlayerView(private val reactContext: ThemedReactContext) : FrameLayout(r
     }
 
     /**
-     * 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.
+     * Load content by explicit content ID and type. Preferred over loadWithJsonUrl.
      *
-     * Note: Shorts URLs (/sh/{id}.json) are NOT supported here - use BBShortsView instead.
+     * @param contentId numeric content ID string
+     * @param contentType "mediaclip" | "mediacliplist" | "project" (or short forms "c", "l", "p"/"pj")
+     * @param autoPlay whether to start playback immediately
+     * @param contextJson optional context JSON string
      */
-    fun loadWithJsonUrl(url: String, autoPlay: Boolean = true, contextJson: String? = null) {
+    fun loadWithContentIdAndType(contentId: String, contentType: String, autoPlay: Boolean = true, contextJson: String? = null) {
         if (!::playerView.isInitialized) {
             Log.w("BBPlayerView", "Cannot load content - playerView not initialized")
             return
         }
+        Log.d("BBPlayerView", "loadWithContentIdAndType called - id: $contentId, type: $contentType, autoPlay: $autoPlay")
+        val context = parseContext(contextJson)
+        when (contentType.lowercase()) {
+            "mediacliplist", "l" -> playerView.player?.loadWithClipListId(contentId, "external", autoPlay, null, context)
+            "project", "p", "pj" -> playerView.player?.loadWithProjectId(contentId, "external", autoPlay, null, context)
+            "mediaclip", "c" -> playerView.player?.loadWithClipId(contentId, "external", autoPlay, null, context)
+            else -> {
+                Log.e("BBPlayerView", "loadWithContentIdAndType: unknown contentType '$contentType'")
+                sendEvent("onDidFailWithError", Arguments.createMap().apply {
+                    putString("payload", "Unknown contentType: '$contentType'. Expected one of: mediaclip, mediacliplist, project")
+                })
+            }
+        }
+    }
 
-        Log.d("BBPlayerView", "loadWithJsonUrl called with URL: $url, context: $contextJson")
+    /**
+     * Convenience method: load content from a BB JSON URL.
+     * Parses the URL to extract content ID and type, then delegates to loadWithContentIdAndType.
+     * Note: Shorts URLs (/sh/{id}.json) are NOT supported — use BBShortsView instead.
+     */
+    fun loadWithJsonUrl(url: String, autoPlay: Boolean = true, contextJson: String? = null) {
+        if (!::playerView.isInitialized) {
+            Log.w("BBPlayerView", "Cannot load content - playerView not initialized")
+            return
+        }
 
-        // 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
+        Log.d("BBPlayerView", "loadWithJsonUrl called with URL: $url")
 
-        val clipIdRegex = Regex("/c/([0-9]+)\\.json|/mediaclip/([0-9]+)")
-        val clipListIdRegex = Regex("/l/([0-9]+)\\.json|/mediacliplist/([0-9]+)")
-        val projectIdRegex = Regex("/pj/([0-9]+)\\.json|/project/([0-9]+)")
         val shortsIdRegex = Regex("/sh/([0-9]+)\\.json")
+        val clipListIdRegex = Regex("/l/([0-9]+)\\.json|/mediacliplist/([0-9]+)")
+        val projectIdRegex = Regex("/pj/([0-9]+)\\.json|/p/[^/]+/p/([0-9]+)\\.json|/project/([0-9]+)")
+        val clipIdRegex = Regex("/c/([0-9]+)\\.json|/mediaclip/([0-9]+)")
 
-        val context = parseContext(contextJson)
+        fun extractId(regex: Regex): String? =
+            regex.find(url)?.groupValues?.drop(1)?.firstOrNull { it.isNotEmpty() }
 
         when {
             shortsIdRegex.containsMatchIn(url) -> {
-                // Shorts require a separate BBShortsView component
                 Log.e("BBPlayerView", "Shorts URLs are not supported in BBPlayerView. Use BBShortsView instead.")
                 sendEvent("onDidFailWithError", Arguments.createMap().apply {
-                    putString("error", "Shorts URLs are not supported in BBPlayerView. Use BBShortsView instead.")
+                    putString("payload", "Shorts URLs are not supported in BBPlayerView. Use BBShortsView instead.")
                 })
             }
             clipListIdRegex.containsMatchIn(url) -> {
-                val match = clipListIdRegex.find(url)
-                val clipListId = match?.groupValues?.drop(1)?.firstOrNull { it.isNotEmpty() }
-                if (clipListId != null) {
-                    Log.d("BBPlayerView", "Loading ClipList by ID: $clipListId")
-                    playerView.player?.loadWithClipListId(clipListId, "external", autoPlay, null, context)
-                } else {
+                val id = extractId(clipListIdRegex)
+                if (id != null) loadWithContentIdAndType(id, "mediacliplist", autoPlay, contextJson)
+                else {
                     Log.e("BBPlayerView", "Failed to extract cliplist ID from URL: $url")
+                    sendEvent("onDidFailWithError", Arguments.createMap().apply {
+                        putString("payload", "Cannot load content: failed to extract ID from URL")
+                    })
                 }
             }
             projectIdRegex.containsMatchIn(url) -> {
-                val match = projectIdRegex.find(url)
-                val projectId = match?.groupValues?.drop(1)?.firstOrNull { it.isNotEmpty() }
-                if (projectId != null) {
-                    Log.d("BBPlayerView", "Loading Project by ID: $projectId")
-                    playerView.player?.loadWithProjectId(projectId, "external", autoPlay, null, context)
-                } else {
+                val id = extractId(projectIdRegex)
+                if (id != null) loadWithContentIdAndType(id, "project", autoPlay, contextJson)
+                else {
                     Log.e("BBPlayerView", "Failed to extract project ID from URL: $url")
+                    sendEvent("onDidFailWithError", Arguments.createMap().apply {
+                        putString("payload", "Cannot load content: failed to extract ID from URL")
+                    })
                 }
             }
             clipIdRegex.containsMatchIn(url) -> {
-                val match = clipIdRegex.find(url)
-                val clipId = match?.groupValues?.drop(1)?.firstOrNull { it.isNotEmpty() }
-                if (clipId != null) {
-                    Log.d("BBPlayerView", "Loading Clip by ID: $clipId")
-                    playerView.player?.loadWithClipId(clipId, "external", autoPlay, null, context)
-                } else {
+                val id = extractId(clipIdRegex)
+                if (id != null) loadWithContentIdAndType(id, "mediaclip", autoPlay, contextJson)
+                else {
                     Log.e("BBPlayerView", "Failed to extract clip ID from URL: $url")
+                    sendEvent("onDidFailWithError", Arguments.createMap().apply {
+                        putString("payload", "Cannot load content: failed to extract ID from URL")
+                    })
                 }
             }
             else -> {
                 Log.e("BBPlayerView", "Unknown URL format, cannot extract ID: $url")
                 sendEvent("onDidFailWithError", Arguments.createMap().apply {
-                    putString("error", "Cannot load content: unsupported URL format")
+                    putString("payload", "Cannot load content: unsupported URL format")
                 })
             }
         }

package/android/src/paper/java/com/bluebillywig/bbplayer/NativeBBPlayerModuleSpec.java

@@ -56,6 +56,7 @@ public abstract class NativeBBPlayerModuleSpec extends ReactContextBaseJavaModul
     public abstract void loadWithClipListJson(int viewTag, String clipListJson, String initiator, boolean autoPlay, double seekTo, String contextJson);
     public abstract void loadWithProjectJson(int viewTag, String projectJson, String initiator, boolean autoPlay, double seekTo, String contextJson);
     public abstract void loadWithJsonUrl(int viewTag, String jsonUrl, boolean autoPlay, String contextJson);
+    public abstract void loadWithContentIdAndType(int viewTag, String contentId, String contentType, boolean autoPlay, String contextJson);
 
     // Viewability control
     public abstract void setInView(int viewTag, boolean inView);

package/ios/BBCastButtonViewManager.swift

@@ -9,4 +9,8 @@ class BBCastButtonViewManager: RCTViewManager {
     override static func requiresMainQueueSetup() -> Bool {
         return true
     }
+
+    @objc override static func moduleName() -> String! {
+        return "BBCastButtonView"
+    }
 }

package/ios/BBCastMiniControlsViewManager.swift

@@ -9,4 +9,8 @@ class BBCastMiniControlsViewManager: RCTViewManager {
     override static func requiresMainQueueSetup() -> Bool {
         return true
     }
+
+    @objc override static func moduleName() -> String! {
+        return "BBCastMiniControlsView"
+    }
 }

package/ios/BBPlayerModule.mm

@@ -37,6 +37,7 @@ RCT_EXTERN_METHOD(loadWithClipJson:(nonnull NSNumber *)viewTag clipJson:(NSStrin
 RCT_EXTERN_METHOD(loadWithClipListJson:(nonnull NSNumber *)viewTag clipListJson:(NSString *)clipListJson initiator:(NSString *)initiator autoPlay:(BOOL)autoPlay seekTo:(NSNumber *)seekTo contextJson:(NSString *)contextJson)
 RCT_EXTERN_METHOD(loadWithProjectJson:(nonnull NSNumber *)viewTag projectJson:(NSString *)projectJson initiator:(NSString *)initiator autoPlay:(BOOL)autoPlay seekTo:(NSNumber *)seekTo contextJson:(NSString *)contextJson)
 RCT_EXTERN_METHOD(loadWithJsonUrl:(nonnull NSNumber *)viewTag jsonUrl:(NSString *)jsonUrl autoPlay:(BOOL)autoPlay contextJson:(NSString *)contextJson)
+RCT_EXTERN_METHOD(loadWithContentIdAndType:(nonnull NSNumber *)viewTag contentId:(NSString *)contentId contentType:(NSString *)contentType autoPlay:(BOOL)autoPlay contextJson:(NSString *)contextJson)
 
 // Getter methods with Promise
 RCT_EXTERN_METHOD(getDuration:(nonnull NSNumber *)viewTag resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)

package/ios/BBPlayerModule.swift

@@ -234,6 +234,18 @@ class BBPlayerModule: RCTEventEmitter {
         }
     }
 
+    @objc func loadWithContentIdAndType(_ viewTag: NSNumber, contentId: String?, contentType: String?, autoPlay: Bool, contextJson: String?) {
+        DispatchQueue.main.async {
+            let view = self.getView(viewTag)
+            guard let view = view, let id = contentId, let type = contentType else {
+                NSLog("BBPlayerModule.loadWithContentIdAndType - FAILED: view=%@, id=%@, type=%@",
+                      view != nil ? "found" : "nil", contentId ?? "nil", contentType ?? "nil")
+                return
+            }
+            view.loadWithContentIdAndType(id, contentType: type, autoPlay: autoPlay, contextJson: contextJson)
+        }
+    }
+
     // MARK: - Getter methods with Promise support
 
     @objc func getDuration(_ viewTag: NSNumber, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {

package/ios/BBPlayerView.swift

@@ -646,69 +646,83 @@ class BBPlayerView: UIView, BBNativePlayerViewDelegate {
   }
 
   /**
-   * 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.
+   * Load content by explicit content ID and type. Preferred over loadWithJsonUrl.
    *
-   * Note: Shorts URLs (/sh/{id}.json) are NOT supported here - use BBShortsView instead.
+   * - Parameters:
+   *   - contentId: numeric content ID string
+   *   - contentType: "mediaclip", "mediacliplist", or "project" (short forms "c", "l", "p"/"pj" also accepted)
+   *   - autoPlay: whether to start playback immediately
+   *   - contextJson: optional context JSON string
+   */
+  func loadWithContentIdAndType(_ contentId: String, contentType: String, autoPlay: Bool, contextJson: String? = nil) {
+    guard playerView != nil else {
+      NSLog("BBPlayerView.loadWithContentIdAndType ERROR - playerView not initialized")
+      return
+    }
+    NSLog("BBPlayerView.loadWithContentIdAndType called - id: %@, type: %@, autoPlay: %d", contentId, contentType, autoPlay)
+    let context = parseContext(contextJson)
+    switch contentType.lowercased() {
+    case "mediacliplist", "l":
+      playerView?.player.loadWithClipListId(clipListId: contentId, initiator: "external", autoPlay: autoPlay, seekTo: nil, context: context)
+    case "project", "p", "pj":
+      playerView?.player.loadWithProjectId(projectId: contentId, initiator: "external", autoPlay: autoPlay, seekTo: nil, context: context)
+    case "mediaclip", "c":
+      playerView?.player.loadWithClipId(clipId: contentId, initiator: "external", autoPlay: autoPlay, seekTo: nil, context: context)
+    default:
+      NSLog("BBPlayerView.loadWithContentIdAndType ERROR - unknown contentType '%@'", contentType)
+      onDidFailWithError?(["payload": "Unknown contentType: '\(contentType)'. Expected one of: mediaclip, mediacliplist, project"])
+    }
+  }
+
+  /**
+   * Convenience method: load content from a BB JSON URL.
+   * Parses the URL to extract content ID and type, then delegates to loadWithContentIdAndType.
+   * Note: Shorts URLs (/sh/{id}.json) are NOT supported — use BBShortsView instead.
    */
   func loadWithJsonUrl(_ url: String, autoPlay: Bool, contextJson: String? = nil) {
-    NSLog("BBPlayerView.loadWithJsonUrl called - url: %@, autoPlay: %d, context: %@", url, autoPlay, contextJson ?? "nil")
+    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"
-
-    let context = parseContext(contextJson)
+    let shortsPattern = "/sh/([0-9]+)\\.json"
+    let clipListPattern = "/l/([0-9]+)\\.json|/mediacliplist/([0-9]+)"
+    let projectPattern = "/pj/([0-9]+)\\.json|/p/[^/]+/p/([0-9]+)\\.json|/project/([0-9]+)"
+    let clipPattern = "/c/([0-9]+)\\.json|/mediaclip/([0-9]+)"
 
-    if let shortsMatch = url.range(of: shortsIdPattern, options: .regularExpression) {
-      // Shorts require a separate BBShortsView component
+    if url.range(of: shortsPattern, options: .regularExpression) != nil {
       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)
+    if url.range(of: clipListPattern, options: .regularExpression) != nil {
+      if let id = extractIdFromUrl(url, pattern: clipListPattern) {
+        loadWithContentIdAndType(id, contentType: "mediacliplist", autoPlay: autoPlay, contextJson: contextJson)
       } else {
         NSLog("BBPlayerView.loadWithJsonUrl ERROR - Failed to extract cliplist ID from URL: %@", url)
+        onDidFailWithError?(["payload": "Cannot load content: failed to extract ID from 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)
+    if url.range(of: projectPattern, options: .regularExpression) != nil {
+      if let id = extractIdFromUrl(url, pattern: projectPattern) {
+        loadWithContentIdAndType(id, contentType: "project", autoPlay: autoPlay, contextJson: contextJson)
       } else {
         NSLog("BBPlayerView.loadWithJsonUrl ERROR - Failed to extract project ID from URL: %@", url)
+        onDidFailWithError?(["payload": "Cannot load content: failed to extract ID from 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)
+    if url.range(of: clipPattern, options: .regularExpression) != nil {
+      if let id = extractIdFromUrl(url, pattern: clipPattern) {
+        loadWithContentIdAndType(id, contentType: "mediaclip", autoPlay: autoPlay, contextJson: contextJson)
       } else {
         NSLog("BBPlayerView.loadWithJsonUrl ERROR - Failed to extract clip ID from URL: %@", url)
+        onDidFailWithError?(["payload": "Cannot load content: failed to extract ID from URL"])
       }
       return
     }

package/ios/Frameworks/BBNativePlayerKit.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>BBNativePlayerKit.framework/BBNativePlayerKit</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>BBNativePlayerKit.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>BBNativePlayerKit.framework/BBNativePlayerKit</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>BBNativePlayerKit.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/ios/Frameworks/BBNativePlayerKit.xcframework/ios-arm64/BBNativePlayerKit.framework/Headers/BBNativePlayerKit-Swift.h

@@ -1,6 +1,6 @@
 #if 0
 #elif defined(__arm64__) && __arm64__
-// Generated by Apple Swift version 6.1.2 (swiftlang-6.1.2.1.2 clang-1700.0.13.5)
+// Generated by Apple Swift version 6.2.4 (swiftlang-6.2.4.1.4 clang-1700.6.4.2)
 #ifndef BBNATIVEPLAYERKIT_SWIFT_H
 #define BBNATIVEPLAYERKIT_SWIFT_H
 #pragma clang diagnostic push
@@ -358,14 +358,14 @@ SWIFT_CLASS("_TtC17BBNativePlayerKit28BBNativePlayerViewController")
 @property (nonatomic, readonly) UIInterfaceOrientationMask supportedInterfaceOrientations;
 @end
 
-@interface BBNativePlayerViewController (SWIFT_EXTENSION(BBNativePlayerKit)) <GCKDiscoveryManagerListener>
-- (void)didUpdateDeviceList;
-@end
-
 @interface BBNativePlayerViewController (SWIFT_EXTENSION(BBNativePlayerKit)) <BbnativesharedEventListenerInterface>
 - (void)onEventEventType:(BbnativesharedEventName * _Nonnull)eventType data:(NSDictionary<NSString *, id> * _Nullable)data;
 @end
 
+@interface BBNativePlayerViewController (SWIFT_EXTENSION(BBNativePlayerKit)) <GCKDiscoveryManagerListener>
+- (void)didUpdateDeviceList;
+@end
+
 @interface BBNativePlayerViewController (SWIFT_EXTENSION(BBNativePlayerKit)) <UIGestureRecognizerDelegate>
 - (BOOL)gestureRecognizer:(UIGestureRecognizer * _Nonnull)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer * _Nonnull)otherGestureRecognizer SWIFT_WARN_UNUSED_RESULT;
 - (BOOL)gestureRecognizer:(UIGestureRecognizer * _Nonnull)gestureRecognizer shouldReceiveTouch:(UITouch * _Nonnull)touch SWIFT_WARN_UNUSED_RESULT;
@@ -650,14 +650,14 @@ SWIFT_CLASS("_TtC17BBNativePlayerKit18BBNativeShortsView")
 - (void)removeFromSuperview;
 @end
 
-@interface BBNativeShortsView (SWIFT_EXTENSION(BBNativePlayerKit)) <BbnativesharedEventListenerInterface>
-- (void)onEventEventType:(BbnativesharedEventName * _Nonnull)eventType data:(NSDictionary<NSString *, id> * _Nullable)data;
-@end
-
 @interface BBNativeShortsView (SWIFT_EXTENSION(BBNativePlayerKit)) <BBNativePlayerViewDelegate>
 - (void)bbNativePlayerViewWithPlayerView:(BBNativePlayerView * _Nonnull)playerView didSetupWithJsonUrl:(NSString * _Nullable)url;
 @end
 
+@interface BBNativeShortsView (SWIFT_EXTENSION(BBNativePlayerKit)) <BbnativesharedEventListenerInterface>
+- (void)onEventEventType:(BbnativesharedEventName * _Nonnull)eventType data:(NSDictionary<NSString *, id> * _Nullable)data;
+@end
+
 /// :nodoc:
 SWIFT_CLASS("_TtC17BBNativePlayerKit28BBNativeShortsViewController")
 @interface BBNativeShortsViewController : UIViewController