@shortkitsdk/react-native 0.2.30 → 0.2.32

package/ios/ShortKitBridge.swift

@@ -1164,13 +1164,31 @@ extension ShortKitBridge: ShortKitDownloadDelegate {
         emitOnMain("onDownloadStarted", body: ["itemId": item.id])
     }
 
+    // Legacy phase-less progress overload. Intentionally a no-op on the
+    // bridge: `DownloadManager.emitProgress` invokes both this method and
+    // the phase-aware overload below for backwards compatibility with
+    // native Swift delegates that only implement the legacy method, but
+    // RN consumers want a single phase-aware emit per progress tick.
+    // Suppressing the legacy emit here avoids double-firing
+    // `onDownloadProgress` (and prevents the `phase` field from being
+    // dropped when this overload would otherwise win the throttle gate).
     public func shortKit(_ shortKit: ShortKit, didUpdateDownloadProgress item: ContentItem, progress: Double) {
+        // No-op — see comment above.
+    }
+
+    public func shortKit(
+        _ shortKit: ShortKit,
+        didUpdateDownloadProgress item: ContentItem,
+        progress: Double,
+        phase: DownloadPhase
+    ) {
         let now = CACurrentMediaTime()
         guard now - lastDownloadProgressEmitTime >= 0.1 else { return }
         lastDownloadProgressEmitTime = now
         emitOnMain("onDownloadProgress", body: [
             "itemId": item.id,
             "progress": progress,
+            "phase": phase.rawValue,
         ])
     }
 
