@shortkitsdk/react-native 0.2.22 → 0.2.24

package/android/src/main/java/com/shortkit/reactnative/ShortKitBridge.kt

@@ -17,7 +17,8 @@ import com.shortkit.sdk.model.FeedInput
 import com.shortkit.sdk.model.FeedScrollPhase
 import com.shortkit.sdk.model.FeedTransitionPhase
 import com.shortkit.sdk.model.ImageCarouselItem
-import com.shortkit.sdk.model.VideoCarouselItem
+import com.shortkit.sdk.model.VideoCarouselInput
+import com.shortkit.sdk.model.VideoCarouselVideoInput
 import com.shortkit.sdk.model.JsonValue
 import com.shortkit.sdk.model.PlayerState
 import com.shortkit.sdk.config.SurveyOverlayMode
@@ -366,22 +367,24 @@ class ShortKitBridge(
                         "videoCarousel" -> {
                             val itemObj = obj.optJSONObject("item") ?: continue
                             val videosArr = itemObj.optJSONArray("videos") ?: continue
-                            val videos = mutableListOf<ContentItem>()
+                            val videoInputs = mutableListOf<VideoCarouselVideoInput>()
                             for (i in 0 until videosArr.length()) {
                                 val videoObj = videosArr.getJSONObject(i)
-                                parseContentItem(videoObj)?.let { videos.add(it) }
+                                val playbackId = videoObj.optString("playbackId", null) ?: continue
+                                val fallbackUrl = videoObj.optString("fallbackUrl", null)
+                                videoInputs.add(VideoCarouselVideoInput(playbackId, fallbackUrl))
                             }
-                            if (videos.isEmpty()) continue
-                            val carouselItem = VideoCarouselItem(
+                            if (videoInputs.isEmpty()) continue
+                            val carouselInput = VideoCarouselInput(
                                 id = itemObj.getString("id"),
-                                videos = videos,
+                                videos = videoInputs,
                                 title = itemObj.optString("title", null),
                                 description = itemObj.optString("description", null),
                                 author = itemObj.optString("author", null),
                                 section = itemObj.optString("section", null),
                                 articleUrl = itemObj.optString("articleUrl", null),
                             )
-                            result.add(FeedInput.VideoCarousel(carouselItem))
+                            result.add(FeedInput.VideoCarousel(carouselInput))
                         }
                     }
                 }

package/ios/ShortKitBridge.swift

@@ -18,6 +18,8 @@ import ShortKitSDK
     private var cancellables = Set<AnyCancellable>()
     private weak var delegate: ShortKitBridgeDelegateProtocol?
     private var lastProgressEmitTime: CFTimeInterval = 0
+    private var lastDownloadProgressEmitTime: TimeInterval = 0
+    private var itemCache: [String: ContentItem] = [:]
 
     // Time update coalescing (250ms, matching overlay timer interval)
     private var cachedTime: (current: Double, duration: Double, buffered: Double) = (0, 0, 0)
@@ -129,6 +131,7 @@ import ShortKitSDK
         subscribeToPublishers(sdk.player)
         startTimeCoalescing()
         sdk.delegate = self
+        sdk.downloadDelegate = self
     }
 
     // MARK: - Teardown
@@ -140,6 +143,7 @@ import ShortKitSDK
         preloadHandles.removeAll()
         feedRegistry.removeAll()
         pendingOps.removeAll()
