@shortkitsdk/react-native 0.2.42 → 0.2.43

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

@@ -14,6 +14,7 @@ import com.shortkit.sdk.model.ContentSignal
 import com.shortkit.sdk.model.FeedDirection
 import com.shortkit.sdk.model.FeedFilter
 import com.shortkit.sdk.model.FeedInput
+import com.shortkit.sdk.model.FeedItem
 import com.shortkit.sdk.model.FeedScrollPhase
 import com.shortkit.sdk.model.FeedTransitionPhase
 import com.shortkit.sdk.model.ImageCarouselItem
@@ -427,7 +428,10 @@ class ShortKitBridge(
                         "video" -> {
                             val playbackId = obj.optString("playbackId", null) ?: continue
                             val fallbackUrl = obj.optString("fallbackUrl", null)
-                            result.add(FeedInput.Video(playbackId, fallbackUrl))
+                            val itemId = obj.optString("id", null)
+                            val nativePlaybackId =
+                                if (!itemId.isNullOrBlank() && !fallbackUrl.isNullOrBlank()) itemId else playbackId
+                            result.add(FeedInput.Video(nativePlaybackId, fallbackUrl))
                         }
                         "imageCarousel" -> {
                             val itemObj = obj.optJSONObject("item") ?: continue
@@ -442,7 +446,10 @@ class ShortKitBridge(
                                 val videoObj = videosArr.getJSONObject(i)
                                 val playbackId = videoObj.optString("playbackId", null) ?: continue
                                 val fallbackUrl = videoObj.optString("fallbackUrl", null)
-                                videoInputs.add(VideoCarouselVideoInput(playbackId, fallbackUrl))
+                                val videoId = videoObj.optString("id", null)
+                                val nativePlaybackId =
+                                    if (!videoId.isNullOrBlank() && !fallbackUrl.isNullOrBlank()) videoId else playbackId
+                                videoInputs.add(VideoCarouselVideoInput(nativePlaybackId, fallbackUrl))
                             }
                             if (videoInputs.isEmpty()) continue
                             val carouselInput = VideoCarouselInput(
@@ -1098,22 +1105,220 @@ class ShortKitBridge(
     // Custom feed operations
     // ------------------------------------------------------------------
 
+    private fun legacyFallbackIdsByFallbackUrl(itemsJSON: String): Map<String, String> {
+        return try {
+            val arr = JSONArray(itemsJSON)
+            val ids = mutableMapOf<String, String>()
+
+            for (i in 0 until arr.length()) {
+                val obj = arr.getJSONObject(i)
+                when (obj.optString("type")) {
+                    "video" -> {
+                        val id = obj.optString("id", null)
+                        val fallbackUrl = obj.optString("fallbackUrl", null)
+                        if (!id.isNullOrBlank() && !fallbackUrl.isNullOrBlank()) {
+                            ids[fallbackUrl] = id
+                        }
+                    }
+                    "videoCarousel" -> {
+                        val videos = obj.optJSONObject("item")?.optJSONArray("videos")
+                        if (videos != null) {
+                            for (videoIndex in 0 until videos.length()) {
+                                val video = videos.getJSONObject(videoIndex)
+                                val id = video.optString("id", null)
+                                val fallbackUrl = video.optString("fallbackUrl", null)
+                                if (!id.isNullOrBlank() && !fallbackUrl.isNullOrBlank()) {
+                                    ids[fallbackUrl] = id
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            ids
+        } catch (_: Throwable) {
+            emptyMap()
+        }
+    }
+
+    private fun fallbackThumbnailUrl(fallbackUrl: String): String {
+        val uploadMarker = "/video/upload/"
+        val uploadIndex = fallbackUrl.indexOf(uploadMarker)
+
+        if (uploadIndex >= 0) {
+            val prefix = fallbackUrl.substring(0, uploadIndex)
+            val path = fallbackUrl.substring(uploadIndex + uploadMarker.length)
+            val withoutExtension = path.substringBeforeLast('.', path)
+            return "$prefix/video/upload/so_0/$withoutExtension.jpg"
+        }
+
+        return fallbackUrl
+    }
+
+    private fun legacyFallbackContentItem(contentId: String, fallbackUrl: String): ContentItem {
+        return ContentItem(
+            id = contentId,
+            playbackId = contentId,
+            title = "",
+            description = null,
+            duration = 0.0,
+            streamingUrl = fallbackUrl,
+            thumbnailUrl = fallbackThumbnailUrl(fallbackUrl),
+            captionTracks = emptyList(),
+            customMetadata = null,
+            author = null,
+            articleUrl = null,
+            commentCount = null,
+            fallbackUrl = fallbackUrl,
+        )
+    }
+
+    private fun patchLegacyFallbackFeedItems(
+        fragment: ShortKitFeedFragment,
+        legacyIdsByFallbackUrl: Map<String, String>,
+    ): Boolean {
+        if (legacyIdsByFallbackUrl.isEmpty()) return false
+
+        try {
+            val feedDataSourceField = fragment.javaClass.getDeclaredField("feedDataSource").apply {
+                isAccessible = true
+            }
+            val feedDataSource = feedDataSourceField.get(fragment) ?: return false
+            @Suppress("UNCHECKED_CAST")
+            val feedItems = feedDataSource.javaClass.getMethod("getItems").invoke(feedDataSource) as? MutableList<FeedItem>
+                ?: return false
+            var patchedCount = 0
+
+            feedItems.forEachIndexed { index, feedItem ->
+                when (feedItem) {
+                    is FeedItem.Content -> {
+                        val item = feedItem.item
+                        val fallbackUrl = item.fallbackUrl
+                        val legacyId = fallbackUrl?.takeIf { it.isNotBlank() }?.let {
+                            legacyIdsByFallbackUrl[it]
+                        }
+                        if (!legacyId.isNullOrBlank() && !fallbackUrl.isNullOrBlank()) {
+                            feedItems[index] = FeedItem.Content(legacyFallbackContentItem(legacyId, fallbackUrl))
+                            patchedCount += 1
+                        }
+                    }
+                    is FeedItem.VideoCarousel -> {
+                        val carouselItem = feedItem.item
+                        var didPatchCarousel = false
+                        val patchedVideos = carouselItem.videos.map { video ->
+                            val fallbackUrl = video.fallbackUrl
+                            val legacyId = fallbackUrl?.takeIf { it.isNotBlank() }?.let {
+                                legacyIdsByFallbackUrl[it]
+                            }
+                            if (legacyId.isNullOrBlank() || fallbackUrl.isNullOrBlank()) {
+                                video
+                            } else {
+                                didPatchCarousel = true
+                                legacyFallbackContentItem(legacyId, fallbackUrl)
+                            }
+                        }
+
+                        if (didPatchCarousel) {
+                            feedItems[index] = FeedItem.VideoCarousel(carouselItem.copy(videos = patchedVideos))
+                            patchedCount += 1
+                        }
+                    }
+                    else -> Unit
+                }
+            }
+
+            if (patchedCount > 0) {
+                android.util.Log.d("SK:Bridge", "patched legacy fallback feed items count=$patchedCount")
+            }
+            return patchedCount > 0
+        } catch (error: Throwable) {
+            android.util.Log.w("SK:Bridge", "failed to patch legacy fallback feed items", error)
+        }
+
+        return false
+    }
+
+    private fun resubmitPatchedFeedItems(fragment: ShortKitFeedFragment, startAtId: String?) {
+        try {
+            val feedDataSourceField = fragment.javaClass.getDeclaredField("feedDataSource").apply {
+                isAccessible = true
+            }
+            val feedDataSource = feedDataSourceField.get(fragment) ?: return
+            @Suppress("UNCHECKED_CAST")
+            val feedItems = feedDataSource.javaClass.getMethod("getItems").invoke(feedDataSource) as? List<FeedItem>
+                ?: return
+
+            val feedAdapterField = fragment.javaClass.getDeclaredField("feedAdapter").apply {
+                isAccessible = true
+            }
+            val feedAdapter = feedAdapterField.get(fragment) ?: return
+            val submitList = feedAdapter.javaClass.methods.firstOrNull { method ->
+                method.name == "submitList" &&
+                    method.parameterTypes.size == 2 &&
+                    Runnable::class.java.isAssignableFrom(method.parameterTypes[1])
+            } ?: return
+            val callback = Runnable {
+                if (!startAtId.isNullOrBlank()) {
+                    fragment.scrollToItem(startAtId, false)
+                }
+            }
+
+            submitList.invoke(feedAdapter, feedItems.toList(), callback)
+        } catch (error: Throwable) {
+            android.util.Log.w("SK:Bridge", "failed to resubmit patched legacy fallback feed items", error)
+        }
+    }
+
+    internal fun hasLegacyFallbackFeedItems(itemsJSON: String): Boolean {
+        return legacyFallbackIdsByFallbackUrl(itemsJSON).isNotEmpty()
+    }
+
+    internal fun setFeedItemsResolvingLegacyFallback(
+        fragment: ShortKitFeedFragment,
+        parsed: List<FeedInput>,
+        itemsJSON: String,
+        startAtId: String?,
+    ) {
+        val legacyIdsByFallbackUrl = legacyFallbackIdsByFallbackUrl(itemsJSON)
+        val nativeStartAtId =
+            if (!startAtId.isNullOrBlank() && legacyIdsByFallbackUrl.containsValue(startAtId)) null else startAtId
+
+        fragment.setFeedItems(parsed, nativeStartAtId)
+        if (patchLegacyFallbackFeedItems(fragment, legacyIdsByFallbackUrl)) {
+            resubmitPatchedFeedItems(fragment, startAtId)
+        }
+    }
+
+    internal fun appendFeedItemsResolvingLegacyFallback(
+        fragment: ShortKitFeedFragment,
+        parsed: List<FeedInput>,
+        itemsJSON: String,
+    ) {
+        val legacyIdsByFallbackUrl = legacyFallbackIdsByFallbackUrl(itemsJSON)
+
+        fragment.appendFeedItems(parsed)
+        if (patchLegacyFallbackFeedItems(fragment, legacyIdsByFallbackUrl)) {
+            resubmitPatchedFeedItems(fragment, null)
+        }
+    }
+
     fun setFeedItems(feedId: String, itemsJSON: String, startAtId: String?) {
         val fragment = feedFragment(feedId)
         if (fragment != null) {
             val parsed = parseFeedInputs(itemsJSON) ?: return
             Handler(Looper.getMainLooper()).post {
-                fragment.setFeedItems(parsed, startAtId)
+                setFeedItemsResolvingLegacyFallback(fragment, parsed, itemsJSON, startAtId)
             }
         } else {
             synchronized(pendingOpsLock) {
                 pendingOps.getOrPut(feedId) { mutableListOf() }.add { frag ->
                     val parsed = parseFeedInputs(itemsJSON) ?: return@add
                     if (Looper.myLooper() == Looper.getMainLooper()) {
-                        frag.setFeedItems(parsed, startAtId)
+                        setFeedItemsResolvingLegacyFallback(frag, parsed, itemsJSON, startAtId)
                     } else {
                         Handler(Looper.getMainLooper()).post {
-                            frag.setFeedItems(parsed, startAtId)
+                            setFeedItemsResolvingLegacyFallback(frag, parsed, itemsJSON, startAtId)
                         }
                     }
                 }
@@ -1143,14 +1348,14 @@ class ShortKitBridge(
         if (fragment != null) {
             val parsed = parseFeedInputs(itemsJSON) ?: return
             Handler(Looper.getMainLooper()).post {
-                fragment.appendFeedItems(parsed)
+                appendFeedItemsResolvingLegacyFallback(fragment, parsed, itemsJSON)
             }
         } else {
             synchronized(pendingOpsLock) {
                 pendingOps.getOrPut(feedId) { mutableListOf() }.add { frag ->
                     val parsed = parseFeedInputs(itemsJSON) ?: return@add
                     Handler(Looper.getMainLooper()).post {
-                        frag.appendFeedItems(parsed)
+                        appendFeedItemsResolvingLegacyFallback(frag, parsed, itemsJSON)
                     }
                 }
             }
@@ -1222,6 +1427,11 @@ class ShortKitBridge(
                 callback("")
                 return
             }
+            if (hasLegacyFallbackFeedItems(itemsJSON)) {
+                android.util.Log.d("SK:Bridge", "skipping custom preload for legacy fallback feed items")
+                callback("")
+                return
+            }
             val items = parseFeedInputs(itemsJSON)
             if (items == null) {
                 callback("")

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

@@ -10,6 +10,7 @@ import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.fragment.app.FragmentActivity
 import com.shortkit.sdk.feed.ShortKitFeedFragment
+import com.shortkit.sdk.model.FeedInput
 
 /**
  * Fabric native view that embeds [ShortKitFeedFragment] using Android
@@ -292,12 +293,10 @@ class ShortKitFeedView(context: Context) : FrameLayout(context) {
 
         val explicitPreloadId = preloadId
         val explicitFeedItemsJSON = feedItemsJSON
-        if (explicitPreloadId != null) {
-            val preload = ShortKitBridge.shared?.consumePreload(explicitPreloadId)
-            if (preload != null) {
-                feedConfig = feedConfig.copy(preload = preload)
-            }
-        } else if (explicitFeedItemsJSON != null) {
+        var deferredFeedItemsJSON: String? = null
+        var deferredFeedItems: List<FeedInput>? = null
+        fun configureExplicitFeedItems() {
+            val sourceItemsJSON = explicitFeedItemsJSON ?: return
             // Mount-time custom-feed fast-path (SHO-29 / iOS PR #150).
             // Parse JSON → FeedInput[] → sdk.preloadFeed(items=) which
             // internally calls FeedPreload.forCustomItems with the SDK's
@@ -310,15 +309,31 @@ class ShortKitFeedView(context: Context) : FrameLayout(context) {
             // ShortKit.kt:232) instead of FeedPreload.forCustomItems
             // directly — avoids needing to promote internal SDK helpers
             // for cross-module access from the bridge.
-            val parsed = ShortKitBridge.parseFeedInputs(explicitFeedItemsJSON)
+            val parsed = ShortKitBridge.parseFeedInputs(sourceItemsJSON)
             if (parsed != null && parsed.isNotEmpty()) {
-                val preload = sdk.preloadFeed(items = parsed)
-                feedConfig = feedConfig.copy(preload = preload)
+                if (ShortKitBridge.shared?.hasLegacyFallbackFeedItems(sourceItemsJSON) == true) {
+                    deferredFeedItemsJSON = sourceItemsJSON
+                    deferredFeedItems = parsed
+                } else {
+                    val preload = sdk.preloadFeed(items = parsed)
+                    feedConfig = feedConfig.copy(preload = preload)
+                }
             } else {
                 Log.w(TAG, "feedItemsJSON parsed to null/empty — ignoring (config feedSource will drive the fetch path)")
             }
         }
 
+        if (explicitPreloadId != null) {
+            val preload = ShortKitBridge.shared?.consumePreload(explicitPreloadId)
+            if (preload != null) {
+                feedConfig = feedConfig.copy(preload = preload)
+            } else {
+                configureExplicitFeedItems()
+            }
+        } else if (explicitFeedItemsJSON != null) {
+            configureExplicitFeedItems()
+        }
+
         val fragment = ShortKitFeedFragment.newInstance(sdk, feedConfig, startAtItemId)
 
         val debugPanelEnabled = if (debugPanelPropSet) debugPanel else sdk.debugPanelEnabled
@@ -348,6 +363,16 @@ class ShortKitFeedView(context: Context) : FrameLayout(context) {
                 .replace(fragmentContainerId, fragment)
                 .commitNowAllowingStateLoss()
             this.feedFragment = fragment
+            val mountFeedItemsJSON = deferredFeedItemsJSON
+            val mountFeedItems = deferredFeedItems
+            if (mountFeedItemsJSON != null && mountFeedItems != null) {
+                ShortKitBridge.shared?.setFeedItemsResolvingLegacyFallback(
+                    fragment,
+                    mountFeedItems,
+                    mountFeedItemsJSON,
+                    startAtItemId,
+                )
+            }
 
             // Android-specific first-mount race: Fabric may have set active=false
             // BEFORE we got to embed the fragment. The fragment self-claims the

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.42</string>
+    <string>0.2.43</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.2.42</string>
+    <string>0.2.43</string>
     <key>MinimumOSVersion</key>
     <string>16.0</string>
 </dict>

package/ios/ShortKitSDK.xcframework/ios-arm64/ShortKitSDK.framework/Modules/ShortKitSDK.swiftmodule/arm64-apple-ios.abi.json

@@ -53531,7 +53531,7 @@
       "kind": "StringLiteral",
       "offset": 154,
       "length": 8,
-      "value": "\"0.2.42\""
+      "value": "\"0.2.43\""
     },
     {
       "filePath": "\/Users\/michaelseleman\/shortkit\/swift_sdk\/Sources\/ShortKit\/ShortKit.swift",

package/ios/ShortKitSDK.xcframework/ios-arm64/ShortKitSDK.framework/_CodeSignature/CodeResources

@@ -10,11 +10,11 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		WYwIj+FGMh7YF5ujxHC/klHgUnc=
+		TG3LP5ZMM8V3dELjK3Olw15ohCg=
 		</data>
 		<key>Modules/ShortKitSDK.swiftmodule/arm64-apple-ios.abi.json</key>
 		<data>
-		tozRG9zh+x9rx3eAHry35nYt4pM=
+		3lW3HwkTYBJ3P/8BAI6tSSqybzM=
 		</data>
 		<key>Modules/ShortKitSDK.swiftmodule/arm64-apple-ios.private.swiftinterface</key>
 		<data>
@@ -50,7 +50,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			SzEj0TFMLukykfaw3Vh0cjVfyWUnkYbtJO3MrTBkLeQ=
+			xcfBvVw56QMYGrmvXutsz9+UxOyQoHa33Hgy7h5/lto=
 			</data>
 		</dict>
 		<key>Modules/ShortKitSDK.swiftmodule/arm64-apple-ios.private.swiftinterface</key>

package/ios/ShortKitSDK.xcframework/ios-arm64_x86_64-simulator/ShortKitSDK.framework/Info.plist

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

package/ios/ShortKitSDK.xcframework/ios-arm64_x86_64-simulator/ShortKitSDK.framework/Modules/ShortKitSDK.swiftmodule/arm64-apple-ios-simulator.abi.json

@@ -53531,7 +53531,7 @@
       "kind": "StringLiteral",
       "offset": 154,
       "length": 8,
-      "value": "\"0.2.42\""
+      "value": "\"0.2.43\""
     },
     {
       "filePath": "\/Users\/michaelseleman\/shortkit\/swift_sdk\/Sources\/ShortKit\/ShortKit.swift",

package/ios/ShortKitSDK.xcframework/ios-arm64_x86_64-simulator/ShortKitSDK.framework/Modules/ShortKitSDK.swiftmodule/x86_64-apple-ios-simulator.abi.json

@@ -53531,7 +53531,7 @@
       "kind": "StringLiteral",
       "offset": 154,
       "length": 8,
-      "value": "\"0.2.42\""
+      "value": "\"0.2.43\""
     },
     {
       "filePath": "\/Users\/michaelseleman\/shortkit\/swift_sdk\/Sources\/ShortKit\/ShortKit.swift",

package/ios/ShortKitSDK.xcframework/ios-arm64_x86_64-simulator/ShortKitSDK.framework/_CodeSignature/CodeResources

@@ -10,11 +10,11 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		WYwIj+FGMh7YF5ujxHC/klHgUnc=
+		TG3LP5ZMM8V3dELjK3Olw15ohCg=
 		</data>
 		<key>Modules/ShortKitSDK.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<data>
-		tozRG9zh+x9rx3eAHry35nYt4pM=
+		3lW3HwkTYBJ3P/8BAI6tSSqybzM=
 		</data>
 		<key>Modules/ShortKitSDK.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
@@ -30,7 +30,7 @@
 		</data>
 		<key>Modules/ShortKitSDK.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
 		<data>
-		tozRG9zh+x9rx3eAHry35nYt4pM=
+		3lW3HwkTYBJ3P/8BAI6tSSqybzM=
 		</data>
 		<key>Modules/ShortKitSDK.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
@@ -66,7 +66,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			SzEj0TFMLukykfaw3Vh0cjVfyWUnkYbtJO3MrTBkLeQ=
+			xcfBvVw56QMYGrmvXutsz9+UxOyQoHa33Hgy7h5/lto=
 			</data>
 		</dict>
 		<key>Modules/ShortKitSDK.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
@@ -94,7 +94,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			SzEj0TFMLukykfaw3Vh0cjVfyWUnkYbtJO3MrTBkLeQ=
+			xcfBvVw56QMYGrmvXutsz9+UxOyQoHa33Hgy7h5/lto=
 			</data>
 		</dict>
 		<key>Modules/ShortKitSDK.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shortkitsdk/react-native",
-  "version": "0.2.42",
+  "version": "0.2.43",
   "description": "ShortKit React Native SDK — short-form video feed",
   "react-native": "src/index",
   "source": "src/index",

package/src/serialization.ts

@@ -100,7 +100,10 @@ export function deserializePlayerTime(event: {
 function serializeVideoCarouselSlide(
   slide: VideoCarouselVideoInput,
 ): Record<string, unknown> {
+  const legacyId = (slide as VideoCarouselVideoInput & { id?: string }).id;
+
   return {
+    ...(legacyId != null ? { id: String(legacyId) } : {}),
     playbackId: slide.playbackId,
     origin: slide.origin ?? 'other',
     ...(slide.fallbackUrl != null ? { fallbackUrl: slide.fallbackUrl } : {}),
@@ -114,8 +117,11 @@ function serializeVideoCarouselSlide(
 export function serializeFeedInputs(items: FeedInput[]): string {
   const serialized = items.map((input) => {
     if (input.type === 'video') {
+      const legacyId = (input as FeedInput & { id?: string }).id;
+
       return {
         type: 'video',
+        ...(legacyId != null ? { id: String(legacyId) } : {}),
         playbackId: input.playbackId,
         origin: input.origin ?? 'other',
         ...(input.fallbackUrl != null ? { fallbackUrl: input.fallbackUrl } : {}),