@@ -1194,6 +1212,10 @@ extension ShortKitBridge: ShortKitDownloadDelegate {
             message = "HTTP error: \(statusCode)"
         case .cancelled:
             message = "Download cancelled"
+        case .exportFailed(let underlying):
+            message = "Overlay export failed: \(underlying.localizedDescription)"
+        case .overlayNotVisibleForSnapshot:
+            message = "Overlay not visible for snapshot"
         }
         emitOnMain("onDownloadFailed", body: [
             "itemId": item.id,
@@ -1205,9 +1227,16 @@ extension ShortKitBridge: ShortKitDownloadDelegate {
 // MARK: - Downloads
 
 extension ShortKitBridge {
-    @objc public func downloadVideo(_ itemId: String, mode: String, completion: @escaping (String?, NSError?) -> Void) {
+    @objc public func downloadVideo(
+        _ itemId: String,
+        mode: String,
+        overlayMode: String,
+        completion: @escaping (String?, NSError?) -> Void
+    ) {
+        print("[SKComposite] Bridge.downloadVideo ENTER itemId=\(itemId) mode=\(mode) overlayMode=\(overlayMode)")
         DispatchQueue.main.async {
             guard let shortKit = self.shortKit else {
+                print("[SKComposite] Bridge.downloadVideo ERROR shortKit==nil")
                 completion(nil, NSError(domain: "ShortKitBridge", code: 1, userInfo: [
                     NSLocalizedDescriptionKey: "ShortKit not initialized"
                 ]))
@@ -1215,25 +1244,70 @@ extension ShortKitBridge {
             }
 
             guard let item = self.itemCache[itemId] else {
+                print("[SKComposite] Bridge.downloadVideo ERROR itemCache miss — cache has \(self.itemCache.count) items; keys=\(Array(self.itemCache.keys).prefix(5))")
                 completion(nil, NSError(domain: "ShortKitBridge", code: 2, userInfo: [
                     NSLocalizedDescriptionKey: "Content item not found: \(itemId)"
                 ]))
                 return
             }
+            print("[SKComposite] Bridge.downloadVideo resolved item id=\(item.id) title=\(item.title) isLive=\(item.isLive) downloadUrl=\(item.downloadUrl ?? "<nil>")")
 
             let downloadMode: DownloadMode = mode == "interruptive" ? .interruptive : .nonInterruptive
 
+            let resolvedOverlayMode: DownloadOverlayMode
+            switch overlayMode {
+            case "static":
+                print("[SKComposite] Bridge.downloadVideo resolving overlay — feedRegistry has \(self.feedRegistry.count) feeds")
+                guard let overlay = self.findActiveOverlay(for: itemId) else {
+                    print("[SKComposite] Bridge.downloadVideo ERROR no visible overlay found for itemId=\(itemId)")
+                    completion(nil, ShortKitDownloadError.overlayNotVisibleForSnapshot as NSError)
+                    return
+                }
+                print("[SKComposite] Bridge.downloadVideo found overlay class=\(type(of: overlay)) bounds=\(overlay.bounds)")
+                resolvedOverlayMode = .staticSnapshot(source: overlay)
+            case "deterministic":
+                print("[SKComposite] Bridge.downloadVideo deterministic mode requested — Phase 2, not implemented")
+                completion(nil, ShortKitDownloadError.downloadNotAvailable as NSError)
+                return
+            default:
+                resolvedOverlayMode = .none
+            }
+
             Task {
                 do {
-                    let fileURL = try await shortKit.downloadVideo(item, mode: downloadMode)
+                    print("[SKComposite] Bridge.downloadVideo calling shortKit.downloadVideo(mode=\(downloadMode), overlayMode=\(overlayMode))")
+                    let fileURL = try await shortKit.downloadVideo(item, mode: downloadMode, overlayMode: resolvedOverlayMode)
+                    print("[SKComposite] Bridge.downloadVideo SUCCESS fileURL=\(fileURL.absoluteString)")
                     completion(fileURL.absoluteString, nil)
                 } catch {
-                    completion(nil, error as NSError)
+                    let ns = error as NSError
+                    print("[SKComposite] Bridge.downloadVideo ERROR domain=\(ns.domain) code=\(ns.code) desc=\(ns.localizedDescription) userInfo=\(ns.userInfo)")
+                    completion(nil, ns)
                 }
             }
         }
     }
 
+    /// Finds the currently-attached overlay for the given item ID by iterating
+    /// all registered feed view controllers. Returns the first match, or nil
+    /// if no visible cell is found for this item in any registered feed.
+    @MainActor
+    private func findActiveOverlay(for itemId: String) -> (UIView & FeedOverlay)? {
+        for (feedId, entry) in feedRegistry {
+            guard let vc = entry.vc else {
+                print("[SKComposite] findActiveOverlay feedId=\(feedId) vc was deallocated")
+                continue
+            }
+            if let overlay = vc.overlayView(forItemId: itemId) {
+                print("[SKComposite] findActiveOverlay matched in feedId=\(feedId)")
+                return overlay
+            } else {
+                print("[SKComposite] findActiveOverlay miss in feedId=\(feedId) — no visible cell for itemId=\(itemId)")
+            }
+        }
+        return nil
+    }
+
     @objc public func cancelDownload() {
         shortKit?.cancelDownload()
     }

package/ios/ShortKitFeedView.swift

@@ -174,18 +174,7 @@ import ShortKitSDK
 
         let debugPanelEnabled = self.debugPanel?.boolValue ?? sdk.debugPanelEnabled
         if debugPanelEnabled {
-            feedVC.debugPanelFactory = { active, prev, next in
-                let panel = DebugPanelView(frame: CGRect(
-                    x: 0, y: 0,
-                    width: DebugPanelView.panelWidth,
-                    height: DebugPanelView.panelHeight
-                ))
-                panel.center = CGPoint(x: UIScreen.main.bounds.width / 2,
-                                       y: UIScreen.main.bounds.height / 2)
-                panel.subscribe(to: active)
-                panel.subscribeAdjacent(prev: prev, next: next)
-                return panel
-            }
+            feedVC.debugPanelFactory = ShortKit.defaultDebugPanelFactory
         }
 
         feedVC.onDismiss = {

package/ios/ShortKitModule.mm

@@ -363,12 +363,16 @@ RCT_EXPORT_METHOD(getStoryboardData:(NSString *)playbackId
 
 RCT_EXPORT_METHOD(downloadVideo:(NSString *)itemId
                   mode:(NSString *)mode
+                  overlayMode:(NSString *)overlayMode
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject) {
-  [_shortKitBridge downloadVideo:itemId mode:mode completion:^(NSString *fileUrl, NSError *error) {
+  NSLog(@"[SKComposite] Module.downloadVideo ENTER itemId=%@ mode=%@ overlayMode=%@", itemId, mode, overlayMode);
+  [_shortKitBridge downloadVideo:itemId mode:mode overlayMode:overlayMode completion:^(NSString *fileUrl, NSError *error) {
     if (error) {
+      NSLog(@"[SKComposite] Module.downloadVideo REJECT domain=%@ code=%ld desc=%@", error.domain, (long)error.code, error.localizedDescription);
       reject(@"DOWNLOAD_ERROR", error.localizedDescription, error);
     } else {
+      NSLog(@"[SKComposite] Module.downloadVideo RESOLVE fileUrl=%@", fileUrl);
       resolve(fileUrl);
     }
   }];

package/ios/ShortKitSDK.xcframework/ios-arm64/ShortKitSDK.framework/Info.plist

@@ -11,9 +11,9 @@
     <key>CFBundlePackageType</key>
     <string>FMWK</string>
     <key>CFBundleVersion</key>
-    <string>0.2.30</string>
+    <string>0.2.32</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.2.30</string>
+    <string>0.2.32</string>
     <key>MinimumOSVersion</key>
     <string>16.0</string>
 </dict>