+        itemCache.removeAll()
         shortKit = nil
         if ShortKitBridge.shared === self {
             ShortKitBridge.shared = nil
@@ -396,6 +400,7 @@ import ShortKitSDK
             .receive(on: DispatchQueue.main)
             .sink { [weak self] item in
                 guard let item else { return }
+                self?.itemCache[item.id] = item
                 let body = Self.contentItemDict(item)
                 DispatchQueue.main.async {
                     self?.emit("onCurrentItemChanged", body: body)
@@ -637,6 +642,9 @@ import ShortKitSDK
         if let fallbackUrl = item.fallbackUrl {
             dict["fallbackUrl"] = fallbackUrl
         }
+        if let downloadUrl = item.downloadUrl {
+            dict["downloadUrl"] = downloadUrl
+        }
 
         return dict
     }
@@ -885,10 +893,10 @@ import ShortKitSDK
             case "videoCarousel":
                 guard let itemData = obj["item"] as? [String: Any],
                       let itemJSON = try? JSONSerialization.data(withJSONObject: itemData),
-                      let carouselItem = try? JSONDecoder().decode(VideoCarouselItem.self, from: itemJSON) else {
+                      let carouselInput = try? JSONDecoder().decode(VideoCarouselInput.self, from: itemJSON) else {
                     continue
                 }
-                result.append(.videoCarousel(carouselItem))
+                result.append(.videoCarousel(carouselInput))
             default:
                 continue
             }
@@ -937,6 +945,11 @@ extension ShortKitBridge: ShortKitDelegate {
     }
 
     public func shortKit(_ shortKit: ShortKit, didFetchContentItems items: [ContentItem]) {
+        DispatchQueue.main.async {
+            for item in items {
+                self.itemCache[item.id] = item
+            }
+        }
         Task {
             let data = try? JSONEncoder().encode(items)
             let json = data.flatMap { String(data: $0, encoding: .utf8) } ?? "[]"
@@ -953,3 +966,85 @@ extension ShortKitBridge {
     }
 }
 
+// MARK: - ShortKitDownloadDelegate
+
+extension ShortKitBridge: ShortKitDownloadDelegate {
+    public func shortKit(_ shortKit: ShortKit, didStartDownload item: ContentItem) {
+        emitOnMain("onDownloadStarted", body: ["itemId": item.id])
+    }
+
+    public func shortKit(_ shortKit: ShortKit, didUpdateDownloadProgress item: ContentItem, progress: Double) {
+        let now = CACurrentMediaTime()
+        guard now - lastDownloadProgressEmitTime >= 0.1 else { return }
+        lastDownloadProgressEmitTime = now
+        emitOnMain("onDownloadProgress", body: [
+            "itemId": item.id,
+            "progress": progress,
+        ])
+    }
+
+    public func shortKit(_ shortKit: ShortKit, didCompleteDownload item: ContentItem, fileURL: URL) {
+        emitOnMain("onDownloadCompleted", body: [
+            "itemId": item.id,
+            "fileUrl": fileURL.absoluteString,
+        ])
+    }
+
+    public func shortKit(_ shortKit: ShortKit, didFailDownload item: ContentItem, error: ShortKitDownloadError) {
+        let message: String
+        switch error {
+        case .downloadNotAvailable:
+            message = "Download not available"
+        case .downloadInProgress:
+            message = "Download already in progress"
+        case .networkError(let underlying):
+            message = "Network error: \(underlying.localizedDescription)"
+        case .httpError(let statusCode):
+            message = "HTTP error: \(statusCode)"
+        case .cancelled:
+            message = "Download cancelled"
+        }
+        emitOnMain("onDownloadFailed", body: [
+            "itemId": item.id,
+            "error": message,
+        ])
+    }
+}
+
+// MARK: - Downloads
+
+extension ShortKitBridge {
+    @objc public func downloadVideo(_ itemId: String, mode: String, completion: @escaping (String?, NSError?) -> Void) {
+        DispatchQueue.main.async {
+            guard let shortKit = self.shortKit else {
+                completion(nil, NSError(domain: "ShortKitBridge", code: 1, userInfo: [
+                    NSLocalizedDescriptionKey: "ShortKit not initialized"
+                ]))
+                return
+            }
+
+            guard let item = self.itemCache[itemId] else {
+                completion(nil, NSError(domain: "ShortKitBridge", code: 2, userInfo: [
+                    NSLocalizedDescriptionKey: "Content item not found: \(itemId)"
+                ]))
+                return
+            }
+
+            let downloadMode: DownloadMode = mode == "interruptive" ? .interruptive : .nonInterruptive
+
+            Task {
+                do {
+                    let fileURL = try await shortKit.downloadVideo(item, mode: downloadMode)
+                    completion(fileURL.absoluteString, nil)
+                } catch {
+                    completion(nil, error as NSError)
+                }
+            }
+        }
+    }
+
+    @objc public func cancelDownload() {
+        shortKit?.cancelDownload()
+    }
+}
+

package/ios/ShortKitModule.mm

@@ -84,6 +84,10 @@ RCT_EXPORT_MODULE(ShortKitModule)
     @"onOverlayFullState",
     @"onCarouselActiveImageChanged",
     @"onVideoCarouselActiveVideoChanged",
+    @"onDownloadStarted",
+    @"onDownloadProgress",
+    @"onDownloadCompleted",
+    @"onDownloadFailed",
   ];
 }
 
@@ -124,7 +128,7 @@ RCT_EXPORT_METHOD(initialize:(NSString *)apiKey
                   clientAppName:(NSString *)clientAppName
                   clientAppVersion:(NSString *)clientAppVersion
                   customDimensions:(NSString *)customDimensions
-                  debugPanel:(BOOL)debugPanel) {
+                  debugPanel:(NSNumber *)debugPanel) {
   // Tear down any existing instance to prevent leaks on re-initialize
   [_shortKitBridge teardown];
 
@@ -133,7 +137,7 @@ RCT_EXPORT_METHOD(initialize:(NSString *)apiKey
                                             clientAppName:clientAppName
                                          clientAppVersion:clientAppVersion
                                          customDimensions:customDimensions
-                                               debugPanel:debugPanel
+                                               debugPanel:[debugPanel boolValue]
                                                  delegate:self
                                          surfacePresenter:_surfacePresenter];
 
@@ -297,6 +301,25 @@ RCT_EXPORT_METHOD(getStoryboardData:(NSString *)playbackId
   }];
 }
 
+// MARK: - Download Management
+
+RCT_EXPORT_METHOD(downloadVideo:(NSString *)itemId
+                  mode:(NSString *)mode
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject) {
+  [_shortKitBridge downloadVideo:itemId mode:mode completion:^(NSString *fileUrl, NSError *error) {
+    if (error) {
+      reject(@"DOWNLOAD_ERROR", error.localizedDescription, error);
+    } else {
+      resolve(fileUrl);
+    }
+  }];
+}
+
+RCT_EXPORT_METHOD(cancelDownload) {
+  [_shortKitBridge cancelDownload];
+}
+
 // MARK: - New Architecture (TurboModule)
 
 #ifdef RCT_NEW_ARCH_ENABLED

package/ios/ShortKitSDK.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>ShortKitSDK.framework/ShortKitSDK</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>ShortKitSDK.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>ShortKitSDK.framework/ShortKitSDK</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>ShortKitSDK.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/ShortKitSDK.xcframework/ios-arm64/ShortKitSDK.framework/Info.plist

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